svn merge ^/branches/released .

1 files changed, 20 insertions, 3 deletions

diff --git a/xorg-server/include/scrnintstr.h b/xorg-server/include/scrnintstr.h
index 705dff3ec..a39dd6107 100644
--- a/xorg-server/include/scrnintstr.h
+++ b/xorg-server/include/scrnintstr.h
@@ -82,6 +82,16 @@ typedef struct _Depth {
     VisualID		*vids;    /* block of visual ids for this depth */

   } DepthRec;

 

+typedef struct _ScreenSaverStuff {

+    WindowPtr pWindow;

+    XID       wid;

+    char      blanked;

+    Bool      (*ExternalScreenSaver)(

+	ScreenPtr	/*pScreen*/,

+	int		/*xstate*/,

+	Bool		/*force*/);

+} ScreenSaverStuffRec;

+

 

 /*

  *  There is a typedef for each screen function pointer so that code that

@@ -386,7 +396,7 @@ typedef    void (* PostChangeSaveUnderProcPtr)(
 	WindowPtr /*pLayerWin*/,

 	WindowPtr /*firstChild*/);

 

-typedef    void (* ConfigNotifyProcPtr)(

+typedef    int (* ConfigNotifyProcPtr)(

 	WindowPtr /*pWin*/,

 	int /*x*/,

 	int /*y*/,

@@ -423,7 +433,8 @@ typedef    void (* ReparentWindowProcPtr)(
     WindowPtr /*pPriorParent*/);

 

 typedef    void (* SetShapeProcPtr)(

-	WindowPtr /*pWin*/);

+        WindowPtr /*pWin*/,

+        int /* kind */);

 

 typedef    void (* ChangeBorderWidthProcPtr)(

 	WindowPtr /*pWin*/,

@@ -449,7 +460,7 @@ typedef    void (* DeviceCursorCleanupProcPtr)(
 typedef struct _Screen {

     int			myNum;	/* index of this instance in Screens[] */

     ATOM		id;

-    short		width, height;

+    short		x, y, width, height;

     short		mmWidth, mmHeight;

     short		numDepths;

     unsigned char      	rootDepth;

@@ -471,6 +482,8 @@ typedef struct _Screen {
     pointer		devPrivate;

     short       	numVisuals;

     VisualPtr		visuals;

+    WindowPtr		root;

+    ScreenSaverStuffRec screensaver;

 

     /* Random screen procedures */

 

@@ -594,6 +607,10 @@ typedef struct _Screen {
     DeviceCursorCleanupProcPtr    DeviceCursorCleanup;

 } ScreenRec;

 

+static inline RegionPtr BitmapToRegion(ScreenPtr _pScreen, PixmapPtr pPix) {

+    return (*(_pScreen)->BitmapToRegion)(pPix); /* no mi version?! */

+}

+

 typedef struct _ScreenInfo {

     int		imageByteOrder;

     int		bitmapScanlineUnit;