Skip to content

Small follow up to #236 and #239 #240

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

Merged
merged 2 commits into from
Jul 24, 2025
Merged

Small follow up to #236 and #239 #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c635a39
vmside: Use correct format string instead of casting part 2
HW42 Jul 23, 2025
131f362
xf86-video-dummy: codestyle: avoid unnecessary indent
HW42 Jul 23, 2025
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
14 changes: 5 additions & 9 deletions gui-agent/vmside.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1328,7 +1328,7 @@ static void process_xevent_message(Ghandles * g, XClientMessageEvent * ev)
return;
}
if (act_type != g->xembed_info) {
fprintf(stderr, "window 0x%x havn't proper _XEMBED_INFO property, assuming defaults (workaround for buggy applications)\n", (unsigned int)w);
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;
Expand Down Expand Up @@ -1534,21 +1534,17 @@ static int send_full_window_info(Ghandles *g, XID w, struct window_data *wd)
if (children_list)
XFree(children_list);
if (parent != g->root_win) {
fprintf(stderr, "Window 0x%x has parent 0x%x, which isn't root 0x%x.\n"
fprintf(stderr, "Window 0x%lx has parent 0x%lx, which isn't root 0x%lx.\n"
" Presumably window has been reparented at some point.\n"
" Skipping it.\n",
(unsigned int)window_to_query,
(unsigned int)parent,
(unsigned int)g->root_win);
window_to_query, parent, g->root_win);
return 0;
}
if (root != g->root_win) {
fprintf(stderr, "Window 0x%x has root 0x%x, which isn't expected root 0x%x.\n"
fprintf(stderr, "Window 0x%lx has root 0x%lx, which isn't expected root 0x%lx.\n"
" This is rather strange and probably indicates a bug somewhere.\n"
" Skipping it.\n",
(unsigned int)window_to_query,
(unsigned int)root,
(unsigned int)g->root_win);
window_to_query, root, g->root_win);
return 0;
}
if (!XGetTransientForHint(g->display, w, &transient))
Expand Down
20 changes: 11 additions & 9 deletions xf86-video-dummy/src/dummy_driver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1093,18 +1093,20 @@ qubes_destroy_pixmap(PixmapPtr pixmap) {

static void
sendRealizedNotify(WindowPtr win, Bool unrealized) {
if (agentClient) {
xQVEWindowRealizedEvent e = {};
e.type = QVE->eventBase + QVEWindowRealized;

if (unrealized) {
e.detail |= QVEWindowRealizedDetailUnrealized;
}
if (!agentClient) {
return;
}

e.window = win->drawable.id;
xQVEWindowRealizedEvent e = {};
e.type = QVE->eventBase + QVEWindowRealized;

WriteEventsToClient(agentClient, 1, (xEvent *)&e);
if (unrealized) {
e.detail |= QVEWindowRealizedDetailUnrealized;
}

e.window = win->drawable.id;

WriteEventsToClient(agentClient, 1, (xEvent *)&e);
}

static Bool
Expand Down