hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-09-26 21:12:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into mpx

Browse source 
Conflicts:

	Xi/closedev.c
	Xi/exevents.c
	Xi/extinit.c
	Xi/listdev.c
	dix/window.c
	hw/xfree86/common/xf86Xinput.c
	include/extinit.h
	mi/mipointer.c
This commit is contained in:
Peter Hutterer 2007-04-02 15:36:26 +09:30
commit e8777a91f3
280 changed files with 4649 additions and 5825 deletions
Download patch file Download diff file Expand all files Collapse all files

54
mi/mi.h
View file

@ -85,18 +85,6 @@ extern RegionPtr miCopyArea(
int /*yOut*/
);
extern void miOpqStipDrawable(
DrawablePtr /*pDraw*/,
GCPtr /*pGC*/,
RegionPtr /*prgnSrc*/,
MiBits * /*pbits*/,
int /*srcx*/,
int /*w*/,
int /*h*/,
int /*dstx*/,
int /*dsty*/
);
extern RegionPtr miCopyPlane(
DrawablePtr /*pSrcDrawable*/,
DrawablePtr /*pDstDrawable*/,
@ -145,15 +133,6 @@ extern void miRecolorCursor(
/* midash.c */
extern miDashPtr miDashLine(
int /*npt*/,
DDXPointPtr /*ppt*/,
unsigned int /*nDash*/,
unsigned char * /*pDash*/,
unsigned int /*offset*/,
int * /*pnseg*/
);
extern void miStepDash(
int /*dist*/,
int * /*pDashIndex*/,
@ -187,6 +166,9 @@ extern void mieqProcessInputEvents(
void
);
typedef void (*mieqHandler)(int, xEventPtr, DeviceIntPtr, int);
void mieqSetHandler(int event, mieqHandler handler);
/* miexpose.c */
extern RegionPtr miHandleExposures(
@ -324,16 +306,6 @@ extern void miPolySegment(
/* mipolytext.c */
extern int miPolyText(
DrawablePtr /*pDraw*/,
GCPtr /*pGC*/,
int /*x*/,
int /*y*/,
int /*count*/,
char * /*chars*/,
FontEncoding /*fontEncoding*/
);
extern int miPolyText8(
DrawablePtr /*pDraw*/,
GCPtr /*pGC*/,
@ -352,16 +324,6 @@ extern int miPolyText16(
unsigned short * /*chars*/
);
extern int miImageText(
DrawablePtr /*pDraw*/,
GCPtr /*pGC*/,
int /*x*/,
int /*y*/,
int /*count*/,
char * /*chars*/,
FontEncoding /*fontEncoding*/
);
extern void miImageText8(
DrawablePtr /*pDraw*/,
GCPtr /*pGC*/,
@ -401,10 +363,6 @@ extern Bool miRectAlloc(
int /*n*/
);
extern void miSetExtents(
RegionPtr /*pReg*/
);
extern int miFindMaxBand(
RegionPtr /*prgn*/
);
@ -415,7 +373,6 @@ extern Bool miValidRegion(
);
#endif
extern Bool miRegionDataCopy(RegionPtr dst, RegionPtr src);
extern Bool miRegionBroken(RegionPtr pReg);
/* miscrinit.c */
@ -430,11 +387,6 @@ extern Bool miModifyPixmapHeader(
pointer /*pPixData*/
);
extern Bool miCloseScreen(
int /*index*/,
ScreenPtr /*pScreen*/
);
extern Bool miCreateScreenResources(
ScreenPtr /*pScreen*/
);