andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

miext/rootless: Silence some warnings by using proper C prototypes.

Browse Source 
(cherry picked from commit 050e46e09e)
This commit is contained in:
Jeremy Huddleston 2008-10-23 16:33:11 -07:00
parent b397cc7277
commit b7cc6ca22a
2 changed files with 65 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
miext/rootless/rootlessGC.c
View File

@ -61,6 +61,8 @@ static void RootlessChangeClip(GCPtr pGC, int type, pointer pvalue,
static void RootlessDestroyClip(GCPtr pGC); static void RootlessDestroyClip(GCPtr pGC);
static void RootlessCopyClip(GCPtr pgcDst, GCPtr pgcSrc); static void RootlessCopyClip(GCPtr pgcDst, GCPtr pgcSrc);
Bool RootlessCreateGC(GCPtr pGC);
GCFuncs rootlessGCFuncs = { GCFuncs rootlessGCFuncs = {
RootlessValidateGC, RootlessValidateGC,
RootlessChangeGC, RootlessChangeGC,
@ -72,26 +74,55 @@ GCFuncs rootlessGCFuncs = {
}; };
// GC operations // GC operations
static void RootlessFillSpans(); static void RootlessFillSpans(DrawablePtr dst, GCPtr pGC, int nInit,
static void RootlessSetSpans(); DDXPointPtr pptInit, int *pwidthInit,
static void RootlessPutImage(); int sorted);
static RegionPtr RootlessCopyArea(); static void RootlessSetSpans(DrawablePtr dst, GCPtr pGC, char *pSrc,
static RegionPtr RootlessCopyPlane(); DDXPointPtr pptInit, int *pwidthInit,
static void RootlessPolyPoint(); int nspans, int sorted);
static void RootlessPolylines(); static void RootlessPutImage(DrawablePtr dst, GCPtr pGC,
static void RootlessPolySegment(); int depth, int x, int y, int w, int h,
static void RootlessPolyRectangle(); int leftPad, int format, char *pBits);
static void RootlessPolyArc(); static RegionPtr RootlessCopyArea(DrawablePtr pSrc, DrawablePtr dst, GCPtr pGC,
static void RootlessFillPolygon(); int srcx, int srcy, int w, int h,
static void RootlessPolyFillRect(); int dstx, int dsty);
static void RootlessPolyFillArc(); static RegionPtr RootlessCopyPlane(DrawablePtr pSrc, DrawablePtr dst,
static int RootlessPolyText8(); GCPtr pGC, int srcx, int srcy,
static int RootlessPolyText16(); int w, int h, int dstx, int dsty,
static void RootlessImageText8(); unsigned long plane);
static void RootlessImageText16(); static void RootlessPolyPoint(DrawablePtr dst, GCPtr pGC,
static void RootlessImageGlyphBlt(); int mode, int npt, DDXPointPtr pptInit);
static void RootlessPolyGlyphBlt(); static void RootlessPolylines(DrawablePtr dst, GCPtr pGC,
static void RootlessPushPixels(); int mode, int npt, DDXPointPtr pptInit);
static void RootlessPolySegment(DrawablePtr dst, GCPtr pGC,
int nseg, xSegment *pSeg);
static void RootlessPolyRectangle(DrawablePtr dst, GCPtr pGC,
int nRects, xRectangle *pRects);
static void RootlessPolyArc(DrawablePtr dst, GCPtr pGC, int narcs, xArc *parcs);
static void RootlessFillPolygon(DrawablePtr dst, GCPtr pGC,
int shape, int mode, int count,
DDXPointPtr pptInit);
static void RootlessPolyFillRect(DrawablePtr dst, GCPtr pGC,
int nRectsInit, xRectangle *pRectsInit);
static void RootlessPolyFillArc(DrawablePtr dst, GCPtr pGC,
int narcsInit, xArc *parcsInit);
static int RootlessPolyText8(DrawablePtr dst, GCPtr pGC,
int x, int y, int count, char *chars);
static int RootlessPolyText16(DrawablePtr dst, GCPtr pGC,
int x, int y, int count, unsigned short *chars);
static void RootlessImageText8(DrawablePtr dst, GCPtr pGC,
int x, int y, int count, char *chars);
static void RootlessImageText16(DrawablePtr dst, GCPtr pGC,
int x, int y, int count, unsigned short *chars);
static void RootlessImageGlyphBlt(DrawablePtr dst, GCPtr pGC,
int x, int y, unsigned int nglyphInit,
CharInfoPtr *ppciInit, pointer unused);
static void RootlessPolyGlyphBlt(DrawablePtr dst, GCPtr pGC,
int x, int y, unsigned int nglyph,
CharInfoPtr *ppci, pointer pglyphBase);
static void RootlessPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr dst,
int dx, int dy, int xOrg, int yOrg);
static GCOps rootlessGCOps = { static GCOps rootlessGCOps = {
RootlessFillSpans, RootlessFillSpans,

32
miext/rootless/rootlessValTree.c
View File

@ -104,15 +104,17 @@ Equipment Corporation.
#include "globals.h" #include "globals.h"
int RootlessShapedWindowIn (ScreenPtr pScreen, RegionPtr universe,
RegionPtr bounding, BoxPtr rect, int x, int y);
int RootlessMiValidateTree (WindowPtr pRoot, WindowPtr pChild, VTKind kind);
/* /*
* Compute the visibility of a shaped window * Compute the visibility of a shaped window
*/ */
int int
RootlessShapedWindowIn (pScreen, universe, bounding, rect, x, y) RootlessShapedWindowIn (ScreenPtr pScreen, RegionPtr universe,
ScreenPtr pScreen; RegionPtr bounding, BoxPtr rect, int x, int y)
RegionPtr universe, bounding;
BoxPtr rect;
register int x, y;
{ {
BoxRec box; BoxRec box;
register BoxPtr boundBox; register BoxPtr boundBox;
@ -189,12 +191,8 @@ RootlessShapedWindowIn (pScreen, universe, bounding, rect, x, y)
*----------------------------------------------------------------------- *-----------------------------------------------------------------------
*/ */
static void static void
RootlessComputeClips (pParent, pScreen, universe, kind, exposed) RootlessComputeClips (WindowPtr pParent, ScreenPtr pScreen,
register WindowPtr pParent; RegionPtr universe, VTKind kind, RegionPtr exposed)
register ScreenPtr pScreen;
register RegionPtr universe;
VTKind kind;
RegionPtr exposed; /* for intermediate calculations */
{ {
int dx, int dx,
dy; dy;
@ -510,8 +508,7 @@ RootlessComputeClips (pParent, pScreen, universe, kind, exposed)
} }
static void static void
RootlessTreeObscured(pParent) RootlessTreeObscured(WindowPtr pParent)
register WindowPtr pParent;
{ {
register WindowPtr pChild; register WindowPtr pChild;
register int oldVis; register int oldVis;
@ -577,11 +574,10 @@ RootlessTreeObscured(pParent)
// fixme this is ugly // fixme this is ugly
// Xprint/ValTree.c doesn't work, but maybe that method can? // Xprint/ValTree.c doesn't work, but maybe that method can?
int int
RootlessMiValidateTree (pRoot, pChild, kind) RootlessMiValidateTree (WindowPtr pRoot, /* Parent to validate */
WindowPtr pRoot; /* Parent to validate */ WindowPtr pChild, /* First child of pRoot that was
WindowPtr pChild; /* First child of pRoot that was * affected */
* affected */ VTKind kind /* What kind of configuration caused call */)
VTKind kind; /* What kind of configuration caused call */
{ {
RegionRec childClip; /* The new borderClip for the current RegionRec childClip; /* The new borderClip for the current
* child */ * child */