xserver: Branch 'master' - 6 commits
Keith Packard
keithp at kemper.freedesktop.org
Sun May 2 16:35:58 PDT 2010
dix/events.c | 2 +-
dix/window.c | 3 +--
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, 10 insertions(+), 8 deletions(-)
New commits:
commit a80b1f888f2f7674a715d512ab950eeadee20448
Merge: 4971099... 0efd7b8...
Author: Keith Packard <keithp at keithp.com>
Date: Sun May 2 16:35:17 2010 -0700
Merge remote branch 'jeremyhu/master'
commit 0efd7b8d82a48793341e27d4c224986e0971687c
Author: Jeremy Huddleston <jeremyhu at 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 at apple.com>
diff --git a/hw/xquartz/GL/indirect.c b/hw/xquartz/GL/indirect.c
index 70558ed..ad9ebbd 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 7b506fdc840aebed6b5acb91437a2cb620b5bddc
Author: Jeremy Huddleston <jeremyhu at 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 at apple.com>
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 4d3789c9b3fbe6aad32fcacd964353b612640f27
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date: Sun Apr 18 01:22:27 2010 -0700
rootless: Remove an unneeded comment
Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c
index e78e2c8..55c7b96 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 048d15192af39ba5111882d18a957b6ff4e34cad
Author: Oliver McFadden <oliver.mcfadden at 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 at nokia.com>
Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>
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]);
commit 4971099860e8e6d7817ada92e2636cb435fd002d
Author: Tiago Vignatti <tiago.vignatti at nokia.com>
Date: Sun May 2 19:14:39 2010 +0300
dix: wrap variables with #ifdef when panoramix is not used
this shut up some warnings.
Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
Reviewed-by: Jamey Sharp <jamey at minilop.net>
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/dix/events.c b/dix/events.c
index 60dd162..9dd7356 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -2558,7 +2558,6 @@ static Bool
PointInBorderSize(WindowPtr pWin, int x, int y)
{
BoxRec box;
- SpritePtr pSprite = inputInfo.pointer->spriteInfo->sprite;
if(POINT_IN_REGION(pWin->drawable.pScreen, &pWin->borderSize, x, y, &box))
return TRUE;
@@ -2566,6 +2565,7 @@ PointInBorderSize(WindowPtr pWin, int x, int y)
#ifdef PANORAMIX
if(!noPanoramiXExtension &&
XineramaSetWindowPntrs(inputInfo.pointer, pWin)) {
+ SpritePtr pSprite = inputInfo.pointer->spriteInfo->sprite;
int i;
for(i = 1; i < PanoramiXNumScreens; i++) {
diff --git a/dix/window.c b/dix/window.c
index c7201df..02451fc 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -2777,7 +2777,6 @@ UnrealizeTree(
WindowPtr pChild;
UnrealizeWindowProcPtr Unrealize;
MarkUnrealizedWindowProcPtr MarkUnrealizedWindow;
- int rc;
Unrealize = pWin->drawable.pScreen->UnrealizeWindow;
MarkUnrealizedWindow = pWin->drawable.pScreen->MarkUnrealizedWindow;
@@ -2791,7 +2790,7 @@ UnrealizeTree(
#ifdef PANORAMIX
if(!noPanoramiXExtension && !pChild->drawable.pScreen->myNum) {
PanoramiXRes *win;
- rc = dixLookupResourceByType((pointer *)&win,
+ int rc = dixLookupResourceByType((pointer *)&win,
pChild->drawable.id, XRT_WINDOW,
serverClient, DixWriteAccess);
if (rc == Success)
More information about the xorg-commit
mailing list