[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xorg-server: Changes to 'ubuntu'



 debian/changelog                                              |   21 +++
 debian/patches/174_set_bg_pixmap_of_cow_to_none.patch         |   34 +++++
 debian/patches/175_set_pointer_screen_in_xtestfakeinput.patch |   68 ++++++++++
 debian/patches/series                                         |    4 
 4 files changed, 126 insertions(+), 1 deletion(-)

New commits:
commit 35e6f6b3cb45e803eca45a1d532a7b567c770b37
Author: Bryce Harrington <bryce@bryceharrington.org>
Date:   Mon Apr 6 17:34:39 2009 -0700

    Add patch from redhat to fix vino mouse behavior

diff --git a/debian/changelog b/debian/changelog
index 0333be0..915558a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+xorg-server (2:1.6.0-0ubuntu11) jaunty; urgency=low
+
+  * Add 175_set_pointer_screen_in_xtestfakeinput.patch: Fixes issue when
+    using Vino, mouse cursor can get stuck in the upper left corner of the
+    screen.  The POINTER_SCREEN flag must be set explicitly for XTest core events to avoid
+    out-of-range events when the lastSlave was an SD with an explicit axis range.
+    Device events sent through XTest don't need this flag, they are expected to be
+    in the valuator range of the device anyway.
+    (LP: #337926)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Mon, 06 Apr 2009 17:22:35 -0700
+
 xorg-server (2:1.6.0-0ubuntu10) jaunty; urgency=low
 
   * debian/patches/174_set_bg_pixmap_of_cow_to_none.patch:
diff --git a/debian/patches/175_set_pointer_screen_in_xtestfakeinput.patch b/debian/patches/175_set_pointer_screen_in_xtestfakeinput.patch
new file mode 100644
index 0000000..0d3d608
--- /dev/null
+++ b/debian/patches/175_set_pointer_screen_in_xtestfakeinput.patch
@@ -0,0 +1,68 @@
+commit 603db34337a61754e0c5f71525011d10eab78411
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Wed Mar 25 15:51:43 2009 +1000
+
+    Xext: set POINTER_SCREEN flag in XTestFakeInput if necessary. (RH #490984)
+    
+    The POINTER_SCREEN flag must be set explicitly for XTest core events to avoid
+    out-of-range events when the lastSlave was an SD with an explicit axis range.
+    Device events sent through XTest don't need this flag, they are expected to be
+    in the valuator range of the device anyway.
+    
+    Red Hat Bug 490984 <https://bugzilla.redhat.com/show_bug.cgi?id=490984>
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+diff --git a/Xext/xtest.c b/Xext/xtest.c
+index fe3816e..ab88231 100644
+--- a/Xext/xtest.c
++++ b/Xext/xtest.c
+@@ -159,6 +159,7 @@ ProcXTestFakeInput(ClientPtr client)
+     int nevents = 0;
+     int i;
+     int base = 0;
++    int flags = 0;
+ 
+     nev = (stuff->length << 2) - sizeof(xReq);
+     if ((nev % sizeof(xEvent)) || !nev)
+@@ -209,8 +210,14 @@ ProcXTestFakeInput(ClientPtr client)
+                 client->errorValue = ev->u.u.type;
+                 return BadValue;
+             }
++
++            if (ev->u.u.detail == xFalse)
++                flags |= POINTER_ABSOLUTE;
+         } else
++        {
+             firstValuator = 0;
++            flags |= POINTER_ABSOLUTE;
++        }
+ 
+         if (nev > 1 && !dev->valuator)
+         {
+@@ -279,6 +286,8 @@ ProcXTestFakeInput(ClientPtr client)
+                 valuators[1] = ev->u.keyButtonPointer.rootY;
+                 numValuators = 2;
+                 firstValuator = 0;
++                if (ev->u.u.detail == xFalse)
++                    flags = POINTER_ABSOLUTE | POINTER_SCREEN;
+                 break;
+             default:
+                 client->errorValue = ev->u.u.type;
+@@ -376,14 +385,13 @@ ProcXTestFakeInput(ClientPtr client)
+     GetEventList(&events);
+     switch(type) {
+         case MotionNotify:
+-            nevents = GetPointerEvents(events, dev, type, 0,
+-                            (ev->u.u.detail == xFalse) ?  POINTER_ABSOLUTE : 0,
++            nevents = GetPointerEvents(events, dev, type, 0, flags,
+                             firstValuator, numValuators, valuators);
+             break;
+         case ButtonPress:
+         case ButtonRelease:
+             nevents = GetPointerEvents(events, dev, type, ev->u.u.detail,
+-                                       POINTER_ABSOLUTE, firstValuator,
++                                       flags, firstValuator,
+                                        numValuators, valuators);
+             break;
+         case KeyPress:
diff --git a/debian/patches/series b/debian/patches/series
index 163eada..814d73a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -31,3 +31,4 @@
 173_edid_quirk_philips_lcd.patch
 174_set_bg_pixmap_of_cow_to_none.patch
 #999_default_modedebug_on.patch
+175_set_pointer_screen_in_xtestfakeinput.patch

commit 32e7d3504a1cc5446c4f1193cdb92a901a995122
Author: Bryce Harrington <bryce@bryceharrington.org>
Date:   Mon Apr 6 13:05:11 2009 -0700

    Patch from Alberto to set composite overlay window background to None
    (LP: #356254)

diff --git a/debian/changelog b/debian/changelog
index b584bac..0333be0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:1.6.0-0ubuntu10) jaunty; urgency=low
+
+  * debian/patches/174_set_bg_pixmap_of_cow_to_none.patch:
+    - Set bg pixmap of composite overlay window to None.
+      Thanks to Havoc Pennington for the patch.
+      (LP: #356254).
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Mon, 06 Apr 2009 15:06:14 +0200
+
 xorg-server (2:1.6.0-0ubuntu9) jaunty; urgency=low
 
   * local/xvfb-run: Fixes race condition with concurrent invocations
diff --git a/debian/patches/174_set_bg_pixmap_of_cow_to_none.patch b/debian/patches/174_set_bg_pixmap_of_cow_to_none.patch
new file mode 100644
index 0000000..bb27cda
--- /dev/null
+++ b/debian/patches/174_set_bg_pixmap_of_cow_to_none.patch
@@ -0,0 +1,34 @@
+From aa41f34e7a5f5de2d2002dd3c58c9f7044aca9bc Mon Sep 17 00:00:00 2001
+From: Havoc Pennington <hp@pobox.com>
+Date: Fri, 27 Mar 2009 12:30:37 -0400
+Subject: [PATCH] set bg pixmap of composite overlay window to None
+
+Otherwise it's impossible to get the COW without a white
+flash on the screen, because it's on top, mapped immediately,
+and unaffected by composite redirection. This makes
+initial login ugly when it doesn't need to be.
+---
+ composite/compoverlay.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/composite/compoverlay.c b/composite/compoverlay.c
+index 94e5b03..68b4f12 100644
+--- a/composite/compoverlay.c
++++ b/composite/compoverlay.c
+@@ -125,13 +125,13 @@ compCreateOverlayWindow (ScreenPtr pScreen)
+     CompScreenPtr   cs = GetCompScreen(pScreen);
+     WindowPtr	    pRoot = WindowTable[pScreen->myNum];
+     WindowPtr	    pWin;
+-    XID		    overrideRedirect = TRUE;
++    XID		    attrs[] = { None, TRUE }; /* backPixmap, overrideRedirect */
+     int		    result;
+ 
+     pWin = cs->pOverlayWin = 
+ 	CreateWindow (cs->overlayWid, pRoot,
+ 		      0, 0, pScreen->width, pScreen->height, 0, 
+-		      InputOutput, CWOverrideRedirect, &overrideRedirect,
++		      InputOutput, CWBackPixmap | CWOverrideRedirect, &attrs[0],
+ 		      pRoot->drawable.depth, 
+ 		      serverClient, pScreen->rootVisual, &result);
+     if (pWin == NULL)
+
diff --git a/debian/patches/series b/debian/patches/series
index 5b87ed5..163eada 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -25,8 +25,9 @@
 167_nullptr_xisbread.patch
 168_glibc_trace_to_stderr.patch
 169_mipointer_nullptr_checks.patch
-#999_default_modedebug_on.patch
 170_primary_pci_video_device.patch
 171_xkb_geometry_copying.patch
 172_cwgetbackingpicture_nullptr_check.patch
 173_edid_quirk_philips_lcd.patch
+174_set_bg_pixmap_of_cow_to_none.patch
+#999_default_modedebug_on.patch


Reply to: