aboutsummaryrefslogtreecommitdiff
path: root/window-copy.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@openbsd.org>2012-08-11 06:45:33 +0000
committerNicholas Marriott <nicm@openbsd.org>2012-08-11 06:45:33 +0000
commita3dec6becef3295e8bd376d5e5b017c538fb10fc (patch)
tree62d68c9d54a7ec8ff59f14f3245214423234b83c /window-copy.c
parentff4097e02cf35709e4b34aa62d227a54c5d7ddb5 (diff)
downloadrtmux-a3dec6becef3295e8bd376d5e5b017c538fb10fc.tar.gz
rtmux-a3dec6becef3295e8bd376d5e5b017c538fb10fc.tar.bz2
rtmux-a3dec6becef3295e8bd376d5e5b017c538fb10fc.zip
Instead of numbering choose mode items 0-9a-z and then nothing, number
them all and if there are more than 10 use a prompt when 0-9 is pressed. From Thomas Adam.
Diffstat (limited to 'window-copy.c')
-rw-r--r--window-copy.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/window-copy.c b/window-copy.c
index 089974f1..2c10861a 100644
--- a/window-copy.c
+++ b/window-copy.c
@@ -1115,10 +1115,7 @@ window_copy_write_line(
char hdr[32];
size_t last, xoff = 0, size = 0;
- memcpy(&gc, &grid_default_cell, sizeof gc);
- colour_set_fg(&gc, options_get_number(oo, "mode-fg"));
- colour_set_bg(&gc, options_get_number(oo, "mode-bg"));
- gc.attr |= options_get_number(oo, "mode-attr");
+ window_mode_attrs(&gc, oo);
last = screen_size_y(s) - 1;
if (py == 0) {
@@ -1232,10 +1229,7 @@ window_copy_update_selection(struct window_pane *wp)
return (0);
/* Set colours. */
- memcpy(&gc, &grid_default_cell, sizeof gc);
- colour_set_fg(&gc, options_get_number(oo, "mode-fg"));
- colour_set_bg(&gc, options_get_number(oo, "mode-bg"));
- gc.attr |= options_get_number(oo, "mode-attr");
+ window_mode_attrs(&gc, oo);
/* Find top of screen. */
ty = screen_hsize(data->backing) - data->oy;