diff options
| author | Nicholas Marriott <nicm@openbsd.org> | 2010-06-06 19:00:13 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@openbsd.org> | 2010-06-06 19:00:13 +0000 |
| commit | dcc100f165d2d710174db61e54d97610843578fb (patch) | |
| tree | d28e5cfb78ea328a928062a9ab7292c56672bb0c /window-copy.c | |
| parent | 4e3bed20351e0b2293d1445d829795578321e069 (diff) | |
| download | rtmux-dcc100f165d2d710174db61e54d97610843578fb.tar.gz rtmux-dcc100f165d2d710174db61e54d97610843578fb.tar.bz2 rtmux-dcc100f165d2d710174db61e54d97610843578fb.zip | |
Use a macro-based mask for obtaining a key or modifier-set from the
combination. Display C-@, etc, as C-Space, in list-keys. By Micah Cowan.
Diffstat (limited to 'window-copy.c')
| -rw-r--r-- | window-copy.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/window-copy.c b/window-copy.c index efee25d0..cd94f67f 100644 --- a/window-copy.c +++ b/window-copy.c @@ -367,7 +367,7 @@ window_copy_key(struct window_pane *wp, struct session *sess, int key) if (data->inputtype == WINDOW_COPY_JUMPFORWARD || data->inputtype == WINDOW_COPY_JUMPBACK) { /* Ignore keys with modifiers. */ - if ((key & 0xff00) == 0) { + if ((key & KEYC_MASK_MOD) == 0) { data->jumpchar = key; if (data->inputtype == WINDOW_COPY_JUMPFORWARD) { for (; np != 0; np--) @@ -627,7 +627,7 @@ window_copy_key(struct window_pane *wp, struct session *sess, int key) *data->inputstr = '\0'; goto input_on; case MODEKEYCOPY_STARTNUMBERPREFIX: - key &= 0xff; + key &= KEYC_MASK_KEY; if (key >= '0' && key <= '9') { data->inputtype = WINDOW_COPY_NUMERICPREFIX; data->numprefix = 0; @@ -741,7 +741,7 @@ window_copy_key_numeric_prefix(struct window_pane *wp, int key) struct window_copy_mode_data *data = wp->modedata; struct screen *s = &data->screen; - key &= 0xff; + key &= KEYC_MASK_KEY; if (key < '0' || key > '9') return 1; |