Skip to content

Fix XEmbed tray docking initialization #264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
besendorf wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix XEmbed tray docking initialization #264

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions gui-agent/vmside.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1410,6 +1410,7 @@ static void process_xevent_message(Ghandles * g, XClientMessageEvent * ev)
Window w;
int ret;
struct msg_hdr hdr;
struct msg_configure conf;
Atom act_type;
int act_fmt;
int mapwindow = 0;
Expand Down Expand Up @@ -1442,7 +1443,7 @@ static void process_xevent_message(Ghandles * g, XClientMessageEvent * ev)
fprintf(stderr, "window 0x%lx havn't proper _XEMBED_INFO property, assuming defaults (workaround for buggy applications)\n", w);
}
if (act_type == g->xembed_info && nitems == 2) {
mapwindow = ((int*)data)[1] & XEMBED_MAPPED;
mapwindow = ((unsigned long*)data)[1] & XEMBED_MAPPED;
/* TODO: handle version */
}
if (ret == Success && nitems > 0)
Expand Down Expand Up @@ -1486,18 +1487,27 @@ static void process_xevent_message(Ghandles * g, XClientMessageEvent * ev)
resp.data.l[4] = 0; /* TODO: handle version; GTK+ uses version 1, but spec says the latest is 0 */
resp.display = g->display;
XSendEvent(resp.display, resp.window, False,
NoEventMask, (XEvent *) & ev);
NoEventMask, (XEvent *) &resp);
XRaiseWindow(g->display, w);
if (mapwindow)
XMapRaised(g->display, resp.window);
XMapWindow(g->display, wd->embeder);
XLowerWindow(g->display, wd->embeder);
XMoveWindow(g->display, w, 0, 0);
XMoveResizeWindow(g->display, w, 0, 0, 32, 32);
/* force refresh of window content */
XClearWindow(g->display, wd->embeder);
XClearArea(g->display, w, 0, 0, 32, 32, True); /* XXX defult size once again */
XSync(g->display, False);

hdr.type = MSG_CONFIGURE;
hdr.window = w;
conf.x = 0;
conf.y = 0;
conf.width = 32;
conf.height = 32;
conf.override_redirect = 0;
write_message(g->vchan, hdr, conf);

@marmarek marmarek Jul 21, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks a bit risky, because the above XMoveResizeWindow() call will eventually also result in a MSG_CONFIGURE message (in response to X11 event). But, IIUC the order or messages is important here, and the other MSG_CONFIGURE will be send after MSG_DOCK. So, maybe duplicate message is less bad...


hdr.type = MSG_DOCK;
hdr.window = w;
hdr.untrusted_len = 0;
Expand Down