xserver: Branch 'server-1.8-branch' - 3 commits
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Tue Mar 8 21:16:10 PST 2011
glx/glxcmds.c | 2 +-
mi/mieq.c | 8 +++++++-
randr/rrscreen.c | 12 ------------
3 files changed, 8 insertions(+), 14 deletions(-)
New commits:
commit c89f694cbd46019bdd77dab6d15d34139e74dc24
Author: Julien Cristau <jcristau at debian.org>
Date: Sat Jul 3 19:42:26 2010 +0100
glx: make sure screen is non-negative in validGlxScreen
Reviewed-by: Adam Jackson <ajax at redhat.com>
Reviewed-by: Kristian Høgsberg <krh at bitplanet.net>
Reviewed-by: Daniel Stone <daniel at fooishbar.org>
Signed-off-by: Julien Cristau <jcristau at debian.org>
(cherry picked from commit 3f0d3f4d97bce75c1828635c322b6560a45a037f)
diff --git a/glx/glxcmds.c b/glx/glxcmds.c
index ec3bbe6..34829dd 100644
--- a/glx/glxcmds.c
+++ b/glx/glxcmds.c
@@ -57,7 +57,7 @@ validGlxScreen(ClientPtr client, int screen, __GLXscreen **pGlxScreen, int *err)
/*
** Check if screen exists.
*/
- if (screen >= screenInfo.numScreens) {
+ if (screen < 0 || screen >= screenInfo.numScreens) {
client->errorValue = screen;
*err = BadValue;
return FALSE;
commit ca766bb6533cac40908a2eca8bec0c19d425866a
Author: Julien Cristau <jcristau at debian.org>
Date: Mon Jan 31 14:14:47 2011 +0100
Revert "randr: check for virtual size limits before set crtc"
Apparently these checks break rotation with the nvidia drivers:
https://bbs.archlinux.org/viewtopic.php?pid=877761
http://bugs.debian.org/611619
Let's not do that in a stable branch.
This reverts commit 6a6d907e77777057cadbd80572119c09732385cd.
Signed-off-by: Julien Cristau <jcristau at debian.org>
(cherry picked from commit d77ffa918b2aaa3ca1deb17ed0145199d0f863da)
diff --git a/randr/rrscreen.c b/randr/rrscreen.c
index 0fee1f5..630ff57 100644
--- a/randr/rrscreen.c
+++ b/randr/rrscreen.c
@@ -921,18 +921,6 @@ ProcRRSetScreenConfig (ClientPtr client)
width = mode->mode.height;
height = mode->mode.width;
}
-
- if (width < pScrPriv->minWidth || pScrPriv->maxWidth < width) {
- client->errorValue = width;
- free(pData);
- return BadValue;
- }
- if (height < pScrPriv->minHeight || pScrPriv->maxHeight < height) {
- client->errorValue = height;
- free(pData);
- return BadValue;
- }
-
if (width != pScreen->width || height != pScreen->height)
{
int c;
commit a200a3cf8613d1c64b26a9149acaaebbdb4cd174
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Fri Sep 3 11:54:41 2010 +1000
mi: handle DGA subtypes when determining the master device.
The subtype in the DGA event is the core type and all ET_ event types (where
applicable) are identical to the core types. Thus the switch statement below
will work as required and assign the right master device.
Fixes a crasher bug on keyboard devices with valuators. If a device sends a
motion event while grabbed and a DGA client is active (but has not selected
input through DGA), the valuator event is posted through the VCK and
eventually results in a NULL-pointer dereference on dev->valuator.
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
(cherry picked from commit 31ab9f8860848504df18a8be9d19b817b191e0df)
diff --git a/mi/mieq.c b/mi/mieq.c
index 9b6d0c9..97f4afc 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -320,6 +320,7 @@ CopyGetMasterEvent(DeviceIntPtr sdev,
{
DeviceIntPtr mdev;
int len = original->any.length;
+ int type = original->any.type;
CHECKEVENT(original);
@@ -327,7 +328,12 @@ CopyGetMasterEvent(DeviceIntPtr sdev,
if (!sdev || !sdev->u.master)
return NULL;
- switch(original->any.type)
+#if XFreeXDGA
+ if (type == ET_DGAEvent)
+ type = original->dga_event.subtype;
+#endif
+
+ switch(type)
{
case ET_KeyPress:
case ET_KeyRelease:
More information about the xorg-commit
mailing list