Mabox/tint2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

systray: Break embedding into 2 steps

Browse Source
This commit is contained in:
o9000
2015-07-30 23:54:46 +02:00
parent 3805adc9f3
commit 78bc330448
3 changed files with 86 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/tint.c
View File

@@ -1279,10 +1279,28 @@ start:
break;
case PropertyNotify:
for (it = systray.list_icons; it ; it = g_slist_next(it)) {
TrayWindow *traywin = (TrayWindow*)it->data;
if (traywin->win == e.xany.window && e.xproperty.atom == server.atom._XEMBED_INFO) {
fprintf(stderr, "PropertyNotify\n");
if (is_embedded(traywin))
embed_icon(traywin);
break;
}
}
event_property_notify(&e);
break;
case ConfigureNotify:
for (it = systray.list_icons; it ; it = g_slist_next(it)) {
TrayWindow *traywin = (TrayWindow*)it->data;
if (traywin->win == e.xany.window) {
fprintf(stderr, "ConfigureNotify\n");
if (is_embedded(traywin))
embed_icon(traywin);
break;
}
}
event_configure_notify(&e);
break;
@@ -1291,6 +1309,7 @@ start:
for (it = systray.list_icons; it ; it = g_slist_next(it)) {
TrayWindow *traywin = (TrayWindow*)it->data;
if (traywin->win == e.xany.window) {
fprintf(stderr, "ConfigureRequest\n");
systray_reconfigure_event(traywin, &e);
break;
}
@@ -1306,8 +1325,11 @@ start:
for (it = systray.list_icons; it; it = g_slist_next(it)) {
TrayWindow *traywin = (TrayWindow*)it->data;
if (traywin->win == e.xreparent.window) {
fprintf(stderr, "ReparentNotify\n");
if (traywin->parent == e.xreparent.parent) {
embed_icon(traywin);
request_embed_icon(traywin);
if (is_embedded(traywin))
embed_icon(traywin);
} else {
remove_icon(traywin);
}