Skip to content

Assure Popup Windows (override-redirect) open over parent #163

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 1 commit into from
Jun 10, 2025
+11 −4
Merged

Assure Popup Windows (override-redirect) open over parent #163

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
*.dep
tags
pkgs/
gui-daemon/qubes-guid
14 changes: 10 additions & 4 deletions gui-daemon/xside.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3357,8 +3357,8 @@ static bool should_keep_on_top(Ghandles *g, Window window) {


/* Move a newly mapped override_redirect window below windows that need to be
* kept on top, i.e. screen lockers. */
static void restack_windows(Ghandles *g, struct windowdata *vm_window)
* kept on top, i.e. screen lockers. Returns new index (-1 == top of all) */
static int restack_windows(Ghandles *g, struct windowdata *vm_window)
{
Window root;
Window parent;
Expand All @@ -3372,7 +3372,7 @@ static void restack_windows(Ghandles *g, struct windowdata *vm_window)

if (!children_list) {
fprintf(stderr, "XQueryTree returned an empty list\n");
return;
return 0;
}

/* Traverse children_list, looking for bottom-most window that
Expand Down Expand Up @@ -3408,6 +3408,7 @@ static void restack_windows(Ghandles *g, struct windowdata *vm_window)
}

XFree(children_list);
return goal_pos;
}


Expand Down Expand Up @@ -3466,7 +3467,12 @@ static void handle_map(Ghandles * g, struct windowdata *vm_window)
(void) XMapWindow(g->display, vm_window->local_winid);

if (vm_window->override_redirect) {
restack_windows(g, vm_window);
if (restack_windows(g, vm_window) == -1) {
// Ensure override redirect window is raised after mapping
// But only if no screensaver is active
XRaiseWindow(g->display, vm_window->local_winid);
XFlush(g->display); // Ensure raise takes effect immediately
}
}
}

Expand Down