From eb44ceb50fa5b47b78cb98794a8c9f6b424aa000 Mon Sep 17 00:00:00 2001
From: okan
Date: Wed, 27 Nov 2013 16:24:17 +0000
Subject: Remove the option to bind a key by keycode with brackets; it never
 worked (and no one complained!).  While it's fairly easy to fix, users should
 be using keysym names and not keycodes.

Discussed at length months ago with todd@, matthieu@ and Owain.
---
 conf.c    | 19 ++++---------------
 cwmrc.5   | 10 ++++------
 xevents.c |  6 ++----
 3 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/conf.c b/conf.c
index 689cbf2..60c9293 100644
--- a/conf.c
+++ b/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.148 2013/10/20 01:55:32 okan Exp $
+ * $OpenBSD: conf.c,v 1.149 2013/11/27 16:24:17 okan Exp $
  */
 
 #include <sys/param.h>
@@ -479,17 +479,8 @@ conf_bind_kbd(struct conf *c, char *name, char *binding)
 	substring = conf_bind_getmask(name, &mask);
 	current_binding->modmask |= mask;
 
-	if (substring[0] == '[' &&
-	    substring[strlen(substring)-1] == ']') {
-		sscanf(substring, "[%d]", &current_binding->keycode);
-		current_binding->keysym = NoSymbol;
-	} else {
-		current_binding->keycode = 0;
-		current_binding->keysym = XStringToKeysym(substring);
-	}
-
-	if (current_binding->keysym == NoSymbol &&
-	    current_binding->keycode == 0) {
+	current_binding->keysym = XStringToKeysym(substring);
+	if (current_binding->keysym == NoSymbol) {
 		free(current_binding);
 		return;
 	}
@@ -530,9 +521,7 @@ conf_unbind_kbd(struct conf *c, struct keybinding *unbind)
 		if (key->modmask != unbind->modmask)
 			continue;
 
-		if ((key->keycode != 0 && key->keysym == NoSymbol &&
-		    key->keycode == unbind->keycode) ||
-		    key->keysym == unbind->keysym) {
+		if (key->keysym == unbind->keysym) {
 			TAILQ_REMOVE(&c->keybindingq, key, entry);
 			if (key->argtype & ARG_CHAR)
 				free(key->argument.c);
diff --git a/cwmrc.5 b/cwmrc.5
index 6d4684f..cf91032 100644
--- a/cwmrc.5
+++ b/cwmrc.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cwmrc.5,v 1.54 2013/07/08 18:39:20 okan Exp $
+.\"	$OpenBSD: cwmrc.5,v 1.55 2013/11/27 16:24:17 okan Exp $
 .\"
 .\" Copyright (c) 2004,2005 Marius Aamodt Eriksen <marius@monkey.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: July 8 2013 $
+.Dd $Mdocdate: November 27 2013 $
 .Dt CWMRC 5
 .Os
 .Sh NAME
@@ -84,10 +84,8 @@ The Mod4 key (normally the windows key).
 .Pp
 The
 .Sq -
-should be followed by either a keysym name, taken from
-.Pa /usr/X11R6/include/X11/keysymdef.h ,
-or a numerical keycode value enclosed in
-.Dq [] .
+should be followed by a keysym name, taken from
+.Pa /usr/X11R6/include/X11/keysymdef.h .
 The
 .Ar command
 may either be one from the
diff --git a/xevents.c b/xevents.c
index f7f772a..0d0426d 100644
--- a/xevents.c
+++ b/xevents.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: xevents.c,v 1.93 2013/11/27 00:01:23 okan Exp $
+ * $OpenBSD: xevents.c,v 1.94 2013/11/27 16:24:17 okan Exp $
  */
 
 /*
@@ -275,9 +275,7 @@ xev_handle_keypress(XEvent *ee)
 		if ((kb->modmask | modshift) != e->state)
 			continue;
 
-		if ((kb->keycode != 0 && kb->keysym == NoSymbol &&
-		    kb->keycode == e->keycode) || kb->keysym ==
-		    (modshift == 0 ? keysym : skeysym))
+		if (kb->keysym == (modshift == 0 ? keysym : skeysym))
 			break;
 	}
 
-- 
cgit v1.2.3-2-gb3c3