From c703243b7de61423a0fa285d19095c07342a9f31 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: May 22 2014 12:02:51 +0000
Subject: Merge branch 'f19' into f20


---

diff --git a/tigervnc-pointersync.patch b/tigervnc-pointersync.patch
new file mode 100644
index 0000000..e0d60fa
--- /dev/null
+++ b/tigervnc-pointersync.patch
@@ -0,0 +1,18 @@
+diff -up tigervnc-1.3.0/unix/xserver/hw/vnc/Input.cc.pointersync tigervnc-1.3.0/unix/xserver/hw/vnc/Input.cc
+--- tigervnc-1.3.0/unix/xserver/hw/vnc/Input.cc.pointersync	2013-07-01 13:41:24.000000000 +0100
++++ tigervnc-1.3.0/unix/xserver/hw/vnc/Input.cc	2014-05-22 11:47:16.707816457 +0100
+@@ -197,6 +197,14 @@ void InputDevice::PointerMove(const rfb:
+ 
+ void InputDevice::PointerSync(void)
+ {
++	if (initialized) {
++		int x, y;
++
++		GetSpritePosition (pointerDev, &x, &y);
++		cursorPos.x = x;
++		cursorPos.y = y;
++	}
++
+ 	if (cursorPos.equals(oldCursorPos))
+ 		return;
+ 
diff --git a/tigervnc.spec b/tigervnc.spec
index 60d3415..7c04d7a 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -1,6 +1,6 @@
 Name:		tigervnc
 Version:	1.3.0
-Release:	14%{?dist}
+Release:	15%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
@@ -51,6 +51,7 @@ Patch11:	tigervnc-format-security.patch
 Patch12:	tigervnc-zrle-crash.patch
 Patch13:	tigervnc-cursor.patch
 Patch14:	tigervnc-CVE-2014-0011.patch
+Patch15:	tigervnc-pointersync.patch
 
 %description
 Virtual Network Computing (VNC) is a remote display system which
@@ -187,6 +188,9 @@ popd
 # Fixed heap-based buffer overflow (CVE-2014-0011, bug #1050928).
 %patch14 -p1 -b .CVE-2014-0011
 
+# Keep pointer in sync when using module (upstream bug #152).
+%patch15 -p1 -b .pointersync
+
 %build
 %ifarch sparcv9 sparc64 s390 s390x
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
@@ -359,6 +363,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Thu May 22 2014 Tim Waugh <twaugh@redhat.com> 1.3.0-15
+- Keep pointer in sync when using module (upstream bug #152).
+
 * Wed Mar 19 2014 Tim Waugh <twaugh@redhat.com> 1.3.0-14
 - Fixed heap-based buffer overflow (CVE-2014-0011, bug #1050928).