diff options
author | Jérémie Courrèges-Anglas <jca@wxcvbn.org> | 2013-02-06 19:03:07 +0100 |
---|---|---|
committer | Jérémie Courrèges-Anglas <jca@wxcvbn.org> | 2013-02-06 21:17:54 +0100 |
commit | 2685676e118cd63380e6a12ce81ce5d4f0badc0a (patch) | |
tree | e32bbf16aa5d84a68edfa061f68506a876f966fe /src/bar.c | |
parent | 20c5d11a3be2843c808ba84f971ed3fed011e144 (diff) | |
download | ratpoison-2685676e118cd63380e6a12ce81ce5d4f0badc0a.zip |
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
Diffstat (limited to 'src/bar.c')
-rw-r--r-- | src/bar.c | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -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)) |