applied Alexis Hildebrandts patches

[dmenu.git] / main.c

diff --git a/main.c b/main.c
index cb52c9c..115fbde 100644 (file)
--- a/main.c
+++ b/main.c
@@ -164,6 +164,8 @@ kpress(XKeyEvent * e) {
                switch (ksym) {
                default:        /* ignore other control sequences */
                        return;
                switch (ksym) {
                default:        /* ignore other control sequences */
                        return;

+               case XK_bracketleft:
+                       ksym = XK_Escape;

                        break;
                case XK_h:
                case XK_H:
                        break;
                case XK_h:
                case XK_H:


@@ -175,7 +177,6 @@ kpress(XKeyEvent * e) {
                        match(text);
                        drawmenu();
                        return;
                        match(text);
                        drawmenu();
                        return;

-                       break;

                }
        }
        if(e->state & Mod1Mask) {
                }
        }
        if(e->state & Mod1Mask) {


@@ -373,7 +374,7 @@ main(int argc, char *argv[]) {
                        if(++i < argc) timeout.tv_sec = atoi(argv[i]);
                }
                else if(!strncmp(argv[i], "-v", 3)) {
                        if(++i < argc) timeout.tv_sec = atoi(argv[i]);
                }
                else if(!strncmp(argv[i], "-v", 3)) {

-                       fputs("dmenu-"VERSION", (C)opyright MMVII Anselm R. Garbe\n", stdout);
+                       fputs("dmenu-"VERSION", (C)opyright MMVI-MMVII Anselm R. Garbe\n", stdout);

                        exit(EXIT_SUCCESS);
                }
                else
                        exit(EXIT_SUCCESS);
                }
                else