[mutter] display: Rename is_mouse_only to is_mouse
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] display: Rename is_mouse_only to is_mouse
- Date: Sun, 20 Apr 2014 17:08:13 +0000 (UTC)
commit 6c9aa15814113e51df4d484ffbfbdbaef2be91ca
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Sun Apr 20 11:45:38 2014 -0400
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 c141c4c..9622817 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 858dfab..89f89ab 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 4bb1b6d..d18d131 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) ||
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]