X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dmenu.c;h=15ce8c75e463e74be1fae896905cc314f8b06289;hb=9a33a72c6afd9042c8395f4318bf5d21e235694d;hp=1d239c2686312e6f298fccdd5ae436121fe638ba;hpb=4983707c706d399e8af8d40c60c1b8b25e4c590a;p=dmenu.git

diff --git a/dmenu.c b/dmenu.c
index 1d239c2..15ce8c7 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -354,45 +354,48 @@ kpress(XKeyEvent * e) {
 		return;
 	/* first check if a control mask is omitted */
 	if(e->state & ControlMask) {
-		switch (ksym) {
-		default:	/* ignore other control sequences */
+		switch(tolower(ksym)) {
+		default:
 			return;
 		case XK_a:
-		case XK_A:
 			ksym = XK_Home;
 			break;
+		case XK_b:
+			ksym = XK_Left;
+			break;
 		case XK_c:
-		case XK_C:
 			ksym = XK_Escape;
 			break;
 		case XK_e:
-		case XK_E:
 			ksym = XK_End;
 			break;
+		case XK_f:
+			ksym = XK_Right;
+			break;
 		case XK_h:
-		case XK_H:
 			ksym = XK_BackSpace;
 			break;
 		case XK_i:
-		case XK_I:
 			ksym = XK_Tab;
 			break;
 		case XK_j:
-		case XK_J:
 			ksym = XK_Return;
 			break;
 		case XK_k:
-		case XK_K:
 			text[cursor] = '\0';
 			break;
+		case XK_n:
+			ksym = XK_Down;
+			break;
+		case XK_p:
+			ksym = XK_Up;
+			break;
 		case XK_u:
-		case XK_U:
 			memmove(text, text + cursor, sizeof text - cursor + 1);
 			cursor = 0;
 			match(text);
 			break;
 		case XK_w:
-		case XK_W:
 			if(cursor > 0) {
 				i = cursor;
 				while(i-- > 0 && text[i] == ' ');
@@ -402,31 +405,7 @@ kpress(XKeyEvent * e) {
 				match(text);
 			}
 			break;
-		}
-	}
-	if(CLEANMASK(e->state) & Mod1Mask) {
-		switch(ksym) {
-		default:
-			return;
-		case XK_h:
-			ksym = XK_Left;
-			break;
-		case XK_l:
-			ksym = XK_Right;
-			break;
-		case XK_j:
-			ksym = XK_Next;
-			break;
-		case XK_k:
-			ksym = XK_Prior;
-			break;
-		case XK_g:
-			ksym = XK_Home;
-			break;
-		case XK_G:
-			ksym = XK_End;
-			break;
-		case XK_p:
+		case XK_y:
 			{
 				FILE *fp;
 				char *s;
@@ -462,6 +441,8 @@ kpress(XKeyEvent * e) {
 		match(text);
 		break;
 	case XK_Delete:
+		if(cursor == len)
+			return;
 		for(i = 1; cursor + i < len && !IS_UTF8_1ST_CHAR(text[cursor + i]); i++);
 		memmove(text + cursor, text + cursor + i, sizeof text - cursor);
 		match(text);
@@ -491,18 +472,20 @@ kpress(XKeyEvent * e) {
 		calcoffsets();
 		break;
 	case XK_Left:
-	case XK_Up:
-		if(sel && sel->left){
-			sel = sel->left;
-			if(sel->right == curr) {
-				curr = prev;
-				calcoffsets();
-			}
-		}
-		else if(cursor > 0)
+		if(cursor > 0 && (!sel || !sel->left)) {
 			while(cursor-- > 0 && !IS_UTF8_1ST_CHAR(text[cursor]));
-		else
+			break;
+		}
+		if(lines > 0)
 			return;
+	case XK_Up:
+		if(!sel || !sel->left)
+			return;
+		sel = sel->left;
+		if(sel->right == curr) {
+			curr = prev;
+			calcoffsets();
+		}
 		break;
 	case XK_Next:
 		if(!next)
@@ -525,18 +508,20 @@ kpress(XKeyEvent * e) {
 		running = False;
 		return;
 	case XK_Right:
-	case XK_Down:
-		if(cursor < len)
+		if(cursor < len) {
 			while(cursor++ < len && !IS_UTF8_1ST_CHAR(text[cursor]));
-		else if(sel && sel->right) {
-			sel = sel->right;
-			if(sel == next) {
-				curr = next;
-				calcoffsets();
-			}
+			break;
 		}
-		else
+		if(lines > 0)
+			return;
+	case XK_Down:
+		if(!sel || !sel->right)
 			return;
+		sel = sel->right;
+		if(sel == next) {
+			curr = next;
+			calcoffsets();
+		}
 		break;
 	case XK_Tab:
 		if(!sel)