diff options
| author | sabetts <sabetts> | 2006-04-20 02:10:02 +0000 |
|---|---|---|
| committer | sabetts <sabetts> | 2006-04-20 02:10:02 +0000 |
| commit | b7bb91712d275065bb4b2440fd0867d9299da94c (patch) | |
| tree | 20fffc9fd31e077b23a44fedd3480c70c84b332a /src/input.c | |
| parent | 91a86a505d76d9a4a0b89ddaaefa631a660c4835 (diff) | |
| download | ratpoison-b7bb91712d275065bb4b2440fd0867d9299da94c.zip | |
* src/split.c (show_frame_message): use XmbDrawString and XmbTextEscapement
* src/screen.c (init_screen): don't include the font in the gc
* src/ratpoison.h: include Xlocale.h
* src/manage.c (get_wmname): support i18n characters
* src/main.c (init_defaults): call load_query_font_set and set_extents_of_fontset
(main): call setlocale
(clean_up): call XFreeFontSet
(set_extents_of_fontset): new function
(load_query_font_set): likewise
* src/input.c (update_input_window): use XmbTextEscapement and XmbDrawString
* src/globals.h (FONT_HEIGHT): use rp_font_ascent and rp_font_descent
(MAX_FONT_WIDTH): use rp_font_width
new globals rp_font_ascent, rp_font_descent, rp_font_width
* src/globals.c: new globals rp_font_ascent, rp_font_descent, rp_font_width
* src/data.h (struct rp_defaults): font is a XFontSet
* src/bar.c (max_line_length): call XmbTextEscapement
(draw_string): call XmbDrawString
(get_mark_box): call XmbTextEscapement
* src/actions.c (read_frame): call XmbTextEscapement
(cmd_license): likewise
(read_frame): call XmbDrawString
(cmd_license): likewise
(cmd_help): likewise
(update_gc): don't include the font
(set_font): call load_query_font_set
Diffstat (limited to 'src/input.c')
| -rw-r--r-- | src/input.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/input.c b/src/input.c index 5fcb303..6a51dd1 100644 --- a/src/input.c +++ b/src/input.c @@ -319,8 +319,8 @@ read_key (KeySym *keysym, unsigned int *modifiers, char *keysym_name, int len) static void update_input_window (rp_screen *s, rp_input_line *line) { - int prompt_width = XTextWidth (defaults.font, line->prompt, strlen (line->prompt)); - int input_width = XTextWidth (defaults.font, line->buffer, line->length); + int prompt_width = XmbTextEscapement (defaults.font, line->prompt, strlen (line->prompt)); + int input_width = XmbTextEscapement (defaults.font, line->buffer, line->length); int total_width; GC lgc; XGCValues gv; @@ -341,17 +341,17 @@ update_input_window (rp_screen *s, rp_input_line *line) XClearWindow (dpy, s->input_window); XSync (dpy, False); - XDrawString (dpy, s->input_window, s->normal_gc, - defaults.bar_x_padding, - defaults.bar_y_padding + defaults.font->max_bounds.ascent, - line->prompt, - strlen (line->prompt)); + XmbDrawString (dpy, s->input_window, defaults.font, s->normal_gc, + defaults.bar_x_padding, + defaults.bar_y_padding + rp_font_ascent, + line->prompt, + strlen (line->prompt)); - XDrawString (dpy, s->input_window, s->normal_gc, - defaults.bar_x_padding + prompt_width, - defaults.bar_y_padding + defaults.font->max_bounds.ascent, - line->buffer, - line->length); + XmbDrawString (dpy, s->input_window, defaults.font, s->normal_gc, + defaults.bar_x_padding + prompt_width, + defaults.bar_y_padding + rp_font_ascent, + line->buffer, + line->length); gv.function = GXxor; gv.foreground = s->fg_color ^ s->bg_color; @@ -359,9 +359,9 @@ update_input_window (rp_screen *s, rp_input_line *line) /* Draw a cheap-o cursor - MkII */ XFillRectangle (dpy, s->input_window, lgc, - defaults.bar_x_padding + prompt_width + XTextWidth (defaults.font, line->buffer, line->position), + defaults.bar_x_padding + prompt_width + XmbTextEscapement (defaults.font, line->buffer, line->position), defaults.bar_y_padding, - XTextWidth (defaults.font, &line->buffer[line->position], 1), + XmbTextEscapement (defaults.font, &line->buffer[line->position], 1), FONT_HEIGHT (defaults.font)); XFlush (dpy); |