diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2012-08-12 19:28:20 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2012-08-12 19:28:20 +0000 |
| commit | 200b0e5821d83de8c83fcc564fe7eda9253939e0 (patch) | |
| tree | d1d71f2cc5c061f1f4b3675990a4ebffbe0d55ca /window-copy.c | |
| parent | 30b801decf261b5e489b1067ee6f04bda40a3d17 (diff) | |
| download | rtmux-200b0e5821d83de8c83fcc564fe7eda9253939e0.tar.gz rtmux-200b0e5821d83de8c83fcc564fe7eda9253939e0.tar.bz2 rtmux-200b0e5821d83de8c83fcc564fe7eda9253939e0.zip | |
Sync OpenBSD patchset 1156:
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.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/window-copy.c b/window-copy.c index 35742a6f..6d18dd42 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; |