systray: Process XEmbed events according to spec
o9000 o9000
3 files changed,
111 insertions(+),
119 deletions(-)
M
src/systray/systraybar.c
→
src/systray/systraybar.c
@@ -28,6 +28,7 @@ #include <Imlib2.h>
#include <X11/extensions/Xdamage.h> #include <X11/extensions/Xcomposite.h> #include <X11/extensions/Xrender.h> +#include <unistd.h> #include "systraybar.h"@@ -609,12 +610,14 @@ fprintf(stderr, "[%f] %s:%d win = %lu (%s)\n", profiling_get_time(), __FUNCTION__, __LINE__, traywin->win, traywin->name);
if (traywin->reparented) return TRUE; + Panel* panel = systray.area.panel; + // Watch for the icon trying to resize itself / closing again XSync(server.dsp, False); error = FALSE; XErrorHandler old = XSetErrorHandler(window_error_handler); if (systray_profile) - fprintf(stderr, "XSelectInput(server.dsp, traywin->win, StructureNotifyMask)\n"); + fprintf(stderr, "XSelectInput(server.dsp, traywin->win, StructureNotifyMask | PropertyChangeMask)\n"); XSelectInput(server.dsp, traywin->win, StructureNotifyMask | PropertyChangeMask); XSync(server.dsp, False); XSetErrorHandler(old);@@ -630,14 +633,42 @@ fprintf(stderr, "XSync(server.dsp, False)\n");
XSync(server.dsp, False); error = FALSE; old = XSetErrorHandler(window_error_handler); + if (systray_profile) + fprintf(stderr, "XWithdrawWindow(server.dsp, traywin->win, server.screen)\n"); + XWithdrawWindow(server.dsp, traywin->win, server.screen); if (systray_profile) fprintf(stderr, "XReparentWindow(server.dsp, traywin->win, traywin->parent, 0, 0)\n"); - XWithdrawWindow(server.dsp, traywin->win, server.screen); XReparentWindow(server.dsp, traywin->win, traywin->parent, 0, 0); if (systray_profile) + fprintf(stderr, "XMoveResizeWindow(server.dsp, traywin->parent = %ld, traywin->x = %d, traywin->y = %d, traywin->width = %d, traywin->height = %d)\n", traywin->parent, traywin->x, traywin->y, traywin->width, traywin->height); + XMoveResizeWindow(server.dsp, traywin->parent, traywin->x, traywin->y, traywin->width, traywin->height); + if (systray_profile) fprintf(stderr, "XMoveResizeWindow(server.dsp, traywin->win = %ld, 0, 0, traywin->width = %d, traywin->height = %d)\n", traywin->win, traywin->width, traywin->height); XMoveResizeWindow(server.dsp, traywin->win, 0, 0, traywin->width, traywin->height); + // Redirect rendering when using compositing + if (systray_composited) { + if (systray_profile) + fprintf(stderr, "XDamageCreate(server.dsp, traywin->parent, XDamageReportRawRectangles)\n"); + traywin->damage = XDamageCreate(server.dsp, traywin->parent, XDamageReportRawRectangles); + if (systray_profile) + fprintf(stderr, "XCompositeRedirectWindow(server.dsp, traywin->parent, CompositeRedirectManual)\n"); + XCompositeRedirectWindow(server.dsp, traywin->parent, CompositeRedirectManual); + } + + // Make the icon visible + if (!traywin->hide) { + if (systray_profile) + fprintf(stderr, "XMapWindow(server.dsp, traywin->win)\n"); + XMapWindow(server.dsp, traywin->win); + } + if (!traywin->hide && !panel->is_hidden) { + if (systray_profile) + fprintf(stderr, "XMapRaised(server.dsp, traywin->parent)\n"); + XMapRaised(server.dsp, traywin->parent); + } + XSync(server.dsp, False); + XSync(server.dsp, False); XSetErrorHandler(old); if (error != FALSE) {@@ -654,146 +685,87 @@
return TRUE; } -gboolean embed_icon(TrayWindow *traywin) +gboolean start_embedding_icon(TrayWindow *traywin) { if (systray_profile) fprintf(stderr, "[%f] %s:%d win = %lu (%s)\n", profiling_get_time(), __FUNCTION__, __LINE__, traywin->win, traywin->name); - if (traywin->embedded) + if (traywin->embedding_started) return TRUE; - Panel* panel = systray.area.panel; - - // Watch for the icon trying to resize itself / closing again + // Embed into parent + XEvent e; + e.xclient.type = ClientMessage; + e.xclient.serial = 0; + e.xclient.send_event = True; + e.xclient.message_type = server.atom._XEMBED; + e.xclient.window = traywin->win; + e.xclient.format = 32; + e.xclient.data.l[0] = CurrentTime; + e.xclient.data.l[1] = XEMBED_EMBEDDED_NOTIFY; + e.xclient.data.l[2] = 0; + e.xclient.data.l[3] = traywin->parent; + e.xclient.data.l[4] = 0; XSync(server.dsp, False); error = FALSE; XErrorHandler old = XSetErrorHandler(window_error_handler); if (systray_profile) - fprintf(stderr, "XSelectInput(server.dsp, traywin->win, StructureNotifyMask)\n"); - XSelectInput(server.dsp, traywin->win, StructureNotifyMask | PropertyChangeMask); + fprintf(stderr, "XSendEvent(server.dsp, traywin->win, False, 0xFFFFFF, &e)\n"); + XSendEvent(server.dsp, traywin->win, False, NoEventMask, &e); XSync(server.dsp, False); XSetErrorHandler(old); if (error != FALSE) { - fprintf(stderr, RED "systray %d: cannot embed icon for window %lu (%s) parent %lu pid %d\n" RESET, __LINE__, traywin->win, traywin->name, traywin->parent, traywin->pid); + fprintf(stderr, RED "systray %d: cannot embed icon for window %lu (%s) pid %d\n" RESET, __LINE__, traywin->win, traywin->name, traywin->pid); remove_icon(traywin); return FALSE; } - // Reparent + traywin->embedding_started = 1; + if (systray_profile) - fprintf(stderr, "XSync(server.dsp, False)\n"); - XSync(server.dsp, False); - error = FALSE; - old = XSetErrorHandler(window_error_handler); - if (systray_profile) - fprintf(stderr, "XReparentWindow(server.dsp, traywin->win, traywin->parent, 0, 0)\n"); - XWithdrawWindow(server.dsp, traywin->win, server.screen); - XReparentWindow(server.dsp, traywin->win, traywin->parent, 0, 0); - if (systray_profile) - fprintf(stderr, "XMoveResizeWindow(server.dsp, traywin->win = %ld, 0, 0, traywin->width = %d, traywin->height = %d)\n", traywin->win, traywin->width, traywin->height); - XMoveResizeWindow(server.dsp, traywin->win, 0, 0, traywin->width, traywin->height); + fprintf(stderr, "[%f] %s:%d win = %lu (%s)\n", profiling_get_time(), __FUNCTION__, __LINE__, traywin->win, traywin->name); - XSync(server.dsp, False); - XSetErrorHandler(old); - if (error != FALSE) { - fprintf(stderr, RED "systray %d: cannot embed icon for window %lu (%s) parent %lu pid %d\n" RESET, __LINE__, traywin->win, traywin->name, traywin->parent, traywin->pid); - remove_icon(traywin); - return FALSE; - } + return TRUE; +} - // Embed into parent - { - XEvent e; - e.xclient.type = ClientMessage; - e.xclient.serial = 0; - e.xclient.send_event = True; - e.xclient.message_type = server.atom._XEMBED; - e.xclient.window = traywin->win; - e.xclient.format = 32; - e.xclient.data.l[0] = CurrentTime; - e.xclient.data.l[1] = XEMBED_EMBEDDED_NOTIFY; - e.xclient.data.l[2] = 0; - e.xclient.data.l[3] = traywin->parent; - e.xclient.data.l[4] = 0; - XSync(server.dsp, False); - error = FALSE; - XErrorHandler old = XSetErrorHandler(window_error_handler); - if (systray_profile) - fprintf(stderr, "XSendEvent(server.dsp, traywin->win, False, 0xFFFFFF, &e)\n"); - XSendEvent(server.dsp, traywin->win, False, 0xFFFFFF, &e); - XSync(server.dsp, False); - XSetErrorHandler(old); - if (error != FALSE) { - fprintf(stderr, RED "systray %d: cannot embed icon for window %lu (%s) pid %d\n" RESET, __LINE__, traywin->win, traywin->name, traywin->pid); - remove_icon(traywin); - return FALSE; - } - } - - { - Atom acttype; - int actfmt; - unsigned long nbitem, bytes; - unsigned char *data = 0; - int ret; +gboolean icon_embedded(TrayWindow *traywin) +{ + Atom acttype; + int actfmt; + unsigned long nbitem, bytes; + unsigned char *data = 0; + int ret; - if (systray_profile) - fprintf(stderr, "XGetWindowProperty(server.dsp, traywin->win, server.atom._XEMBED_INFO, 0, 2, False, server.atom._XEMBED_INFO, &acttype, &actfmt, &nbitem, &bytes, &data)\n"); - ret = XGetWindowProperty(server.dsp, traywin->win, server.atom._XEMBED_INFO, 0, 2, False, server.atom._XEMBED_INFO, &acttype, &actfmt, &nbitem, &bytes, &data); - if (ret == Success) { - if (data) { - if (nbitem >= 2) { - int hide = ((data[1] & XEMBED_MAPPED) == 0); - if (hide) { - // In theory we have to check the embedding with this and remove icons that refuse embedding. - // In practice we have no idea when the other application processes the event and accepts the embed so we cannot check without a race. - // Race can be triggered with PyGtk(2) apps. - //fprintf(stderr, RED "tint2: window refused embedding\n" RESET); - //remove_icon(traywin); - //XFree(data); - //return FALSE; - } - } - XFree(data); + if (systray_profile) + fprintf(stderr, "XGetWindowProperty(server.dsp, traywin->win, server.atom._XEMBED_INFO, 0, 2, False, server.atom._XEMBED_INFO, &acttype, &actfmt, &nbitem, &bytes, &data)\n"); + ret = XGetWindowProperty(server.dsp, traywin->win, server.atom._XEMBED_INFO, 0, 2, False, server.atom._XEMBED_INFO, &acttype, &actfmt, &nbitem, &bytes, &data); + gboolean hide = False; + if (ret == Success) { + if (data) { + if (nbitem >= 2) { + hide = ((data[1] & XEMBED_MAPPED) == 0); } - } else { - fprintf(stderr, RED "tint2 : xembed error\n" RESET); - remove_icon(traywin); - return FALSE; + XFree(data); } - } - - // Redirect rendering when using compositing - if (systray_composited) { - if (systray_profile) - fprintf(stderr, "XDamageCreate(server.dsp, traywin->parent, XDamageReportRawRectangles)\n"); - traywin->damage = XDamageCreate(server.dsp, traywin->parent, XDamageReportRawRectangles); - if (systray_profile) - fprintf(stderr, "XCompositeRedirectWindow(server.dsp, traywin->parent, CompositeRedirectManual)\n"); - XCompositeRedirectWindow(server.dsp, traywin->parent, CompositeRedirectManual); - } - - // Make the icon visible - if (!traywin->hide) { - if (systray_profile) - fprintf(stderr, "XMapWindow(server.dsp, traywin->win)\n"); - XMapWindow(server.dsp, traywin->win); - } - if (!traywin->hide && !panel->is_hidden) { - if (systray_profile) - fprintf(stderr, "XMapRaised(server.dsp, traywin->parent)\n"); - XMapRaised(server.dsp, traywin->parent); + } else { + fprintf(stderr, RED "tint2 : xembed error\n" RESET); + hide = TRUE; } - XSync(server.dsp, False); + return !hide; +} +gboolean finalize_embedding_icon(TrayWindow *traywin) +{ if (systray_profile) - fprintf(stderr, "XMoveResizeWindow(server.dsp, traywin->parent = %ld, traywin->x = %d, traywin->y = %d, traywin->width = %d, traywin->height = %d)\n", traywin->parent, traywin->x, traywin->y, traywin->width, traywin->height); - XMoveResizeWindow(server.dsp, traywin->parent, traywin->x, traywin->y, traywin->width, traywin->height); + fprintf(stderr, "[%f] %s:%d win = %lu (%s)\n", profiling_get_time(), __FUNCTION__, __LINE__, traywin->win, traywin->name); + if (traywin->embedding_finalized) + return TRUE; - if (systray_profile) - fprintf(stderr, "XSync(server.dsp, False)\n"); - XSync(server.dsp, False); + if (!icon_embedded(traywin)) { + remove_icon(traywin); + return FALSE; + } - traywin->embedded = 1; + traywin->embedding_finalized = 1; if (systray_profile) fprintf(stderr, "[%f] %s:%d win = %lu (%s)\n", profiling_get_time(), __FUNCTION__, __LINE__, traywin->win, traywin->name);
M
src/systray/systraybar.h
→
src/systray/systraybar.h
@@ -50,7 +50,8 @@ int chrono;
struct timespec time_last_render; int num_fast_renders; int reparented; - int embedded; + int embedding_started; + int embedding_finalized; char *name; } TrayWindow;@@ -87,7 +88,9 @@ void net_message(XClientMessageEvent *e);
gboolean add_icon(Window id); gboolean reparent_icon(TrayWindow *traywin); -gboolean embed_icon(TrayWindow *traywin); +gboolean start_embedding_icon(TrayWindow *traywin); +gboolean finalize_embedding_icon(TrayWindow *traywin); +gboolean icon_embedded(TrayWindow *traywin); void remove_icon(TrayWindow *traywin); void refresh_systray_icons();
M
src/tint.c
→
src/tint.c
@@ -1280,6 +1280,22 @@ break;
case PropertyNotify: event_property_notify(&e); + if (e.xproperty.atom == server.atom._XEMBED_INFO) { + if (systray_profile) + fprintf(stderr, "XEMBED event\n"); + for (it = systray.list_icons; it; it = g_slist_next(it)) { + TrayWindow *traywin = (TrayWindow*)it->data; + if (traywin->win == e.xany.window) { + if (!traywin->embedding_finalized) { + finalize_embedding_icon(traywin); + } else { + if (!icon_embedded(traywin)) + remove_icon(traywin); + } + break; + } + } + } break; case ConfigureNotify:@@ -1287,7 +1303,6 @@ event_configure_notify(&e);
break; case ReparentNotify: - fprintf(stderr, "ReparentNotify\n"); if (!systray_enabled) break; panel = (Panel*)systray.area.panel;@@ -1296,8 +1311,10 @@ break;
for (it = systray.list_icons; it; it = g_slist_next(it)) { TrayWindow *traywin = (TrayWindow*)it->data; if (traywin->win == e.xreparent.window) { + if (systray_profile) + fprintf(stderr, "ReparentNotify\n"); if (traywin->parent == e.xreparent.parent) { - embed_icon(traywin); + start_embedding_icon(traywin); } else { remove_icon(traywin); }