diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/actions.c | 32 | ||||
| -rw-r--r-- | src/bar.c | 24 | ||||
| -rw-r--r-- | src/input.c | 16 | ||||
| -rw-r--r-- | src/split.c | 6 |
4 files changed, 39 insertions, 39 deletions
diff --git a/src/actions.c b/src/actions.c index c1bf5d4..374bbae 100644 --- a/src/actions.c +++ b/src/actions.c @@ -1731,9 +1731,9 @@ read_frame (struct argspec *spec, struct sbuf *s, struct cmdarg **arg) /* Display the frame's number inside the window. */ rp_draw_string (s, wins[i], s->normal_gc, - defaults.bar_x_padding, - defaults.bar_y_padding + FONT_ASCENT(s), - num, -1); + defaults.bar_x_padding, + defaults.bar_y_padding + FONT_ASCENT(s), + num, -1); free (num); i++; @@ -3214,8 +3214,8 @@ cmd_license (int interactive, struct cmdarg **args) for(i=0; license_text[i]; i++) { rp_draw_string (s, s->help_window, s->normal_gc, - x, y + FONT_ASCENT(s), - license_text[i], -1); + x, y + FONT_ASCENT(s), + license_text[i], -1); y += FONT_HEIGHT (s); } @@ -3266,21 +3266,21 @@ cmd_help (int interactive, struct cmdarg **args) XMapRaised (dpy, s->help_window); rp_draw_string (s, s->help_window, s->normal_gc, - 10, y + FONT_ASCENT(s), - "ratpoison key bindings", -1); + 10, y + FONT_ASCENT(s), + "ratpoison key bindings", -1); y += FONT_HEIGHT (s) * 2; rp_draw_string (s, s->help_window, s->normal_gc, - 10, y + FONT_ASCENT(s), - "Command key: ", -1); + 10, y + FONT_ASCENT(s), + "Command key: ", -1); keysym_name = keysym_to_string (prefix_key.sym, prefix_key.state); rp_draw_string (s, s->help_window, s->normal_gc, - 10 + rp_text_width (s, defaults.font, "Command key: ", -1), - y + FONT_ASCENT(s), - keysym_name, -1); + 10 + rp_text_width (s, defaults.font, "Command key: ", -1), + y + FONT_ASCENT(s), + keysym_name, -1); free (keysym_name); y += FONT_HEIGHT (s) * 2; @@ -3294,8 +3294,8 @@ cmd_help (int interactive, struct cmdarg **args) keysym_name = keysym_to_string (map->actions[i].key, map->actions[i].state); rp_draw_string (s, s->help_window, s->normal_gc, - x, y + FONT_ASCENT(s), - keysym_name, -1); + x, y + FONT_ASCENT(s), + keysym_name, -1); if (rp_text_width (s, defaults.font, keysym_name, -1) > max_width) max_width = rp_text_width (s, defaults.font, keysym_name, -1); @@ -3305,8 +3305,8 @@ cmd_help (int interactive, struct cmdarg **args) else { rp_draw_string (s, s->help_window, s->normal_gc, - x, y + FONT_ASCENT(s), - map->actions[i].data, -1); + x, y + FONT_ASCENT(s), + map->actions[i].data, -1); if (rp_text_width (s, defaults.font, map->actions[i].data, -1) > max_width) { @@ -338,10 +338,10 @@ draw_string (rp_screen *s, char *msg) if (msg[i] == '\n') { rp_draw_string (s, s->bar_window, s->normal_gc, - defaults.bar_x_padding, - defaults.bar_y_padding + FONT_ASCENT(s) - + line_no * line_height, - msg + start, i - start); + defaults.bar_x_padding, + defaults.bar_y_padding + FONT_ASCENT(s) + + line_no * line_height, + msg + start, i - start); line_no++; start = i + 1; } @@ -349,10 +349,10 @@ draw_string (rp_screen *s, char *msg) /* Print the last line. */ rp_draw_string (s, s->bar_window, s->normal_gc, - defaults.bar_x_padding, - defaults.bar_y_padding + FONT_ASCENT(s) - + line_no * line_height, - msg + start, strlen (msg) - start); + defaults.bar_x_padding, + defaults.bar_y_padding + FONT_ASCENT(s) + + line_no * line_height, + msg + start, strlen (msg) - start); XSync (dpy, False); } @@ -452,12 +452,12 @@ get_mark_box (char *msg, size_t mark_start, size_t mark_end, start = 0; else start = rp_text_width (s, defaults.font, - &msg[start_line_beginning], - start_pos_in_line) + defaults.bar_x_padding; + &msg[start_line_beginning], + start_pos_in_line) + defaults.bar_x_padding; end = rp_text_width (s, defaults.font, - &msg[end_line_beginning], - end_pos_in_line) + defaults.bar_x_padding * 2; + &msg[end_line_beginning], + end_pos_in_line) + defaults.bar_x_padding * 2; if (mark_end != strlen (msg)) end -= defaults.bar_x_padding; diff --git a/src/input.c b/src/input.c index ec29fbf..d2e703e 100644 --- a/src/input.c +++ b/src/input.c @@ -447,16 +447,16 @@ update_input_window (rp_screen *s, rp_input_line *line) XSync (dpy, False); rp_draw_string (s, s->input_window, s->normal_gc, - defaults.bar_x_padding, - defaults.bar_y_padding + FONT_ASCENT(s), - line->prompt, - -1); + defaults.bar_x_padding, + defaults.bar_y_padding + FONT_ASCENT(s), + line->prompt, + -1); rp_draw_string (s, s->input_window, s->normal_gc, - defaults.bar_x_padding + prompt_width, - defaults.bar_y_padding + FONT_ASCENT(s), - line->buffer, - line->length); + defaults.bar_x_padding + prompt_width, + defaults.bar_y_padding + FONT_ASCENT(s), + line->buffer, + line->length); gv.function = GXxor; gv.foreground = s->fg_color ^ s->bg_color; diff --git a/src/split.c b/src/split.c index e27e277..9b1d41b 100644 --- a/src/split.c +++ b/src/split.c @@ -1019,9 +1019,9 @@ show_frame_message (char *msg) XSync (dpy, False); rp_draw_string (s, s->frame_window, s->normal_gc, - defaults.bar_x_padding, - defaults.bar_y_padding + FONT_ASCENT(s), - msgbuf->data, msgbuf->len); + defaults.bar_x_padding, + defaults.bar_y_padding + FONT_ASCENT(s), + msgbuf->data, msgbuf->len); sbuf_free (msgbuf); } |