From da47515de41973ed5f52d2084d71001d7755dca6 Mon Sep 17 00:00:00 2001
From: okan <okan@openbsd.org>
Date: Thu, 26 Mar 2015 21:41:43 +0000
Subject: [PATCH] Simplify key/mb binding moving argtype into flags and
 dropping another variable; removes the need to zero out struct binding,
 leaving a simple malloc.

---
 app/cwm/calmwm.h |  4 ++--
 app/cwm/conf.c   | 22 +++++++++-------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/app/cwm/calmwm.h b/app/cwm/calmwm.h
index 955d9fc2c..03783cd0d 100644
--- a/app/cwm/calmwm.h
+++ b/app/cwm/calmwm.h
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: calmwm.h,v 1.284 2015/01/19 14:54:16 okan Exp $
+ * $OpenBSD: calmwm.h,v 1.285 2015/03/26 21:41:43 okan Exp $
  */
 
 #ifndef _CALMWM_H_
@@ -84,6 +84,7 @@
 #define CWM_NOGAP		0x0002
 
 #define CWM_WIN			0x0001
+#define CWM_CMD			0x0002
 
 #define CWM_QUIT		0x0000
 #define CWM_RUNNING		0x0001
@@ -252,7 +253,6 @@ struct binding {
 	unsigned int		 modmask;
 	union press		 press;
 	int			 flags;
-	int			 argtype;
 };
 TAILQ_HEAD(keybinding_q, binding);
 TAILQ_HEAD(mousebinding_q, binding);
diff --git a/app/cwm/conf.c b/app/cwm/conf.c
index 6e4cdeb2a..7a1ae636c 100644
--- a/app/cwm/conf.c
+++ b/app/cwm/conf.c
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: conf.c,v 1.184 2015/01/24 18:16:59 okan Exp $
+ * $OpenBSD: conf.c,v 1.185 2015/03/26 21:41:43 okan Exp $
  */
 
 #include <sys/types.h>
@@ -491,11 +491,10 @@ conf_bind_kbd(struct conf *c, const char *bind, const char *cmd)
 {
 	struct binding	*kb;
 	const char	*key;
-	unsigned int	 i, mask;
+	unsigned int	 i;
 
-	kb = xcalloc(1, sizeof(*kb));
-	key = conf_bind_getmask(bind, &mask);
-	kb->modmask |= mask;
+	kb = xmalloc(sizeof(*kb));
+	key = conf_bind_getmask(bind, &kb->modmask);
 
 	kb->press.keysym = XStringToKeysym(key);
 	if (kb->press.keysym == NoSymbol) {
@@ -519,15 +518,13 @@ conf_bind_kbd(struct conf *c, const char *bind, const char *cmd)
 		kb->callback = name_to_func[i].handler;
 		kb->flags = name_to_func[i].flags;
 		kb->argument = name_to_func[i].argument;
-		kb->argtype |= ARG_INT;
 		TAILQ_INSERT_TAIL(&c->keybindingq, kb, entry);
 		return(1);
 	}
 
 	kb->callback = kbfunc_cmdexec;
-	kb->flags = 0;
+	kb->flags = CWM_CMD;
 	kb->argument.c = xstrdup(cmd);
-	kb->argtype |= ARG_CHAR;
 	TAILQ_INSERT_TAIL(&c->keybindingq, kb, entry);
 	return(1);
 }
@@ -543,7 +540,7 @@ conf_unbind_kbd(struct conf *c, struct binding *unbind)
 
 		if (key->press.keysym == unbind->press.keysym) {
 			TAILQ_REMOVE(&c->keybindingq, key, entry);
-			if (key->argtype & ARG_CHAR)
+			if (key->flags & CWM_CMD)
 				free(key->argument.c);
 			free(key);
 		}
@@ -555,11 +552,10 @@ conf_bind_mouse(struct conf *c, const char *bind, const char *cmd)
 {
 	struct binding	*mb;
 	const char	*button, *errstr;
-	unsigned int	 i, mask;
+	unsigned int	 i;
 
-	mb = xcalloc(1, sizeof(*mb));
-	button = conf_bind_getmask(bind, &mask);
-	mb->modmask |= mask;
+	mb = xmalloc(sizeof(*mb));
+	button = conf_bind_getmask(bind, &mb->modmask);
 
 	mb->press.button = strtonum(button, Button1, Button5, &errstr);
 	if (errstr) {