Apply cwm-3-input_shift.diff from http://aon.iki.fi/cwm/.

2 files changed, 7 insertions, 4 deletions

diff --git a/grab.c b/grab.c
index 90dd73a..a3e936a 100644
--- a/grab.c
+++ b/grab.c
@@ -4,7 +4,7 @@
  * Copyright (c) 2004 Marius Aamodt Eriksen <marius@monkey.org>
  * All rights reserved.
  *
- * $Id: grab.c,v 1.2 2007/04/27 18:08:14 bernd Exp $
+ * $Id: grab.c,v 1.3 2007/04/27 18:10:39 bernd Exp $
  */
 
 #include "headers.h"
@@ -378,7 +378,7 @@ grab_label(struct client_ctx *cc)
 		switch (e.type) {
 		case KeyPress:
 			if (input_keycodetrans(e.xkey.keycode, e.xkey.state,
-				&ctl, &chr, 1) < 0)
+				&ctl, &chr, 0) < 0)
 				continue;
 
 			switch (ctl) {
diff --git a/input.c b/input.c
index 4114c10..28ce7f4 100644
--- a/input.c
+++ b/input.c
@@ -4,7 +4,7 @@
  * Copyright (c) 2004 Marius Aamodt Eriksen <marius@monkey.org>
  * All rights reserved.
  *
- * $Id: input.c,v 1.1.1.1 2007/04/27 17:58:48 bernd Exp $
+ * $Id: input.c,v 1.2 2007/04/27 18:10:39 bernd Exp $
  */
 
 #include "headers.h"
@@ -19,7 +19,10 @@ input_keycodetrans(KeyCode kc, u_int state,
 	*ctl = CTL_NONE;
 	*chr = '\0';
 
-	ks = XKeycodeToKeysym(G_dpy, kc, 0);
+	if (state & ShiftMask)
+		ks = XKeycodeToKeysym(G_dpy, kc, 1);
+	else
+		ks = XKeycodeToKeysym(G_dpy, kc, 0);
 
 	/* Look for control characters. */
 	switch (ks) {