rp_text_width: remove "font" argument

* (globals.[ch]): remove rp_text_width "font" arg, since its value
  is always the global variable defaults.font (non-Xft case).
  remove one #ifdef while here
* update rp_text_width() calls to match new signature

1 files changed, 4 insertions, 6 deletions

diff --git a/src/bar.c b/src/bar.c
index 47ada2d..22dcc92 100644
--- a/src/bar.c
+++ b/src/bar.c
@@ -262,7 +262,7 @@ max_line_length (char* msg)
           int current_width;
 
           /* Check if this line is the longest so far. */
-          current_width = rp_text_width (s, defaults.font, msg + start, i - start);
+          current_width = rp_text_width (s, msg + start, i - start);
           if(current_width > ret)
             {
               ret = current_width;
@@ -480,12 +480,10 @@ 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 = rp_text_width (s, defaults.font,
-                           &msg[start_line_beginning],
+    start = rp_text_width (s, &msg[start_line_beginning],
                            start_pos_in_line) + defaults.bar_x_padding;
-   
-  end = rp_text_width (s, defaults.font,
-                       &msg[end_line_beginning],
+
+  end = rp_text_width (s, &msg[end_line_beginning],
                        end_pos_in_line) + defaults.bar_x_padding * 2;
 
   if (mark_end != strlen (msg))