xmenu now can be operated by keyboard

[xmenu] / xmenu.c

diff --git a/xmenu.c b/xmenu.c
index a56091b..738c815 100644 (file)
--- a/xmenu.c
+++ b/xmenu.c
@@ -5,18 +5,24 @@
 #include <unistd.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <unistd.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>

+#include <X11/Xresource.h>
+#include <X11/XKBlib.h>
+
+#define ITEMPREV 0
+#define ITEMNEXT 1

 
 /* macros */
 #define LEN(x) (sizeof (x) / sizeof (x[0]))
 #define MAX(x,y) ((x)>(y)?(x):(y))
 
 /* macros */
 #define LEN(x) (sizeof (x) / sizeof (x[0]))
 #define MAX(x,y) ((x)>(y)?(x):(y))

+#define MIN(x,y) ((x)<(y)?(x):(y))

 
 /* color enum */
 enum {ColorFG, ColorBG, ColorLast};
 
 /* draw context structure */
 struct DC {
 
 /* color enum */
 enum {ColorFG, ColorBG, ColorLast};
 
 /* draw context structure */
 struct DC {

-       unsigned long unpressed[ColorLast];
-       unsigned long pressed[ColorLast];
+       unsigned long normal[ColorLast];
+       unsigned long selected[ColorLast];

        unsigned long decoration[ColorLast];
 
        Drawable d;
        unsigned long decoration[ColorLast];
 
        Drawable d;


@@ -42,28 +48,31 @@ struct ScreenGeometry {
 
 /* menu item structure */
 struct Item {
 
 /* menu item structure */
 struct Item {

-       char *label;
-       char *output;
-       int y;
-       int h;
-       size_t labellen;
-       struct Item *next;
-       struct Menu *submenu;
+       char *label;            /* string to be drawed on menu */
+       char *output;           /* string to be outputed when item is clicked */
+       int y;                  /* item y position relative to menu */
+       int h;                  /* item height */
+       size_t labellen;        /* strlen(label) */
+       struct Item *prev;      /* previous item */
+       struct Item *next;      /* next item */
+       struct Menu *submenu;   /* submenu spawned by clicking on item */

 };
 
 /* menu structure */
 struct Menu {
 };
 
 /* menu structure */
 struct Menu {

-       struct Menu *parent;
-       struct Item *list;
-       struct Item *selected;
-       int x, y, w, h;
-       unsigned level;
-       Drawable pixmap;
-       Window win;
+       struct Menu *parent;    /* parent menu */
+       struct Item *caller;    /* item that spawned the menu */
+       struct Item *list;      /* list of items contained by the menu */
+       struct Item *selected;  /* item currently selected in the menu */
+       int x, y, w, h;         /* menu geometry */
+       unsigned level;         /* menu level relative to root */
+       Drawable pixmap;        /* pixmap to draw the menu on */
+       Window win;             /* menu window to map on the screen */

 };
 
 /* function declarations */
 static unsigned long getcolor(const char *s);
 };
 
 /* function declarations */
 static unsigned long getcolor(const char *s);

+static void getresources(void);

 static void setupdc(void);
 static void setupgeom(void);
 static void setupgrab(void);
 static void setupdc(void);
 static void setupgeom(void);
 static void setupgrab(void);


@@ -77,7 +86,7 @@ static void setcurrmenu(struct Menu *currmenu_new);
 static void parsestdin(void);
 static void run(void);
 static void freewindow(struct Menu *menu);
 static void parsestdin(void);
 static void run(void);
 static void freewindow(struct Menu *menu);

-static void cleanupexit(void);
+static void cleanup(void);

 static void usage(void);
 
 /* X variables */
 static void usage(void);
 
 /* X variables */


@@ -126,6 +135,7 @@ main(int argc, char *argv[])
        colormap = DefaultColormap(dpy, screen);
 
        /* setup */
        colormap = DefaultColormap(dpy, screen);
 
        /* setup */

+       getresources();

        setupdc();
        setupgeom();
        setupgrab();
        setupdc();
        setupgeom();
        setupgrab();


@@ -137,10 +147,62 @@ main(int argc, char *argv[])
        calcscreengeom();
        calcmenu(rootmenu);
 
        calcscreengeom();
        calcmenu(rootmenu);
 

+       /* map root menu */
+       currmenu = rootmenu;
+       XMapWindow(dpy, rootmenu->win);
+

        /* run event loop */
        run();
 
        /* run event loop */
        run();
 

-       return 1;   /* UNREACHABLE */
+       cleanup();
+
+       return 0;
+}
+
+/* read xrdb for configuration options */
+static void
+getresources(void)
+{
+       char *xrm;
+       long n;
+
+       XrmInitialize();
+       if ((xrm = XResourceManagerString(dpy))) {
+               char *type;
+               XrmDatabase xdb;
+               XrmValue xval;
+
+               xdb = XrmGetStringDatabase(xrm);
+
+               if (XrmGetResource(xdb, "xmenu.menuborder", "*", &type, &xval) == True)
+                       if ((n = strtol(xval.addr, NULL, 10)) > 0)
+                               menuborder = n;
+               if (XrmGetResource(xdb, "xmenu.separatorsize", "*", &type, &xval) == True)
+                       if ((n = strtol(xval.addr, NULL, 10)) > 0)
+                               separatorsize = n;
+               if (XrmGetResource(xdb, "xmenu.itemborder", "*", &type, &xval) == True)
+                       if ((n = strtol(xval.addr, NULL, 10)) > 0)
+                               itemborder = n;
+               if (XrmGetResource(xdb, "xmenu.width", "*", &type, &xval) == True)
+                       if ((n = strtol(xval.addr, NULL, 10)) > 0)
+                               width = n;
+               if (XrmGetResource(xdb, "xmenu.background", "*", &type, &xval) == True)
+                       background = strdup(xval.addr);
+               if (XrmGetResource(xdb, "xmenu.foreground", "*", &type, &xval) == True)
+                       foreground = strdup(xval.addr);
+               if (XrmGetResource(xdb, "xmenu.selbackground", "*", &type, &xval) == True)
+                       selbackground = strdup(xval.addr);
+               if (XrmGetResource(xdb, "xmenu.selforeground", "*", &type, &xval) == True)
+                       selforeground = strdup(xval.addr);
+               if (XrmGetResource(xdb, "xmenu.separator", "*", &type, &xval) == True)
+                       separator = strdup(xval.addr);
+               if (XrmGetResource(xdb, "xmenu.border", "*", &type, &xval) == True)
+                       border = strdup(xval.addr);
+               if (XrmGetResource(xdb, "xmenu.font", "*", &type, &xval) == True)
+                       font = strdup(xval.addr);
+
+               XrmDestroyDatabase(xdb);
+       }

 }
 
 /* get color from color string */
 }
 
 /* get color from color string */


@@ -159,15 +221,15 @@ static void
 setupdc(void)
 {
        /* get color pixels */
 setupdc(void)
 {
        /* get color pixels */

-       dc.unpressed[ColorBG] = getcolor(UNPRESSEDBG);
-       dc.unpressed[ColorFG] = getcolor(UNPRESSEDFG);
-       dc.pressed[ColorBG] = getcolor(PRESSEDBG);
-       dc.pressed[ColorFG] = getcolor(PRESSEDFG);
-       dc.decoration[ColorBG] = getcolor(DECORATIONBG);
-       dc.decoration[ColorFG] = getcolor(DECORATIONFG);
+       dc.normal[ColorBG] = getcolor(background);
+       dc.normal[ColorFG] = getcolor(foreground);
+       dc.selected[ColorBG] = getcolor(selbackground);
+       dc.selected[ColorFG] = getcolor(selforeground);
+       dc.decoration[ColorBG] = getcolor(separator);
+       dc.decoration[ColorFG] = getcolor(border);

 
        /* try to get font */
 
        /* try to get font */

-       if ((dc.font = XLoadQueryFont(dpy, FONT)) == NULL)
+       if ((dc.font = XLoadQueryFont(dpy, font)) == NULL)

                errx(1, "cannot load font");
        dc.fonth = dc.font->ascent + dc.font->descent;
 
                errx(1, "cannot load font");
        dc.fonth = dc.font->ascent + dc.font->descent;
 


@@ -180,19 +242,24 @@ setupdc(void)
 static void
 setupgeom(void)
 {
 static void
 setupgeom(void)
 {

-       geom.itemb = ITEMB;
-       geom.itemh = dc.fonth + ITEMB * 2;
-       geom.itemw = ITEMW;
-       geom.border = BORDER;
-       geom.separator = SEPARATOR;
+       geom.itemb = itemborder;
+       geom.itemh = dc.fonth + itemborder * 2;
+       geom.itemw = width;
+       geom.border = menuborder;
+       geom.separator = separatorsize;

 }
 
 /* grab pointer */
 static void
 setupgrab(void)
 {
 }
 
 /* grab pointer */
 static void
 setupgrab(void)
 {

-       XGrabPointer(dpy, rootwin, True, ButtonPressMask | ButtonReleaseMask,
-                    GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
+       if (XGrabPointer(dpy, rootwin, True, ButtonPressMask,
+                        GrabModeAsync, GrabModeAsync, None,
+                        None, CurrentTime) != GrabSuccess)
+               errx(1, "cannot grab pointer");
+       if (XGrabKeyboard(dpy, rootwin, True, GrabModeAsync,
+                         GrabModeAsync, CurrentTime) != GrabSuccess)
+               errx(1, "cannot grab keyboard");

 }
 
 /* allocate an item */
 }
 
 /* allocate an item */


@@ -235,6 +302,7 @@ allocmenu(struct Menu *parent, struct Item *list, unsigned level)
                err(1, "malloc");
        menu->parent = parent;
        menu->list = list;
                err(1, "malloc");
        menu->parent = parent;
        menu->list = list;

+       menu->caller = NULL;

        menu->selected = NULL;
        menu->w = geom.itemw;
        menu->h = 0;    /* calculated by calcmenu() */
        menu->selected = NULL;
        menu->w = geom.itemw;
        menu->h = 0;    /* calculated by calcmenu() */


@@ -302,6 +370,8 @@ parsestdin(void)
                         rootmenu = menu;
                         prevmenu = menu;
                         count = 1;
                         rootmenu = menu;
                         prevmenu = menu;
                         count = 1;

+                        curritem->prev = NULL;
+                        curritem->next = NULL;

                } else if (level < prevmenu->level) {   /* item is continuation of a parent menu*/
                        for (menu = prevmenu, i = level;
                              menu != NULL && i < prevmenu->level;
                } else if (level < prevmenu->level) {   /* item is continuation of a parent menu*/
                        for (menu = prevmenu, i = level;
                              menu != NULL && i < prevmenu->level;


@@ -315,11 +385,19 @@ parsestdin(void)
                                ;
 
                        item->next = curritem;
                                ;
 
                        item->next = curritem;

+
+                       curritem->prev = item;
+                       curritem->next = NULL;
+

                        prevmenu = menu;
                } else if (level == prevmenu->level) {  /* item is a continuation of current menu */
                        for (item = prevmenu->list; item->next != NULL; item = item->next)
                                ;
                        item->next = curritem;
                        prevmenu = menu;
                } else if (level == prevmenu->level) {  /* item is a continuation of current menu */
                        for (item = prevmenu->list; item->next != NULL; item = item->next)
                                ;
                        item->next = curritem;

+
+                       curritem->prev = item;
+                       curritem->next = NULL;
+

                } else if (level > prevmenu->level) {   /* item begins a new menu */
                        menu = allocmenu(prevmenu, curritem, level);
 
                } else if (level > prevmenu->level) {   /* item begins a new menu */
                        menu = allocmenu(prevmenu, curritem, level);
 


@@ -327,6 +405,10 @@ parsestdin(void)
                                ;
 
                        item->submenu = menu;
                                ;
 
                        item->submenu = menu;

+                       menu->caller = item;
+
+                       curritem->prev = NULL;
+                       curritem->next = NULL;

 
                        prevmenu = menu;
                }
 
                        prevmenu = menu;
                }


@@ -386,10 +468,10 @@ calcmenu(struct Menu *menu)
                for (item = menu->parent->list; item->submenu != menu; item = item->next)
                        ;
 
                for (item = menu->parent->list; item->submenu != menu; item = item->next)
                        ;
 

-               if (screengeom.screenw - (menu->parent->x + menu->parent->w) >= menu->w)
-                       menu->x = menu->parent->x + menu->parent->w;
-               else if (menu->parent->x > menu->w)
-                       menu->x = menu->parent->x - menu->w;
+               if (screengeom.screenw - (menu->parent->x + menu->parent->w + geom.border) >= menu->w)
+                       menu->x = menu->parent->x + menu->parent->w + geom.border;
+               else if (menu->parent->x > menu->w + geom.border)
+                       menu->x = menu->parent->x - menu->w - geom.border;

 
                if (screengeom.screenh - (item->y + menu->parent->y) > menu->h)
                        menu->y = item->y + menu->parent->y;
 
                if (screengeom.screenh - (item->y + menu->parent->y) > menu->h)
                        menu->y = item->y + menu->parent->y;


@@ -451,19 +533,52 @@ done:
 static void
 setcurrmenu(struct Menu *currmenu_new)
 {
 static void
 setcurrmenu(struct Menu *currmenu_new)
 {

-       struct Menu *menu;
+       struct Menu *menu, *menu_;
+       struct Item *item;
+       struct Menu *lcamenu;   /* lowest common ancestor menu */
+       unsigned minlevel;      /* level of the closest to root menu */
+       unsigned maxlevel;      /* level of the closest to root menu */

 
        if (currmenu_new == currmenu)
                return;
 
 
        if (currmenu_new == currmenu)
                return;
 

-       for (menu = currmenu; menu != NULL; menu = menu->parent) {
+       /* find lowest common ancestor menu */
+       lcamenu = rootmenu;
+       if (currmenu != NULL) {
+               minlevel = MIN(currmenu_new->level, currmenu->level);
+               maxlevel = MAX(currmenu_new->level, currmenu->level);
+               if (currmenu_new->level == maxlevel) {
+                       menu = currmenu_new;
+                       menu_ = currmenu;
+               } else {
+                       menu = currmenu;
+                       menu_ = currmenu_new;
+               }
+               while (menu->level > minlevel)
+                       menu = menu->parent;
+
+               while (menu != menu_) {
+                       menu = menu->parent;
+                       menu_ = menu_->parent;
+               }
+               lcamenu = menu;
+       }
+
+       /* unmap menus from currmenu (inclusive) until lcamenu (exclusive) */
+       for (menu = currmenu; menu != lcamenu; menu = menu->parent) {

                XUnmapWindow(dpy, menu->win);
        }
 
        currmenu = currmenu_new;
 
                XUnmapWindow(dpy, menu->win);
        }
 
        currmenu = currmenu_new;
 

-       for (menu = currmenu; menu != NULL; menu = menu->parent)
+       /* map menus from currmenu (inclusive) until lcamenu (exclusive) */
+       item = NULL;
+       for (menu = currmenu; menu != lcamenu; menu = menu->parent) {

                XMapWindow(dpy, menu->win);
                XMapWindow(dpy, menu->win);

+               if (item != NULL)
+                       menu->selected = item;
+               item = menu->caller;
+       }

 }
 
 /* draw items of the current menu and of its ancestors */
 }
 
 /* draw items of the current menu and of its ancestors */


@@ -479,22 +594,22 @@ drawmenu(void)
                        int labelx, labely;
 
                        /* determine item color */
                        int labelx, labely;
 
                        /* determine item color */

-                       if (item->label == NULL)
-                               color = dc.decoration;
-                       else if (item == menu->selected)
-                               color = dc.pressed;
+                       if (item == menu->selected)
+                               color = dc.selected;

                        else
                        else

-                               color = dc.unpressed;
+                               color = dc.normal;
+
+                       /* continue if item is a separator */
+                       if (item->label == NULL)
+                               continue;

 
                        /* draw item box */
                        XSetForeground(dpy, dc.gc, color[ColorBG]);
 
                        /* draw item box */
                        XSetForeground(dpy, dc.gc, color[ColorBG]);

+                       XDrawRectangle(dpy, menu->pixmap, dc.gc, 0, item->y,
+                                      menu->w, item->h);

                        XFillRectangle(dpy, menu->pixmap, dc.gc, 0, item->y,
                                       menu->w, item->h);
 
                        XFillRectangle(dpy, menu->pixmap, dc.gc, 0, item->y,
                                       menu->w, item->h);
 

-                       /* continue if item is a separator */
-                       if (item->label == NULL)
-                               continue;
-

                        /* draw item label */
                        labelx = 0 + dc.fonth;
                        labely = item->y + dc.fonth + geom.itemb;
                        /* draw item label */
                        labelx = 0 + dc.fonth;
                        labely = item->y + dc.fonth + geom.itemb;


@@ -524,6 +639,47 @@ drawmenu(void)
        }
 }
 
        }
 }
 

