rpms/xorg-x11-server/F-11 xserver-1.6.3-coreevents.patch, NONE, 1.1 xorg-x11-server.spec, 1.460, 1.461

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-server/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15275

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.6.3-coreevents.patch 
Log Message:
* Wed Sep 23 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.4-0.2
- xserver-1.6.3-coreevents.patch: dont send events for devices with
  SendCoreEvents off.


xserver-1.6.3-coreevents.patch:
 dix/getevents.c |    4 ++--
 mi/mieq.c       |    5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

--- NEW FILE xserver-1.6.3-coreevents.patch ---
>From 764159be06c8c812d07e07917031b927a9f99f31 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Wed, 16 Sep 2009 15:46:55 +1000
Subject: [PATCH] Don't send events through the master if the device has SendCoreEvents off.

In server 1.6, all devices are attached to the master device (VCP or VCK).
Sending an event through the master device means the device is sending core
events. If a device is configured as SendCoreEvents, just send through the
device, not through the master.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 dix/getevents.c |    4 ++--
 mi/mieq.c       |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dix/getevents.c b/dix/getevents.c
index 9747b35..eadcbeb 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -536,7 +536,7 @@ static EventListPtr
 updateFromMaster(EventListPtr events, DeviceIntPtr dev, int *num_events)
 {
     DeviceIntPtr master = dev->u.master;
-    if (master && master->u.lastSlave != dev)
+    if (master && master->u.lastSlave != dev && dev->coreEvents)
     {
         updateSlaveDeviceCoords(master, dev);
         master->u.lastSlave = dev;
@@ -674,7 +674,7 @@ positionSprite(DeviceIntPtr dev, int *x, int *y,
      * to the current screen. */
     miPointerSetPosition(dev, &dev->last.valuators[0], &dev->last.valuators[1]);
 
-    if (dev->u.master) {
+    if (dev->u.master && dev->coreEvents) {
         dev->u.master->last.valuators[0] = dev->last.valuators[0];
         dev->u.master->last.valuators[1] = dev->last.valuators[1];
     }
diff --git a/mi/mieq.c b/mi/mieq.c
index 213ad5b..478e68b 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -446,7 +446,7 @@ mieqProcessInputEvents(void)
             NewCurrentScreen (dev, DequeueScreen(dev), x, y);
         }
         else {
-            if (master) {
+            if (master && dev->coreEvents) {
                 /* Force a copy of the key class into the VCK so that the layout
                    is transferred. */
                 if (event->u.u.type == DeviceKeyPress ||
@@ -473,7 +473,7 @@ mieqProcessInputEvents(void)
                 /* process slave first, then master */
                 dev->public.processInputProc(event, dev, nevents);
 
-                if (master)
+                if (master && dev->coreEvents)
                     master->public.processInputProc(masterEvents->event, master,
                                                     nevents);
             }
-- 
1.6.3.rc1.2.g0164.dirty



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/xorg-x11-server.spec,v
retrieving revision 1.460
retrieving revision 1.461
diff -u -p -r1.460 -r1.461
--- xorg-x11-server.spec	9 Sep 2009 15:18:29 -0000	1.460
+++ xorg-x11-server.spec	23 Sep 2009 06:08:45 -0000	1.461
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.4
-Release:   0.1%{?dist}
+Release:   0.2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -112,6 +112,9 @@ Patch6047: xserver-1.6.2-vboxvideo.patch
 # 501601, part 2, upstream.
 Patch6049: xserver-1.6.99-dpms.patch
 
+# Nominated for 1.6.4
+Patch6050: xserver-1.6.3-coreevents.patch
+
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -532,6 +535,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 23 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.4-0.2
+- xserver-1.6.3-coreevents.patch: dont send events for devices with
+  SendCoreEvents off.
+
 * Wed Sep 09 2009 Adam Jackson <ajax at redhat.com> 1.6.4-0.1
 - 1.6.4 snapshot