nilix/tint2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

systray: Minor change in error logging

Browse source
This commit is contained in:
o9000 2015-06-12 01:43:39 +02:00
parent b1b95e086d
commit e8869b4d87
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/systray/systraybar.c
View file

@ -330,7 +330,7 @@ int window_error_handler(Display *d, XErrorEvent *e)
{ {
error = TRUE; error = TRUE;
if (e->error_code != BadWindow) { if (e->error_code != BadWindow) {
printf("error_handler %d\n", e->error_code); printf("systray: error code %d\n", e->error_code);
} }
return 0; return 0;
} }
@ -489,12 +489,17 @@ gboolean reparent_icon(TrayWindow *traywin)
Panel* panel = systray.area.panel; Panel* panel = systray.area.panel;
// Reparent
error = FALSE; error = FALSE;
XErrorHandler old = XSetErrorHandler(window_error_handler); XErrorHandler old = XSetErrorHandler(window_error_handler);
// Reparent
XReparentWindow(server.dsp, traywin->win, traywin->parent, 0, 0); XReparentWindow(server.dsp, traywin->win, traywin->parent, 0, 0);
XSync(server.dsp, False); XSync(server.dsp, False);
XSetErrorHandler(old);
if (error != FALSE) {
printf("systray %d: cannot embed icon for window %lu pid %d\n", __LINE__, traywin->win, traywin->pid);
remove_icon(traywin);
return FALSE;
}
traywin->reparented = 1; traywin->reparented = 1;
@ -512,8 +517,16 @@ gboolean reparent_icon(TrayWindow *traywin)
e.xclient.data.l[2] = 0; e.xclient.data.l[2] = 0;
e.xclient.data.l[3] = traywin->parent; e.xclient.data.l[3] = traywin->parent;
e.xclient.data.l[4] = 0; e.xclient.data.l[4] = 0;
error = FALSE;
XErrorHandler old = XSetErrorHandler(window_error_handler);
XSendEvent(server.dsp, traywin->win, False, 0xFFFFFF, &e); XSendEvent(server.dsp, traywin->win, False, 0xFFFFFF, &e);
XSync(server.dsp, False); XSync(server.dsp, False);
XSetErrorHandler(old);
if (error != FALSE) {
printf("systray %d: cannot embed icon for window %lu pid %d\n", __LINE__, traywin->win, traywin->pid);
remove_icon(traywin);
return FALSE;
}
} }
// Check if window was embedded // Check if window was embedded
@ -546,13 +559,6 @@ gboolean reparent_icon(TrayWindow *traywin)
XCompositeRedirectWindow(server.dsp, traywin->parent, CompositeRedirectManual); XCompositeRedirectWindow(server.dsp, traywin->parent, CompositeRedirectManual);
} }
XSync(server.dsp, False);
XSetErrorHandler(old);
if (error != FALSE) {
remove_icon(traywin);
return FALSE;
}
// Make the icon visible // Make the icon visible
if (!traywin->hide) if (!traywin->hide)
XMapWindow(server.dsp, traywin->win); XMapWindow(server.dsp, traywin->win);