Merge remote-tracking branch 'origin/pr/163'

* origin/pr/163:
  Assure Popup Windows (override-redirect) open over parent

Author: marmarek

.gitignore

@@ -2,3 +2,4 @@
 *.dep
 tags
 pkgs/
+gui-daemon/qubes-guid

gui-daemon/xside.c

@@ -3364,8 +3364,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;
@@ -3379,7 +3379,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
@@ -3415,6 +3415,7 @@ static void restack_windows(Ghandles *g, struct windowdata *vm_window)
     }
 
     XFree(children_list);
+    return goal_pos;
 }
 
 
@@ -3473,7 +3474,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
+        }
     }
 }