[mutter/wip/carlosg/xwayland-on-demand: 23/32] core: Untangle input focus management

[Carlos Garnacho <carlosg src gnome org>]

commit a01129186f268a7a65211399024cf5f1b2c5c361
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sun Dec 30 22:59:40 2018 +0100

    core: Untangle input focus management

 src/core/display-private.h        |  7 ++++++
 src/core/display.c                | 52 ++++++++++++++++++++++++++++++++++++---
 src/core/window.c                 |  3 +--
 src/core/workspace.c              |  6 ++---
 src/wayland/meta-window-wayland.c | 10 +++++---
 src/x11/meta-x11-display.c        | 22 -----------------
 src/x11/window-x11.c              | 19 +++++++-------
 7 files changed, 74 insertions(+), 45 deletions(-)
---
diff --git a/src/core/display-private.h b/src/core/display-private.h
index b85006ac5..db6381549 100644
--- a/src/core/display-private.h
+++ b/src/core/display-private.h
@@ -357,6 +357,13 @@ void meta_display_sync_wayland_input_focus (MetaDisplay *display);
 void meta_display_update_focus_window (MetaDisplay *display,
                                        MetaWindow  *window);
 
+void meta_display_set_input_focus   (MetaDisplay *display,
+                                     MetaWindow  *window,
+                                     gboolean     focus_frame,
+                                     guint32      timestamp);
+void meta_display_unset_input_focus (MetaDisplay *display,
+                                     guint32      timestamp);
+
 void meta_display_sanity_check_timestamps (MetaDisplay *display,
                                            guint32      timestamp);
 gboolean meta_display_timestamp_too_old (MetaDisplay *display,
diff --git a/src/core/display.c b/src/core/display.c
index 752e7b175..7c14a066c 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -774,10 +774,10 @@ meta_display_open (void)
       if (old_active_window)
         meta_window_focus (old_active_window, timestamp);
       else
-        meta_x11_display_focus_the_no_focus_window (display->x11_display, timestamp);
+        meta_display_unset_input_focus (display, timestamp);
     }
-  else if (display->x11_display)
-    meta_x11_display_focus_the_no_focus_window (display->x11_display, timestamp);
+  else
+    meta_display_unset_input_focus (display, timestamp);
 
   meta_idle_monitor_init_dbus ();
 
@@ -1301,6 +1301,52 @@ meta_display_timestamp_too_old (MetaDisplay *display,
   return FALSE;
 }
 
+void
+meta_display_set_input_focus (MetaDisplay *display,
+                              MetaWindow  *window,
+                              gboolean     focus_frame,
+                              guint32      timestamp)
+{
+  if (meta_display_timestamp_too_old (display, &timestamp))
+    return;
+
+  if (display->x11_display)
+    {
+      MetaX11Display *x11_display = display->x11_display;
+      Window xwindow;
+      gulong serial;
+
+      meta_x11_error_trap_push (x11_display);
+
+      if (window)
+        xwindow = focus_frame ? window->frame->xwindow : window->xwindow;
+      else
+        xwindow = x11_display->no_focus_window;
+
+      serial = XNextRequest (x11_display->xdisplay);
+
+      meta_x11_display_set_input_focus (x11_display, xwindow, timestamp);
+      meta_x11_display_update_focus_window (x11_display, xwindow, serial, TRUE);
+    }
+
+  meta_display_update_focus_window (display, window);
+
+  if (display->x11_display)
+    meta_x11_error_trap_pop (display->x11_display);
+
+  display->last_focus_time = timestamp;
+
+  if (window == NULL || window != display->autoraise_window)
+    meta_display_remove_autoraise_callback (display);
+}
+
+void
+meta_display_unset_input_focus (MetaDisplay *display,
+                                guint32      timestamp)
+{
+  meta_display_set_input_focus (display, NULL, FALSE, timestamp);
+}
+
 void
 meta_display_register_wayland_window (MetaDisplay *display,
                                       MetaWindow  *window)
diff --git a/src/core/window.c b/src/core/window.c
index 49edc1b66..6d277216f 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -8050,8 +8050,7 @@ mouse_mode_focus (MetaWindow  *window,
                       "Unsetting focus from %s due to mouse entering "
                       "the DESKTOP window\n",
                       display->focus_window->desc);
-          meta_x11_display_focus_the_no_focus_window (display->x11_display,
-                                                      timestamp);
+          meta_display_unset_input_focus (display, timestamp);
         }
     }
 }
