From 6c9aa15814113e51df4d484ffbfbdbaef2be91ca Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sun, 20 Apr 2014 11:45:38 -0400 Subject: [PATCH] display: Rename is_mouse_only to is_mouse --- src/core/display-private.h | 2 +- src/core/display.c | 4 ++-- src/core/events.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/display-private.h b/src/core/display-private.h index c141c4cf2..962281715 100644 --- a/src/core/display-private.h +++ b/src/core/display-private.h @@ -440,8 +440,8 @@ 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_moving_or_resizing (MetaGrabOp op); -gboolean meta_grab_op_is_mouse_only (MetaGrabOp op); gboolean meta_grab_op_is_clicking (MetaGrabOp op); +gboolean meta_grab_op_is_mouse (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 858dfab51..89f89ab4f 100644 --- a/src/core/display.c +++ b/src/core/display.c @@ -1149,7 +1149,7 @@ meta_get_display (void) } gboolean -meta_grab_op_is_mouse_only (MetaGrabOp op) +meta_grab_op_is_mouse (MetaGrabOp op) { switch (op) { @@ -1891,7 +1891,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) || meta_grab_op_is_mouse_only (op)) + if (meta_grab_op_is_keyboard (op) || meta_grab_op_is_mouse (op)) { if (grab_window) display->grab_have_keyboard = diff --git a/src/core/events.c b/src/core/events.c index 4bb1b6dc8..d18d131f3 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_only (display->grab_op) && + meta_grab_op_is_mouse (display->grab_op) && (event->button.modifier_state & display->window_grab_modifiers) && display->grab_button != (int) event->button.button && display->grab_window == window) ||