+/* cycle through the items; non-zero direction is next, zero is prev */
+static struct Item *
+itemcycle(int direction)
+{
+       struct Item *item;
+       struct Item *lastitem;
+
+       item = NULL;
+
+       if (direction == ITEMNEXT) {
+               if (currmenu->selected == NULL)
+                       item = currmenu->list;
+               else if (currmenu->selected->next != NULL)
+                       item = currmenu->selected->next;
+
+               while (item != NULL && item->label == NULL)
+                       item = item->next;
+
+               if (item == NULL)
+                       item = currmenu->list;
+       } else {
+               for (lastitem = currmenu->list;
+                    lastitem != NULL && lastitem->next != NULL;
+                    lastitem = lastitem->next)
+                       ;
+
+               if (currmenu->selected == NULL)
+                       item = lastitem;
+               else if (currmenu->selected->prev != NULL)
+                       item = currmenu->selected->prev;
+
+               while (item != NULL && item->label == NULL)
+                       item = item->prev;
+
+               if (item == NULL)
+                       item = lastitem;
+       }
+
+       return item;
+}
+

 /* run event loop */
 static void
 run(void)
 /* run event loop */
 static void
 run(void)


@@ -531,14 +687,14 @@ run(void)
        struct Menu *menu;
        struct Item *item;
        struct Item *previtem = NULL;
        struct Menu *menu;
        struct Item *item;
        struct Item *previtem = NULL;

