applied Alexis Hildebrandts patches

[dmenu.git] / main.c

diff --git a/main.c b/main.c
index 7fca45e..115fbde 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,5 +1,5 @@
-/* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * (C)opyright MMVI Sander van Dijk <a dot h dot vandijk at gmail dot com>
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
+ * (C)opyright MMVI-MMVII Sander van Dijk <a dot h dot vandijk at gmail dot com>
  * See LICENSE file for license details.
  */
 #include "dmenu.h"
@@ -164,6 +164,8 @@ kpress(XKeyEvent * e) {
                switch (ksym) {
                default:        /* ignore other control sequences */
                        return;
+               case XK_bracketleft:
+                       ksym = XK_Escape;
                        break;
                case XK_h:
                case XK_H:
@@ -175,7 +177,6 @@ kpress(XKeyEvent * e) {
                        match(text);
                        drawmenu();
                        return;
-                       break;
                }
        }
        if(e->state & Mod1Mask) {
@@ -348,37 +349,37 @@ main(int argc, char *argv[]) {
        timeout.tv_sec = 3;
        /* command line args */
        for(i = 1; i < argc; i++)
-               if(!strncmp(argv[i], "-bottom", 8)) {
+               if(!strncmp(argv[i], "-b", 3)) {
                        bottom = True;
                }
-               else if(!strncmp(argv[i], "-font", 6)) {
+               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]);
                }
                else if(!strncmp(argv[i], "-v", 3)) {
-                       fputs("dmenu-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
+                       fputs("dmenu-"VERSION", (C)opyright MMVI-MMVII Anselm R. Garbe\n", stdout);
                        exit(EXIT_SUCCESS);
                }
                else
-                       eprint("usage: dmenu [-bottom] [-font <name>] [-{norm,sel}{bg,fg} <color>]\n"
-                               "             [-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)
@@ -411,12 +412,9 @@ main(int argc, char *argv[]) {
        wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
        mx = my = 0;
        mw = DisplayWidth(dpy, screen);
-       if(bottom) {
-               mh = dc.font.ascent + dc.font.descent + 3; // match wmii
-               my = DisplayHeight(dpy, screen) - mh;
-       }
-       else
-               mh = dc.font.height + 2;
+       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),