frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'jeremyhu/master'

This commit is contained in:
Keith Packard 2010-05-02 16:35:17 -07:00
parent 4971099860 0efd7b8d82
commit a80b1f888f
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xquartz/GL/indirect.c
View File

@ -42,6 +42,8 @@
#define GL_GLEXT_WUNDEF_SUPPORT #define GL_GLEXT_WUNDEF_SUPPORT
#include <OpenGL/OpenGL.h> #include <OpenGL/OpenGL.h>
#include <OpenGL/gl.h>
#include <OpenGL/glext.h>
#include <OpenGL/CGLContext.h> #include <OpenGL/CGLContext.h>
/* These next few GL_EXT pre-processing blocks are to explicitly define /* These next few GL_EXT pre-processing blocks are to explicitly define

3
hw/xquartz/GL/visualConfigs.c
View File

@ -35,9 +35,10 @@
#include "dri.h" #include "dri.h"
#include <OpenGL/OpenGL.h> #include <OpenGL/OpenGL.h>
#include <OpenGL/gl.h>
#include <OpenGL/glext.h>
#include <OpenGL/CGLContext.h> #include <OpenGL/CGLContext.h>
#include <GL/gl.h>
#include <GL/glxproto.h> #include <GL/glxproto.h>
#include <windowstr.h> #include <windowstr.h>
#include <resource.h> #include <resource.h>

1
hw/xquartz/xpr/x-list.c
View File

@ -97,6 +97,7 @@ X_PFX (list_prepend) (x_list *lst, void *data)
int i; int i;
b = malloc (sizeof (x_list_block)); b = malloc (sizeof (x_list_block));
assert(b != NULL);
for (i = 0; i < NODES_PER_BLOCK - 1; i++) for (i = 0; i < NODES_PER_BLOCK - 1; i++)
b->l[i].next = &(b->l[i+1]); b->l[i].next = &(b->l[i+1]);

3
mi/miexpose.c
View File

@ -552,6 +552,9 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
DrawablePtr drawable = &pWin->drawable; DrawablePtr drawable = &pWin->drawable;
#ifdef ROOTLESS #ifdef ROOTLESS
if(!drawable || drawable->type == UNDRAWABLE_WINDOW)
return;
if(IsFramedWindow(pWin)) { if(IsFramedWindow(pWin)) {
RootlessStartDrawing(pWin); RootlessStartDrawing(pWin);
RootlessDamageRegion(pWin, prgn); RootlessDamageRegion(pWin, prgn);

4
miext/rootless/rootlessWindow.c
View File

@ -1553,10 +1553,6 @@ RootlessDisableRoot (ScreenPtr pScreen)
return; return;
RootlessDestroyFrame (pRoot, winRec); 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 ()); DeleteProperty (serverClient, pRoot, xa_native_window_id ());
} }