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/split.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/split.c')
| -rw-r--r-- | src/split.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/split.c b/src/split.c index 109740f..a93d3a0 100644 --- a/src/split.c +++ b/src/split.c @@ -918,7 +918,7 @@ show_frame_message (char *msg) frame = current_frame(); - width = defaults.bar_x_padding * 2 + XTextWidth (defaults.font, msg, strlen (msg)); + width = defaults.bar_x_padding * 2 + XmbTextEscapement (defaults.font, msg, strlen (msg)); height = (FONT_HEIGHT (defaults.font) + defaults.bar_y_padding * 2); /* We don't want another frame indicator to be displayed on another @@ -935,10 +935,10 @@ show_frame_message (char *msg) XClearWindow (dpy, s->frame_window); XSync (dpy, False); - XDrawString (dpy, s->frame_window, s->normal_gc, - defaults.bar_x_padding, - defaults.bar_y_padding + defaults.font->max_bounds.ascent, - msg, strlen (msg)); + XmbDrawString (dpy, s->frame_window, defaults.font, s->normal_gc, + defaults.bar_x_padding, + defaults.bar_y_padding + rp_font_ascent, + msg, strlen (msg)); } rp_frame * |