[mutter] display: Remove the screen from set_grab_op_cursor
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] display: Remove the screen from set_grab_op_cursor
- Date: Wed, 23 Apr 2014 16:15:50 +0000 (UTC)
commit 1762436775e06a30e269a8a8bdb7f744926adc70
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Wed Apr 23 10:57:52 2014 -0400
display: Remove the screen from set_grab_op_cursor
src/core/display-private.h | 1 -
src/core/display.c | 7 ++-----
src/core/window.c | 1 -
3 files changed, 2 insertions(+), 7 deletions(-)
---
diff --git a/src/core/display-private.h b/src/core/display-private.h
index e9410df..8a18ffd 100644
--- a/src/core/display-private.h
+++ b/src/core/display-private.h
@@ -369,7 +369,6 @@ Cursor meta_display_create_x_cursor (MetaDisplay *display,
MetaCursor cursor);
void meta_display_set_grab_op_cursor (MetaDisplay *display,
- MetaScreen *screen,
MetaGrabOp op,
guint32 timestamp);
diff --git a/src/core/display.c b/src/core/display.c
index 68daad6..41fe46c 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -1724,13 +1724,12 @@ meta_cursor_for_grab_op (MetaGrabOp op)
void
meta_display_set_grab_op_cursor (MetaDisplay *display,
- MetaScreen *screen,
MetaGrabOp op,
guint32 timestamp)
{
unsigned char mask_bits[XIMaskLen (XI_LASTEVENT)] = { 0 };
XIEventMask mask = { XIAllMasterDevices, sizeof (mask_bits), mask_bits };
- MetaCursorTracker *tracker = meta_cursor_tracker_get_for_screen (screen);
+ MetaCursorTracker *tracker = meta_cursor_tracker_get_for_screen (display->screen);
MetaCursor cursor = meta_cursor_for_grab_op (op);
MetaCursorReference *cursor_ref;
@@ -1740,8 +1739,6 @@ meta_display_set_grab_op_cursor (MetaDisplay *display,
XISetMask (mask.mask, XI_Leave);
XISetMask (mask.mask, XI_Motion);
- g_assert (screen != NULL);
-
meta_error_trap_push (display);
if (XIGrabDevice (display->xdisplay,
META_VIRTUAL_CORE_POINTER_ID,
@@ -1827,7 +1824,7 @@ meta_display_begin_grab_op (MetaDisplay *display,
if (pointer_already_grabbed)
display->grab_have_pointer = TRUE;
- meta_display_set_grab_op_cursor (display, screen, op, timestamp);
+ meta_display_set_grab_op_cursor (display, op, timestamp);
if (!display->grab_have_pointer && !meta_grab_op_is_keyboard (op))
{
diff --git a/src/core/window.c b/src/core/window.c
index 2f2d459..9e32967 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -8102,7 +8102,6 @@ meta_window_update_keyboard_resize (MetaWindow *window,
if (update_cursor)
{
meta_display_set_grab_op_cursor (window->display,
- window->screen,
window->display->grab_op,
window->display->grab_timestamp);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]