diff options
| author | Keith Packard <keithp@keithp.com> | 2010-05-02 16:35:17 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-05-02 16:35:17 -0700 |
| commit | a80b1f888f2f7674a715d512ab950eeadee20448 (patch) | |
| tree | 363dc6e86a1d14dade0403ce2e35038ac52ec951 | |
| parent | 4971099860e8e6d7817ada92e2636cb435fd002d (diff) | |
| parent | 0efd7b8d82a48793341e27d4c224986e0971687c (diff) | |
Merge remote branch 'jeremyhu/master'
| -rw-r--r-- | hw/xquartz/GL/indirect.c | 2 | ||||
| -rw-r--r-- | hw/xquartz/GL/visualConfigs.c | 3 | ||||
| -rw-r--r-- | hw/xquartz/xpr/x-list.c | 1 | ||||
| -rw-r--r-- | mi/miexpose.c | 3 | ||||
| -rw-r--r-- | miext/rootless/rootlessWindow.c | 4 |
5 files changed, 8 insertions, 5 deletions
diff --git a/hw/xquartz/GL/indirect.c b/hw/xquartz/GL/indirect.c index 70558ed20..ad9ebbdac 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 bef27f048..cecc90265 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> diff --git a/hw/xquartz/xpr/x-list.c b/hw/xquartz/xpr/x-list.c index 3596dd355..77c9309aa 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]); diff --git a/mi/miexpose.c b/mi/miexpose.c index 1c9c3a436..f52b49211 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); diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c index e78e2c8f1..55c7b9689 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 ()); } |