mraber/xmenu
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

using pixmaps

Browse Source 
Using pixmaps rather than drawing directly on windows.
This commit is contained in:
phillbush 2020-05-16 00:43:59 -03:00
parent c58c645637
commit f15fc33987
1 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
xmenu.c
View File

@ -56,6 +56,7 @@ struct Menu {
struct Item *selected; struct Item *selected;
int x, y, w, h; int x, y, w, h;
unsigned level; unsigned level;
Drawable pixmap;
Window win; Window win;
}; };
@ -66,14 +67,14 @@ static void setupgeom(void);
static void setupgrab(void); static void setupgrab(void);
static struct Item *allocitem(const char *label, const char *output); static struct Item *allocitem(const char *label, const char *output);
static struct Menu *allocmenu(struct Menu *parent, struct Item *list, unsigned level); static struct Menu *allocmenu(struct Menu *parent, struct Item *list, unsigned level);
static void getmenuitem(Window win, int y, static void getmenuitem(Window win, int y, struct Menu **menu_ret, struct Item **item_ret);
struct Menu **menu_ret, struct Item **item_ret);
static void drawmenu(void); static void drawmenu(void);
static void calcscreengeom(void); static void calcscreengeom(void);
static void calcmenu(struct Menu *menu); static void calcmenu(struct Menu *menu);
static void setcurrmenu(struct Menu *currmenu_new); static void setcurrmenu(struct Menu *currmenu_new);
static void parsestdin(void); static void parsestdin(void);
static void run(void); static void run(void);
static void freewindow(struct Menu *menu);
static void cleanupexit(void); static void cleanupexit(void);
static void usage(void); static void usage(void);
@ -239,7 +240,7 @@ allocmenu(struct Menu *parent, struct Item *list, unsigned level)
swa.background_pixel = dc.decoration[ColorBG]; swa.background_pixel = dc.decoration[ColorBG];
swa.border_pixel = dc.decoration[ColorFG]; swa.border_pixel = dc.decoration[ColorFG];
swa.event_mask = ExposureMask | KeyPressMask | ButtonPressMask | ButtonReleaseMask swa.event_mask = ExposureMask | KeyPressMask | ButtonPressMask | ButtonReleaseMask
| PointerMotionMask; | PointerMotionMask | LeaveWindowMask;
menu->win = XCreateWindow(dpy, rootwin, 0, 0, geom.itemw, geom.itemh, geom.border, menu->win = XCreateWindow(dpy, rootwin, 0, 0, geom.itemw, geom.itemh, geom.border,
CopyFromParent, CopyFromParent, CopyFromParent, CopyFromParent, CopyFromParent, CopyFromParent,
CWOverrideRedirect | CWBackPixel | CWBorderPixel | CWEventMask, CWOverrideRedirect | CWBackPixel | CWBorderPixel | CWEventMask,
@ -399,6 +400,10 @@ calcmenu(struct Menu *menu)
sizeh.min_height = sizeh.max_height = menu->h; sizeh.min_height = sizeh.max_height = menu->h;
XSetWMNormalHints(dpy, menu->win, &sizeh); XSetWMNormalHints(dpy, menu->win, &sizeh);
/* create pixmap */
menu->pixmap = XCreatePixmap(dpy, menu->win, menu->w, menu->h,
DefaultDepth(dpy, screen));
/* calculate positions of submenus */ /* calculate positions of submenus */
for (item = menu->list; item != NULL; item = item->next) { for (item = menu->list; item != NULL; item = item->next) {
if (item->submenu != NULL) if (item->submenu != NULL)
@ -472,7 +477,7 @@ drawmenu(void)
/* draw item box */ /* draw item box */
XSetForeground(dpy, dc.gc, color[ColorBG]); XSetForeground(dpy, dc.gc, color[ColorBG]);
XFillRectangle(dpy, menu->win, dc.gc, 0, item->y, XFillRectangle(dpy, menu->pixmap, dc.gc, 0, item->y,
geom.itemw, item->h); geom.itemw, item->h);
/* continue if item is a separator */ /* continue if item is a separator */
@ -484,7 +489,7 @@ drawmenu(void)
labelx = 0 + dc.fonth; labelx = 0 + dc.fonth;
labely = item->y + dc.fonth + geom.itemb; labely = item->y + dc.fonth + geom.itemb;
XSetForeground(dpy, dc.gc, color[ColorFG]); XSetForeground(dpy, dc.gc, color[ColorFG]);
XDrawString(dpy, menu->win, dc.gc, labelx, labely, item->label, labellen); XDrawString(dpy, menu->pixmap, dc.gc, labelx, labely, item->label, labellen);
/* draw triangle, if item contains a submenu */ /* draw triangle, if item contains a submenu */
if (item->submenu != NULL) { if (item->submenu != NULL) {
@ -498,9 +503,12 @@ drawmenu(void)
{trianglex, triangley} {trianglex, triangley}
}; };
XFillPolygon(dpy, menu->win, dc.gc, triangle, LEN(triangle), XFillPolygon(dpy, menu->pixmap, dc.gc, triangle, LEN(triangle),
Convex, CoordModeOrigin); Convex, CoordModeOrigin);
} }
XCopyArea(dpy, menu->pixmap, menu->win, dc.gc, 0, item->y,
menu->w, item->h, 0, item->y);
} }
} }
} }
@ -532,8 +540,8 @@ run(void)
previtem = item; previtem = item;
} else if (menu->selected != item) } else if (menu->selected != item)
menu->selected = item; menu->selected = item;
drawmenu();
} }
drawmenu();
break; break;
case ButtonRelease: case ButtonRelease:
getmenuitem(ev.xbutton.window, ev.xbutton.y, &menu, &item); getmenuitem(ev.xbutton.window, ev.xbutton.y, &menu, &item);
@ -551,14 +559,35 @@ run(void)
cleanupexit(); cleanupexit();
} }
break; break;
case LeaveNotify:
currmenu->selected = NULL;
drawmenu();
break;
} }
} }
} }
/* recursivelly free a pixmap */
static void
freewindow(struct Menu *menu)
{
struct Item *item;
for (item = menu->list; item != NULL; item = item->next)
if (item->submenu != NULL)
freewindow(item->submenu);
XFreePixmap(dpy, menu->pixmap);
XDestroyWindow(dpy, menu->win);
}
/* cleanup and exit */ /* cleanup and exit */
static void static void
cleanupexit(void) cleanupexit(void)
{ {
freewindow(rootmenu);
XFreeFont(dpy, dc.font);
XFreeGC(dpy, dc.gc);
XCloseDisplay(dpy); XCloseDisplay(dpy);
exit(0); exit(0);
} }