diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2009-07-22 16:24:59 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2009-07-22 16:24:59 +0000 |
| commit | a734488a4b84752000ee511b57f07d91ddc28a6d (patch) | |
| tree | 091cec0e80ba02bc776c3ae1263c37dd2c9e670f /cmd-resize-pane.c | |
| parent | 94e2339842b813b608fa7726f67b985eb8592712 (diff) | |
| download | rtmux-a734488a4b84752000ee511b57f07d91ddc28a6d.tar.gz rtmux-a734488a4b84752000ee511b57f07d91ddc28a6d.tar.bz2 rtmux-a734488a4b84752000ee511b57f07d91ddc28a6d.zip | |
Sync OpenBSD patchset 151:
Tidy up keys: use an enum for the key codes, and remove the macros which just
wrap flag sets/clears/tests.
Diffstat (limited to 'cmd-resize-pane.c')
| -rw-r--r-- | cmd-resize-pane.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cmd-resize-pane.c b/cmd-resize-pane.c index d32dbc25..bb6e12b7 100644 --- a/cmd-resize-pane.c +++ b/cmd-resize-pane.c @@ -1,4 +1,4 @@ -/* $Id: cmd-resize-pane.c,v 1.9 2009-07-20 15:42:05 tcunha Exp $ */ +/* $Id: cmd-resize-pane.c,v 1.10 2009-07-22 16:24:59 tcunha Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -51,28 +51,28 @@ cmd_resize_pane_init(struct cmd *self, int key) cmd_pane_init(self, key); data = self->data; - if (key == KEYC_ADDCTL(KEYC_UP)) + if (key == (KEYC_UP | KEYC_CTRL)) data->chflags |= CMD_CHFLAG('U'); - if (key == KEYC_ADDCTL(KEYC_DOWN)) + if (key == (KEYC_DOWN | KEYC_CTRL)) data->chflags |= CMD_CHFLAG('D'); - if (key == KEYC_ADDCTL(KEYC_LEFT)) + if (key == (KEYC_LEFT | KEYC_CTRL)) data->chflags |= CMD_CHFLAG('L'); - if (key == KEYC_ADDCTL(KEYC_RIGHT)) + if (key == (KEYC_RIGHT | KEYC_CTRL)) data->chflags |= CMD_CHFLAG('R'); - - if (key == KEYC_ADDESC(KEYC_UP)) { + + if (key == (KEYC_UP | KEYC_ESCAPE)) { data->chflags |= CMD_CHFLAG('U'); data->arg = xstrdup("5"); } - if (key == KEYC_ADDESC(KEYC_DOWN)) { + if (key == (KEYC_DOWN | KEYC_ESCAPE)) { data->chflags |= CMD_CHFLAG('D'); data->arg = xstrdup("5"); } - if (key == KEYC_ADDESC(KEYC_LEFT)) { + if (key == (KEYC_LEFT | KEYC_ESCAPE)) { data->chflags |= CMD_CHFLAG('L'); data->arg = xstrdup("5"); } - if (key == KEYC_ADDESC(KEYC_RIGHT)) { + if (key == (KEYC_RIGHT | KEYC_ESCAPE)) { data->chflags |= CMD_CHFLAG('R'); data->arg = xstrdup("5"); } |