X-Git-Url: https://git.subgeniuskitty.com/xmenu/.git/blobdiff_plain/cdeaefaaa2dc75e59016e352fdfe5adf48190c6e..237da9824c6ed299058589519e9f7a1003d5f145:/xmenu.c diff --git a/xmenu.c b/xmenu.c index 29ccb66..4a4ffca 100644 --- a/xmenu.c +++ b/xmenu.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include "xmenu.h" @@ -21,11 +22,12 @@ */ /* argument parser */ -static void parseposition(const char *optarg); +static void parseposition(char *optarg); /* initializers, and their helper routines */ static void parsefonts(const char *s); static void ealloccolor(const char *s, XftColor *color); +static void initmonitor(void); static void initresources(void); static void initdc(void); static void initconfig(void); @@ -37,15 +39,9 @@ static struct Menu *allocmenu(struct Menu *parent, struct Item *list, unsigned l static struct Menu *buildmenutree(unsigned level, const char *label, const char *output, char *file); static struct Menu *parsestdin(void); -/* image loader */ -static Imlib_Image loadicon(const char *file); - -/* utf8 utils */ +/* text drawer, and its helper routine */ static FcChar32 getnextutf8char(const char *s, const char **end_ret); - -/* pixmap drawers */ static int drawtext(XftDraw *draw, XftColor *color, int x, int y, unsigned h, const char *text); -static void drawitems(struct Menu *menu); /* structure setters, and their helper routines */ static void setupitems(struct Menu *menu); @@ -56,9 +52,13 @@ static void setupmenu(struct Menu *menu, XClassHint *classh); static void grabpointer(void); static void grabkeyboard(void); -/* window drawers and mappers */ +/* item drawer, and its helper routine */ +static Imlib_Image loadicon(const char *file); +static void drawitems(struct Menu *menu); + +/* menu drawers and mappers */ +static void drawmenus(struct Menu *currmenu); static void mapmenu(struct Menu *currmenu); -static void copypixmaps(struct Menu *currmenu); /* getters */ static struct Menu *getmenu(struct Menu *currmenu, Window win); @@ -89,13 +89,15 @@ static Visual *visual; static Window rootwin; static Colormap colormap; static struct DC dc; +static struct Monitor mon; static Atom utf8string; static Atom wmdelete; static Atom netatom[NetLast]; /* flags */ static int iflag = 0; /* whether to disable icons */ -static int pflag = 0; /* whether the user specified a position */ +static int mflag = 0; /* whether the user specified a monitor with -p */ +static int pflag = 0; /* whether the user specified a position with -p */ static int wflag = 0; /* whether to let the window manager control XMenu */ /* include config variable */ @@ -155,6 +157,7 @@ main(int argc, char *argv[]) } /* initializers */ + initmonitor(); initresources(); initdc(); initconfig(); @@ -189,12 +192,13 @@ main(int argc, char *argv[]) return 0; } -/* parse position string from -p, put results on config.x and config.y */ +/* parse position string from -p, + * put results on config.posx, config.posy, and config.monitor */ static void -parseposition(const char *optarg) +parseposition(char *optarg) { long n; - const char *s = optarg; + char *s = optarg; char *endp; n = strtol(s, &endp, 10); @@ -203,9 +207,24 @@ parseposition(const char *optarg) config.posx = n; s = endp+1; n = strtol(s, &endp, 10); - if (errno == ERANGE || n > INT_MAX || n < 0 || endp == s || *endp != '\0') + if (errno == ERANGE || n > INT_MAX || n < 0 || endp == s) goto error; config.posy = n; + if (*endp == ':') { + s = endp+1; + mflag = 1; + if (strncasecmp(s, "CUR", 3) == 0) { + config.monitor = -1; + endp = s+3; + } else { + n = strtol(s, &endp, 10); + if (errno == ERANGE || n > INT_MAX || n < 0 || endp == s || *endp != '\0') + goto error; + config.monitor = n; + } + } else if (*endp != '\0') { + goto error; + } return; @@ -255,6 +274,54 @@ ealloccolor(const char *s, XftColor *color) errx(1, "cannot allocate color: %s", s); } +/* query monitor information and cursor position */ +static void +initmonitor(void) +{ + XineramaScreenInfo *info = NULL; + Window dw; /* dummy variable */ + int di; /* dummy variable */ + unsigned du; /* dummy variable */ + int cursx, cursy; /* cursor position */ + int nmons; + int i; + + XQueryPointer(dpy, rootwin, &dw, &dw, &cursx, &cursy, &di, &di, &du); + + mon.x = mon.y = 0; + mon.w = DisplayWidth(dpy, screen); + mon.h = DisplayHeight(dpy, screen); + + if ((info = XineramaQueryScreens(dpy, &nmons)) != NULL) { + int selmon = 0; + + if (!mflag || (mflag && (config.monitor < 0 || config.monitor >= nmons))) { + for (i = 0; i < nmons; i++) { + if (cursx >= info[i].x_org && cursx <= info[i].x_org + info[i].width && + cursy >= info[i].y_org && cursy <= info[i].y_org + info[i].height) { + selmon = i; + break; + } + } + } else { + selmon = config.monitor; + } + + mon.x = info[selmon].x_org; + mon.y = info[selmon].y_org; + mon.w = info[selmon].width; + mon.h = info[selmon].height; + } + + if (!pflag) { + config.posx = cursx; + config.posy = cursy; + } else if (mflag) { + config.posx += mon.x; + config.posy += mon.y; + } +} + /* read xrdb for configuration options */ static void initresources(void) @@ -327,12 +394,6 @@ initdc(void) static void initconfig(void) { - Window dw; /* dummy variable */ - int di; /* dummy variable */ - unsigned du; /* dummy variable */ - - if (!pflag) /* if the user haven't specified a position, use cursor position*/ - XQueryPointer(dpy, rootwin, &dw, &dw, &config.posx, &config.posy, &di, &di, &du); config.screenw = DisplayWidth(dpy, screen); config.screenh = DisplayHeight(dpy, screen); config.iconsize = config.height_pixels - config.iconpadding * 2; @@ -407,6 +468,7 @@ allocmenu(struct Menu *parent, struct Item *list, unsigned level) menu->x = 0; /* calculated by setupmenu() */ menu->y = 0; /* calculated by setupmenu() */ menu->level = level; + menu->drawn = 0; swa.override_redirect = (wflag) ? False : True; swa.background_pixel = dc.normal[ColorBG].pixel; @@ -525,43 +587,15 @@ parsestdin(void) return rootmenu; } -/* load and scale icon */ -static Imlib_Image -loadicon(const char *file) -{ - Imlib_Image icon; - int width; - int height; - int imgsize; - - icon = imlib_load_image(file); - if (icon == NULL) - errx(1, "cannot load icon %s", file); - - imlib_context_set_image(icon); - - width = imlib_image_get_width(); - height = imlib_image_get_height(); - imgsize = MIN(width, height); - - icon = imlib_create_cropped_scaled_image(0, 0, imgsize, imgsize, - config.iconsize, - config.iconsize); - - return icon; -} - -/* get next utf8 char from s return its codepoint and set next_ret to pointer to next character */ +/* get next utf8 char from s return its codepoint and set next_ret to pointer to end of character */ static FcChar32 getnextutf8char(const char *s, const char **next_ret) { - /* */ static const unsigned char utfbyte[] = {0x80, 0x00, 0xC0, 0xE0, 0xF0}; - /* */ static const unsigned char utfmask[] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8}; - /* 0xFFFD is the replacement character, used to represent unknown characters */ static const FcChar32 utfmin[] = {0, 0x00, 0x80, 0x800, 0x10000}; static const FcChar32 utfmax[] = {0, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF}; + /* 0xFFFD is the replacement character, used to represent unknown characters */ static const FcChar32 unknown = 0xFFFD; FcChar32 ucode; /* FcChar32 type holds 32 bits */ size_t usize = 0; /* n' of bytes of the utf8 character */ @@ -586,7 +620,7 @@ getnextutf8char(const char *s, const char **next_ret) s++; for (i = 1; i < usize; i++) { *next_ret = s+1; - /* if byte is EOS or is not a continuation byte, return unknown */ + /* if byte is nul or is not a continuation byte, return unknown */ if (*s == '\0' || ((unsigned char)*s & utfmask[0]) != utfbyte[0]) return unknown; /* 6 is the number of relevant bits in the continuation byte */ @@ -649,94 +683,17 @@ drawtext(XftDraw *draw, XftColor *color, int x, int y, unsigned h, const char *t return textlen; } -/* draw pixmap for the selected and unselected version of each item on menu */ -static void -drawitems(struct Menu *menu) -{ - struct Item *item; - - for (item = menu->list; item != NULL; item = item->next) { - XftDraw *dsel, *dunsel; - int x, y; - - item->unsel = XCreatePixmap(dpy, menu->win, menu->w, item->h, - DefaultDepth(dpy, screen)); - - XSetForeground(dpy, dc.gc, dc.normal[ColorBG].pixel); - XFillRectangle(dpy, item->unsel, dc.gc, 0, 0, menu->w, item->h); - - if (item->label == NULL) { /* item is separator */ - y = item->h/2; - XSetForeground(dpy, dc.gc, dc.separator.pixel); - XDrawLine(dpy, item->unsel, dc.gc, config.horzpadding, y, - menu->w - config.horzpadding, y); - - item->sel = item->unsel; - } else { - - item->sel = XCreatePixmap(dpy, menu->win, menu->w, item->h, - DefaultDepth(dpy, screen)); - XSetForeground(dpy, dc.gc, dc.selected[ColorBG].pixel); - XFillRectangle(dpy, item->sel, dc.gc, 0, 0, menu->w, item->h); - - /* draw text */ - x = config.horzpadding; - x += (iflag) ? 0 : config.horzpadding + config.iconsize; - dsel = XftDrawCreate(dpy, item->sel, visual, colormap); - dunsel = XftDrawCreate(dpy, item->unsel, visual, colormap); - XSetForeground(dpy, dc.gc, dc.selected[ColorFG].pixel); - drawtext(dsel, &dc.selected[ColorFG], x, 0, item->h, item->label); - XSetForeground(dpy, dc.gc, dc.normal[ColorFG].pixel); - drawtext(dunsel, &dc.normal[ColorFG], x, 0, item->h, item->label); - XftDrawDestroy(dsel); - XftDrawDestroy(dunsel); - - /* draw triangle */ - if (item->submenu != NULL) { - x = menu->w - config.triangle_width - config.horzpadding; - y = (item->h - config.triangle_height + 1) / 2; - - XPoint triangle[] = { - {x, y}, - {x + config.triangle_width, y + config.triangle_height/2}, - {x, y + config.triangle_height}, - {x, y} - }; - - XSetForeground(dpy, dc.gc, dc.selected[ColorFG].pixel); - XFillPolygon(dpy, item->sel, dc.gc, triangle, LEN(triangle), - Convex, CoordModeOrigin); - XSetForeground(dpy, dc.gc, dc.normal[ColorFG].pixel); - XFillPolygon(dpy, item->unsel, dc.gc, triangle, LEN(triangle), - Convex, CoordModeOrigin); - } - - /* draw icon */ - if (item->file != NULL && !iflag) { - item->icon = loadicon(item->file); - - imlib_context_set_drawable(item->sel); - imlib_context_set_image(item->icon); - imlib_render_image_on_drawable(config.horzpadding, config.iconpadding); - - imlib_context_set_drawable(item->unsel); - imlib_context_set_image(item->icon); - imlib_render_image_on_drawable(config.horzpadding, config.iconpadding); - } - } - } -} - /* setup the height, width and icon of the items of a menu */ static void setupitems(struct Menu *menu) { - XGlyphInfo ext; struct Item *item; - int itemwidth; menu->w = config.width_pixels; for (item = menu->list; item != NULL; item = item->next) { + int itemwidth; + int textwidth; + item->y = menu->h; if (item->label == NULL) /* height for separator item */ @@ -745,23 +702,24 @@ setupitems(struct Menu *menu) item->h = config.height_pixels; menu->h += item->h; - /* get length of item->label rendered in the font */ - XftTextExtentsUtf8(dpy, dc.fonts[0], (XftChar8 *)item->label, - item->labellen, &ext); + if (item->label) + textwidth = drawtext(NULL, NULL, 0, 0, item->h, item->label); + else + textwidth = 0; /* * set menu width * - * the item width depends on the size of its label (ext.xOff), + * the item width depends on the size of its label (textwidth), * and it is only used to calculate the width of the menu (which * is equal to the width of the largest item). * * the horizontal padding appears 4 times through the width of a - * item: before and after its icon, and before and after its triangle + * item: before and after its icon, and before and after its triangle. * if the iflag is set (icons are disabled) then the horizontal - * padding appears before the label and around the triangle. + * padding appears 3 times: before the label and around the triangle. */ - itemwidth = ext.xOff + config.triangle_width + config.horzpadding * 3; + itemwidth = textwidth + config.triangle_width + config.horzpadding * 3; itemwidth += (iflag) ? 0 : config.iconsize + config.horzpadding; menu->w = MAX(menu->w, itemwidth); } @@ -776,27 +734,31 @@ setupmenupos(struct Menu *menu) width = menu->w + config.border_pixels * 2; height = menu->h + config.border_pixels * 2; if (menu->parent == NULL) { /* if root menu, calculate in respect to cursor */ - if (pflag || config.screenw - config.posx >= menu->w) + if (pflag || (config.posx > mon.x && mon.x + mon.w - config.posx >= width)) menu->x = config.posx; else if (config.posx > width) menu->x = config.posx - width; - if (pflag || config.screenh - config.posy >= height) + if (pflag || (config.posy > mon.y && mon.y + mon.h - config.posy >= height)) menu->y = config.posy; else if (config.screenh > height) - menu->y = config.screenh - height; + menu->y = mon.y + mon.h - height; } else { /* else, calculate in respect to parent menu */ - if (config.screenw - (menu->parent->x + menu->parent->w + config.border_pixels + config.gap_pixels) >= width) - menu->x = menu->parent->x + menu->parent->w + config.border_pixels + config.gap_pixels; + int parentwidth; + + parentwidth = menu->parent->x + menu->parent->w + config.border_pixels + config.gap_pixels; + + if (mon.x + mon.w - parentwidth >= width) + menu->x = parentwidth; else if (menu->parent->x > menu->w + config.border_pixels + config.gap_pixels) menu->x = menu->parent->x - menu->w - config.border_pixels - config.gap_pixels; - if (config.screenh - (menu->caller->y + menu->parent->y) > height) + if (mon.y + mon.h - (menu->caller->y + menu->parent->y) > height) menu->y = menu->caller->y + menu->parent->y; - else if (config.screenh - menu->parent->y > height) + else if (mon.y + mon.h - menu->parent->y > height) menu->y = menu->parent->y; - else if (config.screenh > height) - menu->y = config.screenh - height; + else if (mon.y + mon.h > height) + menu->y = mon.y + mon.h - height; } } @@ -812,7 +774,6 @@ setupmenu(struct Menu *menu, XClassHint *classh) /* setup size and position of menus */ setupitems(menu); - drawitems(menu); setupmenupos(menu); /* update menu geometry */ @@ -885,6 +846,131 @@ grabkeyboard(void) errx(1, "cannot grab keyboard"); } +/* load and scale icon */ +static Imlib_Image +loadicon(const char *file) +{ + Imlib_Image icon; + int width; + int height; + int imgsize; + + icon = imlib_load_image(file); + if (icon == NULL) + errx(1, "cannot load icon %s", file); + + imlib_context_set_image(icon); + + width = imlib_image_get_width(); + height = imlib_image_get_height(); + imgsize = MIN(width, height); + + icon = imlib_create_cropped_scaled_image(0, 0, imgsize, imgsize, + config.iconsize, + config.iconsize); + + return icon; +} + +/* draw pixmap for the selected and unselected version of each item on menu */ +static void +drawitems(struct Menu *menu) +{ + struct Item *item; + + for (item = menu->list; item != NULL; item = item->next) { + XftDraw *dsel, *dunsel; + int x, y; + + item->unsel = XCreatePixmap(dpy, menu->win, menu->w, item->h, + DefaultDepth(dpy, screen)); + + XSetForeground(dpy, dc.gc, dc.normal[ColorBG].pixel); + XFillRectangle(dpy, item->unsel, dc.gc, 0, 0, menu->w, item->h); + + if (item->label == NULL) { /* item is separator */ + y = item->h/2; + XSetForeground(dpy, dc.gc, dc.separator.pixel); + XDrawLine(dpy, item->unsel, dc.gc, config.horzpadding, y, + menu->w - config.horzpadding, y); + + item->sel = item->unsel; + } else { + + item->sel = XCreatePixmap(dpy, menu->win, menu->w, item->h, + DefaultDepth(dpy, screen)); + XSetForeground(dpy, dc.gc, dc.selected[ColorBG].pixel); + XFillRectangle(dpy, item->sel, dc.gc, 0, 0, menu->w, item->h); + + /* draw text */ + x = config.horzpadding; + x += (iflag) ? 0 : config.horzpadding + config.iconsize; + dsel = XftDrawCreate(dpy, item->sel, visual, colormap); + dunsel = XftDrawCreate(dpy, item->unsel, visual, colormap); + XSetForeground(dpy, dc.gc, dc.selected[ColorFG].pixel); + drawtext(dsel, &dc.selected[ColorFG], x, 0, item->h, item->label); + XSetForeground(dpy, dc.gc, dc.normal[ColorFG].pixel); + drawtext(dunsel, &dc.normal[ColorFG], x, 0, item->h, item->label); + XftDrawDestroy(dsel); + XftDrawDestroy(dunsel); + + /* draw triangle */ + if (item->submenu != NULL) { + x = menu->w - config.triangle_width - config.horzpadding; + y = (item->h - config.triangle_height + 1) / 2; + + XPoint triangle[] = { + {x, y}, + {x + config.triangle_width, y + config.triangle_height/2}, + {x, y + config.triangle_height}, + {x, y} + }; + + XSetForeground(dpy, dc.gc, dc.selected[ColorFG].pixel); + XFillPolygon(dpy, item->sel, dc.gc, triangle, LEN(triangle), + Convex, CoordModeOrigin); + XSetForeground(dpy, dc.gc, dc.normal[ColorFG].pixel); + XFillPolygon(dpy, item->unsel, dc.gc, triangle, LEN(triangle), + Convex, CoordModeOrigin); + } + + /* draw icon */ + if (item->file != NULL && !iflag) { + item->icon = loadicon(item->file); + + imlib_context_set_image(item->icon); + imlib_context_set_drawable(item->sel); + imlib_render_image_on_drawable(config.horzpadding, config.iconpadding); + imlib_context_set_drawable(item->unsel); + imlib_render_image_on_drawable(config.horzpadding, config.iconpadding); + } + } + } +} + +/* copy pixmaps of items of the current menu and of its ancestors into menu window */ +static void +drawmenus(struct Menu *currmenu) +{ + struct Menu *menu; + struct Item *item; + + for (menu = currmenu; menu != NULL; menu = menu->parent) { + if (!menu->drawn) { + drawitems(menu); + menu->drawn = 1; + } + for (item = menu->list; item != NULL; item = item->next) { + if (item == menu->selected) + XCopyArea(dpy, item->sel, menu->win, dc.gc, 0, 0, + menu->w, item->h, 0, item->y); + else + XCopyArea(dpy, item->unsel, menu->win, dc.gc, 0, 0, + menu->w, item->h, 0, item->y); + } + } +} + /* umap previous menus and map current menu and its parents */ static void mapmenu(struct Menu *currmenu) @@ -944,25 +1030,6 @@ mapmenu(struct Menu *currmenu) prevmenu = currmenu; } -/* copy pixmaps of items of the current menu and of its ancestors into menu window */ -static void -copypixmaps(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) { - if (item == menu->selected) - XCopyArea(dpy, item->sel, menu->win, dc.gc, 0, 0, - menu->w, item->h, 0, item->y); - else - XCopyArea(dpy, item->unsel, menu->win, dc.gc, 0, 0, - menu->w, item->h, 0, item->y); - } - } -} - /* get menu of given window */ static struct Menu * getmenu(struct Menu *currmenu, Window win) @@ -1049,7 +1116,7 @@ run(struct Menu *currmenu) switch(ev.type) { case Expose: if (ev.xexpose.count == 0) - copypixmaps(currmenu); + drawmenus(currmenu); break; case MotionNotify: menu = getmenu(currmenu, ev.xbutton.window); @@ -1065,7 +1132,7 @@ run(struct Menu *currmenu) currmenu = menu; } mapmenu(currmenu); - copypixmaps(currmenu); + drawmenus(currmenu); break; case ButtonRelease: menu = getmenu(currmenu, ev.xbutton.window); @@ -1083,7 +1150,7 @@ selectitem: } mapmenu(currmenu); currmenu->selected = currmenu->list; - copypixmaps(currmenu); + drawmenus(currmenu); break; case ButtonPress: menu = getmenu(currmenu, ev.xbutton.window); @@ -1119,12 +1186,12 @@ selectitem: } else break; currmenu->selected = item; - copypixmaps(currmenu); + drawmenus(currmenu); break; case LeaveNotify: previtem = NULL; currmenu->selected = NULL; - copypixmaps(currmenu); + drawmenus(currmenu); break; case ConfigureNotify: menu = getmenu(currmenu, ev.xconfigure.window); @@ -1159,9 +1226,11 @@ cleanmenu(struct Menu *menu) if (item->submenu != NULL) cleanmenu(item->submenu); tmp = item; - XFreePixmap(dpy, item->unsel); - if (tmp->label != NULL) - XFreePixmap(dpy, item->sel); + if (menu->drawn) { + XFreePixmap(dpy, item->unsel); + if (tmp->label != NULL) + XFreePixmap(dpy, item->sel); + } if (tmp->label != tmp->output) free(tmp->label); free(tmp->output);