[mutter] backend-x11: Always pass None for the cursor
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] backend-x11: Always pass None for the cursor
- Date: Tue, 13 May 2014 20:20:27 +0000 (UTC)
commit c8f382095696c610641b06b048c2d640e97d3b45
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Tue May 13 15:52:26 2014 -0400
backend-x11: Always pass None for the cursor
This means we fall back to what's defined on the root window, which
will give us our properly set cursor.
src/backends/x11/meta-backend-x11.c | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)
---
diff --git a/src/backends/x11/meta-backend-x11.c b/src/backends/x11/meta-backend-x11.c
index 5ce37c0..7716780 100644
--- a/src/backends/x11/meta-backend-x11.c
+++ b/src/backends/x11/meta-backend-x11.c
@@ -34,8 +34,6 @@
#include "meta-monitor-manager-xrandr.h"
#include "backends/meta-monitor-manager-dummy.h"
-#include "meta-cursor-tracker-private.h"
-#include "meta-cursor.h"
#include <meta/util.h>
#include "display-private.h"
#include "compositor/compositor-private.h"
@@ -326,14 +324,10 @@ meta_backend_x11_grab_device (MetaBackend *backend,
XISetMask (mask.mask, XI_KeyPress);
XISetMask (mask.mask, XI_KeyRelease);
- MetaCursorTracker *tracker = meta_cursor_tracker_get_for_screen (NULL);
- MetaCursorReference *cursor_ref = meta_cursor_tracker_get_displayed_cursor (tracker);
- MetaCursor cursor = meta_cursor_reference_get_meta_cursor (cursor_ref);
-
ret = XIGrabDevice (priv->xdisplay, device_id,
get_stage_window (x11),
timestamp,
- meta_cursor_create_x_cursor (priv->xdisplay, cursor),
+ None,
XIGrabModeAsync, XIGrabModeAsync,
False, /* owner_events */
&mask);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]