xorg-server: Changes to 'upstream-unstable'
Xext/xtest.c | 6 +++++-
configure.ac | 4 ++--
hw/xquartz/GL/indirect.c | 2 ++
hw/xquartz/GL/visualConfigs.c | 3 ++-
hw/xquartz/xpr/x-list.c | 1 +
mi/miexpose.c | 3 +++
miext/rootless/rootlessWindow.c | 4 ----
7 files changed, 15 insertions(+), 8 deletions(-)
New commits:
commit e9a2eb86e9dd1f0d3d955bb7c16f2660c773e070
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 4 10:55:22 2010 +1000
xserver 1.7.7
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 4b020a4..07be7f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.7.6.902, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2010-04-21"
+AC_INIT([xorg-server], 1.7.7, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2010-05-04"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_MAINTAINER_MODE
commit ad48184752970541aa153bf2961a2d7da1a910b5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 21 15:51:20 2010 +1000
Xext: only update the sprite on pointer events.
A call to miPointerUpdateSprite for the XTEST keyboard may result in a
NULL pointer dereference in miDCPutUpCursor() when the save buffer is NULL.
XTS test case: Xlib 11 KeymapNotify
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit af170a4ab76d33254dd4e54a33bb410fa1624739)
diff --git a/Xext/xtest.c b/Xext/xtest.c
index 6b0e9fd..e6d4431 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -184,6 +184,7 @@ ProcXTestFakeInput(ClientPtr client)
int i;
int base = 0;
int flags = 0;
+ int need_ptr_update = 1;
nev = (stuff->length << 2) - sizeof(xReq);
if ((nev % sizeof(xEvent)) || !nev)
@@ -387,6 +388,8 @@ ProcXTestFakeInput(ClientPtr client)
client->errorValue = ev->u.u.detail;
return BadValue;
}
+
+ need_ptr_update = 0;
break;
case MotionNotify:
if (!dev->valuator)
@@ -451,7 +454,8 @@ ProcXTestFakeInput(ClientPtr client)
for (i = 0; i < nevents; i++)
mieqProcessDeviceEvent(dev, (InternalEvent*)(xtest_evlist+i)->event, NULL);
- miPointerUpdateSprite(dev);
+ if (need_ptr_update)
+ miPointerUpdateSprite(dev);
return client->noClientException;
}
commit d2229e829d61033141d25fd4486c689c0367b97e
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Apr 27 13:14:47 2010 -0700
XQuartz GLX: Change around includes for better compatability with different OS versions
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 0efd7b8d82a48793341e27d4c224986e0971687c)
diff --git a/hw/xquartz/GL/indirect.c b/hw/xquartz/GL/indirect.c
index 574a90a..4caeb13 100644
--- a/hw/xquartz/GL/indirect.c
+++ b/hw/xquartz/GL/indirect.c
@@ -42,6 +42,8 @@
#define GL_GLEXT_WUNDEF_SUPPORT
#include <OpenGL/OpenGL.h>
+#include <OpenGL/gl.h>
+#include <OpenGL/glext.h>
#include <OpenGL/CGLContext.h>
/* These next few GL_EXT pre-processing blocks are to explicitly define
diff --git a/hw/xquartz/GL/visualConfigs.c b/hw/xquartz/GL/visualConfigs.c
index bef27f0..cecc902 100644
--- a/hw/xquartz/GL/visualConfigs.c
+++ b/hw/xquartz/GL/visualConfigs.c
@@ -35,9 +35,10 @@
#include "dri.h"
#include <OpenGL/OpenGL.h>
+#include <OpenGL/gl.h>
+#include <OpenGL/glext.h>
#include <OpenGL/CGLContext.h>
-#include <GL/gl.h>
#include <GL/glxproto.h>
#include <windowstr.h>
#include <resource.h>
commit 86f37fa8627807030cee89c117b05a4a06d2d734
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Apr 21 08:38:53 2010 -0700
rootless: Add some sanity checking to miPaintWindow
This avoids painting the root window when it isn't actually drawable.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 7b506fdc840aebed6b5acb91437a2cb620b5bddc)
diff --git a/mi/miexpose.c b/mi/miexpose.c
index 1c9c3a4..f52b492 100644
--- a/mi/miexpose.c
+++ b/mi/miexpose.c
@@ -552,6 +552,9 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
DrawablePtr drawable = &pWin->drawable;
#ifdef ROOTLESS
+ if(!drawable || drawable->type == UNDRAWABLE_WINDOW)
+ return;
+
if(IsFramedWindow(pWin)) {
RootlessStartDrawing(pWin);
RootlessDamageRegion(pWin, prgn);
commit 1dbdcfbcbc8105a5878ebce4c74aff7f8071f590
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Apr 18 01:22:27 2010 -0700
rootless: Remove an unneeded comment
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 4d3789c9b3fbe6aad32fcacd964353b612640f27)
diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c
index 5320956..f8fc49d 100644
--- a/miext/rootless/rootlessWindow.c
+++ b/miext/rootless/rootlessWindow.c
@@ -1553,10 +1553,6 @@ RootlessDisableRoot (ScreenPtr pScreen)
return;
RootlessDestroyFrame (pRoot, winRec);
- /*
- * gstaplin: I fixed the usage of this DeleteProperty so that it would compile.
- * QUESTION: Where is this xa_native_window_id set?
- */
DeleteProperty (serverClient, pRoot, xa_native_window_id ());
}
commit 67a50803da4eb8d7f827c32776441f34cb726365
Author: Oliver McFadden <oliver.mcfadden@nokia.com>
Date: Thu Apr 22 10:29:44 2010 +0300
x-list.c: null-returning function malloc() was called without checking
Signed-off-by: Oliver McFadden <oliver.mcfadden@nokia.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 048d15192af39ba5111882d18a957b6ff4e34cad)
diff --git a/hw/xquartz/xpr/x-list.c b/hw/xquartz/xpr/x-list.c
index 3596dd3..77c9309 100644
--- a/hw/xquartz/xpr/x-list.c
+++ b/hw/xquartz/xpr/x-list.c
@@ -97,6 +97,7 @@ X_PFX (list_prepend) (x_list *lst, void *data)
int i;
b = malloc (sizeof (x_list_block));
+ assert(b != NULL);
for (i = 0; i < NODES_PER_BLOCK - 1; i++)
b->l[i].next = &(b->l[i+1]);
Reply to: