X-Git-Url: https://git.subgeniuskitty.com/xmenu/.git/blobdiff_plain/2744390027e330553aff63b8f1ee32b672895ec5..571d99e165ee9ecd24945cc3c441d8b982f0cfb1:/xmenu.c diff --git a/xmenu.c b/xmenu.c index 03c184e..273f690 100644 --- a/xmenu.c +++ b/xmenu.c @@ -25,7 +25,8 @@ enum {ColorFG, ColorBG, ColorLast}; struct DC { XftColor normal[ColorLast]; XftColor selected[ColorLast]; - XftColor decoration[ColorLast]; + XftColor border; + XftColor separator; Drawable d; GC gc; @@ -33,7 +34,7 @@ struct DC { }; /* menu geometry structure */ -struct Geometry { +struct MenuGeometry { int itemb; /* item border */ int itemw; /* item width */ int itemh; /* item height */ @@ -79,7 +80,10 @@ static void setupdc(void); static void setupgeom(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 struct Menu *getmenu(Window win); +static struct Item *getitem(struct Menu *menu, int y); +static void drawseparator(struct Menu *menu, struct Item *item); +static void drawitem(struct Menu *menu, struct Item *item, XftColor *color); static void drawmenu(void); static void calcscreengeom(void); static void calcmenu(struct Menu *menu); @@ -99,16 +103,12 @@ static Visual *visual; static Window rootwin; static int screen; static struct DC dc; +static struct ScreenGeometry screengeom; /* menu variables */ static struct Menu *rootmenu = NULL; static struct Menu *currmenu = NULL; -static char **menutitle; -static int menutitlecount; - -/* geometry variables */ -static struct Geometry geom; -static struct ScreenGeometry screengeom; +static struct MenuGeometry geom; #include "config.h" @@ -127,9 +127,6 @@ main(int argc, char *argv[]) argc -= optind; argv += optind; - menutitle = argv; - menutitlecount = argc; - /* open connection to server and set X variables */ if ((dpy = XOpenDisplay(NULL)) == NULL) errx(1, "cannot open display"); @@ -154,10 +151,6 @@ main(int argc, char *argv[]) grabpointer(); grabkeyboard(); - /* map root menu */ - setcurrmenu(rootmenu); - XMapWindow(dpy, rootmenu->win); - /* run event loop */ run(); @@ -171,44 +164,44 @@ getresources(void) { 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 */ @@ -224,18 +217,18 @@ static void 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); } @@ -243,11 +236,11 @@ setupdc(void) static void setupgeom(void) { - geom.itemb = itemborder; - geom.itemh = dc.font->height + itemborder * 2; - geom.itemw = width; - geom.border = menuborder; - geom.separator = separatorsize; + geom.itemb = padding_pixels; + geom.itemh = dc.font->height + padding_pixels * 2; + geom.itemw = width_pixels; + geom.border = border_pixels; + geom.separator = separator_pixels; } /* allocate an item */ @@ -299,13 +292,15 @@ allocmenu(struct Menu *parent, struct Item *list, unsigned level) menu->level = level; swa.override_redirect = True; - swa.background_pixel = dc.decoration[ColorBG].pixel; - swa.border_pixel = dc.decoration[ColorFG].pixel; + 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; @@ -423,7 +418,6 @@ calcmenu(struct Menu *menu) { static XClassHint classh = {PROGNAME, PROGNAME}; XWindowChanges changes; - XTextProperty textprop; XSizeHints sizeh; XGlyphInfo ext; struct Item *item; @@ -455,8 +449,6 @@ calcmenu(struct Menu *menu) menu->y = screengeom.cursy; else if (screengeom.screenh > menu->h) menu->y = screengeom.screenh - menu->h; - - XStringListToTextProperty(menutitle, menutitlecount, &textprop); } else { /* else, calculate in respect to parent menu */ if (screengeom.screenw - (menu->parent->x + menu->parent->w + geom.border) >= menu->w) menu->x = menu->parent->x + menu->parent->w + geom.border; @@ -469,8 +461,6 @@ calcmenu(struct Menu *menu) menu->y = menu->parent->y; else if (screengeom.screenh > menu->h) menu->y = screengeom.screenh - menu->h; - - XStringListToTextProperty(&(menu->caller->output), 1, &textprop); } /* update menu geometry */ @@ -484,7 +474,7 @@ calcmenu(struct Menu *menu) sizeh.flags = PMaxSize | PMinSize; sizeh.min_width = sizeh.max_width = menu->w; sizeh.min_height = sizeh.max_height = menu->h; - XSetWMProperties(dpy, menu->win, &textprop, NULL, NULL, 0, &sizeh, + XSetWMProperties(dpy, menu->win, NULL, NULL, NULL, 0, &sizeh, NULL, &classh); /* create pixmap and XftDraw */ @@ -532,28 +522,33 @@ grabkeyboard(void) errx(1, "cannot grab keyboard"); } -/* get menu and item of given window and position */ -static void -getmenuitem(Window win, int y, - struct Menu **menu_ret, struct Item **item_ret) +/* get menu of given window */ +static struct Menu * +getmenu(Window win) { - struct Menu *menu = NULL; - struct Item *item = NULL; + struct Menu *menu; - 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; - } - } - } - } + for (menu = currmenu; menu != NULL; menu = menu->parent) + if (menu->win == win) + return menu; + + return NULL; +} + +/* get item of given menu and position */ +static struct Item * +getitem(struct Menu *menu, int y) +{ + struct Item *item; + if (menu == NULL) + return NULL; -done: - *menu_ret = menu; - *item_ret = item; + for (item = menu->list; item != NULL; item = item->next) + if (y >= item->y && y <= item->y + item->h) + return item; + + return NULL; } /* set currentmenu to menu, umap previous menus and map current menu and its parents */ @@ -573,6 +568,7 @@ setcurrmenu(struct Menu *currmenu_new) /* if there was no currmenu, skip calculations */ if (currmenu == NULL) { currmenu = currmenu_new; + XMapWindow(dpy, currmenu->win); return; } @@ -607,9 +603,49 @@ setcurrmenu(struct Menu *currmenu_new) item = NULL; for (menu = currmenu; menu != lcamenu; menu = menu->parent) { XMapWindow(dpy, menu->win); - if (item != NULL) - menu->selected = item; - item = menu->caller; + } +} + +/* 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 = 0 + dc.font->height; + y = item->y + dc.font->height + geom.itemb / 2; + 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 + geom.itemb - 1; + y = item->y + geom.itemh/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); } } @@ -623,52 +659,26 @@ drawmenu(void) 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); } } @@ -723,6 +733,8 @@ run(void) KeySym ksym; XEvent ev; + setcurrmenu(rootmenu); + while (!XNextEvent(dpy, &ev)) { switch(ev.type) { case Expose: @@ -730,47 +742,46 @@ run(void) drawmenu(); 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(ev.xbutton.window); + item = getitem(menu, ev.xbutton.y); + if (menu == NULL || item == NULL) + break; + if (previtem != item) { + menu->selected = item; + if (item->submenu != NULL) + setcurrmenu(item->submenu); + else + setcurrmenu(menu); + previtem = item; + drawmenu(); } 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(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) { + setcurrmenu(item->submenu); } else { + printf("%s\n", item->output); return; } + currmenu->selected = currmenu->list; + drawmenu(); + break; case ButtonPress: - getmenuitem(ev.xbutton.window, ev.xbutton.y, &menu, &item); - if (menu == NULL || item == NULL) + menu = getmenu(ev.xbutton.window); + if (menu == NULL) return; break; case KeyPress: ksym = XkbKeycodeToKeysym(dpy, ev.xkey.keycode, 0, 0); + /* esc closes xmenu when current menu is the root menu */ if (ksym == XK_Escape && currmenu == rootmenu) return; @@ -798,6 +809,7 @@ selectitem: drawmenu(); break; case LeaveNotify: + previtem = NULL; currmenu->selected = NULL; drawmenu(); break; @@ -805,7 +817,7 @@ selectitem: } } -/* recursivelly free a pixmap */ +/* recursivelly free pixmaps and destroy windows */ static void freewindow(struct Menu *menu) { @@ -830,8 +842,8 @@ cleanup(void) 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);