[xserver-commit] xserver/hw/xnest Color.c,1.4,1.5 Color.h,1.1.1.2,1.2 Cursor.c,1.4,1.5 Display.c,3.5,3.6 Display.h,1.6,1.7 Events.c,1.3,1.4 Events.h,1.1.1.2,1.2 Font.c,3.7,3.8 GC.c,3.7,3.8 GCOps.c,3.6,3.7 GCOps.h,1.1.1.2,1.2 Handlers.c,1.3,1.4 Handlers.h,1.1.1.2,1.2 Init.c,3.25,3.26 Keyboard.c,1.10,1.11 Keyboard.h,1.1.1.2,1.2 Makefile.am,3.4,3.5 Pixmap.c,3.8,3.9 Pointer.c,1.2,1.3 Pointer.h,1.1.1.2,1.2 Screen.c,3.12,3.13 Screen.h,1.1.1.2,1.2 Visual.c,1.2,1.3 Visual.h,1.1.1.2,1.2 Window.c,3.8,3.9 XNCursor.h,1.2,1.3 XNFont.h,1.1.1.2,1.2 XNGC.h,1.1.1.2,1.2 XNPixmap.h,1.4,1.5 XNWindow.h,1.2,1.3
Keith Packard
xserver-commit@pdx.freedesktop.org
Sun, 02 Nov 2003 11:56:13 -0800
- Previous message: [xserver-commit] xserver/hw/kdrive/src Makefile.am,1.5,1.6 kaa.c,1.15,1.16 kasync.c,1.13,1.14 kcmap.c,1.8,1.9 kcurscol.c,1.7,1.8 kdrive.c,1.35,1.36 kdrive.h,1.40,1.41 kinput.c,1.35,1.36 knoop.c,1.4,1.5 koffscreen.c,1.9,1.10 kshadow.c,1.6,1.7 vga.c,1.7,1.8 vga.h,1.5,1.6
- Next message: [xserver-commit] xserver/include cursorstr.h,1.11,1.12 extnsionst.h,3.9,3.10 os.h,3.47,3.48 picture.h,1.20,1.21 window.h,1.5,1.6 windowstr.h,1.8,1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Committed by: keithp
Update of /cvs/xserver/xserver/hw/xnest
In directory pdx:/tmp/cvs-serv23831/hw/xnest
Modified Files:
Color.c Color.h Cursor.c Display.c Display.h Events.c Events.h
Font.c GC.c GCOps.c GCOps.h Handlers.c Handlers.h Init.c
Keyboard.c Keyboard.h Makefile.am Pixmap.c Pointer.c Pointer.h
Screen.c Screen.h Visual.c Visual.h Window.c XNCursor.h
XNFont.h XNGC.h XNPixmap.h XNWindow.h
Log Message:
merge xfixes_2_branch back to HEAD
Index: Color.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/Color.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Color.c 12 Oct 2003 00:21:02 -0000 1.4
+++ Color.c 2 Nov 2003 19:56:10 -0000 1.5
@@ -30,8 +30,7 @@
static ColormapPtr InstalledMaps[MAXSCREENS];
-Bool xnestCreateColormap(pCmap)
- ColormapPtr pCmap;
+Bool xnestCreateColormap(ColormapPtr pCmap)
{
VisualPtr pVisual;
XColor *colors;
@@ -116,8 +115,7 @@
return True;
}
-void xnestDestroyColormap (pCmap)
- ColormapPtr pCmap;
+void xnestDestroyColormap (ColormapPtr pCmap)
{
XFreeColormap(xnestDisplay, xnestColormap(pCmap));
xfree(pCmap->devPriv);
@@ -126,9 +124,8 @@
#define SEARCH_PREDICATE \
(xnestWindow(pWin) != None && wColormap(pWin) == icws->cmapIDs[i])
-static int xnestCountInstalledColormapWindows(pWin, ptr)
- WindowPtr pWin;
- pointer ptr;
+static int
+xnestCountInstalledColormapWindows(WindowPtr pWin, pointer ptr)
{
xnestInstalledColormapWindows *icws = (xnestInstalledColormapWindows *)ptr;
int i;
@@ -142,9 +139,8 @@
return WT_WALKCHILDREN;
}
-static int xnestGetInstalledColormapWindows(pWin, ptr)
- WindowPtr pWin;
- pointer ptr;
+static int
+xnestGetInstalledColormapWindows(WindowPtr pWin, pointer ptr)
{
xnestInstalledColormapWindows *icws = (xnestInstalledColormapWindows *)ptr;
int i;
@@ -161,9 +157,8 @@
static Window *xnestOldInstalledColormapWindows = NULL;
static int xnestNumOldInstalledColormapWindows = 0;
-static Bool xnestSameInstalledColormapWindows(windows, numWindows)
- Window *windows;
- int numWindows;
+static Bool
+xnestSameInstalledColormapWindows(Window *windows, int numWindows)
{
if (xnestNumOldInstalledColormapWindows != numWindows)
return False;
@@ -181,8 +176,7 @@
return True;
}
-void xnestSetInstalledColormapWindows(pScreen)
- ScreenPtr pScreen;
+void xnestSetInstalledColormapWindows(ScreenPtr pScreen)
{
xnestInstalledColormapWindows icws;
int numWindows;
@@ -260,8 +254,7 @@
if (icws.windows) xfree(icws.windows);
}
-void xnestSetScreenSaverColormapWindow(pScreen)
- ScreenPtr pScreen;
+void xnestSetScreenSaverColormapWindow(ScreenPtr pScreen)
{
if (xnestOldInstalledColormapWindows)
xfree(xnestOldInstalledColormapWindows);
@@ -286,8 +279,7 @@
xnestDirectUninstallColormaps(pScreen);
}
-void xnestDirectInstallColormaps(pScreen)
- ScreenPtr pScreen;
+void xnestDirectInstallColormaps(ScreenPtr pScreen)
{
int i, n;
Colormap pCmapIDs[MAXCMAPS];
@@ -305,8 +297,7 @@
}
}
-void xnestDirectUninstallColormaps(pScreen)
- ScreenPtr pScreen;
+void xnestDirectUninstallColormaps(ScreenPtr pScreen)
{
int i, n;
Colormap pCmapIDs[MAXCMAPS];
@@ -324,8 +315,7 @@
}
}
-void xnestInstallColormap(pCmap)
- ColormapPtr pCmap;
+void xnestInstallColormap(ColormapPtr pCmap)
{
int index;
ColormapPtr pOldCmap;
@@ -349,8 +339,7 @@
}
}
-void xnestUninstallColormap(pCmap)
- ColormapPtr pCmap;
+void xnestUninstallColormap(ColormapPtr pCmap)
{
int index;
ColormapPtr pCurCmap;
@@ -371,9 +360,8 @@
static Bool xnestInstalledDefaultColormap = False;
-int xnestListInstalledColormaps(pScreen, pCmapIDs)
- ScreenPtr pScreen;
- Colormap *pCmapIDs;
+int
+xnestListInstalledColormaps(ScreenPtr pScreen, Colormap *pCmapIDs)
{
if (xnestInstalledDefaultColormap) {
*pCmapIDs = InstalledMaps[pScreen->myNum]->mid;
@@ -383,10 +371,7 @@
return 0;
}
-void xnestStoreColors(pCmap, nColors, pColors)
- ColormapPtr pCmap;
- int nColors;
- xColorItem *pColors;
+void xnestStoreColors(ColormapPtr pCmap, int nColors, xColorItem *pColors)
{
if (pCmap->pVisual->class & DynamicClass)
#ifdef _XSERVER64
@@ -411,11 +396,10 @@
#endif
}
-void xnestResolveColor(pRed, pGreen, pBlue, pVisual)
- unsigned short *pRed;
- unsigned short *pGreen;
- unsigned short *pBlue;
- VisualPtr pVisual;
+void xnestResolveColor(unsigned short *pRed,
+ unsigned short *pGreen,
+ unsigned short *pBlue,
+ VisualPtr pVisual)
{
int shift;
unsigned int lim;
@@ -463,8 +447,7 @@
}
}
-Bool xnestCreateDefaultColormap(pScreen)
- ScreenPtr pScreen;
+Bool xnestCreateDefaultColormap(ScreenPtr pScreen)
{
VisualPtr pVisual;
ColormapPtr pCmap;
Index: Color.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/Color.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- Color.h 16 Jan 2001 22:43:43 -0000 1.1.1.2
+++ Color.h 2 Nov 2003 19:56:10 -0000 1.2
@@ -40,17 +40,20 @@
#define xnestPixel(pixel) (pixel)
-Bool xnestCreateColormap();
-void xnestDestroyColormap ();
-void xnestSetInstalledColormapWindows();
-void xnestSetScreenSaverColormapWindow();
-void xnestDirectInstallColormaps();
-void xnestDirectUninstallColormaps();
-void xnestInstallColormap();
-void xnestUninstallColormap();
-int xnestListInstalledColormaps();
-void xnestStoreColors();
-void xnestResolveColor();
-Bool xnestCreateDefaultColormap();
+Bool xnestCreateColormap(ColormapPtr pCmap);
+void xnestDestroyColormap (ColormapPtr pCmap);
+void xnestSetInstalledColormapWindows(ScreenPtr pScreen);
+void xnestSetScreenSaverColormapWindow(ScreenPtr pScreen);
+void xnestDirectInstallColormaps(ScreenPtr pScreen);
+void xnestDirectUninstallColormaps(ScreenPtr pScreen);
+void xnestInstallColormap(ColormapPtr pCmap);
+void xnestUninstallColormap(ColormapPtr pCmap);
+int xnestListInstalledColormaps(ScreenPtr pScreen, Colormap *pCmapIDs);
+void xnestStoreColors(ColormapPtr pCmap, int nColors, xColorItem *pColors);
+void xnestResolveColor(unsigned short *pRed,
+ unsigned short *pGreen,
+ unsigned short *pBlue,
+ VisualPtr pVisual);
+Bool xnestCreateDefaultColormap(ScreenPtr pScreen);
#endif /* XNESTCOLOR_H */
Index: Cursor.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/Cursor.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Cursor.c 12 Oct 2003 00:21:02 -0000 1.4
+++ Cursor.c 2 Nov 2003 19:56:10 -0000 1.5
@@ -31,9 +31,7 @@
#include "Keyboard.h"
#include "Args.h"
-void xnestConstrainCursor(pScreen, pBox)
- ScreenPtr pScreen;
- BoxPtr pBox;
+void xnestConstrainCursor(ScreenPtr pScreen, BoxPtr pBox)
{
#ifdef _XSERVER64
Window64 wroot;
@@ -69,18 +67,15 @@
}
}
-void xnestCursorLimits(pScreen, pCursor, pHotBox, pTopLeftBox)
- ScreenPtr pScreen;
- CursorPtr pCursor;
- BoxPtr pHotBox;
- BoxPtr pTopLeftBox;
+void xnestCursorLimits(ScreenPtr pScreen,
+ CursorPtr pCursor,
+ BoxPtr pHotBox,
+ BoxPtr pTopLeftBox)
{
*pTopLeftBox = *pHotBox;
}
-Bool xnestDisplayCursor(pScreen, pCursor)
- ScreenPtr pScreen;
- CursorPtr pCursor;
+Bool xnestDisplayCursor(ScreenPtr pScreen, CursorPtr pCursor)
{
XDefineCursor(xnestDisplay,
xnestDefaultWindows[pScreen->myNum],
@@ -88,9 +83,7 @@
return True;
}
-Bool xnestRealizeCursor(pScreen, pCursor)
- ScreenPtr pScreen;
- CursorPtr pCursor;
+Bool xnestRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor)
{
XImage *ximage;
Pixmap source, mask;
@@ -169,19 +162,14 @@
return True;
}
-Bool xnestUnrealizeCursor(pScreen, pCursor)
- ScreenPtr pScreen;
- CursorPtr pCursor;
+Bool xnestUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor)
{
XFreeCursor(xnestDisplay, xnestCursor(pCursor, pScreen));
xfree(xnestCursorPriv(pCursor, pScreen));
return True;
}
-void xnestRecolorCursor(pScreen, pCursor, displayed)
- ScreenPtr pScreen;
- CursorPtr pCursor;
- Bool displayed;
+void xnestRecolorCursor(ScreenPtr pScreen, CursorPtr pCursor, Bool displayed)
{
XColor fg_color, bg_color;
@@ -198,10 +186,7 @@
&fg_color, &bg_color);
}
-Bool xnestSetCursorPosition(pScreen, x, y, generateEvent)
- ScreenPtr pScreen;
- int x, y;
- Bool generateEvent;
+Bool xnestSetCursorPosition(ScreenPtr pScreen, int x, int y, Bool generateEvent)
{
int i;
Index: Display.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/Display.c,v
retrieving revision 3.5
retrieving revision 3.6
diff -u -d -r3.5 -r3.6
--- Display.c 12 Oct 2003 00:21:02 -0000 3.5
+++ Display.c 2 Nov 2003 19:56:10 -0000 3.6
@@ -47,15 +47,13 @@
XlibGC xnestBitmapGC;
Window xnestConfineWindow;
unsigned long xnestEventMask;
+extern Window xnestParentWindow;
-void xnestOpenDisplay(argc, argv)
- int argc;
- char *argv[];
+void xnestOpenDisplay(int argc, char *argv[])
{
XVisualInfo vi;
long mask;
int i, j;
- extern Window xnestParentWindow;
if (!xnestDoFullGeneration) return;
Index: Display.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/Display.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Display.h 17 Jan 2001 22:36:55 -0000 1.6
+++ Display.h 2 Nov 2003 19:56:10 -0000 1.7
@@ -41,7 +41,7 @@
extern Window xnestConfineWindow;
extern unsigned long xnestEventMask;
-void xnestOpenDisplay();
-void xnestCloseDisplay();
+void xnestOpenDisplay(int argc, char *argv[]);
+void xnestCloseDisplay(void);
#endif /* XNESTCOMMON_H */
Index: Events.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/Events.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Events.c 12 Oct 2003 00:21:02 -0000 1.3
+++ Events.c 2 Nov 2003 19:56:10 -0000 1.4
@@ -46,28 +46,20 @@
return GetTimeInMillis() - lastEventTime;
}
-void SetTimeSinceLastInputEvent()
-{
- lastEventTime = GetTimeInMillis();
-}
-
-static Bool xnestExposurePredicate(display, event, args)
- Display *display;
- XEvent *event;
- char *args;
+static Bool
+xnestExposurePredicate(Display *display, XEvent *event, char *args)
{
return (event->type == Expose || event->type == ProcessedExpose);
}
-static Bool xnestNotExposurePredicate(display, event, args)
- Display *display;
- XEvent *event;
- char *args;
+static Bool
+xnestNotExposurePredicate(Display *display, XEvent *event, char *args)
{
return !xnestExposurePredicate(display, event, args);
}
-void xnestCollectExposures()
+void
+xnestCollectExposures(void)
{
XEvent X;
WindowPtr pWin;
@@ -90,12 +82,12 @@
}
}
-void xnestCollectEvents()
+void
+xnestCollectEvents(void)
{
XEvent X;
xEvent x;
ScreenPtr pScreen;
- extern Window xnestParentWindow;
while (XCheckIfEvent(xnestDisplay, &X, xnestNotExposurePredicate, NULL)) {
switch (X.type) {
Index: Events.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/Events.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- Events.h 16 Jan 2001 22:43:44 -0000 1.1.1.2
+++ Events.h 2 Nov 2003 19:56:10 -0000 1.2
@@ -22,7 +22,10 @@
extern CARD32 lastEventTime;
-void xnestCollectExposures();
-void xnestCollectEvents();
+void
+xnestCollectExposures(void);
+
+void
+xnestCollectEvents(void);
#endif /* XNESTEVENTS_H */
Index: Font.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/Font.c,v
retrieving revision 3.7
retrieving revision 3.8
diff -u -d -r3.7 -r3.8
--- Font.c 12 Oct 2003 00:21:02 -0000 3.7
+++ Font.c 2 Nov 2003 19:56:10 -0000 3.8
@@ -28,9 +28,7 @@
int xnestFontPrivateIndex;
-Bool xnestRealizeFont(pScreen, pFont)
- ScreenPtr pScreen;
- FontPtr pFont;
+Bool xnestRealizeFont(ScreenPtr pScreen, FontPtr pFont)
{
pointer priv;
Atom name_atom, value_atom;
@@ -73,9 +71,7 @@
}
-Bool xnestUnrealizeFont(pScreen, pFont)
- ScreenPtr pScreen;
- FontPtr pFont;
+Bool xnestUnrealizeFont(ScreenPtr pScreen, FontPtr pFont)
{
if (xnestFontPriv(pFont)) {
if (xnestFontStruct(pFont))
Index: GC.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/GC.c,v
retrieving revision 3.7
retrieving revision 3.8
diff -u -d -r3.7 -r3.8
--- GC.c 12 Oct 2003 00:21:02 -0000 3.7
+++ GC.c 2 Nov 2003 19:56:10 -0000 3.8
@@ -33,70 +33,15 @@
int xnestGCPrivateIndex;
-static GCFuncs xnestFuncs = {
- xnestValidateGC,
- xnestChangeGC,
- xnestCopyGC,
- xnestDestroyGC,
- xnestChangeClip,
- xnestDestroyClip,
- xnestCopyClip,
-};
-
-static GCOps xnestOps = {
- xnestFillSpans,
- xnestSetSpans,
- xnestPutImage,
- xnestCopyArea,
- xnestCopyPlane,
- xnestPolyPoint,
- xnestPolylines,
- xnestPolySegment,
- xnestPolyRectangle,
- xnestPolyArc,
- xnestFillPolygon,
- xnestPolyFillRect,
- xnestPolyFillArc,
- xnestPolyText8,
- xnestPolyText16,
- xnestImageText8,
- xnestImageText16,
- xnestImageGlyphBlt,
- xnestPolyGlyphBlt,
- xnestPushPixels
-};
-
-Bool xnestCreateGC(pGC)
- GCPtr pGC;
-{
- pGC->clientClipType = CT_NONE;
- pGC->clientClip = NULL;
-
- pGC->funcs = &xnestFuncs;
- pGC->ops = &xnestOps;
-
- pGC->miTranslate = 1;
-
- xnestGCPriv(pGC)->gc = XCreateGC(xnestDisplay,
- xnestDefaultDrawables[pGC->depth],
- 0L, NULL);
- xnestGCPriv(pGC)->nClipRects = 0;
-
- return True;
-}
-
-void xnestValidateGC(pGC, changes, pDrawable)
- GCPtr pGC;
- unsigned long changes;
- DrawablePtr pDrawable;
+static void
+xnestValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
{
pGC->lastWinOrg.x = pDrawable->x;
pGC->lastWinOrg.y = pDrawable->y;
}
-void xnestChangeGC(pGC, mask)
- GC *pGC;
- unsigned long mask;
+static void
+xnestChangeGC(GCPtr pGC, unsigned long mask)
{
XGCValues values;
@@ -180,25 +125,35 @@
XChangeGC(xnestDisplay, xnestGC(pGC), mask, &values);
}
-void xnestCopyGC(pGCSrc, mask, pGCDst)
- GCPtr pGCSrc;
- unsigned long mask;
- GCPtr pGCDst;
+static void
+xnestCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst)
{
XCopyGC(xnestDisplay, xnestGC(pGCSrc), mask, xnestGC(pGCDst));
}
-void xnestDestroyGC(pGC)
- GC *pGC;
+static void
+xnestDestroyGC(GCPtr pGC)
{
XFreeGC(xnestDisplay, xnestGC(pGC));
}
-void xnestChangeClip(pGC, type, pValue, nRects)
- GCPtr pGC;
- int type;
- pointer pValue;
- int nRects;
+static void
+xnestDestroyClipHelper(GCPtr pGC)
+{
+ switch (pGC->clientClipType)
+ {
+ default:
+ case CT_NONE:
+ break;
+
+ case CT_REGION:
+ REGION_DESTROY(pGC->pScreen, pGC->clientClip);
+ break;
+ }
+}
+
+static void
+xnestChangeClip(GCPtr pGC, int type, pointer pValue, int nRects)
{
int i, size;
BoxPtr pBox;
@@ -294,8 +249,7 @@
xnestGCPriv(pGC)->nClipRects = nRects;
}
-void xnestDestroyClip(pGC)
- GCPtr pGC;
+static void xnestDestroyClip(GCPtr pGC)
{
xnestDestroyClipHelper(pGC);
@@ -306,24 +260,8 @@
xnestGCPriv(pGC)->nClipRects = 0;
}
-void xnestDestroyClipHelper(pGC)
- GCPtr pGC;
-{
- switch (pGC->clientClipType)
- {
- default:
- case CT_NONE:
- break;
-
- case CT_REGION:
- REGION_DESTROY(pGC->pScreen, pGC->clientClip);
- break;
- }
-}
-
-void xnestCopyClip(pGCDst, pGCSrc)
- GCPtr pGCSrc;
- GCPtr pGCDst;
+static void
+xnestCopyClip(GCPtr pGCDst, GCPtr pGCSrc)
{
RegionPtr pRgn;
@@ -341,3 +279,54 @@
break;
}
}
+
+static GCFuncs xnestFuncs = {
+ xnestValidateGC,
+ xnestChangeGC,
+ xnestCopyGC,
+ xnestDestroyGC,
+ xnestChangeClip,
+ xnestDestroyClip,
+ xnestCopyClip,
+};
+
+static GCOps xnestOps = {
+ xnestFillSpans,
+ xnestSetSpans,
+ xnestPutImage,
+ xnestCopyArea,
+ xnestCopyPlane,
+ xnestPolyPoint,
+ xnestPolylines,
+ xnestPolySegment,
+ xnestPolyRectangle,
+ xnestPolyArc,
+ xnestFillPolygon,
+ xnestPolyFillRect,
+ xnestPolyFillArc,
+ xnestPolyText8,
+ xnestPolyText16,
+ xnestImageText8,
+ xnestImageText16,
+ xnestImageGlyphBlt,
+ xnestPolyGlyphBlt,
+ xnestPushPixels
+};
+
+Bool xnestCreateGC(GCPtr pGC)
+{
+ pGC->clientClipType = CT_NONE;
+ pGC->clientClip = NULL;
+
+ pGC->funcs = &xnestFuncs;
+ pGC->ops = &xnestOps;
+
+ pGC->miTranslate = 1;
+
+ xnestGCPriv(pGC)->gc = XCreateGC(xnestDisplay,
+ xnestDefaultDrawables[pGC->depth],
+ 0L, NULL);
+ xnestGCPriv(pGC)->nClipRects = 0;
+
+ return True;
+}
Index: GCOps.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/GCOps.c,v
retrieving revision 3.6
retrieving revision 3.7
diff -u -d -r3.6 -r3.7
--- GCOps.c 12 Oct 2003 00:21:02 -0000 3.6
+++ GCOps.c 2 Nov 2003 19:56:10 -0000 3.7
@@ -33,45 +33,22 @@
#include "Drawable.h"
#include "Visual.h"
-void xnestFillSpans(pDrawable, pGC, nSpans, pPoints, pWidths, fSorted)
- DrawablePtr pDrawable;
- GCPtr pGC;
- int nSpans;
- xPoint *pPoints;
- int *pWidths;
- int fSorted;
+void xnestFillSpans(DrawablePtr pDrawable, GCPtr pGC, int nSpans, xPoint *pPoints, int *pWidths, int fSorted)
{
ErrorF("xnest warning: function xnestFillSpans not implemented\n");
}
-void xnestSetSpans(pDrawable, pGC, pSrc, pPoints, pWidths, nSpans, fSorted)
- DrawablePtr pDrawable;
- GCPtr pGC;
- unsigned char * 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, pPoints, pWidths, nSpans, pBuffer)
- 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)
{
ErrorF("xnest warning: function xnestGetSpans not implemented\n");
}
-void xnestQueryBestSize(class, pWidth, pHeight, pScreen)
- int class;
- short *pWidth;
- short *pHeight;
- ScreenPtr pScreen;
+void xnestQueryBestSize(int class, unsigned short *pWidth, unsigned short *pHeight, ScreenPtr pScreen)
{
unsigned int width, height;
@@ -86,13 +63,9 @@
*pHeight = height;
}
-void xnestPutImage(pDrawable, pGC, depth, x, y, w, h, leftPad, format, pImage)
- DrawablePtr pDrawable;
- GCPtr pGC;
- int depth, x, y, w, h;
- int leftPad;
- unsigned int format;
- unsigned char *pImage;
+void xnestPutImage(DrawablePtr pDrawable, GCPtr pGC,
+ int depth, int x, int y, int w, int h,
+ int leftPad, int format, char *pImage)
{
XImage *ximage;
@@ -109,12 +82,9 @@
}
}
-void xnestGetImage(pDrawable, x, y, w, h, format, planeMask, pImage)
- DrawablePtr pDrawable;
- int x, y, w, h;
- unsigned int format;
- unsigned long planeMask;
- unsigned char *pImage;
+void xnestGetImage(DrawablePtr pDrawable, int x, int y, int w, int h,
+ unsigned int format, unsigned long planeMask,
+ char *pImage)
{
XImage *ximage;
int length;
@@ -131,16 +101,12 @@
}
}
-static Bool xnestBitBlitPredicate(display, event, args)
- Display *display;
- XEvent *event;
- char *args;
+static Bool xnestBitBlitPredicate(Display *display, XEvent *event, char *args)
{
return (event->type == GraphicsExpose || event->type == NoExpose);
}
-RegionPtr xnestBitBlitHelper(pGC)
- GC *pGC;
+static RegionPtr xnestBitBlitHelper(GCPtr pGC)
{
if (!pGC->graphicsExposures)
return NullRegion;
@@ -181,14 +147,9 @@
}
}
-RegionPtr xnestCopyArea(pSrcDrawable, pDstDrawable,
- pGC, srcx, srcy, width, height, dstx, dsty)
- DrawablePtr pSrcDrawable;
- DrawablePtr pDstDrawable;
- GC *pGC;
- int srcx, srcy;
- int width, height;
- int dstx, dsty;
+RegionPtr xnestCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
+ GCPtr pGC, int srcx, int srcy, int width, int height,
+ int dstx, int dsty)
{
XCopyArea(xnestDisplay,
xnestDrawable(pSrcDrawable), xnestDrawable(pDstDrawable),
@@ -197,15 +158,9 @@
return xnestBitBlitHelper(pGC);
}
-RegionPtr xnestCopyPlane(pSrcDrawable, pDstDrawable,
- pGC, srcx, srcy, width, height, dstx, dsty, plane)
- DrawablePtr pSrcDrawable;
- DrawablePtr pDstDrawable;
- GC *pGC;
- int srcx, srcy;
- int width, height;
- int dstx, dsty;
- unsigned long plane;
+RegionPtr xnestCopyPlane(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
+ GCPtr pGC,int srcx, int srcy, int width, int height,
+ int dstx, int dsty, unsigned long plane)
{
XCopyPlane(xnestDisplay,
xnestDrawable(pSrcDrawable), xnestDrawable(pDstDrawable),
@@ -214,96 +169,61 @@
return xnestBitBlitHelper(pGC);
}
-void xnestPolyPoint(pDrawable, pGC, mode, nPoints, pPoints)
- DrawablePtr pDrawable;
- GCPtr pGC;
- int mode;
- int nPoints;
- XPoint *pPoints;
+void xnestPolyPoint(DrawablePtr pDrawable, GCPtr pGC, int mode, int nPoints, xPoint *pPoints)
{
XDrawPoints(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC),
- pPoints, nPoints, mode);
+ (XPoint *) pPoints, nPoints, mode);
}
-void xnestPolylines(pDrawable, pGC, mode, nPoints, pPoints)
- DrawablePtr pDrawable;
- GCPtr pGC;
- int mode;
- int nPoints;
- XPoint *pPoints;
+void xnestPolylines(DrawablePtr pDrawable, GCPtr pGC, int mode,
+ int nPoints, xPoint *pPoints)
{
XDrawLines(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC),
- pPoints, nPoints, mode);
+ (XPoint *) pPoints, nPoints, mode);
}
-void xnestPolySegment(pDrawable, pGC, nSegments, pSegments)
- DrawablePtr pDrawable;
- GCPtr pGC;
- int nSegments;
- XSegment *pSegments;
+void xnestPolySegment(DrawablePtr pDrawable, GCPtr pGC, int nSegments,
+ xSegment *pSegments)
{
XDrawSegments(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC),
- pSegments, nSegments);
+ (XSegment *) pSegments, nSegments);
}
-void xnestPolyRectangle(pDrawable, pGC, nRectangles, pRectangles)
- DrawablePtr pDrawable;
- GCPtr pGC;
- int nRectangles;
- XRectangle *pRectangles;
+void xnestPolyRectangle(DrawablePtr pDrawable, GCPtr pGC,
+ int nRectangles, xRectangle *pRectangles)
{
XDrawRectangles(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC),
- pRectangles, nRectangles);
+ (XRectangle *) pRectangles, nRectangles);
}
-void xnestPolyArc(pDrawable, pGC, nArcs, pArcs)
- DrawablePtr pDrawable;
- GCPtr pGC;
- int nArcs;
- XArc *pArcs;
+void xnestPolyArc(DrawablePtr pDrawable, GCPtr pGC, int nArcs, xArc *pArcs)
{
XDrawArcs(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC),
- pArcs, nArcs);
+ (XArc *) pArcs, nArcs);
}
-void xnestFillPolygon(pDrawable, pGC, shape, mode, nPoints, pPoints)
- DrawablePtr pDrawable;
- GCPtr pGC;
- int shape;
- int mode;
- int nPoints;
- XPoint *pPoints;
+void xnestFillPolygon(DrawablePtr pDrawable, GCPtr pGC,
+ int shape, int mode, int nPoints, xPoint *pPoints)
{
XFillPolygon(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC),
- pPoints, nPoints, shape, mode);
+ (XPoint *) pPoints, nPoints, shape, mode);
}
-void xnestPolyFillRect(pDrawable, pGC, nRectangles, pRectangles)
- DrawablePtr pDrawable;
- GCPtr pGC;
- int nRectangles;
- XRectangle *pRectangles;
+void xnestPolyFillRect(DrawablePtr pDrawable, GCPtr pGC,
+ int nRectangles, xRectangle *pRectangles)
{
XFillRectangles(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC),
- pRectangles, nRectangles);
+ (XRectangle *) pRectangles, nRectangles);
}
-void xnestPolyFillArc(pDrawable, pGC, nArcs, pArcs)
- DrawablePtr pDrawable;
- GCPtr pGC;
- int nArcs;
- XArc *pArcs;
+void xnestPolyFillArc(DrawablePtr pDrawable, GCPtr pGC, int nArcs, xArc *pArcs)
{
XFillArcs(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC),
- pArcs, nArcs);
+ (XArc *) pArcs, nArcs);
}
-int xnestPolyText8(pDrawable, pGC, x, y, count, string)
- DrawablePtr pDrawable;
- GCPtr pGC;
- int x, y;
- int count;
- char *string;
+int xnestPolyText8(DrawablePtr pDrawable, GCPtr pGC,
+ int x, int y, int count, char *string)
{
int width;
@@ -315,73 +235,49 @@
return width + x;
}
-int xnestPolyText16(pDrawable, pGC, x, y, count, string)
- DrawablePtr pDrawable;
- GCPtr pGC;
- int x, y;
- int count;
- XChar2b *string;
+int xnestPolyText16(DrawablePtr pDrawable, GCPtr pGC,
+ int x, int y, int count, unsigned short *string)
{
int width;
XDrawString16(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC),
- x, y, string, count);
+ x, y, (XChar2b *) string, count);
- width = XTextWidth16(xnestFontStruct(pGC->font), string, count);
+ width = XTextWidth16(xnestFontStruct(pGC->font), (XChar2b *) string, count);
return width + x;
}
-void xnestImageText8(pDrawable, pGC, x, y, count, string)
- DrawablePtr pDrawable;
- GCPtr pGC;
- int x, y;
- int count;
- char *string;
+void xnestImageText8(DrawablePtr pDrawable, GCPtr pGC,
+ int x, int y, int count, char *string)
{
XDrawImageString(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC),
x, y, string, count);
}
-void xnestImageText16(pDrawable, pGC, x, y, count, string)
- DrawablePtr pDrawable;
- GCPtr pGC;
- int x, y;
- int count;
- XChar2b *string;
+void xnestImageText16(DrawablePtr pDrawable, GCPtr pGC,
+ int x, int y, int count, unsigned short *string)
{
XDrawImageString16(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC),
- x, y, string, count);
+ x, y, (XChar2b *) string, count);
}
-void xnestImageGlyphBlt(pDrawable, pGC, x, y, nGlyphs, pCharInfo, pGlyphBase)
- DrawablePtr pDrawable;
- GC pGC;
- int x, y;
- int nGlyphs;
- CharInfoPtr pCharInfo;
- char pGlyphBase;
+void xnestImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
+ int x, int y, unsigned int nGlyphs, CharInfoPtr *pCharInfo,
+ pointer pGlyphBase)
{
ErrorF("xnest warning: function xnestImageGlyphBlt not implemented\n");
}
-void xnestPolyGlyphBlt(pDrawable, pGC, x, y, nGlyphs, pCharInfo, pGlyphBase)
- DrawablePtr pDrawable;
- GC pGC;
- int x, y;
- int nGlyphs;
- CharInfoPtr pCharInfo;
- char pGlyphBase;
+void xnestPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
+ int x, int y, unsigned int nGlyphs, CharInfoPtr *pCharInfo,
+ pointer pGlyphBase)
{
ErrorF("xnest warning: function xnestPolyGlyphBlt not implemented\n");
}
-void xnestPushPixels(pDrawable, pGC, pBitmap, width, height, x, y)
- DrawablePtr pDrawable;
- GC pGC;
- PixmapPtr pBitmap;
- int width, height;
- int x, y;
+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
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- GCOps.h 16 Jan 2001 22:43:46 -0000 1.1.1.2
+++ GCOps.h 2 Nov 2003 19:56:10 -0000 1.2
@@ -16,28 +16,73 @@
#ifndef XNESTGCOPS_H
#define XNESTGCOPS_H
-void xnestFillSpans();
-void xnestSetSpans();
-void xnestGetSpans();
-void xnestPutImage();
-void xnestGetImage();
-RegionPtr xnestCopyArea();
-RegionPtr xnestCopyPlane();
-void xnestQueryBestSize();
-void xnestPolyPoint();
-void xnestPolylines();
-void xnestPolySegment();
-void xnestPolyRectangle();
-void xnestPolyArc();
-void xnestFillPolygon();
-void xnestPolyFillRect();
-void xnestPolyFillArc();
-int xnestPolyText8();
-int xnestPolyText16();
-void xnestImageText8();
-void xnestImageText16();
-void xnestImageGlyphBlt();
-void xnestPolyGlyphBlt();
-void xnestPushPixels();
+void xnestFillSpans(DrawablePtr pDrawable, GCPtr pGC, int nSpans, xPoint *pPoints, int *pWidths, int fSorted);
+
+void xnestSetSpans(DrawablePtr pDrawable, GCPtr pGC, char *pSrc, xPoint *pPoints, int *pWidths, int nSpans, int fSorted);
+
+void xnestGetSpans(DrawablePtr pDrawable, int maxWidth, DDXPointPtr pPoints,
+ int *pWidths, int nSpans, char *pBuffer);
+
+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, int format, char *pImage);
+void xnestGetImage(DrawablePtr pDrawable, int x, int y, int w, int h,
+ unsigned int format, unsigned long planeMask,
+ char *pImage);
+
+
+RegionPtr xnestCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDdstDrawable,
+ GCPtr pGC, int srcx, int srcy, int width, int height,
+ int dstx, int dsty);
+
+RegionPtr xnestCopyPlane(DrawablePtr pSrcDrawable, DrawablePtr pDdstDrawable,
+ GCPtr pGC,int srcx, int srcy, int width, int height,
+ int dstx, int dsty, unsigned long plane);
+
+void xnestPolyPoint(DrawablePtr pDrawable, GCPtr pGC, int mode, int nPoints, xPoint *pPoints);
+
+void xnestPolylines(DrawablePtr pDrawable, GCPtr pGC, int mode,
+ int nPoints, xPoint *pPoints);
+
+void xnestPolySegment(DrawablePtr pDrawable, GCPtr pGC, int nSegments,
+ xSegment *pSegments);
+
+void xnestPolyRectangle(DrawablePtr pDrawable, GCPtr pGC,
+ int nRectangles, xRectangle *pRectangles);
+
+void xnestPolyArc(DrawablePtr pDrawable, GCPtr pGC, int nArcs, xArc *pArcs);
+
+void xnestFillPolygon(DrawablePtr pDrawable, GCPtr pGC,
+ int shape, int mode, int nPoints, xPoint *pPoints);
+
+void xnestPolyFillRect(DrawablePtr pDrawable, GCPtr pGC,
+ int nRectangles, xRectangle *pRectangles);
+
+void xnestPolyFillArc(DrawablePtr pDrawable, GCPtr pGC, int nArcs, xArc *pArcs);
+
+int xnestPolyText8(DrawablePtr pDrawable, GCPtr pGC,
+ int x, int y, int count, char *string);
+
+int xnestPolyText16(DrawablePtr pDrawable, GCPtr pGC,
+ 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, unsigned short *string);
+
+void xnestImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
+ int x, int y, unsigned int nGlyphs, CharInfoPtr *pCharInfo,
+ pointer pGlyphBase);
+
+void xnestPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
+ int x, int y, unsigned int nGlyphs, CharInfoPtr *pCharInfo,
+ pointer pGlyphBase);
+
+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.4
diff -u -d -r1.3 -r1.4
--- Handlers.c 12 Oct 2003 00:21:02 -0000 1.3
+++ Handlers.c 2 Nov 2003 19:56:10 -0000 1.4
@@ -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.2
diff -u -d -r1.1.1.2 -r1.2
--- Handlers.h 16 Jan 2001 22:43:46 -0000 1.1.1.2
+++ Handlers.h 2 Nov 2003 19:56:10 -0000 1.2
@@ -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.26
diff -u -d -r3.25 -r3.26
--- Init.c 12 Oct 2003 00:21:02 -0000 3.25
+++ Init.c 2 Nov 2003 19:56:10 -0000 3.26
@@ -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.11
diff -u -d -r1.10 -r1.11
--- Keyboard.c 12 Oct 2003 00:21:02 -0000 1.10
+++ Keyboard.c 2 Nov 2003 19:56:10 -0000 1.11
@@ -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
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- Keyboard.h 16 Jan 2001 22:43:48 -0000 1.1.1.2
+++ Keyboard.h 2 Nov 2003 19:56:10 -0000 1.2
@@ -19,8 +19,6 @@
#define XNEST_KEYBOARD_EVENT_MASK \
(KeyPressMask | KeyReleaseMask | FocusChangeMask | KeymapStateMask)
-void xnestBell();
-void xnestChangeKeyboardControl();
-int xnestKeyboardProc();
-
+int xnestKeyboardProc(DeviceIntPtr pDev, int onoff);
+
#endif /* XNESTKEYBOARD_H */
Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/Makefile.am,v
retrieving revision 3.4
retrieving revision 3.5
diff -u -d -r3.4 -r3.5
--- Makefile.am 15 Oct 2003 04:59:45 -0000 3.4
+++ Makefile.am 2 Nov 2003 19:56:10 -0000 3.5
@@ -1,12 +1,7 @@
INCLUDES = \
- -I$(top_srcdir)/fb \
- -I$(top_srcdir)/include \
- -I$(top_srcdir)/mi \
- -I$(top_srcdir)/miext/shadow \
- -I$(top_srcdir)/randr \
- -I$(top_srcdir)/render \
- $(XSERVER_CFLAGS) \
- $(XNESTSERVER_CFLAGS)
+ @XNEST_INCS@ \
+ @XNESTSERVER_CFLAGS@ \
+ @XSERVER_CFLAGS@
bin_PROGRAMS = Xnest
@@ -34,20 +29,10 @@
Xnest_LDADD = \
libxnest.a \
- $(top_builddir)/dix/libdix.a \
- $(top_builddir)/os/libos.a \
- $(top_builddir)/miext/layer/liblayer.a \
- $(top_builddir)/hw/kdrive/src/libkdrive.a \
- $(top_builddir)/hw/kdrive/linux/liblinux.a \
- $(top_builddir)/miext/shadow/libshadow.a \
- $(top_builddir)/randr/librandr.a \
- $(top_builddir)/render/librender.a \
- $(top_builddir)/fb/libfb.a \
- $(top_builddir)/mi/libmi.a \
- $(top_builddir)/Xext/libXext.a \
- $(top_builddir)/randr/librandr.a \
- $(top_builddir)/render/librender.a \
- $(top_builddir)/xfixes/libxfixes.a \
- $(top_builddir)/dix/libxpstubs.a \
- $(XSERVER_LIBS) \
- -lm -lz $(XNESTSERVER_LIBS)
+ @XNEST_LIBS@ \
+ @XNESTSERVER_LIBS@ \
+ @XSERVER_LIBS@
+
+Xnest_DEPENDENCIES = \
+ libxnest.a \
+ @XNEST_LIBS@
Index: Pixmap.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/Pixmap.c,v
retrieving revision 3.8
retrieving revision 3.9
diff -u -d -r3.8 -r3.9
--- Pixmap.c 12 Oct 2003 00:21:02 -0000 3.8
+++ Pixmap.c 2 Nov 2003 19:56:10 -0000 3.9
@@ -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.3
diff -u -d -r1.2 -r1.3
--- Pointer.c 12 Oct 2003 00:21:02 -0000 1.2
+++ Pointer.c 2 Nov 2003 19:56:10 -0000 1.3
@@ -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.2
diff -u -d -r1.1.1.2 -r1.2
--- Pointer.h 16 Jan 2001 22:43:49 -0000 1.1.1.2
+++ Pointer.h 2 Nov 2003 19:56:10 -0000 1.2
@@ -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
retrieving revision 3.13
diff -u -d -r3.12 -r3.13
--- Screen.c 12 Oct 2003 00:21:02 -0000 3.12
+++ Screen.c 2 Nov 2003 19:56:10 -0000 3.13
@@ -46,8 +46,7 @@
int xnestScreenGeneration = -1;
#endif
-ScreenPtr xnestScreen(window)
- Window window;
+ScreenPtr xnestScreen(Window window)
{
int i;
@@ -58,8 +57,7 @@
return NULL;
}
-static int offset(mask)
- unsigned long mask;
+static int offset(unsigned long mask)
{
int count;
@@ -69,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;
@@ -103,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)
{
}
@@ -124,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;
@@ -320,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))
@@ -395,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
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- Screen.h 16 Jan 2001 22:43:51 -0000 1.1.1.2
+++ Screen.h 2 Nov 2003 19:56:10 -0000 1.2
@@ -19,8 +19,8 @@
extern Window xnestDefaultWindows[MAXSCREENS];
extern Window xnestScreenSaverWindows[MAXSCREENS];
-ScreenPtr xnestScreen();
-Bool xnestOpenScreen();
-Bool xnestCloseScreen();
+ScreenPtr xnestScreen(Window window);
+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
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Visual.c 12 Oct 2003 00:21:02 -0000 1.2
+++ Visual.c 2 Nov 2003 19:56:10 -0000 1.3
@@ -21,8 +21,7 @@
#include "Display.h"
#include "Visual.h"
-Visual *xnestVisual(pVisual)
- VisualPtr pVisual;
+Visual *xnestVisual(VisualPtr pVisual)
{
int i;
@@ -39,9 +38,7 @@
return NULL;
}
-Visual *xnestVisualFromID(pScreen, visual)
- ScreenPtr pScreen;
- VisualID visual;
+Visual *xnestVisualFromID(ScreenPtr pScreen, VisualID visual)
{
int i;
@@ -52,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
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- Visual.h 16 Jan 2001 22:43:52 -0000 1.1.1.2
+++ Visual.h 2 Nov 2003 19:56:10 -0000 1.2
@@ -16,9 +16,9 @@
#ifndef XNESTVISUAL_H
#define XNESTVISUAL_H
-Visual *xnestVisual();
-Visual *xnestVisualFromID();
-Colormap xnestDefaultVisualColormap();
+Visual *xnestVisual(VisualPtr pVisual);
+Visual *xnestVisualFromID(ScreenPtr pScreen, VisualID visual);
+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
retrieving revision 3.9
diff -u -d -r3.8 -r3.9
--- Window.c 12 Oct 2003 00:21:02 -0000 3.8
+++ Window.c 2 Nov 2003 19:56:10 -0000 3.9
@@ -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)) {
@@ -50,8 +48,7 @@
return WT_WALKCHILDREN;
}
-WindowPtr xnestWindowPtr(window)
- Window window;
+WindowPtr xnestWindowPtr(Window window)
{
xnestWindowMatch wm;
int i;
@@ -67,8 +64,7 @@
return wm.pWin;
}
-Bool xnestCreateWindow(pWin)
- WindowPtr pWin;
+Bool xnestCreateWindow(WindowPtr pWin)
{
unsigned long mask;
XSetWindowAttributes attributes;
@@ -141,8 +137,7 @@
return True;
}
-Bool xnestDestroyWindow(pWin)
- WindowPtr pWin;
+Bool xnestDestroyWindow(WindowPtr pWin)
{
if (pWin->nextSib)
xnestWindowPriv(pWin->nextSib)->sibling_above =
@@ -162,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 |
@@ -175,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;
@@ -265,9 +256,7 @@
}
}
-Bool xnestChangeWindowAttributes(pWin, mask)
- WindowPtr pWin;
- unsigned long mask;
+Bool xnestChangeWindowAttributes(WindowPtr pWin, unsigned long mask)
{
XSetWindowAttributes attributes;
@@ -358,8 +347,7 @@
return True;
}
-Bool xnestRealizeWindow(pWin)
- WindowPtr pWin;
+Bool xnestRealizeWindow(WindowPtr pWin)
{
xnestConfigureWindow(pWin, CWStackingOrder);
#ifdef SHAPE
@@ -370,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;
@@ -398,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
@@ -423,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;
@@ -461,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;
@@ -486,8 +456,7 @@
return True;
}
-void xnestShapeWindow(pWin)
- WindowPtr pWin;
+void xnestShapeWindow(WindowPtr pWin)
{
Region reg;
BoxPtr pBox;
Index: XNCursor.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/XNCursor.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- XNCursor.h 23 Nov 2002 19:27:50 -0000 1.2
+++ XNCursor.h 2 Nov 2003 19:56:10 -0000 1.3
@@ -27,12 +27,22 @@
#define xnestCursor(pCursor, pScreen) \
(xnestCursorPriv(pCursor, pScreen)->cursor)
-void xnestConstrainCursor();
-void xnestCursorLimits();
-Bool xnestDisplayCursor();
-Bool xnestRealizeCursor();
-Bool xnestUnrealizeCursor();
-void xnestRecolorCursor();
-Bool xnestSetCursorPosition();
+void xnestConstrainCursor(ScreenPtr pScreen, BoxPtr pBox);
+
+void xnestCursorLimits(ScreenPtr pScreen,
+ CursorPtr pCursor,
+ BoxPtr pHotBox,
+ BoxPtr pTopLeftBox);
+
+Bool xnestDisplayCursor(ScreenPtr pScreen, CursorPtr pCursor);
+
+Bool xnestRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor);
+
+Bool xnestUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor);
+
+void xnestRecolorCursor(ScreenPtr pScreen, CursorPtr pCursor, Bool displayed);
+
+Bool xnestSetCursorPosition(ScreenPtr pScreen, int x, int y, Bool generateEvent);
+
#endif /* XNESTCURSOR_H */
Index: XNFont.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/XNFont.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- XNFont.h 16 Jan 2001 22:43:54 -0000 1.1.1.2
+++ XNFont.h 2 Nov 2003 19:56:10 -0000 1.2
@@ -30,7 +30,7 @@
#define xnestFont(pFont) (xnestFontStruct(pFont)->fid)
-Bool xnestRealizeFont();
-Bool xnestUnrealizeFont();
+Bool xnestRealizeFont(ScreenPtr pScreen, FontPtr pFont);
+Bool xnestUnrealizeFont(ScreenPtr pScreen, FontPtr pFont);
#endif /* XNESTFONT_H */
Index: XNGC.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/XNGC.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- XNGC.h 16 Jan 2001 22:43:54 -0000 1.1.1.2
+++ XNGC.h 2 Nov 2003 19:56:10 -0000 1.2
@@ -30,14 +30,6 @@
#define xnestGC(pGC) (xnestGCPriv(pGC)->gc)
-Bool xnestCreateGC();
-void xnestValidateGC();
-void xnestChangeGC();
-void xnestCopyGC();
-void xnestDestroyGC();
-void xnestChangeClip();
-void xnestDestroyClip();
-void xnestDestroyClipHelper();
-void xnestCopyClip();
+Bool xnestCreateGC(GCPtr pGC);
#endif /* XNESTGC_H */
Index: XNPixmap.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/XNPixmap.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- XNPixmap.h 12 Oct 2003 00:21:02 -0000 1.4
+++ XNPixmap.h 2 Nov 2003 19:56:10 -0000 1.5
@@ -37,8 +37,10 @@
#define xnestSharePixmap(pPixmap) ((pPixmap)->refcnt++)
-PixmapPtr xnestCreatePixmap();
-Bool xnestDestroyPixmap();
-RegionPtr xnestPixmapToRegion();
+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
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- XNWindow.h 13 Sep 2003 21:33:10 -0000 1.2
+++ XNWindow.h 2 Nov 2003 19:56:10 -0000 1.3
@@ -57,21 +57,23 @@
#define CWParent CWSibling
#define CWStackingOrder CWStackMode
-WindowPtr xnestWindowPtr();
-Bool xnestCreateWindow();
-Bool xnestDestroyWindow();
-Bool xnestPositionWindow();
-void xnestConfigureWindow();
-Bool xnestChangeWindowAttributes();
-Bool xnestRealizeWindow();
-Bool xnestUnrealizeWindow();
-void xnestPaintWindowBackground();
-void xnestPaintWindowBorder();
-void xnestCopyWindow();
-void xnestClipNotify();
-void xnestWindowExposures();
+extern Window xnestParentWindow;
+
+WindowPtr xnestWindowPtr(Window window);
+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 xnestShapeWindow(WindowPtr pWin);
#endif /* SHAPE */
#endif /* XNESTWINDOW_H */
- Previous message: [xserver-commit] xserver/hw/kdrive/src Makefile.am,1.5,1.6 kaa.c,1.15,1.16 kasync.c,1.13,1.14 kcmap.c,1.8,1.9 kcurscol.c,1.7,1.8 kdrive.c,1.35,1.36 kdrive.h,1.40,1.41 kinput.c,1.35,1.36 knoop.c,1.4,1.5 koffscreen.c,1.9,1.10 kshadow.c,1.6,1.7 vga.c,1.7,1.8 vga.h,1.5,1.6
- Next message: [xserver-commit] xserver/include cursorstr.h,1.11,1.12 extnsionst.h,3.9,3.10 os.h,3.47,3.48 picture.h,1.20,1.21 window.h,1.5,1.6 windowstr.h,1.8,1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]