From 49f3193bd3ecb3b5e447f9c0b2318069d5945887 Mon Sep 17 00:00:00 2001
From: okan
Date: Mon, 19 May 2008 18:07:53 +0000
Subject: stop normalizing search input; searching and matching are still
case-insensitive. since this was the only use of normalizing input, simplify
as well.
allows one to exec with mixed case unmatched commands.
"works for me" oga@
---
calmwm.h | 4 ++--
grab.c | 4 ++--
input.c | 7 ++-----
search.c | 4 ++--
4 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/calmwm.h b/calmwm.h
index a3a3da2..c3fac3e 100644
--- a/calmwm.h
+++ b/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.
*
- * $Id: calmwm.h,v 1.47 2008/05/19 17:32:22 oga Exp $
+ * $Id: calmwm.h,v 1.48 2008/05/19 18:07:53 okan Exp $
*/
#ifndef _CALMWM_H_
@@ -310,7 +310,7 @@ struct mwm_hints {
#define MWM_DECOR_BORDER (1 << 1)
int input_keycodetrans(KeyCode, u_int, enum ctltype *,
- char *, int);
+ char *);
int x_errorhandler(Display *, XErrorEvent *);
void x_setup(char *display_name);
diff --git a/grab.c b/grab.c
index 027d6ed..90f23b2 100644
--- a/grab.c
+++ b/grab.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.
*
- * $Id: grab.c,v 1.11 2008/05/17 03:59:55 okan Exp $
+ * $Id: grab.c,v 1.12 2008/05/19 18:07:53 okan Exp $
*/
#include "headers.h"
@@ -301,7 +301,7 @@ grab_label(struct client_ctx *cc)
switch (e.type) {
case KeyPress:
if (input_keycodetrans(e.xkey.keycode, e.xkey.state,
- &ctl, &chr, 0) < 0)
+ &ctl, &chr) < 0)
continue;
switch (ctl) {
diff --git a/input.c b/input.c
index 28c973b..5cfae4e 100644
--- a/input.c
+++ b/input.c
@@ -15,15 +15,14 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: input.c,v 1.5 2008/04/15 18:33:13 okan Exp $
+ * $Id: input.c,v 1.6 2008/05/19 18:07:53 okan Exp $
*/
#include "headers.h"
#include "calmwm.h"
int
-input_keycodetrans(KeyCode kc, u_int state,
- enum ctltype *ctl, char *chr, int normalize)
+input_keycodetrans(KeyCode kc, u_int state, enum ctltype *ctl, char *chr)
{
int ks;
@@ -107,8 +106,6 @@ input_keycodetrans(KeyCode kc, u_int state,
return (-1);
*chr = (char)ks;
- if (normalize)
- *chr = tolower(*chr);
return (0);
}
diff --git a/search.c b/search.c
index ee6058d..e989f4e 100644
--- a/search.c
+++ b/search.c
@@ -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.
*
- * $Id: search.c,v 1.9 2008/05/15 22:18:00 oga Exp $
+ * $Id: search.c,v 1.10 2008/05/19 18:07:53 okan Exp $
*/
#include "headers.h"
@@ -104,7 +104,7 @@ search_start(struct menu_q *menuq,
switch (e.type) {
case KeyPress:
if (input_keycodetrans(e.xkey.keycode, e.xkey.state,
- &ctl, &chr, 1) < 0)
+ &ctl, &chr) < 0)
continue;
switch (ctl) {
--
cgit v1.2.3-2-gb3c3