summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-01-30 09:13:21 +0000
committerMichael Stahl <mstahl@redhat.com>2017-02-01 12:16:48 +0000
commitd74cbda66b8cd2ecacb56d200960dc2230064616 (patch)
treed8a6107638217a47d687a8fbd6599bdcb8fe15b8 /vcl
parentd9423d80e7a2c8dc323027425780a17e76b6d0c6 (diff)
Resolves: rhbz#1417480 stray bare XWarpPointer call in gtk3 code
which blows up under wayland naturally can get here from tools->options->mouse positioning->"dialog center" table->insert table Change-Id: Id81b06a63cc3a2a1073d236e2f36dc65e533e598 (cherry picked from commit b4b989b59cc5841fdf4635b19b975cae3a88430f) Reviewed-on: https://gerrit.libreoffice.org/33690 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/unx/gtk3/gtk3gtkframe.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 56a74ac81723..6b0af8f19934 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -2151,9 +2151,9 @@ void GtkSalFrame::SetPointerPos( long nX, long nY )
unsigned int nWindowLeft = maGeometry.nX + nX;
unsigned int nWindowTop = maGeometry.nY + nY;
- XWarpPointer( GDK_DISPLAY_XDISPLAY (pDisplay), None,
- GDK_WINDOW_XID (gdk_screen_get_root_window( pScreen ) ),
- 0, 0, 0, 0, nWindowLeft, nWindowTop);
+ GdkDeviceManager* pManager = gdk_display_get_device_manager(pDisplay);
+ gdk_device_warp(gdk_device_manager_get_client_pointer(pManager), pScreen, nWindowLeft, nWindowTop);
+
// #i38648# ask for the next motion hint
gint x, y;
GdkModifierType mask;