projects
/
xmenu
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
tags
|
clone url
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8902c43
)
Moving XSetWMProtocols to setupmenu()
author
phillbush
<phillbush@cock.li>
Mon, 29 Jun 2020 15:25:59 +0000
(12:25 -0300)
committer
phillbush
<phillbush@cock.li>
Mon, 29 Jun 2020 15:25:59 +0000
(12:25 -0300)
xmenu.c
patch
|
blob
|
blame
|
history
diff --git
a/xmenu.c
b/xmenu.c
index
310b17d
..
8a7d511
100644
(file)
--- a/
xmenu.c
+++ b/
xmenu.c
@@
-300,7
+300,7
@@
allocitem(const char *label, const char *output, char *file)
return item;
}
return item;
}
-/* allocate a menu */
+/* allocate a menu
and create its window
*/
static struct Menu *
allocmenu(struct Menu *parent, struct Item *list, unsigned level)
{
static struct Menu *
allocmenu(struct Menu *parent, struct Item *list, unsigned level)
{
@@
-333,8
+333,6
@@
allocmenu(struct Menu *parent, struct Item *list, unsigned level)
CWBorderPixel | CWEventMask | CWSaveUnder,
&swa);
CWBorderPixel | CWEventMask | CWSaveUnder,
&swa);
- XSetWMProtocols(dpy, menu->win, &wmdelete, 1);
-
return menu;
}
return menu;
}
@@
-568,10
+566,10
@@
setupmenu(struct Menu *menu, XClassHint *classh)
DefaultDepth(dpy, screen));
menu->draw = XftDrawCreate(dpy, menu->pixmap, visual, colormap);
DefaultDepth(dpy, screen));
menu->draw = XftDrawCreate(dpy, menu->pixmap, visual, colormap);
- /* set ewmh window properties */
+ /* set WM protocols and ewmh window properties */
+ XSetWMProtocols(dpy, menu->win, &wmdelete, 1);
XChangeProperty(dpy, menu->win, netatom[NetWMName], utf8string, 8,
XChangeProperty(dpy, menu->win, netatom[NetWMName], utf8string, 8,
- PropModeReplace,
- (unsigned char *)title, strlen(title));
+ PropModeReplace, (unsigned char *)title, strlen(title));
XChangeProperty(dpy, menu->win, netatom[NetWMWindowType], XA_ATOM, 32,
PropModeReplace,
(unsigned char *)&netatom[NetWMWindowTypePopupMenu], 1);
XChangeProperty(dpy, menu->win, netatom[NetWMWindowType], XA_ATOM, 32,
PropModeReplace,
(unsigned char *)&netatom[NetWMWindowTypePopupMenu], 1);