From 725938fb85290ca67ab50e27f9cacb870ff56c63 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Tue, 21 Jul 2009 17:57:29 +0000 Subject: Tidy up keys: use an enum for the key codes, and remove the macros which just wrap flag sets/clears/tests. --- cmd-resize-pane.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'cmd-resize-pane.c') diff --git a/cmd-resize-pane.c b/cmd-resize-pane.c index 5e9f67e3..b0ea214c 100644 --- a/cmd-resize-pane.c +++ b/cmd-resize-pane.c @@ -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"); } -- cgit