#include <X11/XKBlib.h>
#include <X11/Xft/Xft.h>
+#define PROGNAME "xmenu"
#define ITEMPREV 0
#define ITEMNEXT 1
struct DC {
XftColor normal[ColorLast];
XftColor selected[ColorLast];
- XftColor decoration[ColorLast];
+ XftColor border;
+ XftColor separator;
Drawable d;
GC gc;
/* menu geometry structure */
struct Geometry {
- int itemb; /* item border */
- int itemw; /* item width */
- int itemh; /* item height */
- int border; /* window border width */
- int separator; /* menu separator width */
-};
-
-/* screen geometry structure */
-struct ScreenGeometry {
+ int border; /* window border width */
+ int separator; /* menu separator width */
+ int itemw, itemh; /* item width and height */
int cursx, cursy; /* cursor position */
int screenw, screenh; /* screen width and height */
};
Window win; /* menu window to map on the screen */
};
-/* function declarations */
-static void getcolor(const char *s, XftColor *color);
+/* functions declarations */
static void getresources(void);
+static void getcolor(const char *s, XftColor *color);
static void setupdc(void);
-static void setupgeom(void);
-static void setupgrab(void);
+static void calcgeom(void);
static struct Item *allocitem(const char *label, const char *output);
static struct Menu *allocmenu(struct Menu *parent, struct Item *list, unsigned level);
-static void getmenuitem(Window win, int y, struct Menu **menu_ret, struct Item **item_ret);
-static void drawmenu(void);
-static void calcscreengeom(void);
+static struct Menu *parsestdin(void);
static void calcmenu(struct Menu *menu);
-static void setcurrmenu(struct Menu *currmenu_new);
-static void parsestdin(void);
-static void run(void);
+static void grabpointer(void);
+static void grabkeyboard(void);
+static struct Menu *getmenu(struct Menu *currmenu, Window win);
+static struct Item *getitem(struct Menu *menu, int y);
+static void mapmenu(struct Menu *currmenu);
+static void drawseparator(struct Menu *menu, struct Item *item);
+static void drawitem(struct Menu *menu, struct Item *item, XftColor *color);
+static void drawmenu(struct Menu *currmenu);
+static struct Item *itemcycle(struct Menu *currmenu, int direction);
+static void run(struct Menu *currmenu);
static void freewindow(struct Menu *menu);
-static void cleanup(void);
+static void cleanup(struct Menu *rootmenu);
static void usage(void);
-/* X variables */
-static Colormap colormap;
+/* global variables (X stuff and geometries) */
static Display *dpy;
+static int screen;
static Visual *visual;
static Window rootwin;
-static int screen;
+static Colormap colormap;
static struct DC dc;
-
-/* menu variables */
-static struct Menu *rootmenu = NULL;
-static struct Menu *currmenu = NULL;
-
-/* geometry variables */
static struct Geometry geom;
-static struct ScreenGeometry screengeom;
-
-/* flag variables */
-static Bool override_redirect = True;
#include "config.h"
int
main(int argc, char *argv[])
{
+ struct Menu *rootmenu;
int ch;
- while ((ch = getopt(argc, argv, "w")) != -1) {
+ while ((ch = getopt(argc, argv, "")) != -1) {
switch (ch) {
- case 'w':
- override_redirect = False;
- break;
default:
usage();
break;
argc -= optind;
argv += optind;
+ if (argc != 0)
+ usage();
+
/* open connection to server and set X variables */
if ((dpy = XOpenDisplay(NULL)) == NULL)
errx(1, "cannot open display");
/* setup */
getresources();
setupdc();
- setupgeom();
+ calcgeom();
/* generate menus and recalculate them */
- parsestdin();
+ rootmenu = parsestdin();
if (rootmenu == NULL)
errx(1, "no menu generated");
- calcscreengeom();
calcmenu(rootmenu);
/* grab mouse and keyboard */
- if (override_redirect)
- setupgrab();
-
- /* map root menu */
- currmenu = rootmenu;
- XMapWindow(dpy, rootmenu->win);
+ grabpointer();
+ grabkeyboard();
/* run event loop */
- run();
-
- cleanup();
+ run(rootmenu);
+ cleanup(rootmenu);
return 0;
}
{
char *xrm;
long n;
+ char *type;
+ XrmDatabase xdb;
+ XrmValue xval;
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);
- }
+ if ((xrm = XResourceManagerString(dpy)) == NULL)
+ return;
+
+ xdb = XrmGetStringDatabase(xrm);
+
+ if (XrmGetResource(xdb, "xmenu.borderWidth", "*", &type, &xval) == True)
+ if ((n = strtol(xval.addr, NULL, 10)) > 0)
+ border_pixels = n;
+ if (XrmGetResource(xdb, "xmenu.separatorWidth", "*", &type, &xval) == True)
+ if ((n = strtol(xval.addr, NULL, 10)) > 0)
+ separator_pixels = n;
+ if (XrmGetResource(xdb, "xmenu.padding", "*", &type, &xval) == True)
+ if ((n = strtol(xval.addr, NULL, 10)) > 0)
+ padding_pixels = n;
+ if (XrmGetResource(xdb, "xmenu.width", "*", &type, &xval) == True)
+ if ((n = strtol(xval.addr, NULL, 10)) > 0)
+ width_pixels = n;
+ if (XrmGetResource(xdb, "xmenu.background", "*", &type, &xval) == True)
+ background_color = strdup(xval.addr);
+ if (XrmGetResource(xdb, "xmenu.foreground", "*", &type, &xval) == True)
+ foreground_color = strdup(xval.addr);
+ if (XrmGetResource(xdb, "xmenu.selbackground", "*", &type, &xval) == True)
+ selbackground_color = strdup(xval.addr);
+ if (XrmGetResource(xdb, "xmenu.selforeground", "*", &type, &xval) == True)
+ selforeground_color = strdup(xval.addr);
+ if (XrmGetResource(xdb, "xmenu.separator", "*", &type, &xval) == True)
+ separator_color = strdup(xval.addr);
+ if (XrmGetResource(xdb, "xmenu.border", "*", &type, &xval) == True)
+ border_color = strdup(xval.addr);
+ if (XrmGetResource(xdb, "xmenu.font", "*", &type, &xval) == True)
+ font = strdup(xval.addr);
+
+ XrmDestroyDatabase(xdb);
}
/* get color from color string */
setupdc(void)
{
/* get color pixels */
- getcolor(background, &dc.normal[ColorBG]);
- getcolor(foreground, &dc.normal[ColorFG]);
- getcolor(selbackground, &dc.selected[ColorBG]);
- getcolor(selforeground, &dc.selected[ColorFG]);
- getcolor(separator, &dc.decoration[ColorBG]);
- getcolor(border, &dc.decoration[ColorFG]);
+ getcolor(background_color, &dc.normal[ColorBG]);
+ getcolor(foreground_color, &dc.normal[ColorFG]);
+ getcolor(selbackground_color, &dc.selected[ColorBG]);
+ getcolor(selforeground_color, &dc.selected[ColorFG]);
+ getcolor(separator_color, &dc.separator);
+ getcolor(border_color, &dc.border);
/* try to get font */
if ((dc.font = XftFontOpenName(dpy, screen, font)) == NULL)
errx(1, "cannot load font");
- /* create GC */
+ /* create common GC */
dc.gc = XCreateGC(dpy, rootwin, 0, NULL);
}
-/* init menu geometry values */
+/* calculate menu and screen geometry */
static void
-setupgeom(void)
+calcgeom(void)
{
- geom.itemb = itemborder;
- geom.itemh = dc.font->height + itemborder * 2;
- geom.itemw = width;
- geom.border = menuborder;
- geom.separator = separatorsize;
-}
+ Window w1, w2; /* unused variables */
+ int a, b; /* unused variables */
+ unsigned mask; /* unused variable */
-/* grab pointer */
-static void
-setupgrab(void)
-{
- 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");
+ XQueryPointer(dpy, rootwin, &w1, &w2, &geom.cursx, &geom.cursy, &a, &b, &mask);
+ geom.screenw = DisplayWidth(dpy, screen);
+ geom.screenh = DisplayHeight(dpy, screen);
+ geom.itemh = dc.font->height + padding_pixels * 2;
+ geom.itemw = width_pixels;
+ geom.border = border_pixels;
+ geom.separator = separator_pixels;
}
/* allocate an item */
menu->y = 0; /* calculated by calcmenu() */
menu->level = level;
- swa.override_redirect = override_redirect;
- swa.background_pixel = dc.decoration[ColorBG].pixel;
- swa.border_pixel = dc.decoration[ColorFG].pixel;
+ swa.override_redirect = True;
+ swa.background_pixel = dc.normal[ColorBG].pixel;
+ swa.border_pixel = dc.border.pixel;
+ swa.save_under = True; /* pop-up windows should save_under*/
swa.event_mask = ExposureMask | KeyPressMask | ButtonPressMask | ButtonReleaseMask
| PointerMotionMask | LeaveWindowMask;
menu->win = XCreateWindow(dpy, rootwin, 0, 0, geom.itemw, geom.itemh, geom.border,
CopyFromParent, CopyFromParent, CopyFromParent,
- CWOverrideRedirect | CWBackPixel | CWBorderPixel | CWEventMask,
+ CWOverrideRedirect | CWBackPixel |
+ CWBorderPixel | CWEventMask | CWSaveUnder,
&swa);
return menu;
}
/* create menus and items from the stdin */
-static void
+static struct Menu *
parsestdin(void)
{
char *s, buf[BUFSIZ];
unsigned i;
struct Item *curritem = NULL; /* item currently being read */
struct Menu *prevmenu = NULL; /* menu the previous item was added to */
- struct Item *item; /* dummy item for for loops */
- struct Menu *menu; /* dummy menu for for loops */
- size_t count = 0; /* number of items in the current menu */
+ struct Item *item; /* dummy item for loops */
+ struct Menu *menu; /* dummy menu for loops */
+ struct Menu *rootmenu; /* menu to be returned */
+
+ rootmenu = NULL;
while (fgets(buf, BUFSIZ, stdin) != NULL) {
level = 0;
menu = allocmenu(NULL, curritem, level);
rootmenu = menu;
prevmenu = menu;
- count = 1;
curritem->prev = NULL;
curritem->next = NULL;
} else if (level < prevmenu->level) { /* item is continuation of a parent menu*/
prevmenu = menu;
}
- count++;
}
-}
-
-/* calculate screen geometry */
-static void
-calcscreengeom(void)
-{
- Window w1, w2; /* unused variables */
- int a, b; /* unused variables */
- unsigned mask; /* unused variable */
- XQueryPointer(dpy, rootwin, &w1, &w2, &screengeom.cursx, &screengeom.cursy, &a, &b, &mask);
- screengeom.screenw = DisplayWidth(dpy, screen);
- screengeom.screenh = DisplayHeight(dpy, screen);
+ return rootmenu;
}
-/* recursivelly calculate height and position of the menus */
+/* recursivelly calculate menu geometry and set window hints */
static void
calcmenu(struct Menu *menu)
{
+ static XClassHint classh = {PROGNAME, PROGNAME};
XWindowChanges changes;
XSizeHints sizeh;
XGlyphInfo ext;
/* calculate menu's x and y positions */
if (menu->parent == NULL) { /* if root menu, calculate in respect to cursor */
- if (screengeom.screenw - screengeom.cursx >= menu->w)
- menu->x = screengeom.cursx;
- else if (screengeom.cursx > menu->w)
- menu->x = screengeom.cursx - menu->w;
-
- if (screengeom.screenh - screengeom.cursy >= menu->h)
- menu->y = screengeom.cursy;
- else if (screengeom.screenh > menu->h)
- menu->y = screengeom.screenh - menu->h;
+ if (geom.screenw - geom.cursx >= menu->w)
+ menu->x = geom.cursx;
+ else if (geom.cursx > menu->w)
+ menu->x = geom.cursx - menu->w;
+
+ if (geom.screenh - geom.cursy >= menu->h)
+ menu->y = geom.cursy;
+ else if (geom.screenh > menu->h)
+ menu->y = geom.screenh - menu->h;
} else { /* else, calculate in respect to parent menu */
-
- /* search for the item in parent menu that generates this menu */
- for (item = menu->parent->list; item->submenu != menu; item = item->next)
- ;
-
- if (screengeom.screenw - (menu->parent->x + menu->parent->w + geom.border) >= menu->w)
+ if (geom.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;
- else if (screengeom.screenh - menu->parent->y > menu->h)
+ if (geom.screenh - (menu->caller->y + menu->parent->y) > menu->h)
+ menu->y = menu->caller->y + menu->parent->y;
+ else if (geom.screenh - menu->parent->y > menu->h)
menu->y = menu->parent->y;
- else if (screengeom.screenh > menu->h)
- menu->y = screengeom.screenh - menu->h;
+ else if (geom.screenh > menu->h)
+ menu->y = geom.screenh - menu->h;
}
/* update menu geometry */
changes.y = menu->y;
XConfigureWindow(dpy, menu->win, CWWidth | CWHeight | CWX | CWY, &changes);
- /* set window manager size hints */
+ /* set window manager hints */
sizeh.flags = PMaxSize | PMinSize;
sizeh.min_width = sizeh.max_width = menu->w;
sizeh.min_height = sizeh.max_height = menu->h;
- XSetWMNormalHints(dpy, menu->win, &sizeh);
+ XSetWMProperties(dpy, menu->win, NULL, NULL, NULL, 0, &sizeh,
+ NULL, &classh);
/* create pixmap and XftDraw */
menu->pixmap = XCreatePixmap(dpy, menu->win, menu->w, menu->h,
}
}
-/* get menu and item of given window and position */
+/* try to grab pointer, we may have to wait for another process to ungrab */
static void
-getmenuitem(Window win, int y,
- struct Menu **menu_ret, struct Item **item_ret)
+grabpointer(void)
{
- struct Menu *menu = NULL;
- struct Item *item = NULL;
+ struct timespec ts = { .tv_sec = 0, .tv_nsec = 1000000 };
+ int i;
+
+ for (i = 0; i < 1000; i++) {
+ if (XGrabPointer(dpy, rootwin, True, ButtonPressMask,
+ GrabModeAsync, GrabModeAsync, None,
+ None, CurrentTime) == GrabSuccess)
+ return;
+ nanosleep(&ts, NULL);
+ }
+ errx(1, "cannot grab keyboard");
+}
- for (menu = currmenu; menu != NULL; menu = menu->parent) {
- if (menu->win == win) {
- for (item = menu->list; item != NULL; item = item->next) {
- if (y >= item->y && y <= item->y + item->h) {
- goto done;
- }
- }
- }
+/* try to grab keyboard, we may have to wait for another process to ungrab */
+static void
+grabkeyboard(void)
+{
+ struct timespec ts = { .tv_sec = 0, .tv_nsec = 1000000 };
+ int i;
+
+ for (i = 0; i < 1000; i++) {
+ if (XGrabKeyboard(dpy, rootwin, True, GrabModeAsync,
+ GrabModeAsync, CurrentTime) == GrabSuccess)
+ return;
+ nanosleep(&ts, NULL);
}
+ errx(1, "cannot grab keyboard");
+}
+/* get menu of given window */
+static struct Menu *
+getmenu(struct Menu *currmenu, Window win)
+{
+ struct Menu *menu;
+
+ for (menu = currmenu; menu != NULL; menu = menu->parent)
+ if (menu->win == win)
+ return menu;
-done:
- *menu_ret = menu;
- *item_ret = item;
+ return NULL;
}
-/* set currentmenu to menu, umap previous menus and map current menu and its parents */
+/* get item of given menu and position */
+static struct Item *
+getitem(struct Menu *menu, int y)
+{
+ struct Item *item;
+
+ if (menu == NULL)
+ return NULL;
+
+ for (item = menu->list; item != NULL; item = item->next)
+ if (y >= item->y && y <= item->y + item->h)
+ return item;
+
+ return NULL;
+}
+
+/* umap previous menus and map current menu and its parents */
static void
-setcurrmenu(struct Menu *currmenu_new)
+mapmenu(struct Menu *currmenu)
{
+ static struct Menu *prevmenu = NULL;
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)
+ /* do not remap current menu if it wasn't updated*/
+ if (prevmenu == currmenu)
return;
- /* 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;
+ /* if this is the first time mapping, skip calculations */
+ if (prevmenu == NULL) {
+ XMapWindow(dpy, currmenu->win);
+ prevmenu = currmenu;
+ return;
+ }
- while (menu != menu_) {
- menu = menu->parent;
- menu_ = menu_->parent;
- }
- lcamenu = menu;
+ /* find lowest common ancestor menu */
+ minlevel = MIN(currmenu->level, prevmenu->level);
+ maxlevel = MAX(currmenu->level, prevmenu->level);
+ if (currmenu->level == maxlevel) {
+ menu = currmenu;
+ menu_ = prevmenu;
+ } else {
+ menu = prevmenu;
+ menu_ = currmenu;
}
+ 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) {
+ for (menu = prevmenu; menu != lcamenu; menu = menu->parent) {
+ menu->selected = NULL;
XUnmapWindow(dpy, menu->win);
}
- currmenu = currmenu_new;
-
/* map menus from currmenu (inclusive) until lcamenu (exclusive) */
- item = NULL;
for (menu = currmenu; menu != lcamenu; menu = menu->parent) {
XMapWindow(dpy, menu->win);
- if (item != NULL)
- menu->selected = item;
- item = menu->caller;
+ }
+
+ prevmenu = currmenu;
+}
+
+/* draw separator item */
+static void
+drawseparator(struct Menu *menu, struct Item *item)
+{
+ int linex, liney, linew;
+
+ linex = dc.font->height;
+ liney = item->y + item->h/2;
+ linew = menu->w - dc.font->height;
+
+ XSetForeground(dpy, dc.gc, dc.separator.pixel);
+ XDrawLine(dpy, menu->pixmap, dc.gc, linex, liney, linew, liney);
+}
+
+/* draw regular item */
+static void
+drawitem(struct Menu *menu, struct Item *item, XftColor *color)
+{
+ int x, y;
+
+ x = dc.font->height;
+ y = item->y + item->h/2 + dc.font->ascent/2 - 1;
+ XSetForeground(dpy, dc.gc, color[ColorFG].pixel);
+ XftDrawStringUtf8(menu->draw, &color[ColorFG], dc.font,
+ x, y, item->label, item->labellen);
+
+ /* draw triangle, if item contains a submenu */
+ if (item->submenu != NULL) {
+ x = menu->w - dc.font->height/2 - triangle_width/2;
+ y = item->y + item->h/2 - triangle_height/2 - 1;
+
+ XPoint triangle[] = {
+ {x, y},
+ {x + triangle_width, y + triangle_height/2},
+ {x, y + triangle_height},
+ {x, y}
+ };
+
+ XFillPolygon(dpy, menu->pixmap, dc.gc, triangle, LEN(triangle),
+ Convex, CoordModeOrigin);
}
}
/* draw items of the current menu and of its ancestors */
static void
-drawmenu(void)
+drawmenu(struct Menu *currmenu)
{
struct Menu *menu;
struct Item *item;
for (menu = currmenu; menu != NULL; menu = menu->parent) {
for (item = menu->list; item != NULL; item = item->next) {
XftColor *color;
- int labelx, labely;
/* determine item color */
- if (item == menu->selected)
+ if (item == menu->selected && item->label != NULL)
color = dc.selected;
else
color = dc.normal;
- /* continue if item is a separator */
- if (item->label == NULL)
- continue;
-
/* draw item box */
XSetForeground(dpy, dc.gc, color[ColorBG].pixel);
- 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);
- /* draw item label */
- labelx = 0 + dc.font->height;
- labely = item->y + dc.font->height + geom.itemb / 2;
- XSetForeground(dpy, dc.gc, color[ColorFG].pixel);
- XftDrawStringUtf8(menu->draw, &color[ColorFG], dc.font,
- labelx, labely, item->label,
- item->labellen);
-
- /* draw triangle, if item contains a submenu */
- if (item->submenu != NULL) {
- int trianglex = menu->w - dc.font->height + geom.itemb - 1;
- int triangley = item->y + (3 * item->h)/8 -1;
-
- XPoint triangle[] = {
- {trianglex, triangley},
- {trianglex + item->h/8 + 1, item->y + item->h/2},
- {trianglex, triangley + item->h/4 + 2},
- {trianglex, triangley}
- };
-
- XFillPolygon(dpy, menu->pixmap, dc.gc, triangle, LEN(triangle),
- Convex, CoordModeOrigin);
- }
-
- XCopyArea(dpy, menu->pixmap, menu->win, dc.gc, 0, item->y,
- menu->w, item->h, 0, item->y);
+ if (item->label == NULL) /* item is a separator */
+ drawseparator(menu, item);
+ else /* item is a regular item */
+ drawitem(menu, item, color);
}
+
+ XCopyArea(dpy, menu->pixmap, menu->win, dc.gc, 0, 0,
+ menu->w, menu->h, 0, 0);
}
}
/* cycle through the items; non-zero direction is next, zero is prev */
static struct Item *
-itemcycle(int direction)
+itemcycle(struct Menu *currmenu, int direction)
{
struct Item *item;
struct Item *lastitem;
/* run event loop */
static void
-run(void)
+run(struct Menu *currmenu)
{
struct Menu *menu;
struct Item *item;
KeySym ksym;
XEvent ev;
+ mapmenu(currmenu);
+
while (!XNextEvent(dpy, &ev)) {
switch(ev.type) {
case Expose:
if (ev.xexpose.count == 0)
- drawmenu();
+ drawmenu(currmenu);
break;
case MotionNotify:
- getmenuitem(ev.xbutton.window, ev.xbutton.y, &menu, &item);
- if (menu != NULL && item != NULL) {
- if (previtem != item) {
- if (item->submenu != NULL)
- setcurrmenu(item->submenu);
- else
- setcurrmenu(menu);
- previtem = item;
- drawmenu();
- } else if (menu->selected != item) {
- menu->selected = item;
- drawmenu();
- }
+ menu = getmenu(currmenu, ev.xbutton.window);
+ item = getitem(menu, ev.xbutton.y);
+ if (menu == NULL || item == NULL || previtem == item)
+ break;
+ previtem = item;
+ menu->selected = item;
+ if (item->submenu != NULL) {
+ currmenu = item->submenu;
+ currmenu->selected = NULL;
+ } else {
+ currmenu = menu;
}
+ mapmenu(currmenu);
+ drawmenu(currmenu);
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);
- return;
- }
- currmenu->selected = currmenu->list;
- drawmenu();
+ menu = getmenu(currmenu, ev.xbutton.window);
+ item = getitem(menu, ev.xbutton.y);
+ if (menu == NULL || item == NULL)
break;
+selectitem:
+ if (item->label == NULL)
+ break; /* ignore separators */
+ if (item->submenu != NULL) {
+ currmenu = item->submenu;
} else {
+ printf("%s\n", item->output);
return;
}
+ mapmenu(currmenu);
+ currmenu->selected = currmenu->list;
+ drawmenu(currmenu);
+ break;
case ButtonPress:
- getmenuitem(ev.xbutton.window, ev.xbutton.y, &menu, &item);
- if (menu == NULL || item == NULL)
+ menu = getmenu(currmenu, ev.xbutton.window);
+ if (menu == NULL)
return;
break;
case KeyPress:
ksym = XkbKeycodeToKeysym(dpy, ev.xkey.keycode, 0, 0);
- if (ksym == XK_Escape && currmenu == rootmenu)
+ /* esc closes xmenu when current menu is the root menu */
+ if (ksym == XK_Escape && currmenu->parent == NULL)
return;
/* Shift-Tab = ISO_Left_Tab */
/* cycle through menu */
item = NULL;
if (ksym == XK_ISO_Left_Tab || ksym == XK_Up) {
- item = itemcycle(ITEMPREV);
+ item = itemcycle(currmenu, ITEMPREV);
} else if (ksym == XK_Tab || ksym == XK_Down) {
- item = itemcycle(ITEMNEXT);
+ item = itemcycle(currmenu, ITEMNEXT);
} else if ((ksym == XK_Return || ksym == XK_Right) &&
currmenu->selected != NULL) {
item = currmenu->selected;
} else if ((ksym == XK_Escape || ksym == XK_Left) &&
currmenu->parent != NULL) {
item = currmenu->parent->selected;
- setcurrmenu(currmenu->parent);
+ currmenu = currmenu->parent;
+ mapmenu(currmenu);
} else
break;
currmenu->selected = item;
- drawmenu();
+ drawmenu(currmenu);
break;
case LeaveNotify:
+ previtem = NULL;
currmenu->selected = NULL;
- drawmenu();
+ drawmenu(currmenu);
break;
}
}
}
-/* recursivelly free a pixmap */
+/* recursivelly free pixmaps and destroy windows */
static void
freewindow(struct Menu *menu)
{
/* cleanup and exit */
static void
-cleanup(void)
+cleanup(struct Menu *rootmenu)
{
+ XUngrabPointer(dpy, CurrentTime);
+ XUngrabKeyboard(dpy, CurrentTime);
+
freewindow(rootmenu);
XftColorFree(dpy, visual, colormap, &dc.normal[ColorBG]);
XftColorFree(dpy, visual, colormap, &dc.normal[ColorFG]);
XftColorFree(dpy, visual, colormap, &dc.selected[ColorBG]);
XftColorFree(dpy, visual, colormap, &dc.selected[ColorFG]);
- XftColorFree(dpy, visual, colormap, &dc.decoration[ColorBG]);
- XftColorFree(dpy, visual, colormap, &dc.decoration[ColorFG]);
+ XftColorFree(dpy, visual, colormap, &dc.separator);
+ XftColorFree(dpy, visual, colormap, &dc.border);
XFreeGC(dpy, dc.gc);
XCloseDisplay(dpy);
static void
usage(void)
{
- (void)fprintf(stderr, "usage: xmenu [-w]\n");
+ (void)fprintf(stderr, "usage: xmenu\n");
exit(1);
}