|
 |
2e55f16 |
From: Cole Robinson <crobinso@redhat.com>
|
|
|
2e55f16 |
Date: Thu, 13 Mar 2014 15:30:24 -0400
|
|
|
2e55f16 |
Subject: [PATCH] gtk: Don't warp absolute pointer
|
|
|
2e55f16 |
|
|
|
2e55f16 |
This matches the behavior of SDL, and makes the mouse usable when
|
|
|
2e55f16 |
using -display gtk -vga qxl
|
|
|
2e55f16 |
|
|
|
2e55f16 |
https://bugzilla.redhat.com/show_bug.cgi?id=1051724
|
|
|
2e55f16 |
Signed-off-by: Cole Robinson <crobinso@redhat.com>
|
|
|
2e55f16 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
2e55f16 |
(cherry picked from commit 2bda66028b4962c36d4eabe2995edab12df93691)
|
|
|
2e55f16 |
---
|
|
|
2e55f16 |
ui/gtk.c | 8 ++++++++
|
|
|
2e55f16 |
1 file changed, 8 insertions(+)
|
|
|
2e55f16 |
|
|
|
2e55f16 |
diff --git a/ui/gtk.c b/ui/gtk.c
|
|
|
2e55f16 |
index 6c9d90a..6ce9694 100644
|
|
|
2e55f16 |
--- a/ui/gtk.c
|
|
|
2e55f16 |
+++ b/ui/gtk.c
|
|
|
2e55f16 |
@@ -349,6 +349,10 @@ static void gd_mouse_set(DisplayChangeListener *dcl,
|
|
|
2e55f16 |
GdkDeviceManager *mgr;
|
|
|
2e55f16 |
gint x_root, y_root;
|
|
|
2e55f16 |
|
|
|
2e55f16 |
+ if (kbd_mouse_is_absolute()) {
|
|
|
2e55f16 |
+ return;
|
|
|
2e55f16 |
+ }
|
|
|
2e55f16 |
+
|
|
|
2e55f16 |
dpy = gtk_widget_get_display(s->drawing_area);
|
|
|
2e55f16 |
mgr = gdk_display_get_device_manager(dpy);
|
|
|
2e55f16 |
gdk_window_get_root_coords(gtk_widget_get_window(s->drawing_area),
|
|
|
2e55f16 |
@@ -364,6 +368,10 @@ static void gd_mouse_set(DisplayChangeListener *dcl,
|
|
|
2e55f16 |
GtkDisplayState *s = container_of(dcl, GtkDisplayState, dcl);
|
|
|
2e55f16 |
gint x_root, y_root;
|
|
|
2e55f16 |
|
|
|
2e55f16 |
+ if (kbd_mouse_is_absolute()) {
|
|
|
2e55f16 |
+ return;
|
|
|
2e55f16 |
+ }
|
|
|
2e55f16 |
+
|
|
|
2e55f16 |
gdk_window_get_root_coords(gtk_widget_get_window(s->drawing_area),
|
|
|
2e55f16 |
x, y, &x_root, &y_root);
|
|
|
2e55f16 |
gdk_display_warp_pointer(gtk_widget_get_display(s->drawing_area),
|