[mutter] display: Expose meta_grab_op_is_mouse_only



commit beca90a68934f59a399c2509b6de796b08cf451c
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Sun Apr 20 11:41:22 2014 -0400

    display: Expose meta_grab_op_is_mouse_only
    
    And use it properly in some event handling code.

 src/core/display-private.h |    1 +
 src/core/display.c         |    6 +++---
 src/core/events.c          |    2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/src/core/display-private.h b/src/core/display-private.h
index 9f18031..e789537 100644
--- a/src/core/display-private.h
+++ b/src/core/display-private.h
@@ -440,6 +440,7 @@ int meta_resize_gravity_from_grab_op (MetaGrabOp op);
 gboolean meta_grab_op_is_moving   (MetaGrabOp op);
 gboolean meta_grab_op_is_resizing (MetaGrabOp op);
 gboolean meta_grab_op_is_mouse    (MetaGrabOp op);
+gboolean meta_grab_op_is_mouse_only (MetaGrabOp op);
 gboolean meta_grab_op_is_clicking (MetaGrabOp op);
 gboolean meta_grab_op_is_keyboard (MetaGrabOp op);
 gboolean meta_grab_op_should_block_wayland (MetaGrabOp op);
diff --git a/src/core/display.c b/src/core/display.c
index 4da248c..28a9a39 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -1148,8 +1148,8 @@ meta_get_display (void)
   return the_display;
 }
 
-static gboolean
-grab_op_is_mouse_only (MetaGrabOp op)
+gboolean
+meta_grab_op_is_mouse_only (MetaGrabOp op)
 {
   switch (op)
     {
@@ -1915,7 +1915,7 @@ meta_display_begin_grab_op (MetaDisplay *display,
     }
 
   /* Grab keys for keyboard ops and mouse move/resizes; see #126497 */
-  if (meta_grab_op_is_keyboard (op) || grab_op_is_mouse_only (op))
+  if (meta_grab_op_is_keyboard (op) || meta_grab_op_is_mouse_only (op))
     {
       if (grab_window)
         display->grab_have_keyboard =
diff --git a/src/core/events.c b/src/core/events.c
index 6233543..7b27257 100644
--- a/src/core/events.c
+++ b/src/core/events.c
@@ -1950,7 +1950,7 @@ meta_display_handle_event (MetaDisplay        *display,
       display->overlay_key_only_pressed = FALSE;
 
       if ((window &&
-           meta_grab_op_is_mouse (display->grab_op) &&
+           meta_grab_op_is_mouse_only (display->grab_op) &&
            (event->button.modifier_state & display->window_grab_modifiers) &&
            display->grab_button != (int) event->button.button &&
            display->grab_window == window) ||


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]