[xserver-commit] xserver/hw/xnest GCOps.c,3.6.2.1,3.6.2.2 GCOps.h,1.1.1.2.10.1,1.1.1.2.10.2 Handlers.c,1.3,1.3.2.1 Handlers.h,1.1.1.2,1.1.1.2.10.1 Init.c,3.25,3.25.2.1 Keyboard.c,1.10,1.10.2.1 Keyboard.h,1.1.1.2.10.1,1.1.1.2.10.2 Pixmap.c,3.8,3.8.2.1 Pointer.c,1.2,1.2.2.1 Pointer.h,1.1.1.2,1.1.1.2.10.1 Screen.c,3.12.2.1,3.12.2.2 Screen.h,1.1.1.2.10.1,1.1.1.2.10.2 Visual.c,1.2.2.1,1.2.2.2 Visual.h,1.1.1.2.10.1,1.1.1.2.10.2 Window.c,3.8.2.1,3.8.2.2 XNPixmap.h,1.4.2.1,1.4.2.2 XNWindow.h,1.2.2.1,1.2.2.2
Keith Packard
xserver-commit@pdx.freedesktop.org
Fri, 31 Oct 2003 20:11:18 -0800
Committed by: keithp
Update of /cvs/xserver/xserver/hw/xnest
In directory pdx:/tmp/cvs-serv23175/hw/xnest
Modified Files:
Tag: xfixes_2_branch
GCOps.c GCOps.h Handlers.c Handlers.h Init.c Keyboard.c
Keyboard.h Pixmap.c Pointer.c Pointer.h Screen.c Screen.h
Visual.c Visual.h Window.c XNPixmap.h XNWindow.h
Log Message:
* Xext/shm.c: (miShmPutImage), (fbShmCreatePixmap):
* hw/xnest/GCOps.c: (xnestSetSpans), (xnestGetSpans),
(xnestQueryBestSize), (xnestPutImage), (xnestGetImage),
(xnestBitBlitHelper), (xnestCopyArea), (xnestCopyPlane),
(xnestPolyPoint), (xnestPolylines), (xnestPolyText16),
(xnestImageText16), (xnestImageGlyphBlt), (xnestPolyGlyphBlt),
(xnestPushPixels):
* hw/xnest/GCOps.h:
* hw/xnest/Handlers.c: (xnestBlockHandler), (xnestWakeupHandler):
* hw/xnest/Handlers.h:
* hw/xnest/Init.c: (InitOutput), (InitInput), (AbortDDX),
(ddxGiveUp), (OsVendorInit), (OsVendorFatalError):
* hw/xnest/Keyboard.c: (xnestBell), (xnestChangeKeyboardControl),
(xnestKeyboardProc):
* hw/xnest/Keyboard.h:
* hw/xnest/Pixmap.c: (xnestCreatePixmap), (xnestDestroyPixmap),
(xnestPixmapToRegion):
* hw/xnest/Pointer.c: (xnestChangePointerControl),
(xnestPointerProc):
* hw/xnest/Pointer.h:
* hw/xnest/Screen.c: (offset), (xnestSaveScreen),
(xnestCursorOffScreen), (xnestCrossScreen), (xnestOpenScreen),
(xnestCloseScreen):
* hw/xnest/Screen.h:
* hw/xnest/Visual.c: (xnestDefaultVisualColormap):
* hw/xnest/Visual.h:
* hw/xnest/Window.c: (xnestFindWindowMatch), (xnestCreateWindow),
(xnestDestroyWindow), (xnestPositionWindow),
(xnestConfigureWindow), (xnestChangeWindowAttributes),
(xnestRealizeWindow), (xnestUnrealizeWindow),
(xnestPaintWindowBackground), (xnestPaintWindowBorder),
(xnestCopyWindow), (xnestClipNotify),
(xnestWindowExposurePredicate), (xnestWindowExposures),
(xnestRegionEqual), (xnestShapeWindow):
* hw/xnest/XNPixmap.h:
* hw/xnest/XNWindow.h:
* mi/miscrinit.c:
* miext/damage/damage.c:
* miext/shadow/shrotpack.h:
Prototype fixes (mostly in Xnest). Seems to build -Werror now.
Index: GCOps.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/GCOps.c,v
retrieving revision 3.6.2.1
retrieving revision 3.6.2.2
diff -u -d -r3.6.2.1 -r3.6.2.2
--- GCOps.c 29 Oct 2003 16:26:51 -0000 3.6.2.1
+++ GCOps.c 1 Nov 2003 04:11:15 -0000 3.6.2.2
@@ -38,17 +38,17 @@
ErrorF("xnest warning: function xnestFillSpans not implemented\n");
}
-void xnestSetSpans(DrawablePtr pDrawable, GCPtr pGC, pSrc, xPoint *pPoints, int *pWidths, int nSpans, int fSorted)
+void xnestSetSpans(DrawablePtr pDrawable, GCPtr pGC, char *pSrc, xPoint *pPoints, int *pWidths, int nSpans, int fSorted)
{
ErrorF("xnest warning: function xnestSetSpans not implemented\n");
}
-void xnestGetSpans(pDrawable, maxWidth, xPoint *pPoints, int *pWidths, int nSpans, int *pBuffer)
+void xnestGetSpans(DrawablePtr pDrawable, int maxWidth, DDXPointPtr pPoints, int *pWidths, int nSpans, char *pBuffer)
{
ErrorF("xnest warning: function xnestGetSpans not implemented\n");
}
-void xnestQueryBestSize(int class, short *pWidth, short *pHeight, ScreenPtr pScreen)
+void xnestQueryBestSize(int class, unsigned short *pWidth, unsigned short *pHeight, ScreenPtr pScreen)
{
unsigned int width, height;
@@ -65,7 +65,7 @@
void xnestPutImage(DrawablePtr pDrawable, GCPtr pGC,
int depth, int x, int y, int w, int h,
- int leftPad, unsigned int format, unsigned char *pImage)
+ int leftPad, int format, char *pImage)
{
XImage *ximage;
@@ -84,7 +84,7 @@
void xnestGetImage(DrawablePtr pDrawable, int x, int y, int w, int h,
unsigned int format, unsigned long planeMask,
- unsigned char *pImage)
+ char *pImage)
{
XImage *ximage;
int length;
@@ -106,7 +106,7 @@
return (event->type == GraphicsExpose || event->type == NoExpose);
}
-RegionPtr xnestBitBlitHelper(GCPtr pGC)
+static RegionPtr xnestBitBlitHelper(GCPtr pGC)
{
if (!pGC->graphicsExposures)
return NullRegion;
@@ -147,7 +147,7 @@
}
}
-RegionPtr xnestCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDdstDrawable,
+RegionPtr xnestCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
GCPtr pGC, int srcx, int srcy, int width, int height,
int dstx, int dsty)
{
@@ -158,7 +158,7 @@
return xnestBitBlitHelper(pGC);
}
-RegionPtr xnestCopyPlane(DrawablePtr pSrcDrawable, DrawablePtr pDdstDrawable,
+RegionPtr xnestCopyPlane(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
GCPtr pGC,int srcx, int srcy, int width, int height,
int dstx, int dsty, unsigned long plane)
{
@@ -172,14 +172,14 @@
void xnestPolyPoint(DrawablePtr pDrawable, GCPtr pGC, int mode, int nPoints, xPoint *pPoints)
{
XDrawPoints(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC),
- xPoint *pPoints, nPoints, mode);
+ (XPoint *) pPoints, nPoints, mode);
}
void xnestPolylines(DrawablePtr pDrawable, GCPtr pGC, int mode,
int nPoints, xPoint *pPoints)
{
XDrawLines(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC),
- xPoint *pPoints, nPoints, mode);
+ (XPoint *) pPoints, nPoints, mode);
}
void xnestPolySegment(DrawablePtr pDrawable, GCPtr pGC, int nSegments,
@@ -236,14 +236,14 @@
}
int xnestPolyText16(DrawablePtr pDrawable, GCPtr pGC,
- int x, int y, int count, char *string)
+ int x, int y, int count, unsigned short *string)
{
int width;
XDrawString16(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC),
x, y, (XChar2b *) string, count);
- width = XTextWidth16(xnestFontStruct(pGC->font), string, count);
+ width = XTextWidth16(xnestFontStruct(pGC->font), (XChar2b *) string, count);
return width + x;
}
@@ -256,27 +256,27 @@
}
void xnestImageText16(DrawablePtr pDrawable, GCPtr pGC,
- int x, int y, int count, char *string)
+ int x, int y, int count, unsigned short *string)
{
XDrawImageString16(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC),
x, y, (XChar2b *) string, count);
}
void xnestImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
- int x, int y, int nGlyphs, CharInfoPtr *pCharInfo,
- char *pGlyphBase)
+ int x, int y, unsigned int nGlyphs, CharInfoPtr *pCharInfo,
+ pointer pGlyphBase)
{
ErrorF("xnest warning: function xnestImageGlyphBlt not implemented\n");
}
void xnestPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
- int x, int y, int nGlyphs, CharInfoPtr *pCharInfo,
- char *pGlyphBase)
+ int x, int y, unsigned int nGlyphs, CharInfoPtr *pCharInfo,
+ pointer pGlyphBase)
{
ErrorF("xnest warning: function xnestPolyGlyphBlt not implemented\n");
}
-void xnestPushPixels(DrawablePtr pDrawable, GCPtr pGC, PixmapPtr pBitmap,
+void xnestPushPixels(GCPtr pGC, PixmapPtr pBitmap, DrawablePtr pDrawable,
int width, int height, int x, int y)
{
ErrorF("xnest warning: function xnestPushPixels not implemented\n");
Index: GCOps.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/GCOps.h,v
retrieving revision 1.1.1.2.10.1
retrieving revision 1.1.1.2.10.2
diff -u -d -r1.1.1.2.10.1 -r1.1.1.2.10.2
--- GCOps.h 29 Oct 2003 16:26:51 -0000 1.1.1.2.10.1
+++ GCOps.h 1 Nov 2003 04:11:15 -0000 1.1.1.2.10.2
@@ -20,17 +20,18 @@
void xnestSetSpans(DrawablePtr pDrawable, GCPtr pGC, char *pSrc, xPoint *pPoints, int *pWidths, int nSpans, int fSorted);
-void xnestGetSpans(DrawablePtr pDrawable, int maxWidth, xPoint *pPoints, int *pWidths, int nSpans, int *pBuffer);
+void xnestGetSpans(DrawablePtr pDrawable, int maxWidth, DDXPointPtr pPoints,
+ int *pWidths, int nSpans, char *pBuffer);
-void xnestQueryBestSize(int class, short *pWidth, short *pHeight, ScreenPtr pScreen);
+void xnestQueryBestSize(int class, unsigned short *pWidth, unsigned short *pHeight, ScreenPtr pScreen);
void xnestPutImage(DrawablePtr pDrawable, GCPtr pGC,
int depth, int x, int y, int w, int h,
- int leftPad, unsigned int format, unsigned char *pImage);
+ int leftPad, int format, char *pImage);
void xnestGetImage(DrawablePtr pDrawable, int x, int y, int w, int h,
unsigned int format, unsigned long planeMask,
- unsigned char *pImage);
+ char *pImage);
RegionPtr xnestCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDdstDrawable,
@@ -66,22 +67,22 @@
int x, int y, int count, char *string);
int xnestPolyText16(DrawablePtr pDrawable, GCPtr pGC,
- int x, int y, int count, char *string);
+ int x, int y, int count, unsigned short *string);
void xnestImageText8(DrawablePtr pDrawable, GCPtr pGC,
int x, int y, int count, char *string);
void xnestImageText16(DrawablePtr pDrawable, GCPtr pGC,
- int x, int y, int count, char *string);
+ int x, int y, int count, unsigned short *string);
void xnestImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
- int x, int y, int nGlyphs, CharInfoPtr *pCharInfo,
- char *pGlyphBase);
+ int x, int y, unsigned int nGlyphs, CharInfoPtr *pCharInfo,
+ pointer pGlyphBase);
void xnestPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
- int x, int y, int nGlyphs, CharInfoPtr *pCharInfo,
- char *pGlyphBase);
+ int x, int y, unsigned int nGlyphs, CharInfoPtr *pCharInfo,
+ pointer pGlyphBase);
-void xnestPushPixels(DrawablePtr pDrawable, GCPtr pGC, PixmapPtr pBitmap,
+void xnestPushPixels(GCPtr pGC, PixmapPtr pBitmap, DrawablePtr pDrawable,
int width, int height, int x, int y);
#endif /* XNESTGCOPS_H */
Index: Handlers.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/Handlers.c,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- Handlers.c 12 Oct 2003 00:21:02 -0000 1.3
+++ Handlers.c 1 Nov 2003 04:11:15 -0000 1.3.2.1
@@ -27,18 +27,13 @@
#include "Events.h"
#include "Handlers.h"
-void xnestBlockHandler(blockData, pTimeout, pReadMask)
- pointer blockData;
- pointer pTimeout;
- pointer pReadMask;
+void xnestBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadMask)
{
xnestCollectExposures();
XFlush(xnestDisplay);
}
-void xnestWakeupHandler(result, pReadMask)
- int result;
- pointer pReadMask;
+void xnestWakeupHandler(pointer blockData, int result, pointer pReadMask)
{
xnestCollectEvents();
}
Index: Handlers.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/Handlers.h,v
retrieving revision 1.1.1.2
retrieving revision 1.1.1.2.10.1
diff -u -d -r1.1.1.2 -r1.1.1.2.10.1
--- Handlers.h 16 Jan 2001 22:43:46 -0000 1.1.1.2
+++ Handlers.h 1 Nov 2003 04:11:15 -0000 1.1.1.2.10.1
@@ -16,7 +16,7 @@
#ifndef XNESTHANDLERS_H
#define XNESTHANDLERS_H
-void xnestBlockHandler();
-void xnestWakeupHandler();
+void xnestBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadMask);
+void xnestWakeupHandler(pointer blockData, int result, pointer pReadMask);
#endif /* XNESTHANDLERS_H */
Index: Init.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/Init.c,v
retrieving revision 3.25
retrieving revision 3.25.2.1
diff -u -d -r3.25 -r3.25.2.1
--- Init.c 12 Oct 2003 00:21:02 -0000 3.25
+++ Init.c 1 Nov 2003 04:11:15 -0000 3.25.2.1
@@ -38,10 +38,7 @@
Bool xnestDoFullGeneration = True;
-void InitOutput(screenInfo, argc, argv)
- ScreenInfo *screenInfo;
- int argc;
- char *argv[];
+void InitOutput(ScreenInfo *screenInfo, int argc, char **argv)
{
int i, j;
@@ -81,9 +78,7 @@
xnestDoFullGeneration = xnestFullGeneration;
}
-void InitInput(argc, argv)
- int argc;
- char *argv[];
+void InitInput(int argc, char **argv)
{
pointer ptr, kbd;
@@ -103,14 +98,14 @@
/*
* DDX - specific abort routine. Called by AbortServer().
*/
-void AbortDDX()
+void AbortDDX(void)
{
xnestDoFullGeneration = True;
xnestCloseDisplay();
}
/* Called by GiveUp(). */
-void ddxGiveUp()
+void ddxGiveUp(void)
{
AbortDDX();
}
@@ -138,12 +133,12 @@
}
#endif
-void OsVendorInit()
+void OsVendorInit(void)
{
return;
}
-void OsVendorFatalError()
+void OsVendorFatalError(void)
{
return;
}
Index: Keyboard.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/Keyboard.c,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -d -r1.10 -r1.10.2.1
--- Keyboard.c 12 Oct 2003 00:21:02 -0000 1.10
+++ Keyboard.c 1 Nov 2003 04:11:15 -0000 1.10.2.1
@@ -85,18 +85,12 @@
#endif
-void xnestBell(volume, pDev, ctrl, cls)
- int volume;
- DeviceIntPtr pDev;
- pointer ctrl;
- int cls;
+static void xnestBell(int volume, DeviceIntPtr pDev, pointer ctrl, int cls)
{
XBell(xnestDisplay, volume);
}
-void xnestChangeKeyboardControl(pDev, ctrl)
- DeviceIntPtr pDev;
- KeybdCtrl *ctrl;
+static void xnestChangeKeyboardControl(DeviceIntPtr pDev, KeybdCtrl *ctrl)
{
#if 0
unsigned long value_mask;
@@ -133,10 +127,7 @@
#endif
}
-int xnestKeyboardProc(pDev, onoff, argc, argv)
- DevicePtr pDev;
- int onoff, argc;
- char *argv[];
+int xnestKeyboardProc(DeviceIntPtr pDev, int onoff)
{
XModifierKeymap *modifier_keymap;
KeySym *keymap;
@@ -199,7 +190,7 @@
memmove((char *) defaultKeyboardControl.autoRepeats,
(char *) values.auto_repeats, sizeof(values.auto_repeats));
- InitKeyboardDeviceStruct(pDev, &keySyms, modmap,
+ InitKeyboardDeviceStruct(&pDev->public, &keySyms, modmap,
xnestBell, xnestChangeKeyboardControl);
#ifdef XKB
} else {
Index: Keyboard.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/Keyboard.h,v
retrieving revision 1.1.1.2.10.1
retrieving revision 1.1.1.2.10.2
diff -u -d -r1.1.1.2.10.1 -r1.1.1.2.10.2
--- Keyboard.h 29 Oct 2003 16:26:51 -0000 1.1.1.2.10.1
+++ Keyboard.h 1 Nov 2003 04:11:15 -0000 1.1.1.2.10.2
@@ -19,4 +19,6 @@
#define XNEST_KEYBOARD_EVENT_MASK \
(KeyPressMask | KeyReleaseMask | FocusChangeMask | KeymapStateMask)
+int xnestKeyboardProc(DeviceIntPtr pDev, int onoff);
+
#endif /* XNESTKEYBOARD_H */
Index: Pixmap.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/Pixmap.c,v
retrieving revision 3.8
retrieving revision 3.8.2.1
diff -u -d -r3.8 -r3.8.2.1
--- Pixmap.c 12 Oct 2003 00:21:02 -0000 3.8
+++ Pixmap.c 1 Nov 2003 04:11:15 -0000 3.8.2.1
@@ -32,11 +32,7 @@
int xnestPixmapPrivateIndex;
#endif
-PixmapPtr xnestCreatePixmap(pScreen, width, height, depth)
- ScreenPtr pScreen;
- int width;
- int height;
- int depth;
+PixmapPtr xnestCreatePixmap(ScreenPtr pScreen, int width, int height, int depth)
{
PixmapPtr pPixmap;
@@ -73,8 +69,7 @@
return pPixmap;
}
-Bool xnestDestroyPixmap(pPixmap)
- PixmapPtr pPixmap;
+Bool xnestDestroyPixmap(PixmapPtr pPixmap)
{
if(--pPixmap->refcnt)
return TRUE;
@@ -83,8 +78,7 @@
return TRUE;
}
-RegionPtr xnestPixmapToRegion(pPixmap)
- PixmapPtr pPixmap;
+RegionPtr xnestPixmapToRegion(PixmapPtr pPixmap)
{
XImage *ximage;
register RegionPtr pReg, pTmpReg;
Index: Pointer.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/Pointer.c,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- Pointer.c 12 Oct 2003 00:21:02 -0000 1.2
+++ Pointer.c 1 Nov 2003 04:11:15 -0000 1.2.2.1
@@ -14,6 +14,7 @@
*/
#include "screenint.h"
#include "input.h"
+#include "inputstr.h"
#include "misc.h"
#include "scrnintstr.h"
#include "servermd.h"
@@ -26,18 +27,13 @@
#include "Pointer.h"
#include "Args.h"
-void xnestChangePointerControl(pDev, ctrl)
- DeviceIntPtr pDev;
- PtrCtrl *ctrl;
+void xnestChangePointerControl(DeviceIntPtr pDev, PtrCtrl *ctrl)
{
XChangePointerControl(xnestDisplay, True, True,
ctrl->num, ctrl->den, ctrl->threshold);
}
-int xnestPointerProc(pDev, onoff, argc, argv)
- DevicePtr pDev;
- int onoff, argc;
- char *argv[];
+int xnestPointerProc(DeviceIntPtr pDev, int onoff)
{
CARD8 map[MAXBUTTONS];
int nmap;
@@ -49,7 +45,7 @@
nmap = XGetPointerMapping(xnestDisplay, map, MAXBUTTONS);
for (i = 0; i <= nmap; i++)
map[i] = i; /* buttons are already mapped */
- InitPointerDeviceStruct(pDev, map, nmap,
+ InitPointerDeviceStruct(&pDev->public, map, nmap,
miPointerGetMotionEvents,
xnestChangePointerControl,
miPointerGetMotionBufferSize());
Index: Pointer.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/Pointer.h,v
retrieving revision 1.1.1.2
retrieving revision 1.1.1.2.10.1
diff -u -d -r1.1.1.2 -r1.1.1.2.10.1
--- Pointer.h 16 Jan 2001 22:43:49 -0000 1.1.1.2
+++ Pointer.h 1 Nov 2003 04:11:15 -0000 1.1.1.2.10.1
@@ -22,7 +22,8 @@
(ButtonPressMask | ButtonReleaseMask | PointerMotionMask | \
EnterWindowMask | LeaveWindowMask)
-void xnestChangePointerControl();
-int xnestPointerProc();
+void xnestChangePointerControl(DeviceIntPtr pDev, PtrCtrl *ctrl);
+
+int xnestPointerProc(DeviceIntPtr pDev, int onoff);
#endif /* XNESTPOINTER_H */
Index: Screen.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/Screen.c,v
retrieving revision 3.12.2.1
retrieving revision 3.12.2.2
diff -u -d -r3.12.2.1 -r3.12.2.2
--- Screen.c 29 Oct 2003 16:26:51 -0000 3.12.2.1
+++ Screen.c 1 Nov 2003 04:11:15 -0000 3.12.2.2
@@ -57,8 +57,7 @@
return NULL;
}
-static int offset(mask)
- unsigned long mask;
+static int offset(unsigned long mask)
{
int count;
@@ -68,9 +67,7 @@
return count;
}
-static Bool xnestSaveScreen(pScreen, what)
- ScreenPtr pScreen;
- int what;
+static Bool xnestSaveScreen(ScreenPtr pScreen, int what)
{
if (xnestSoftwareScreenSaver)
return False;
@@ -102,17 +99,13 @@
}
static Bool
-xnestCursorOffScreen (ppScreen, x, y)
- ScreenPtr *ppScreen;
- int *x, *y;
+xnestCursorOffScreen (ScreenPtr *ppScreen, int *x, int *y)
{
return FALSE;
}
static void
-xnestCrossScreen (pScreen, entering)
- ScreenPtr pScreen;
- Bool entering;
+xnestCrossScreen (ScreenPtr pScreen, Bool entering)
{
}
@@ -123,11 +116,13 @@
miPointerWarpCursor
};
-Bool xnestOpenScreen(index, pScreen, argc, argv)
- int index;
- register ScreenPtr pScreen;
- int argc;
- char *argv[];
+extern int AllocatePixmapPrivateIndex(void);
+extern Bool AllocatePixmapPrivate(
+ ScreenPtr /* pScreen */,
+ int /* index */,
+ unsigned /* amount */);
+
+Bool xnestOpenScreen(int index, ScreenPtr pScreen, int argc, char **argv)
{
VisualPtr visuals;
DepthPtr depths;
@@ -319,8 +314,8 @@
/* OS layer procedures */
- pScreen->BlockHandler = (void (*)())NoopDDA;
- pScreen->WakeupHandler = (void (*)())NoopDDA;
+ pScreen->BlockHandler = (ScreenBlockHandlerProcPtr)NoopDDA;
+ pScreen->WakeupHandler = (ScreenWakeupHandlerProcPtr)NoopDDA;
pScreen->blockData = (pointer)0;
pScreen->wakeupData = (pointer)0;
if (!miScreenDevPrivateInit(pScreen, xnestWidth, NULL))
@@ -394,9 +389,7 @@
return True;
}
-Bool xnestCloseScreen(index, pScreen)
- int index;
- ScreenPtr pScreen;
+Bool xnestCloseScreen(int index, ScreenPtr pScreen)
{
int i;
Index: Screen.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/Screen.h,v
retrieving revision 1.1.1.2.10.1
retrieving revision 1.1.1.2.10.2
diff -u -d -r1.1.1.2.10.1 -r1.1.1.2.10.2
--- Screen.h 29 Oct 2003 16:26:51 -0000 1.1.1.2.10.1
+++ Screen.h 1 Nov 2003 04:11:15 -0000 1.1.1.2.10.2
@@ -20,7 +20,7 @@
extern Window xnestScreenSaverWindows[MAXSCREENS];
ScreenPtr xnestScreen(Window window);
-Bool xnestOpenScreen(void);
-Bool xnestCloseScreen(void);
+Bool xnestOpenScreen(int index, ScreenPtr pScreen, int argc, char **argv);
+Bool xnestCloseScreen(int index, ScreenPtr pScreen);
#endif /* XNESTSCREEN_H */
Index: Visual.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/Visual.c,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- Visual.c 29 Oct 2003 16:26:51 -0000 1.2.2.1
+++ Visual.c 1 Nov 2003 04:11:15 -0000 1.2.2.2
@@ -49,8 +49,7 @@
return NULL;
}
-Colormap xnestDefaultVisualColormap(visual)
- Visual *visual;
+Colormap xnestDefaultVisualColormap(Visual *visual)
{
int i;
Index: Visual.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/Visual.h,v
retrieving revision 1.1.1.2.10.1
retrieving revision 1.1.1.2.10.2
diff -u -d -r1.1.1.2.10.1 -r1.1.1.2.10.2
--- Visual.h 29 Oct 2003 16:26:51 -0000 1.1.1.2.10.1
+++ Visual.h 1 Nov 2003 04:11:15 -0000 1.1.1.2.10.2
@@ -18,7 +18,7 @@
Visual *xnestVisual(VisualPtr pVisual);
Visual *xnestVisualFromID(ScreenPtr pScreen, VisualID visual);
-Colormap xnestDefaultVisualColormap(void);
+Colormap xnestDefaultVisualColormap(Visual *visual);
#define xnestDefaultVisual(pScreen) \
xnestVisualFromID((pScreen), (pScreen)->rootVisual)
Index: Window.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/Window.c,v
retrieving revision 3.8.2.1
retrieving revision 3.8.2.2
diff -u -d -r3.8.2.1 -r3.8.2.2
--- Window.c 29 Oct 2003 16:26:51 -0000 3.8.2.1
+++ Window.c 1 Nov 2003 04:11:15 -0000 3.8.2.2
@@ -37,9 +37,7 @@
int xnestWindowPrivateIndex;
-static int xnestFindWindowMatch(pWin, ptr)
- WindowPtr pWin;
- pointer ptr;
+static int xnestFindWindowMatch(WindowPtr pWin, pointer ptr)
{
xnestWindowMatch *wm = (xnestWindowMatch *)ptr;
if (wm->window == xnestWindow(pWin)) {
@@ -66,8 +64,7 @@
return wm.pWin;
}
-Bool xnestCreateWindow(pWin)
- WindowPtr pWin;
+Bool xnestCreateWindow(WindowPtr pWin)
{
unsigned long mask;
XSetWindowAttributes attributes;
@@ -140,8 +137,7 @@
return True;
}
-Bool xnestDestroyWindow(pWin)
- WindowPtr pWin;
+Bool xnestDestroyWindow(WindowPtr pWin)
{
if (pWin->nextSib)
xnestWindowPriv(pWin->nextSib)->sibling_above =
@@ -161,9 +157,7 @@
return True;
}
-Bool xnestPositionWindow(pWin, x, y)
- WindowPtr pWin;
- int x, y;
+Bool xnestPositionWindow(WindowPtr pWin, int x, int y)
{
xnestConfigureWindow(pWin,
CWParent |
@@ -174,9 +168,7 @@
return True;
}
-void xnestConfigureWindow(pWin, mask)
- WindowPtr pWin;
- unsigned int mask;
+void xnestConfigureWindow(WindowPtr pWin, unsigned long mask)
{
unsigned int valuemask;
XWindowChanges values;
@@ -264,9 +256,7 @@
}
}
-Bool xnestChangeWindowAttributes(pWin, mask)
- WindowPtr pWin;
- unsigned long mask;
+Bool xnestChangeWindowAttributes(WindowPtr pWin, unsigned long mask)
{
XSetWindowAttributes attributes;
@@ -357,8 +347,7 @@
return True;
}
-Bool xnestRealizeWindow(pWin)
- WindowPtr pWin;
+Bool xnestRealizeWindow(WindowPtr pWin)
{
xnestConfigureWindow(pWin, CWStackingOrder);
#ifdef SHAPE
@@ -369,18 +358,14 @@
return True;
}
-Bool xnestUnrealizeWindow(pWin)
- WindowPtr pWin;
+Bool xnestUnrealizeWindow(WindowPtr pWin)
{
XUnmapWindow(xnestDisplay, xnestWindow(pWin));
return True;
}
-void xnestPaintWindowBackground(pWin, pRegion, what)
- WindowPtr pWin;
- RegionPtr pRegion;
- int what;
+void xnestPaintWindowBackground(WindowPtr pWin, RegionPtr pRegion, int what)
{
int i;
BoxPtr pBox;
@@ -397,24 +382,16 @@
False);
}
-void xnestPaintWindowBorder(pWin, pRegion, what)
- WindowPtr pWin;
- RegionPtr pRegion;
- int what;
+void xnestPaintWindowBorder(WindowPtr pWin, RegionPtr pRegion, int what)
{
xnestConfigureWindow(pWin, CWBorderWidth);
}
-void xnestCopyWindow(pWin, oldOrigin, oldRegion)
- WindowPtr pWin;
- xPoint oldOrigin;
- RegionPtr oldRegion;
+void xnestCopyWindow(WindowPtr pWin, DDXPointRec oldOrigin, RegionPtr oldRegion)
{
}
-void xnestClipNotify(pWin, dx, dy)
- WindowPtr pWin;
- int dx, dy;
+void xnestClipNotify(WindowPtr pWin, int dx, int dy)
{
xnestConfigureWindow(pWin, CWStackingOrder);
#ifdef SHAPE
@@ -422,17 +399,12 @@
#endif /* SHAPE */
}
-static Bool xnestWindowExposurePredicate(display, event, ptr)
- Display *display;
- XEvent *event;
- XPointer ptr;
+static Bool xnestWindowExposurePredicate(Display *display, XEvent *event, XPointer ptr)
{
return (event->type == Expose && event->xexpose.window == *(Window *)ptr);
}
-void xnestWindowExposures(pWin, pRgn, other_exposed)
- WindowPtr pWin;
- RegionPtr pRgn, other_exposed;
+void xnestWindowExposures(WindowPtr pWin, RegionPtr pRgn, RegionPtr other_exposed)
{
XEvent event;
Window window;
@@ -460,8 +432,7 @@
}
#ifdef SHAPE
-static Bool xnestRegionEqual(pReg1, pReg2)
- RegionPtr pReg1, pReg2;
+static Bool xnestRegionEqual(RegionPtr pReg1, RegionPtr pReg2)
{
BoxPtr pBox1, pBox2;
unsigned int n1, n2;
@@ -485,8 +456,7 @@
return True;
}
-void xnestShapeWindow(pWin)
- WindowPtr pWin;
+void xnestShapeWindow(WindowPtr pWin)
{
Region reg;
BoxPtr pBox;
Index: XNPixmap.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/XNPixmap.h,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -d -r1.4.2.1 -r1.4.2.2
--- XNPixmap.h 29 Oct 2003 16:26:51 -0000 1.4.2.1
+++ XNPixmap.h 1 Nov 2003 04:11:15 -0000 1.4.2.2
@@ -37,4 +37,10 @@
#define xnestSharePixmap(pPixmap) ((pPixmap)->refcnt++)
+PixmapPtr xnestCreatePixmap(ScreenPtr pScreen, int width, int height, int depth);
+
+Bool xnestDestroyPixmap(PixmapPtr pPixmap);
+
+RegionPtr xnestPixmapToRegion(PixmapPtr pPixmap);
+
#endif /* XNESTPIXMAP_H */
Index: XNWindow.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/XNWindow.h,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- XNWindow.h 29 Oct 2003 16:26:51 -0000 1.2.2.1
+++ XNWindow.h 1 Nov 2003 04:11:15 -0000 1.2.2.2
@@ -60,20 +60,20 @@
extern Window xnestParentWindow;
WindowPtr xnestWindowPtr(Window window);
-Bool xnestCreateWindow(void);
-Bool xnestDestroyWindow(void);
-Bool xnestPositionWindow(void);
-void xnestConfigureWindow(void);
-Bool xnestChangeWindowAttributes(void);
-Bool xnestRealizeWindow(void);
-Bool xnestUnrealizeWindow(void);
-void xnestPaintWindowBackground(void);
-void xnestPaintWindowBorder(void);
-void xnestCopyWindow(void);
-void xnestClipNotify(void);
-void xnestWindowExposures(void);
+Bool xnestCreateWindow(WindowPtr pWin);
+Bool xnestDestroyWindow(WindowPtr pWin);
+Bool xnestPositionWindow(WindowPtr pWin, int x, int y);
+void xnestConfigureWindow(WindowPtr pWin, unsigned long mask);
+Bool xnestChangeWindowAttributes(WindowPtr pWin, unsigned long mask);
+Bool xnestRealizeWindow(WindowPtr pWin);
+Bool xnestUnrealizeWindow(WindowPtr pWin);
+void xnestPaintWindowBackground(WindowPtr pWin, RegionPtr pRegion, int what);
+void xnestPaintWindowBorder(WindowPtr pWin, RegionPtr pRegion, int what);
+void xnestCopyWindow(WindowPtr pWin, DDXPointRec oldOrigin, RegionPtr oldRegion);
+void xnestClipNotify(WindowPtr pWin, int dx, int dy);
+void xnestWindowExposures(WindowPtr pWin, RegionPtr pRgn, RegionPtr other_exposed);
#ifdef SHAPE
-void xnestShapeWindow(void);
+void xnestShapeWindow(WindowPtr pWin);
#endif /* SHAPE */
#endif /* XNESTWINDOW_H */