From a734488a4b84752000ee511b57f07d91ddc28a6d Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Wed, 22 Jul 2009 16:24:59 +0000 Subject: 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. --- cmd-select-layout.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'cmd-select-layout.c') diff --git a/cmd-select-layout.c b/cmd-select-layout.c index acca099f..0f305815 100644 --- a/cmd-select-layout.c +++ b/cmd-select-layout.c @@ -1,4 +1,4 @@ -/* $Id: cmd-select-layout.c,v 1.5 2009-07-20 15:42:05 tcunha Exp $ */ +/* $Id: cmd-select-layout.c,v 1.6 2009-07-22 16:24:59 tcunha Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott @@ -49,16 +49,16 @@ cmd_select_layout_init(struct cmd *self, int key) data = self->data; switch (key) { - case KEYC_ADDESC('1'): + case ('1' | KEYC_ESCAPE): data->arg = xstrdup("even-horizontal"); break; - case KEYC_ADDESC('2'): + case ('2' | KEYC_ESCAPE): data->arg = xstrdup("even-vertical"); - break; - case KEYC_ADDESC('3'): + break; + case ('3' | KEYC_ESCAPE): data->arg = xstrdup("main-horizontal"); break; - case KEYC_ADDESC('4'): + case ('4' | KEYC_ESCAPE): data->arg = xstrdup("main-vertical"); break; } -- cgit v1.2.3