diff --git a/src/core/workspace.c b/src/core/workspace.c
index 1f129fd12..332030982 100644
--- a/src/core/workspace.c
+++ b/src/core/workspace.c
@@ -1321,8 +1321,7 @@ meta_workspace_focus_default_window (MetaWorkspace *workspace,
           meta_topic (META_DEBUG_FOCUS,
                       "Setting focus to no_focus_window, since no valid "
                       "window to focus found.\n");
-          meta_x11_display_focus_the_no_focus_window (workspace->display->x11_display,
-                                                      timestamp);
+          meta_display_unset_input_focus (workspace->display, timestamp);
         }
     }
 }
@@ -1394,8 +1393,7 @@ focus_ancestor_or_top_window (MetaWorkspace *workspace,
   else
     {
       meta_topic (META_DEBUG_FOCUS, "No MRU window to focus found; focusing no_focus_window.\n");
-      meta_x11_display_focus_the_no_focus_window (workspace->display->x11_display,
-                                                  timestamp);
+      meta_display_unset_input_focus (workspace->display, timestamp);
     }
 }
 
diff --git a/src/wayland/meta-window-wayland.c b/src/wayland/meta-window-wayland.c
index dffee486d..9a10f80dc 100644
--- a/src/wayland/meta-window-wayland.c
+++ b/src/wayland/meta-window-wayland.c
@@ -142,10 +142,12 @@ meta_window_wayland_focus (MetaWindow *window,
                            guint32     timestamp)
 {
   if (window->input)
-    meta_x11_display_set_input_focus_window (window->display->x11_display,
-                                             window,
-                                             FALSE,
-                                             timestamp);
+    {
+      meta_display_set_input_focus (window->display,
+                                    window,
+                                    FALSE,
+                                    timestamp);
+    }
 }
 
 static void
diff --git a/src/x11/meta-x11-display.c b/src/x11/meta-x11-display.c
index 875dbae0d..344dbf786 100644
--- a/src/x11/meta-x11-display.c
+++ b/src/x11/meta-x11-display.c
@@ -1886,18 +1886,6 @@ request_xserver_input_focus_change (MetaX11Display *x11_display,
     meta_display_remove_autoraise_callback (x11_display->display);
 }
 
-void
-meta_x11_display_set_input_focus_window (MetaX11Display *x11_display,
-                                         MetaWindow     *window,
-                                         gboolean        focus_frame,
-                                         guint32         timestamp)
-{
-  request_xserver_input_focus_change (x11_display,
-                                      window,
-                                      focus_frame ? window->frame->xwindow : window->xwindow,
-                                      timestamp);
-}
-
 void
 meta_x11_display_set_input_focus_xwindow (MetaX11Display *x11_display,
                                           Window          window,
@@ -1909,16 +1897,6 @@ meta_x11_display_set_input_focus_xwindow (MetaX11Display *x11_display,
                                       timestamp);
 }
 
-void
-meta_x11_display_focus_the_no_focus_window (MetaX11Display *x11_display,
-                                            guint32         timestamp)
-{
-  request_xserver_input_focus_change (x11_display,
-                                      NULL,
-                                      x11_display->no_focus_window,
-                                      timestamp);
-}
-
 static MetaX11DisplayLogicalMonitorData *
 get_x11_display_logical_monitor_data (MetaLogicalMonitor *logical_monitor)
 {
diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c
index 0bfde501c..7a04dd40e 100644
--- a/src/x11/window-x11.c
+++ b/src/x11/window-x11.c
@@ -757,10 +757,10 @@ meta_window_x11_focus (MetaWindow *window,
     {
       meta_topic (META_DEBUG_FOCUS,
                   "Focusing frame of %s\n", window->desc);
-      meta_x11_display_set_input_focus_window (window->display->x11_display,
-                                               window,
-                                               TRUE,
-                                               timestamp);
+      meta_display_set_input_focus (window->display,
+                                    window,
+                                    TRUE,
+                                    timestamp);
     }
   else
     {
@@ -769,10 +769,10 @@ meta_window_x11_focus (MetaWindow *window,
           meta_topic (META_DEBUG_FOCUS,
                       "Setting input focus on %s since input = true\n",
                       window->desc);
-          meta_x11_display_set_input_focus_window (window->display->x11_display,
-                                                   window,
-                                                   FALSE,
-                                                   timestamp);
+          meta_display_set_input_focus (window->display,
+                                        window,
+                                        FALSE,
+                                        timestamp);
         }
 
       if (window->take_focus)
@@ -795,8 +795,7 @@ meta_window_x11_focus (MetaWindow *window,
                */
               if (window->display->focus_window != NULL &&
                   window->display->focus_window->unmanaging)
-                meta_x11_display_focus_the_no_focus_window (window->display->x11_display,
-                                                            timestamp);
+                meta_display_unset_input_focus (window->display, timestamp);
             }
 
           request_take_focus (window, timestamp);