+       KeySym ksym;

        XEvent ev;
 
        XEvent ev;
 

-       setcurrmenu(rootmenu);
-

        while (!XNextEvent(dpy, &ev)) {
                switch(ev.type) {
                case Expose:
        while (!XNextEvent(dpy, &ev)) {
                switch(ev.type) {
                case Expose:

-                       drawmenu();
+                       if (ev.xexpose.count == 0)
+                               drawmenu();

                        break;
                case MotionNotify:
                        getmenuitem(ev.xbutton.window, ev.xbutton.y, &menu, &item);
                        break;
                case MotionNotify:
                        getmenuitem(ev.xbutton.window, ev.xbutton.y, &menu, &item);


@@ -549,26 +705,64 @@ run(void)
                                        else
                                                setcurrmenu(menu);
                                        previtem = item;
                                        else
                                                setcurrmenu(menu);
                                        previtem = item;

-                               } else if (menu->selected != item)
+                                       drawmenu();
+                               } else if (menu->selected != item) {

                                        menu->selected = item;
                                        menu->selected = item;

-                               drawmenu();
+                                       drawmenu();
+                               }

                        }
                        break;
                case ButtonRelease:
                        getmenuitem(ev.xbutton.window, ev.xbutton.y, &menu, &item);
                        if (menu != NULL && item != NULL) {
                        }
                        break;
                case ButtonRelease:
                        getmenuitem(ev.xbutton.window, ev.xbutton.y, &menu, &item);
                        if (menu != NULL && item != NULL) {

+selectitem:

                                if (item->label == NULL)
                                        break;  /* ignore separators */
                                if (item->submenu != NULL) {
                                        setcurrmenu(item->submenu);
                                } else {
                                        printf("%s\n", item->output);
                                if (item->label == NULL)
                                        break;  /* ignore separators */
                                if (item->submenu != NULL) {
                                        setcurrmenu(item->submenu);
                                } else {
                                        printf("%s\n", item->output);

-                                       cleanupexit();
+                                       return;

                                }
                                }

+                               currmenu->selected = currmenu->list;

                                drawmenu();
                                drawmenu();

+                               break;

                        } else {
                        } else {

-                               cleanupexit();
+                               return;

                        }
                        }

