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

systray: Fix race in sorting icons by name

Browse source
This commit is contained in:
o9000 2016-03-20 15:48:48 +01:00
parent c8250e5200
commit c5c8786363
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/systray/systraybar.c
View file

@ -526,6 +526,13 @@ gboolean add_icon(Window win)
} }
} }
// Dangerous actions begin
XSync(server.display, False);
error = FALSE;
XErrorHandler old = XSetErrorHandler(window_error_handler);
XSelectInput(server.display, win, StructureNotifyMask | PropertyChangeMask | ResizeRedirectMask);
XTextProperty xname; XTextProperty xname;
char *name; char *name;
if (XGetWMName(server.display, win, &xname)) { if (XGetWMName(server.display, win, &xname)) {
@ -571,8 +578,19 @@ gboolean add_icon(Window win)
fprintf(stderr, "XGetWindowAttributes(server.display, win = %ld, &attr)\n", win); fprintf(stderr, "XGetWindowAttributes(server.display, win = %ld, &attr)\n", win);
if (XGetWindowAttributes(server.display, win, &attr) == False) { if (XGetWindowAttributes(server.display, win, &attr) == False) {
free(name); free(name);
XSelectInput(server.display, win, NoEventMask);
// Dangerous actions end
XSync(server.display, False);
XSetErrorHandler(old);
return FALSE; return FALSE;
} }
// Dangerous actions end
XSync(server.display, False);
XSetErrorHandler(old);
unsigned long mask = 0; unsigned long mask = 0;
XSetWindowAttributes set_attr; XSetWindowAttributes set_attr;
Visual *visual = server.visual; Visual *visual = server.visual;
@ -606,6 +624,7 @@ gboolean add_icon(Window win)
mask = CWBackPixmap; mask = CWBackPixmap;
} }
} }
if (systray_profile) if (systray_profile)
fprintf(stderr, "XCreateWindow(...)\n"); fprintf(stderr, "XCreateWindow(...)\n");
Window parent = XCreateWindow(server.display, Window parent = XCreateWindow(server.display,
@ -683,9 +702,6 @@ gboolean reparent_icon(TrayWindow *traywin)
XSync(server.display, False); XSync(server.display, False);
error = FALSE; error = FALSE;
XErrorHandler old = XSetErrorHandler(window_error_handler); XErrorHandler old = XSetErrorHandler(window_error_handler);
if (systray_profile)
fprintf(stderr, "XSelectInput(server.display, traywin->win, ...)\n");
XSelectInput(server.display, traywin->win, StructureNotifyMask | PropertyChangeMask | ResizeRedirectMask);
XWithdrawWindow(server.display, traywin->win, server.screen); XWithdrawWindow(server.display, traywin->win, server.screen);
XReparentWindow(server.display, traywin->win, traywin->parent, 0, 0); XReparentWindow(server.display, traywin->win, traywin->parent, 0, 0);