X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=main.c;h=69214dd5e7c54434edb0056360add8377f9b9b68;hb=0e96ae6f4842b4ef4c79eaea821658e24bc03d5e;hp=964fad6ba193410843c90e0c626f30041dd33af8;hpb=65912f2a96d32600a07b963e9149f70ca22e73bb;p=dmenu.git

diff --git a/main.c b/main.c
index 964fad6..69214dd 100644
--- a/main.c
+++ b/main.c
@@ -178,6 +178,29 @@ kpress(XKeyEvent * e) {
 			break;
 		}
 	}
+	if(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;
+		}
+	}
 	switch(ksym) {
 	default:
 		if(num && !iscntrl((int) buf[0])) {
@@ -200,11 +223,13 @@ kpress(XKeyEvent * e) {
 		}
 		break;
 	case XK_End:
+		if(!item)
+			return;
 		while(next) {
 			sel = curr = next;
 			calcoffsets();
 		}
-		while(sel->right)
+		while(sel && sel->right)
 			sel = sel->right;
 		break;
 	case XK_Escape:
@@ -212,6 +237,8 @@ kpress(XKeyEvent * e) {
 		running = False;
 		break;
 	case XK_Home:
+		if(!item)
+			return;
 		sel = curr = item;
 		calcoffsets();
 		break;
@@ -225,16 +252,16 @@ kpress(XKeyEvent * e) {
 		}
 		break;
 	case XK_Next:
-		if(next) {
-			sel = curr = next;
-			calcoffsets();
-		}
+		if(!next)
+			return;
+		sel = curr = next;
+		calcoffsets();
 		break;
 	case XK_Prior:
-		if(prev) {
-			sel = curr = prev;
-			calcoffsets();
-		}
+		if(!prev)
+			return;
+		sel = curr = prev;
+		calcoffsets();
 		break;
 	case XK_Return:
 		if((e->state & ShiftMask) && text)
@@ -303,6 +330,7 @@ DC dc = {0};
 
 int
 main(int argc, char *argv[]) {
+	Bool bottom = False;
 	char *font = FONT;
 	char *maxname;
 	char *normbg = NORMBGCOLOR;
@@ -320,24 +348,27 @@ main(int argc, char *argv[]) {
 	timeout.tv_sec = 3;
 	/* command line args */
 	for(i = 1; i < argc; i++)
-		if(!strncmp(argv[i], "-font", 6)) {
+		if(!strncmp(argv[i], "-b", 3)) {
+			bottom = True;
+		}
+		else if(!strncmp(argv[i], "-fn", 4)) {
 			if(++i < argc) font = argv[i];
 		}
-		else if(!strncmp(argv[i], "-normbg", 8)) {
+		else if(!strncmp(argv[i], "-nb", 4)) {
 			if(++i < argc) normbg = argv[i];
 		}
-		else if(!strncmp(argv[i], "-normfg", 8)) {
+		else if(!strncmp(argv[i], "-nf", 4)) {
 			if(++i < argc) normfg = argv[i];
 		}
-		else if(!strncmp(argv[i], "-selbg", 7)) {
+		else if(!strncmp(argv[i], "-p", 3)) {
+			if(++i < argc) prompt = argv[i];
+		}
+		else if(!strncmp(argv[i], "-sb", 4)) {
 			if(++i < argc) selbg = argv[i];
 		}
-		else if(!strncmp(argv[i], "-selfg", 7)) {
+		else if(!strncmp(argv[i], "-sf", 4)) {
 			if(++i < argc) selfg = argv[i];
 		}
-		else if(!strncmp(argv[i], "-p", 3)) {
-			if(++i < argc) prompt = argv[i];
-		}
 		else if(!strncmp(argv[i], "-t", 3)) {
 			if(++i < argc) timeout.tv_sec = atoi(argv[i]);
 		}
@@ -346,7 +377,8 @@ main(int argc, char *argv[]) {
 			exit(EXIT_SUCCESS);
 		}
 		else
-			eprint("usage: dmenu [-font <name>] [-{norm,sel}{bg,fg} <color>] [-p <prompt>] [-t <seconds>] [-v]\n", stdout);
+			eprint("usage: dmenu [-b] [-fn <font>] [-nb <color>] [-nf <color>] [-p <prompt>]\n"
+				"             [-sb <color>] [-sf <color>] [-t <seconds>] [-v]\n", stdout);
 	setlocale(LC_CTYPE, "");
 	dpy = XOpenDisplay(0);
 	if(!dpy)
@@ -380,6 +412,8 @@ main(int argc, char *argv[]) {
 	mx = my = 0;
 	mw = DisplayWidth(dpy, screen);
 	mh = dc.font.height + 2;
+	if(bottom)
+		my += DisplayHeight(dpy, screen) - mh;
 	win = XCreateWindow(dpy, root, mx, my, mw, mh, 0,
 			DefaultDepth(dpy, screen), CopyFromParent,
 			DefaultVisual(dpy, screen),