From 57e56ee866b07fb577c146e031d77e5fff52bceb Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Thu, 29 Sep 2022 19:00:01 +0200
Subject: [PATCH] core: Make MetaDisplay grab API private

Leave meta_window_begin_grab_op() as the only public API to initiate
a display grab. There's no longer grab operations that don't attain
windows, and ending these grabs usually happen through user interaction
when the right circumstances happen.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2683>
---
 src/core/display-private.h | 14 ++++++++++++++
 src/meta/display.h         | 16 ----------------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/core/display-private.h b/src/core/display-private.h
index 565529385..cf1f138f0 100644
--- a/src/core/display-private.h
+++ b/src/core/display-private.h
@@ -424,4 +424,18 @@ void meta_display_flush_queued_window (MetaDisplay   *display,
                                        MetaWindow    *window,
                                        MetaQueueType  queue_types);
 
+gboolean meta_display_begin_grab_op (MetaDisplay *display,
+                                     MetaWindow  *window,
+                                     MetaGrabOp   op,
+                                     gboolean     pointer_already_grabbed,
+                                     gboolean     frame_action,
+                                     int          button,
+                                     gulong       modmask,
+                                     uint32_t     timestamp,
+                                     int          root_x,
+                                     int          root_y);
+
+void meta_display_end_grab_op (MetaDisplay *display,
+                               uint32_t     timestamp);
+
 #endif
diff --git a/src/meta/display.h b/src/meta/display.h
index f53346c24..510d802e2 100644
--- a/src/meta/display.h
+++ b/src/meta/display.h
@@ -131,22 +131,6 @@ MetaWindow* meta_display_get_tab_current (MetaDisplay   *display,
                                           MetaTabList    type,
                                           MetaWorkspace *workspace);
 
-META_EXPORT
-gboolean meta_display_begin_grab_op (MetaDisplay *display,
-                                     MetaWindow  *window,
-                                     MetaGrabOp   op,
-                                     gboolean     pointer_already_grabbed,
-                                     gboolean     frame_action,
-                                     int          button,
-                                     gulong       modmask,
-                                     guint32      timestamp,
-                                     int          root_x,
-                                     int          root_y);
-
-META_EXPORT
-void     meta_display_end_grab_op   (MetaDisplay *display,
-                                     guint32      timestamp);
-
 META_EXPORT
 gboolean meta_display_is_grabbed (MetaDisplay *display);