* 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

1 files changed, 13 insertions, 13 deletions

diff --git a/src/bar.c b/src/bar.c
index 79d39ec..c54c627 100644
--- a/src/bar.c
+++ b/src/bar.c
@@ -231,7 +231,7 @@ max_line_length (char* msg)
           int current_width;
 
           /* Check if this line is the longest so far. */
-          current_width = XTextWidth (defaults.font, msg + start, i - start);
+          current_width = XmbTextEscapement (defaults.font, msg + start, i - start);
           if(current_width > ret)
             {
               ret = current_width;
@@ -306,22 +306,22 @@ draw_string (rp_screen *s, char *msg)
          line, and move down one line. */
       if (msg[i] == '\n')
         {
-          XDrawString (dpy, s->bar_window, s->normal_gc,
-                       defaults.bar_x_padding,
-                       defaults.bar_y_padding + defaults.font->max_bounds.ascent
-                       +  line_no * line_height,
-                       msg + start, i - start);
+          XmbDrawString (dpy, s->bar_window, defaults.font, s->normal_gc,
+			 defaults.bar_x_padding,
+			 defaults.bar_y_padding + rp_font_ascent
+			 +  line_no * line_height,
+			 msg + start, i - start);
           line_no++;
           start = i + 1;
         }
     }
 
   /* Print the last line. */
-  XDrawString (dpy, s->bar_window, s->normal_gc,
-               defaults.bar_x_padding,
-               defaults.bar_y_padding + defaults.font->max_bounds.ascent
-               +  line_no * line_height,
-               msg + start, strlen (msg) - start);
+  XmbDrawString (dpy, s->bar_window, defaults.font, s->normal_gc,
+		 defaults.bar_x_padding,
+		 defaults.bar_y_padding + rp_font_ascent
+		 +  line_no * line_height,
+		 msg + start, strlen (msg) - start);
 
   XSync (dpy, False);
 }
@@ -412,11 +412,11 @@ get_mark_box (char *msg, size_t mark_start, size_t mark_end,
   if (mark_start == 0 || start_pos_in_line == 0)
     start = 0;
   else
-    start = XTextWidth (defaults.font,
+    start = XmbTextEscapement (defaults.font,
                         &msg[start_line_beginning],
                         start_pos_in_line) + defaults.bar_x_padding;
 
-  end = XTextWidth (defaults.font,
+  end = XmbTextEscapement (defaults.font,
                     &msg[end_line_beginning],
                     end_pos_in_line) + defaults.bar_x_padding * 2;