fixed vlist cursor

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 4a6ca3d..b89c0da 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -79,9 +79,9 @@ static char text[4096];
 static int cmdw = 0;
 static int promptw = 0;
 static int ret = 0;
-static int cursor = 0;
 static int screen;
 static unsigned int mw, mh;
+static unsigned int cursor = 0;
 static unsigned int numlockmask = 0;
 static Bool running = True;
 static Display *dpy;
@@ -338,8 +338,8 @@ initfont(const char *fontstr) {
 void
 kpress(XKeyEvent * e) {
        char buf[sizeof text];
-       int i, num;
-       unsigned int len;
+       int num;
+       unsigned int i, len;
        KeySym ksym;
 
        len = strlen(text);
@@ -354,41 +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:
+                       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] == ' ');
@@ -398,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;
@@ -450,14 +433,16 @@ kpress(XKeyEvent * e) {
                }
                break;
        case XK_BackSpace:
-               if(cursor > 0) {
-                       for(i = 1; cursor - i > 0 && !IS_UTF8_1ST_CHAR(text[cursor - i]); i++);
-                       memmove(text + cursor - i, text + cursor, sizeof text - cursor + i);
-                       cursor -= i;
-                       match(text);
-               }
+               if(cursor == 0)
+                       return;
+               for(i = 1; cursor - i > 0 && !IS_UTF8_1ST_CHAR(text[cursor - i]); i++);
+               memmove(text + cursor - i, text + cursor, sizeof text - cursor + i);
+               cursor -= i;
+               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);
@@ -477,7 +462,7 @@ kpress(XKeyEvent * e) {
        case XK_Escape:
                ret = 1;
                running = False;
-               break;
+               return;
        case XK_Home:
                if(sel == item) {
                        cursor = 0;
@@ -487,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 || lines > 0)) {
                        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)
@@ -519,20 +506,22 @@ kpress(XKeyEvent * e) {
                        fprintf(stdout, "%s", sel->text);
                fflush(stdout);
                running = False;
-               break;
+               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)