+               case ButtonPress:
+                       getmenuitem(ev.xbutton.window, ev.xbutton.y, &menu, &item);
+                       if (menu == NULL || item == NULL)
+                               return;
+                       break;
+               case KeyPress:
+                       ksym = XkbKeycodeToKeysym(dpy, ev.xkey.keycode, 0, 0);
+
+                       if (ksym == XK_Escape && currmenu == rootmenu)
+                               return;
+
+                       /* Shift-Tab = ISO_Left_Tab */
+                       if (ksym == XK_Tab && (ev.xkey.state & ShiftMask))
+                               ksym = XK_ISO_Left_Tab;
+
+                       /* cycle through menu */
+                       item = NULL;
+                       if (ksym == XK_ISO_Left_Tab || ksym == XK_Up) {
+                               item = itemcycle(ITEMPREV);
+                       } else if (ksym == XK_Tab || ksym == XK_Down) {
+                               item = itemcycle(ITEMNEXT);
+                       } else if ((ksym == XK_Return || ksym == XK_Right) &&
+                                  currmenu->selected != NULL) {
+                               item = currmenu->selected;
+                               goto selectitem;
+                       } else if ((ksym == XK_Escape || ksym == XK_Left) &&
+                                  currmenu->parent != NULL) {
+                               item = currmenu->parent->selected;
+                               setcurrmenu(currmenu->parent);
+                       } else
+                               break;
+                       currmenu->selected = item;
+                       drawmenu();

                        break;
                case LeaveNotify:
                        currmenu->selected = NULL;
                        break;
                case LeaveNotify:
                        currmenu->selected = NULL;


@@ -594,19 +788,18 @@ freewindow(struct Menu *menu)
 
 /* cleanup and exit */
 static void
 
 /* cleanup and exit */
 static void

-cleanupexit(void)
+cleanup(void)

 {
        freewindow(rootmenu);
        XFreeFont(dpy, dc.font);
        XFreeGC(dpy, dc.gc);
        XCloseDisplay(dpy);
 {
        freewindow(rootmenu);
        XFreeFont(dpy, dc.font);
        XFreeGC(dpy, dc.gc);
        XCloseDisplay(dpy);

-       exit(0);

 }
 
 /* show usage */
 static void
 usage(void)
 {
 }
 
 /* show usage */
 static void
 usage(void)
 {

-       (void)fprintf(stderr, "usage: xmenu [-w] menuname\n");
+       (void)fprintf(stderr, "usage: xmenu [-w]\n");

        exit(1);
 }
        exit(1);
 }