Merge branch 'f20'

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;
+ 

tigervnc.spec

@@ -1,6 +1,6 @@
 Name:		tigervnc
 Version:	1.3.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	A TigerVNC remote display system
 
 %global _hardened_build 1
@@ -58,6 +58,7 @@ Patch13:	tigervnc-cursor.patch
 Patch14:	tigervnc-xstartup.patch
 Patch15:	tigervnc-ppc64le.patch
 Patch16:        tigervnc-1.3.1-xserver-1.16.patch
+Patch17:	tigervnc-pointersync.patch
 
 # This is tigervnc-%{version}/unix/xserver114.patch rebased on the latest xorg
 Patch100:       0001-tigervnc-xserver-1.14-patch.patch
@@ -202,6 +203,9 @@ popd
 
 %patch16 -p1 -b .116
 
+# Keep pointer in sync when using module (upstream bug #152).
+%patch17 -p1 -b .pointersync
+
 %build
 %ifarch sparcv9 sparc64 s390 s390x
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
@@ -372,6 +376,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Thu May 22 2014 Tim Waugh <twaugh@redhat.com> 1.3.1-5
+- Keep pointer in sync when using module (upstream bug #152).
+
 * Mon Apr 28 2014 Adam Jackson <ajax@redhat.com> 1.3.1-4
 - Add version interlocks for -server-module