diff options
| author | Micah Cowan <micah@micah.cowan.name> | 2010-06-05 20:29:11 +0000 |
|---|---|---|
| committer | Micah Cowan <micah@micah.cowan.name> | 2010-06-05 20:29:11 +0000 |
| commit | 227e458ebbd69d1e8d22f9013de111f734608ba7 (patch) | |
| tree | 8394378e8217309998e3b03e2eddf5270033d89b /window-copy.c | |
| parent | 89eb95265a8acf42f17f7f93b1b5206a20f842a9 (diff) | |
| download | rtmux-227e458ebbd69d1e8d22f9013de111f734608ba7.tar.gz rtmux-227e458ebbd69d1e8d22f9013de111f734608ba7.tar.bz2 rtmux-227e458ebbd69d1e8d22f9013de111f734608ba7.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.
Diffstat (limited to 'window-copy.c')
| -rw-r--r-- | window-copy.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/window-copy.c b/window-copy.c index 917a4e97..fdc97949 100644 --- a/window-copy.c +++ b/window-copy.c @@ -1,4 +1,4 @@ -/* $Id: window-copy.c,v 1.118 2010-06-05 07:48:35 micahcowan Exp $ */ +/* $Id: window-copy.c,v 1.119 2010-06-05 20:29:11 micahcowan Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -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; |