XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks

Browse Source
This commit is contained in:
Kaleb Keithley
2003-11-25 19:29:01 +00:00
parent 90f1536dd3
commit adc7f9a4eb
705 changed files with 30366 additions and 26639 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
include/XIstubs.h
View File

@@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/include/XIstubs.h,v 3.1 1996/04/15 11:34:22 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/include/XIstubs.h,v 3.2 2003/04/27 21:31:04 herrb Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -29,73 +29,48 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
ChangeKeyboardDevice (
#if NeedFunctionPrototypes
DeviceIntPtr /* old_dev */,
DeviceIntPtr /* new_dev */
#endif
);
DeviceIntPtr /* new_dev */);
int
ChangePointerDevice (
#if NeedFunctionPrototypes
DeviceIntPtr /* old_dev */,
DeviceIntPtr /* new_dev */,
unsigned char /* x */,
unsigned char /* y */
#endif
);
unsigned char /* y */);
void
CloseInputDevice (
#if NeedFunctionPrototypes
DeviceIntPtr /* d */,
ClientPtr /* client */
#endif
);
ClientPtr /* client */);
void
AddOtherInputDevices (
#if NeedFunctionPrototypes
void
#endif
);
AddOtherInputDevices (void);
void
OpenInputDevice (
#if NeedFunctionPrototypes
DeviceIntPtr /* dev */,
ClientPtr /* client */,
int * /* status */
#endif
);
int * /* status */);
int
SetDeviceMode (
#if NeedFunctionPrototypes
ClientPtr /* client */,
DeviceIntPtr /* dev */,
int /* mode */
#endif
);
int /* mode */);
int
SetDeviceValuators (
#if NeedFunctionPrototypes
ClientPtr /* client */,
DeviceIntPtr /* dev */,
int * /* valuators */,
int /* first_valuator */,
int /* num_valuators */
#endif
);
int /* num_valuators */);
int
ChangeDeviceControl (
#if NeedFunctionPrototypes
ClientPtr /* client */,
DeviceIntPtr /* dev */,
xDeviceCtl * /* control */
#endif
);
xDeviceCtl * /* control */);
#endif /* XI_STUBS_H */

29
include/bstorestr.h
View File

@@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/include/bstorestr.h,v 1.2 2001/01/06 20:58:12 tsi Exp $*/
/* $XFree86: xc/programs/Xserver/include/bstorestr.h,v 1.3 2003/04/27 21:31:04 herrb Exp $*/
/*
* Copyright (c) 1987 by the Regents of the University of California
*
@@ -24,43 +24,26 @@
#include "window.h"
typedef void (* BackingStoreSaveAreasProcPtr)(
#if NeedNestedPrototypes
PixmapPtr /*pBackingPixmap*/,
RegionPtr /*pObscured*/,
int /*x*/,
int /*y*/,
WindowPtr /*pWin*/
#endif
);
WindowPtr /*pWin*/);
typedef void (* BackingStoreRestoreAreasProcPtr)(
#if NeedNestedPrototypes
PixmapPtr /*pBackingPixmap*/,
RegionPtr /*pExposed*/,
int /*x*/,
int /*y*/,
WindowPtr /*pWin*/
#endif
);
WindowPtr /*pWin*/);
typedef void (* BackingStoreSetClipmaskRgnProcPtr)(
#if NeedNestedPrototypes
GCPtr /*pBackingGC*/,
RegionPtr /*pbackingCompositeClip*/
#endif
);
RegionPtr /*pbackingCompositeClip*/);
typedef PixmapPtr (* BackingStoreGetImagePixmapProcPtr)( /* unused */
#if NeedNestedPrototypes
void
#endif
);
typedef PixmapPtr (* BackingStoreGetImagePixmapProcPtr)(void);
typedef PixmapPtr (* BackingStoreGetSpansPixmapProcPtr)( /* unused */
#if NeedNestedPrototypes
void
#endif
);
typedef PixmapPtr (* BackingStoreGetSpansPixmapProcPtr)(void);
typedef struct _BSFuncs {

6
include/closestr.h
View File

@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
/* $XFree86: xc/programs/Xserver/include/closestr.h,v 3.4 2001/12/14 19:59:53 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/include/closestr.h,v 3.5 2003/11/17 22:20:43 dawes Exp $ */
#ifndef CLOSESTR_H
@@ -105,14 +105,12 @@ typedef struct _LFclosure {
typedef
int (* PolyTextPtr)(
#if NeedNestedPrototypes
DrawablePtr /* pDraw */,
GCPtr /* pGC */,
int /* x */,
int /* y */,
int /* count */,
void * /* chars or shorts */
#endif
);
typedef struct _PTclosure {
@@ -136,14 +134,12 @@ typedef struct _PTclosure {
typedef
void (* ImageTextPtr)(
#if NeedNestedPrototypes
DrawablePtr /* pDraw */,
GCPtr /* pGC */,
int /* x */,
int /* y */,
int /* count */,
void * /* chars or shorts */
#endif
);
typedef struct _ITclosure {

87
include/colormap.h
View File

@@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/include/colormap.h,v 1.5 2001/12/14 19:59:53 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/include/colormap.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */
/*
Copyright 1987, 1998 The Open Group
@@ -79,79 +79,51 @@ typedef struct _CMEntry *EntryPtr;
typedef struct _colorResource *colorResourcePtr;
extern int CreateColormap(
#if NeedFunctionPrototypes
Colormap /*mid*/,
ScreenPtr /*pScreen*/,
VisualPtr /*pVisual*/,
ColormapPtr* /*ppcmap*/,
int /*alloc*/,
int /*client*/
#endif
);
int /*client*/);
extern int FreeColormap(
#if NeedFunctionPrototypes
pointer /*pmap*/,
XID /*mid*/
#endif
);
XID /*mid*/);
extern int TellLostMap(
#if NeedFunctionPrototypes
WindowPtr /*pwin*/,
pointer /* Colormap *pmid */
#endif
);
pointer /* Colormap *pmid */);
extern int TellGainedMap(
#if NeedFunctionPrototypes
WindowPtr /*pwin*/,
pointer /* Colormap *pmid */
#endif
);
pointer /* Colormap *pmid */);
extern int CopyColormapAndFree(
#if NeedFunctionPrototypes
Colormap /*mid*/,
ColormapPtr /*pSrc*/,
int /*client*/
#endif
);
int /*client*/);
extern int AllocColor(
#if NeedFunctionPrototypes
ColormapPtr /*pmap*/,
unsigned short* /*pred*/,
unsigned short* /*pgreen*/,
unsigned short* /*pblue*/,
Pixel* /*pPix*/,
int /*client*/
#endif
);
int /*client*/);
extern void FakeAllocColor(
#if NeedFunctionPrototypes
ColormapPtr /*pmap*/,
xColorItem * /*item*/
#endif
);
xColorItem * /*item*/);
extern void FakeFreeColor(
#if NeedFunctionPrototypes
ColormapPtr /*pmap*/,
Pixel /*pixel*/
#endif
);
Pixel /*pixel*/);
typedef int (*ColorCompareProcPtr)(
#if NeedNestedPrototypes
EntryPtr /*pent*/,
xrgb * /*prgb*/
#endif
);
xrgb * /*prgb*/);
extern int FindColor(
#if NeedFunctionPrototypes
ColormapPtr /*pmap*/,
EntryPtr /*pentFirst*/,
int /*size*/,
@@ -159,40 +131,28 @@ extern int FindColor(
Pixel* /*pPixel*/,
int /*channel*/,
int /*client*/,
ColorCompareProcPtr /*comp*/
#endif
);
ColorCompareProcPtr /*comp*/);
extern int QueryColors(
#if NeedFunctionPrototypes
ColormapPtr /*pmap*/,
int /*count*/,
Pixel* /*ppixIn*/,
xrgb* /*prgbList*/
#endif
);
xrgb* /*prgbList*/);
extern int FreeClientPixels(
#if NeedFunctionPrototypes
pointer /*pcr*/,
XID /*fakeid*/
#endif
);
XID /*fakeid*/);
extern int AllocColorCells(
#if NeedFunctionPrototypes
int /*client*/,
ColormapPtr /*pmap*/,
int /*colors*/,
int /*planes*/,
Bool /*contig*/,
Pixel* /*ppix*/,
Pixel* /*masks*/
#endif
);
Pixel* /*masks*/);
extern int AllocColorPlanes(
#if NeedFunctionPrototypes
int /*client*/,
ColormapPtr /*pmap*/,
int /*colors*/,
@@ -203,33 +163,22 @@ extern int AllocColorPlanes(
Pixel* /*pixels*/,
Pixel* /*prmask*/,
Pixel* /*pgmask*/,
Pixel* /*pbmask*/
#endif
);
Pixel* /*pbmask*/);
extern int FreeColors(
#if NeedFunctionPrototypes
ColormapPtr /*pmap*/,
int /*client*/,
int /*count*/,
Pixel* /*pixels*/,
Pixel /*mask*/
#endif
);
Pixel /*mask*/);
extern int StoreColors(
#if NeedFunctionPrototypes
ColormapPtr /*pmap*/,
int /*count*/,
xColorItem* /*defs*/
#endif
);
xColorItem* /*defs*/);
extern int IsMapInstalled(
#if NeedFunctionPrototypes
Colormap /*map*/,
WindowPtr /*pWin*/
#endif
);
WindowPtr /*pWin*/);
#endif /* CMAP_H */

64
include/cursor.h
View File

@@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/include/cursor.h,v 1.6 2002/09/17 01:15:14 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/include/cursor.h,v 1.7 2003/04/27 21:31:04 herrb Exp $ */
/***********************************************************
Copyright 1987, 1998 The Open Group
@@ -66,11 +66,8 @@ typedef struct _CursorMetric *CursorMetricPtr;
extern CursorPtr rootCursor;
extern int FreeCursor(
#if NeedFunctionPrototypes
pointer /*pCurs*/,
XID /*cid*/
#endif
);
XID /*cid*/);
/* Quartz support on Mac OS X pulls in the QuickDraw
framework whose AllocCursor function conflicts here. */
@@ -78,7 +75,6 @@ extern int FreeCursor(
#define AllocCursor Darwin_X_AllocCursor
#endif
extern CursorPtr AllocCursor(
#if NeedFunctionPrototypes
unsigned char* /*psrcbits*/,
unsigned char* /*pmaskbits*/,
CursorMetricPtr /*cm*/,
@@ -87,12 +83,9 @@ extern CursorPtr AllocCursor(
unsigned /*foreBlue*/,
unsigned /*backRed*/,
unsigned /*backGreen*/,
unsigned /*backBlue*/
#endif
);
unsigned /*backBlue*/);
extern CursorPtr AllocCursorARGB(
#if NeedFunctionPrototypes
unsigned char* /*psrcbits*/,
unsigned char* /*pmaskbits*/,
CARD32* /*argb*/,
@@ -102,12 +95,9 @@ extern CursorPtr AllocCursorARGB(
unsigned /*foreBlue*/,
unsigned /*backRed*/,
unsigned /*backGreen*/,
unsigned /*backBlue*/
#endif
);
unsigned /*backBlue*/);
extern int AllocGlyphCursor(
#if NeedFunctionPrototypes
Font /*source*/,
unsigned int /*sourceChar*/,
Font /*mask*/,
@@ -119,67 +109,39 @@ extern int AllocGlyphCursor(
unsigned /*backGreen*/,
unsigned /*backBlue*/,
CursorPtr* /*ppCurs*/,
ClientPtr /*client*/
#endif
);
ClientPtr /*client*/);
extern CursorPtr CreateRootCursor(
#if NeedFunctionPrototypes
char* /*pfilename*/,
unsigned int /*glyph*/
#endif
);
unsigned int /*glyph*/);
extern int ServerBitsFromGlyph(
#if NeedFunctionPrototypes
FontPtr /*pfont*/,
unsigned int /*ch*/,
register CursorMetricPtr /*cm*/,
unsigned char ** /*ppbits*/
#endif
);
unsigned char ** /*ppbits*/);
extern Bool CursorMetricsFromGlyph(
#if NeedFunctionPrototypes
FontPtr /*pfont*/,
unsigned /*ch*/,
CursorMetricPtr /*cm*/
#endif
);
CursorMetricPtr /*cm*/);
extern void CheckCursorConfinement(
#if NeedFunctionPrototypes
WindowPtr /*pWin*/
#endif
);
WindowPtr /*pWin*/);
extern void NewCurrentScreen(
#if NeedFunctionPrototypes
ScreenPtr /*newScreen*/,
int /*x*/,
int /*y*/
#endif
);
int /*y*/);
extern Bool PointerConfinedToScreen(
#if NeedFunctionPrototypes
void
#endif
);
extern Bool PointerConfinedToScreen(void);
extern void GetSpritePosition(
#if NeedFunctionPrototypes
int * /*px*/,
int * /*py*/
#endif
);
int * /*py*/);
#ifdef PANORAMIX
extern int XineramaGetCursorScreen(
#if NeedFunctionPrototypes
void
#endif
);
extern int XineramaGetCursorScreen(void);
#endif /* PANORAMIX */
#endif /* CURSOR_H */

509
include/dix.h
View File

@@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/include/dix.h,v 3.26 2003/01/12 02:44:27 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/include/dix.h,v 3.27 2003/04/27 21:31:04 herrb Exp $ */
/***********************************************************
Copyright 1987, 1998 The Open Group
@@ -308,108 +308,56 @@ typedef struct _TimeStamp {
/* dispatch.c */
extern void SetInputCheck(
#if NeedFunctionPrototypes
HWEventQueuePtr /*c0*/,
HWEventQueuePtr /*c1*/
#endif
);
HWEventQueuePtr /*c1*/);
extern void CloseDownClient(
#if NeedFunctionPrototypes
ClientPtr /*client*/
#endif
);
ClientPtr /*client*/);
extern void UpdateCurrentTime(
#if NeedFunctionPrototypes
void
#endif
);
extern void UpdateCurrentTime(void);
extern void UpdateCurrentTimeIf(
#if NeedFunctionPrototypes
void
#endif
);
extern void UpdateCurrentTimeIf(void);
extern void InitSelections(
#if NeedFunctionPrototypes
void
#endif
);
extern void InitSelections(void);
extern void FlushClientCaches(
#if NeedFunctionPrototypes
XID /*id*/
#endif
);
extern void FlushClientCaches(XID /*id*/);
extern int dixDestroyPixmap(
#if NeedFunctionPrototypes
pointer /*value*/,
XID /*pid*/
#endif
);
XID /*pid*/);
extern void CloseDownRetainedResources(
#if NeedFunctionPrototypes
void
#endif
);
extern void CloseDownRetainedResources(void);
extern void InitClient(
#if NeedFunctionPrototypes
ClientPtr /*client*/,
int /*i*/,
pointer /*ospriv*/
#endif
);
pointer /*ospriv*/);
extern ClientPtr NextAvailableClient(
#if NeedFunctionPrototypes
pointer /*ospriv*/
#endif
);
pointer /*ospriv*/);
extern void SendErrorToClient(
#if NeedFunctionPrototypes
ClientPtr /*client*/,
unsigned int /*majorCode*/,
unsigned int /*minorCode*/,
XID /*resId*/,
int /*errorCode*/
#endif
);
int /*errorCode*/);
extern void DeleteWindowFromAnySelections(
#if NeedFunctionPrototypes
WindowPtr /*pWin*/
#endif
);
WindowPtr /*pWin*/);
extern void MarkClientException(
#if NeedFunctionPrototypes
ClientPtr /*client*/
#endif
);
ClientPtr /*client*/);
extern int GetGeometry(
#if NeedFunctionPrototypes
ClientPtr /*client*/,
xGetGeometryReply* /* wa */
#endif
);
xGetGeometryReply* /* wa */);
extern int SendConnSetup(
#if NeedFunctionPrototypes
ClientPtr /*client*/,
char* /*reason*/
#endif
);
char* /*reason*/);
extern int
DoGetImage(
#if NeedFunctionPrototypes
extern int DoGetImage(
ClientPtr /*client*/,
int /*format*/,
Drawable /*drawable*/,
@@ -418,75 +366,48 @@ DoGetImage(
int /*width*/,
int /*height*/,
Mask /*planemask*/,
xGetImageReply **/*im_return*/
#endif
);
xGetImageReply **/*im_return*/);
#ifdef LBX
extern void IncrementClientCount(
#if NeedFunctionPrototypes
void
#endif
);
extern void IncrementClientCount(void);
#endif /* LBX */
/* dixutils.c */
extern void CopyISOLatin1Lowered(
#if NeedFunctionPrototypes
unsigned char * /*dest*/,
unsigned char * /*source*/,
int /*length*/
#endif
);
int /*length*/);
#ifdef XCSECURITY
extern WindowPtr SecurityLookupWindow(
#if NeedFunctionPrototypes
XID /*rid*/,
ClientPtr /*client*/,
Mask /*access_mode*/
#endif
);
Mask /*access_mode*/);
extern pointer SecurityLookupDrawable(
#if NeedFunctionPrototypes
XID /*rid*/,
ClientPtr /*client*/,
Mask /*access_mode*/
#endif
);
Mask /*access_mode*/);
extern WindowPtr LookupWindow(
#if NeedFunctionPrototypes
XID /*rid*/,
ClientPtr /*client*/
#endif
);
ClientPtr /*client*/);
extern pointer LookupDrawable(
#if NeedFunctionPrototypes
XID /*rid*/,
ClientPtr /*client*/
#endif
);
ClientPtr /*client*/);
#else
extern WindowPtr LookupWindow(
#if NeedFunctionPrototypes
XID /*rid*/,
ClientPtr /*client*/
#endif
);
ClientPtr /*client*/);
extern pointer LookupDrawable(
#if NeedFunctionPrototypes
XID /*rid*/,
ClientPtr /*client*/
#endif
);
ClientPtr /*client*/);
#define SecurityLookupWindow(rid, client, access_mode) \
LookupWindow(rid, client)
@@ -497,385 +418,221 @@ extern pointer LookupDrawable(
#endif /* XCSECURITY */
extern ClientPtr LookupClient(
#if NeedFunctionPrototypes
XID /*rid*/,
ClientPtr /*client*/
#endif
);
ClientPtr /*client*/);
extern void NoopDDA(
#if NeedFunctionPrototypes
void
#endif
);
extern void NoopDDA(void);
extern int AlterSaveSetForClient(
#if NeedFunctionPrototypes
ClientPtr /*client*/,
WindowPtr /*pWin*/,
unsigned /*mode*/
#endif
);
unsigned /*mode*/);
extern void DeleteWindowFromAnySaveSet(
#if NeedFunctionPrototypes
WindowPtr /*pWin*/
#endif
);
WindowPtr /*pWin*/);
extern void BlockHandler(
#if NeedFunctionPrototypes
pointer /*pTimeout*/,
pointer /*pReadmask*/
#endif
);
pointer /*pReadmask*/);
extern void WakeupHandler(
#if NeedFunctionPrototypes
int /*result*/,
pointer /*pReadmask*/
#endif
);
pointer /*pReadmask*/);
typedef void (* WakeupHandlerProcPtr)(
#if NeedNestedPrototypes
pointer /* blockData */,
int /* result */,
pointer /* pReadmask */
#endif
);
pointer /* pReadmask */);
extern Bool RegisterBlockAndWakeupHandlers(
#if NeedFunctionPrototypes
BlockHandlerProcPtr /*blockHandler*/,
WakeupHandlerProcPtr /*wakeupHandler*/,
pointer /*blockData*/
#endif
);
pointer /*blockData*/);
extern void RemoveBlockAndWakeupHandlers(
#if NeedFunctionPrototypes
BlockHandlerProcPtr /*blockHandler*/,
WakeupHandlerProcPtr /*wakeupHandler*/,
pointer /*blockData*/
#endif
);
pointer /*blockData*/);
extern void InitBlockAndWakeupHandlers(
#if NeedFunctionPrototypes
void
#endif
);
extern void InitBlockAndWakeupHandlers(void);
extern void ProcessWorkQueue(
#if NeedFunctionPrototypes
void
#endif
);
extern void ProcessWorkQueue(void);
extern void ProcessWorkQueueZombies(
#if NeedFunctionPrototypes
void
#endif
);
extern void ProcessWorkQueueZombies(void);
extern Bool QueueWorkProc(
#if NeedFunctionPrototypes
Bool (* /*function*/)(
#if NeedNestedPrototypes
ClientPtr /*clientUnused*/,
pointer /*closure*/
#endif
),
pointer /*closure*/),
ClientPtr /*client*/,
pointer /*closure*/
#endif
);
typedef Bool (* ClientSleepProcPtr)(
#if NeedFunctionPrototypes
ClientPtr /*client*/,
pointer /*closure*/
#endif
);
pointer /*closure*/);
extern Bool ClientSleep(
#if NeedFunctionPrototypes
ClientPtr /*client*/,
ClientSleepProcPtr /* function */,
pointer /*closure*/
#endif
);
pointer /*closure*/);
#ifndef ___CLIENTSIGNAL_DEFINED___
#define ___CLIENTSIGNAL_DEFINED___
extern Bool ClientSignal(
#if NeedFunctionPrototypes
ClientPtr /*client*/
#endif
);
ClientPtr /*client*/);
#endif /* ___CLIENTSIGNAL_DEFINED___ */
extern void ClientWakeup(
#if NeedFunctionPrototypes
ClientPtr /*client*/
#endif
);
ClientPtr /*client*/);
extern Bool ClientIsAsleep(
#if NeedFunctionPrototypes
ClientPtr /*client*/
#endif
);
ClientPtr /*client*/);
/* atom.c */
extern Atom MakeAtom(
#if NeedFunctionPrototypes
char * /*string*/,
unsigned /*len*/,
Bool /*makeit*/
#endif
);
Bool /*makeit*/);
extern Bool ValidAtom(
#if NeedFunctionPrototypes
Atom /*atom*/
#endif
);
Atom /*atom*/);
extern char *NameForAtom(
#if NeedFunctionPrototypes
Atom /*atom*/
#endif
);
Atom /*atom*/);
extern void AtomError(
#if NeedFunctionPrototypes
void
#endif
);
extern void AtomError(void);
extern void FreeAllAtoms(
#if NeedFunctionPrototypes
void
#endif
);
extern void FreeAllAtoms(void);
extern void InitAtoms(
#if NeedFunctionPrototypes
void
#endif
);
extern void InitAtoms(void);
/* events.c */
extern void SetMaskForEvent(
#if NeedFunctionPrototypes
Mask /* mask */,
int /* event */
#endif
);
int /* event */);
extern Bool IsParent(
#if NeedFunctionPrototypes
WindowPtr /* maybeparent */,
WindowPtr /* child */
#endif
);
WindowPtr /* child */);
extern WindowPtr GetCurrentRootWindow(
#if NeedFunctionPrototypes
void
#endif
);
extern WindowPtr GetCurrentRootWindow(void);
extern WindowPtr GetSpriteWindow(
#if NeedFunctionPrototypes
void
#endif
);
extern WindowPtr GetSpriteWindow(void);
extern void NoticeEventTime(
#if NeedFunctionPrototypes
xEventPtr /* xE */
#endif
);
extern void NoticeEventTime(xEventPtr /* xE */);
extern void EnqueueEvent(
#if NeedFunctionPrototypes
xEventPtr /* xE */,
DeviceIntPtr /* device */,
int /* count */
#endif
);
int /* count */);
extern void ComputeFreezes(
#if NeedFunctionPrototypes
void
#endif
);
extern void ComputeFreezes(void);
extern void CheckGrabForSyncs(
#if NeedFunctionPrototypes
DeviceIntPtr /* dev */,
Bool /* thisMode */,
Bool /* otherMode */
#endif
);
Bool /* otherMode */);
extern void ActivatePointerGrab(
#if NeedFunctionPrototypes
DeviceIntPtr /* mouse */,
GrabPtr /* grab */,
TimeStamp /* time */,
Bool /* autoGrab */
#endif
);
Bool /* autoGrab */);
extern void DeactivatePointerGrab(
#if NeedFunctionPrototypes
DeviceIntPtr /* mouse */
#endif
);
DeviceIntPtr /* mouse */);
extern void ActivateKeyboardGrab(
#if NeedFunctionPrototypes
DeviceIntPtr /* keybd */,
GrabPtr /* grab */,
TimeStamp /* time */,
Bool /* passive */
#endif
);
Bool /* passive */);
extern void DeactivateKeyboardGrab(
#if NeedFunctionPrototypes
DeviceIntPtr /* keybd */
#endif
);
DeviceIntPtr /* keybd */);
extern void AllowSome(
#if NeedFunctionPrototypes
ClientPtr /* client */,
TimeStamp /* time */,
DeviceIntPtr /* thisDev */,
int /* newState */
#endif
);
int /* newState */);
extern void ReleaseActiveGrabs(
#if NeedFunctionPrototypes
ClientPtr client
#endif
);
ClientPtr client);
extern int DeliverEventsToWindow(
#if NeedFunctionPrototypes
WindowPtr /* pWin */,
xEventPtr /* pEvents */,
int /* count */,
Mask /* filter */,
GrabPtr /* grab */,
int /* mskidx */
#endif
);
int /* mskidx */);
extern int DeliverDeviceEvents(
#if NeedFunctionPrototypes
WindowPtr /* pWin */,
xEventPtr /* xE */,
GrabPtr /* grab */,
WindowPtr /* stopAt */,
DeviceIntPtr /* dev */,
int /* count */
#endif
);
int /* count */);
extern void DefineInitialRootWindow(
#if NeedFunctionPrototypes
WindowPtr /* win */
#endif
);
WindowPtr /* win */);
extern void WindowHasNewCursor(
#if NeedFunctionPrototypes
WindowPtr /* pWin */
#endif
);
WindowPtr /* pWin */);
extern Bool CheckDeviceGrabs(
#if NeedFunctionPrototypes
DeviceIntPtr /* device */,
xEventPtr /* xE */,
int /* checkFirst */,
int /* count */
#endif
);
int /* count */);
extern void DeliverFocusedEvent(
#if NeedFunctionPrototypes
DeviceIntPtr /* keybd */,
xEventPtr /* xE */,
WindowPtr /* window */,
int /* count */
#endif
);
int /* count */);
extern void DeliverGrabbedEvent(
#if NeedFunctionPrototypes
xEventPtr /* xE */,
DeviceIntPtr /* thisDev */,
Bool /* deactivateGrab */,
int /* count */
#endif
);
int /* count */);
#ifdef XKB
extern void FixKeyState(
#if NeedFunctionPrototypes
xEvent * /* xE */,
DeviceIntPtr /* keybd */
#endif
);
DeviceIntPtr /* keybd */);
#endif /* XKB */
extern void RecalculateDeliverableEvents(
#if NeedFunctionPrototypes
WindowPtr /* pWin */
#endif
);
WindowPtr /* pWin */);
extern int OtherClientGone(
#if NeedFunctionPrototypes
pointer /* value */,
XID /* id */
#endif
);
XID /* id */);
extern void DoFocusEvents(
#if NeedFunctionPrototypes
DeviceIntPtr /* dev */,
WindowPtr /* fromWin */,
WindowPtr /* toWin */,
int /* mode */
#endif
);
int /* mode */);
extern int SetInputFocus(
#if NeedFunctionPrototypes
ClientPtr /* client */,
DeviceIntPtr /* dev */,
Window /* focusID */,
CARD8 /* revertTo */,
Time /* ctime */,
Bool /* followOK */
#endif
);
Bool /* followOK */);
extern int GrabDevice(
#if NeedFunctionPrototypes
ClientPtr /* client */,
DeviceIntPtr /* dev */,
unsigned /* this_mode */,
@@ -884,69 +641,44 @@ extern int GrabDevice(
unsigned /* ownerEvents */,
Time /* ctime */,
Mask /* mask */,
CARD8 * /* status */
#endif
);
CARD8 * /* status */);
extern void InitEvents(
#if NeedFunctionPrototypes
void
#endif
);
extern void InitEvents(void);
extern void CloseDownEvents(void);
extern void DeleteWindowFromAnyEvents(
#if NeedFunctionPrototypes
WindowPtr /* pWin */,
Bool /* freeResources */
#endif
);
Bool /* freeResources */);
extern Mask EventMaskForClient(
#if NeedFunctionPrototypes
WindowPtr /* pWin */,
ClientPtr /* client */
#endif
);
ClientPtr /* client */);
extern int DeliverEvents(
#if NeedFunctionPrototypes
WindowPtr /*pWin*/,
xEventPtr /*xE*/,
int /*count*/,
WindowPtr /*otherParent*/
#endif
);
WindowPtr /*otherParent*/);
extern void WriteEventsToClient(
#if NeedFunctionPrototypes
ClientPtr /*pClient*/,
int /*count*/,
xEventPtr /*events*/
#endif
);
xEventPtr /*events*/);
extern int TryClientEvents(
#if NeedFunctionPrototypes
ClientPtr /*client*/,
xEventPtr /*pEvents*/,
int /*count*/,
Mask /*mask*/,
Mask /*filter*/,
GrabPtr /*grab*/
#endif
);
GrabPtr /*grab*/);
extern void WindowsRestructured(
#if NeedFunctionPrototypes
void
#endif
);
extern void WindowsRestructured(void);
#ifdef RANDR
@@ -954,24 +686,13 @@ void
ScreenRestructured (ScreenPtr pScreen);
#endif
extern void ResetClientPrivates(
#if NeedFunctionPrototypes
void
#endif
);
extern void ResetClientPrivates(void);
extern int AllocateClientPrivateIndex(
#if NeedFunctionPrototypes
void
#endif
);
extern int AllocateClientPrivateIndex(void);
extern Bool AllocateClientPrivate(
#if NeedFunctionPrototypes
int /*index*/,
unsigned /*amount*/
#endif
);
unsigned /*amount*/);
/*
* callback manager stuff
@@ -983,34 +704,19 @@ typedef struct _CallbackList *CallbackListPtr; /* also in misc.h */
#endif
typedef void (*CallbackProcPtr) (
#if NeedNestedPrototypes
CallbackListPtr *, pointer, pointer
#endif
);
CallbackListPtr *, pointer, pointer);
typedef Bool (*AddCallbackProcPtr) (
#if NeedNestedPrototypes
CallbackListPtr *, CallbackProcPtr, pointer
#endif
);
CallbackListPtr *, CallbackProcPtr, pointer);
typedef Bool (*DeleteCallbackProcPtr) (
#if NeedNestedPrototypes
CallbackListPtr *, CallbackProcPtr, pointer
#endif
);
CallbackListPtr *, CallbackProcPtr, pointer);
typedef void (*CallCallbacksProcPtr) (
#if NeedNestedPrototypes
CallbackListPtr *, pointer
#endif
);
CallbackListPtr *, pointer);
typedef void (*DeleteCallbackListProcPtr) (
#if NeedNestedPrototypes
CallbackListPtr *
#endif
);
CallbackListPtr *);
typedef struct _CallbackProcs {
AddCallbackProcPtr AddCallback;
@@ -1020,46 +726,27 @@ typedef struct _CallbackProcs {
} CallbackFuncsRec, *CallbackFuncsPtr;
extern Bool CreateCallbackList(
#if NeedFunctionPrototypes
CallbackListPtr * /*pcbl*/,
CallbackFuncsPtr /*cbfuncs*/
#endif
);
CallbackFuncsPtr /*cbfuncs*/);
extern Bool AddCallback(
#if NeedFunctionPrototypes
CallbackListPtr * /*pcbl*/,
CallbackProcPtr /*callback*/,
pointer /*data*/
#endif
);
pointer /*data*/);
extern Bool DeleteCallback(
#if NeedFunctionPrototypes
CallbackListPtr * /*pcbl*/,
CallbackProcPtr /*callback*/,
pointer /*data*/
#endif
);
pointer /*data*/);
extern void CallCallbacks(
#if NeedFunctionPrototypes
CallbackListPtr * /*pcbl*/,
pointer /*call_data*/
#endif
);
pointer /*call_data*/);
extern void DeleteCallbackList(
#if NeedFunctionPrototypes
CallbackListPtr * /*pcbl*/
#endif
);
CallbackListPtr * /*pcbl*/);
extern void InitCallbackManager(
#if NeedFunctionPrototypes
void
#endif
);
extern void InitCallbackManager(void);
/*
* ServerGrabCallback stuff

162
include/dixevents.h
View File

@@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/include/dixevents.h,v 3.4 2001/09/04 14:03:27 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/include/dixevents.h,v 3.5 2003/04/27 21:31:04 herrb Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -27,44 +27,20 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef DIXEVENTS_H
#define DIXEVENTS_H
extern void
SetCriticalEvent(
#if NeedFunctionPrototypes
int /* event */
#endif
);
extern void SetCriticalEvent(int /* event */);
extern CursorPtr
GetSpriteCursor(
#if NeedFunctionPrototypes
void
#endif
);
extern CursorPtr GetSpriteCursor(void);
extern int
ProcAllowEvents(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
extern int ProcAllowEvents(ClientPtr /* client */);
extern int
MaybeDeliverEventsToClient(
#if NeedFunctionPrototypes
extern int MaybeDeliverEventsToClient(
WindowPtr /* pWin */,
xEvent * /* pEvents */,
int /* count */,
Mask /* filter */,
ClientPtr /* dontClient */
#endif
);
ClientPtr /* dontClient */);
extern int
ProcWarpPointer(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
extern int ProcWarpPointer(ClientPtr /* client */);
#if 0
extern void
@@ -73,12 +49,9 @@ CoreProcessKeyboardEvent (
#else
ProcessKeyboardEvent (
#endif
#if NeedFunctionPrototypes
xEvent * /* xE */,
DeviceIntPtr /* keybd */,
int /* count */
#endif
);
int /* count */);
extern void
#ifdef XKB
@@ -86,129 +59,48 @@ CoreProcessPointerEvent (
#else
ProcessPointerEvent (
#endif
#if NeedFunctionPrototypes
xEvent * /* xE */,
DeviceIntPtr /* mouse */,
int /* count */
#endif
);
int /* count */);
#endif
extern int
EventSelectForWindow(
#if NeedFunctionPrototypes
extern int EventSelectForWindow(
WindowPtr /* pWin */,
ClientPtr /* client */,
Mask /* mask */
#endif
);
Mask /* mask */);
extern int
EventSuppressForWindow(
#if NeedFunctionPrototypes
extern int EventSuppressForWindow(
WindowPtr /* pWin */,
ClientPtr /* client */,
Mask /* mask */,
Bool * /* checkOptional */
#endif
);
Bool * /* checkOptional */);
extern int
ProcSetInputFocus(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
extern int ProcSetInputFocus(ClientPtr /* client */);
extern int
ProcGetInputFocus(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
extern int ProcGetInputFocus(ClientPtr /* client */);
extern int
ProcGrabPointer(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
extern int ProcGrabPointer(ClientPtr /* client */);
extern int
ProcChangeActivePointerGrab(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
extern int ProcChangeActivePointerGrab(ClientPtr /* client */);
extern int
ProcUngrabPointer(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
extern int ProcUngrabPointer(ClientPtr /* client */);
extern int
ProcGrabKeyboard(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
extern int ProcGrabKeyboard(ClientPtr /* client */);
extern int
ProcUngrabKeyboard(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
extern int ProcUngrabKeyboard(ClientPtr /* client */);
extern int
ProcQueryPointer(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
extern int ProcQueryPointer(ClientPtr /* client */);
extern int
ProcSendEvent(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
extern int ProcSendEvent(ClientPtr /* client */);
extern int
ProcUngrabKey(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
extern int ProcUngrabKey(ClientPtr /* client */);
extern int
ProcGrabKey(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
extern int ProcGrabKey(ClientPtr /* client */);
extern int
ProcGrabButton(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
extern int ProcGrabButton(ClientPtr /* client */);
extern int
ProcUngrabButton(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
extern int ProcUngrabButton(ClientPtr /* client */);
extern int
ProcRecolorCursor(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
extern int ProcRecolorCursor(ClientPtr /* client */);
#endif /* DIXEVENTS_H */

42
include/dixgrabs.h
View File

@@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/include/dixgrabs.h,v 3.0 1996/04/15 11:34:27 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/include/dixgrabs.h,v 3.1 2003/04/27 21:31:04 herrb Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -27,9 +27,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef DIXGRABS_H
#define DIXGRABS_H 1
GrabPtr
CreateGrab(
#if NeedFunctionPrototypes
extern GrabPtr CreateGrab(
int /* client */,
DeviceIntPtr /* device */,
WindowPtr /* window */,
@@ -42,38 +40,20 @@ CreateGrab(
int /* type */,
KeyCode /* keybut */,
WindowPtr /* confineTo */,
CursorPtr /* cursor */
#endif
);
CursorPtr /* cursor */);
int
DeletePassiveGrab(
#if NeedFunctionPrototypes
extern int DeletePassiveGrab(
pointer /* value */,
XID /* id */
#endif
);
XID /* id */);
Bool
GrabMatchesSecond(
#if NeedFunctionPrototypes
extern Bool GrabMatchesSecond(
GrabPtr /* pFirstGrab */,
GrabPtr /* pSecondGrab */
#endif
);
GrabPtr /* pSecondGrab */);
int
AddPassiveGrabToList(
#if NeedFunctionPrototypes
GrabPtr /* pGrab */
#endif
);
extern int AddPassiveGrabToList(
GrabPtr /* pGrab */);
Bool
DeletePassiveGrabFromList(
#if NeedFunctionPrototypes
GrabPtr /* pMinuendGrab */
#endif
);
extern Bool DeletePassiveGrabFromList(
GrabPtr /* pMinuendGrab */);
#endif /* DIXGRABS_H */

90
include/dixstruct.h
View File

@@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/include/dixstruct.h,v 3.18 2003/01/12 02:44:27 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/include/dixstruct.h,v 3.20 2003/11/03 05:11:59 tsi Exp $ */
/***********************************************************
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
@@ -51,20 +51,14 @@ typedef struct {
} NewClientInfoRec;
typedef void (*ReplySwapPtr) (
#if NeedNestedPrototypes
ClientPtr /* pClient */,
int /* size */,
void * /* pbuf */
#endif
);
void * /* pbuf */);
extern void ReplyNotSwappd (
#if NeedNestedPrototypes
ClientPtr /* pClient */,
int /* size */,
void * /* pbuf */
#endif
);
void * /* pbuf */);
typedef enum {ClientStateInitial,
ClientStateAuthenticating,
@@ -95,10 +89,7 @@ typedef struct _Client {
int numSaved;
pointer screenPrivate[MAXSCREENS];
int (**requestVector) (
#if NeedNestedPrototypes
ClientPtr /* pClient */
#endif
);
ClientPtr /* pClient */);
CARD32 req_len; /* length of current request */
Bool big_requests; /* supports large requests */
int priority;
@@ -117,35 +108,25 @@ typedef struct _Client {
int requestLogIndex;
#endif
#ifdef LBX
int (*readRequest)(
#if NeedNestedPrototypes
ClientPtr /*client*/
#endif
);
int (*readRequest)(ClientPtr /*client*/);
#endif
unsigned long replyBytesRemaining;
#ifdef XCSECURITY
XID authId;
unsigned int trustLevel;
pointer (* CheckAccess)(
#if NeedNestedPrototypes
ClientPtr /*pClient*/,
XID /*id*/,
RESTYPE /*classes*/,
Mask /*access_mode*/,
pointer /*resourceval*/
#endif
);
pointer /*resourceval*/);
#endif
#ifdef XAPPGROUP
struct _AppGroupRec* appgroup;
#endif
struct _FontResolution * (*fontResFunc) ( /* no need for font.h */
#if NeedNestedPrototypes
ClientPtr /* pClient */,
int * /* num */
#endif
);
int * /* num */);
#ifdef SMART_SCHEDULE
int smart_priority;
long smart_start_tick;
@@ -167,31 +148,21 @@ extern Bool SmartScheduleDisable;
extern Bool SmartScheduleIdle;
extern Bool SmartScheduleTimerStopped;
extern Bool SmartScheduleStartTimer(void);
#define SMART_MAX_PRIORITY 20
#define SMART_MIN_PRIORITY -20
#define SMART_MAX_PRIORITY (20)
#define SMART_MIN_PRIORITY (-20)
extern Bool SmartScheduleInit(
#ifdef NeedFunctionPrototypes
void
#endif
);
extern Bool SmartScheduleInit(void);
#endif
/* This prototype is used pervasively in Xext, dix */
#if NeedFunctionPrototypes
#define DISPATCH_PROC(func) int func(ClientPtr /* client */)
#else
#define DISPATCH_PROC(func) int func(/* ClientPtr client */)
#endif
typedef struct _WorkQueue {
struct _WorkQueue *next;
Bool (*function) (
#if NeedNestedPrototypes
ClientPtr /* pClient */,
pointer /* closure */
#endif
);
ClientPtr client;
pointer closure;
@@ -201,17 +172,10 @@ extern TimeStamp currentTime;
extern TimeStamp lastDeviceEventTime;
extern int CompareTimeStamps(
#if NeedFunctionPrototypes
TimeStamp /*a*/,
TimeStamp /*b*/
#endif
);
TimeStamp /*b*/);
extern TimeStamp ClientTimeToServerTime(
#if NeedFunctionPrototypes
CARD32 /*c*/
#endif
);
extern TimeStamp ClientTimeToServerTime(CARD32 /*c*/);
typedef struct _CallbackRec {
CallbackProcPtr proc;
@@ -230,38 +194,18 @@ typedef struct _CallbackList {
/* proc vectors */
extern int (* InitialVector[3]) (
#if NeedNestedPrototypes
ClientPtr /*client*/
#endif
);
extern int (* InitialVector[3]) (ClientPtr /*client*/);
extern int (* ProcVector[256]) (
#if NeedNestedPrototypes
ClientPtr /*client*/
#endif
);
extern int (* ProcVector[256]) (ClientPtr /*client*/);
extern int (* SwappedProcVector[256]) (
#if NeedNestedPrototypes
ClientPtr /*client*/
#endif
);
extern int (* SwappedProcVector[256]) (ClientPtr /*client*/);
#ifdef K5AUTH
extern int (*k5_Vector[256])() =
#if NeedNestedPrototypes
ClientPtr /*client*/
#endif
);
extern int (*k5_Vector[256])(ClientPtr /*client*/);
#endif
extern ReplySwapPtr ReplySwapVector[256];
extern int ProcBadRequest(
#if NeedFunctionPrototypes
ClientPtr /*client*/
#endif
);
extern int ProcBadRequest(ClientPtr /*client*/);
#endif /* DIXSTRUCT_H */

186
include/exevents.h
View File

@@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/include/exevents.h,v 3.1 1996/04/15 11:34:29 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/include/exevents.h,v 3.2 2003/04/27 21:31:04 herrb Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -31,56 +31,34 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef EXEVENTS_H
#define EXEVENTS_H
void
RegisterOtherDevice (
#if NeedFunctionPrototypes
DeviceIntPtr /* device */
#endif
);
extern void RegisterOtherDevice (
DeviceIntPtr /* device */);
void
ProcessOtherEvent (
#if NeedFunctionPrototypes
extern void ProcessOtherEvent (
xEventPtr /* FIXME deviceKeyButtonPointer * xE */,
DeviceIntPtr /* other */,
int /* count */
#endif
);
int /* count */);
int
InitProximityClassDeviceStruct(
#if NeedFunctionPrototypes
DeviceIntPtr /* dev */
#endif
);
extern int InitProximityClassDeviceStruct(
DeviceIntPtr /* dev */);
void
InitValuatorAxisStruct(
#if NeedFunctionPrototypes
extern void InitValuatorAxisStruct(
DeviceIntPtr /* dev */,
int /* axnum */,
int /* minval */,
int /* maxval */,
int /* resolution */,
int /* min_res */,
int /* max_res */
#endif
);
int /* max_res */);
void
DeviceFocusEvent(
#if NeedFunctionPrototypes
extern void DeviceFocusEvent(
DeviceIntPtr /* dev */,
int /* type */,
int /* mode */,
int /* detail */,
WindowPtr /* pWin */
#endif
);
WindowPtr /* pWin */);
int
GrabButton(
#if NeedFunctionPrototypes
extern int GrabButton(
ClientPtr /* client */,
DeviceIntPtr /* dev */,
BYTE /* this_device_mode */,
@@ -92,13 +70,9 @@ GrabButton(
BOOL /* ownerEvents */,
Cursor /* rcursor */,
Window /* rconfineTo */,
Mask /* eventMask */
#endif
);
Mask /* eventMask */);
int
GrabKey(
#if NeedFunctionPrototypes
extern int GrabKey(
ClientPtr /* client */,
DeviceIntPtr /* dev */,
BYTE /* this_device_mode */,
@@ -108,96 +82,60 @@ GrabKey(
CARD8 /* key */,
Window /* grabWindow */,
BOOL /* ownerEvents */,
Mask /* mask */
#endif
);
Mask /* mask */);
int
SelectForWindow(
#if NeedFunctionPrototypes
extern int SelectForWindow(
DeviceIntPtr /* dev */,
WindowPtr /* pWin */,
ClientPtr /* client */,
Mask /* mask */,
Mask /* exclusivemasks */,
Mask /* validmasks */
#endif
);
Mask /* validmasks */);
int
AddExtensionClient (
#if NeedFunctionPrototypes
extern int AddExtensionClient (
WindowPtr /* pWin */,
ClientPtr /* client */,
Mask /* mask */,
int /* mskidx */
#endif
);
int /* mskidx */);
void
RecalculateDeviceDeliverableEvents(
#if NeedFunctionPrototypes
WindowPtr /* pWin */
#endif
);
extern void RecalculateDeviceDeliverableEvents(
WindowPtr /* pWin */);
int
InputClientGone(
#if NeedFunctionPrototypes
extern int InputClientGone(
WindowPtr /* pWin */,
XID /* id */
#endif
);
XID /* id */);
int
SendEvent (
#if NeedFunctionPrototypes
extern int SendEvent (
ClientPtr /* client */,
DeviceIntPtr /* d */,
Window /* dest */,
Bool /* propagate */,
xEvent * /* ev */,
Mask /* mask */,
int /* count */
#endif
);
int /* count */);
int
SetButtonMapping (
#if NeedFunctionPrototypes
extern int SetButtonMapping (
ClientPtr /* client */,
DeviceIntPtr /* dev */,
int /* nElts */,
BYTE * /* map */
#endif
);
BYTE * /* map */);
int
SetModifierMapping(
#if NeedFunctionPrototypes
extern int SetModifierMapping(
ClientPtr /* client */,
DeviceIntPtr /* dev */,
int /* len */,
int /* rlen */,
int /* numKeyPerModifier */,
KeyCode * /* inputMap */,
KeyClassPtr * /* k */
#endif
);
KeyClassPtr * /* k */);
void
SendDeviceMappingNotify(
#if NeedFunctionPrototypes
extern void SendDeviceMappingNotify(
CARD8 /* request, */,
KeyCode /* firstKeyCode */,
CARD8 /* count */,
DeviceIntPtr /* dev */
#endif
);
DeviceIntPtr /* dev */);
int
ChangeKeyMapping(
#if NeedFunctionPrototypes
extern int ChangeKeyMapping(
ClientPtr /* client */,
DeviceIntPtr /* dev */,
unsigned /* len */,
@@ -205,71 +143,41 @@ ChangeKeyMapping(
KeyCode /* firstKeyCode */,
CARD8 /* keyCodes */,
CARD8 /* keySymsPerKeyCode */,
KeySym * /* map */
#endif
);
KeySym * /* map */);
void
DeleteWindowFromAnyExtEvents(
#if NeedFunctionPrototypes
extern void DeleteWindowFromAnyExtEvents(
WindowPtr /* pWin */,
Bool /* freeResources */
#endif
);
Bool /* freeResources */);
void
DeleteDeviceFromAnyExtEvents(
#if NeedFunctionPrototypes
extern void DeleteDeviceFromAnyExtEvents(
WindowPtr /* pWin */,
DeviceIntPtr /* dev */
#endif
);
DeviceIntPtr /* dev */);
int
MaybeSendDeviceMotionNotifyHint (
#if NeedFunctionPrototypes
extern int MaybeSendDeviceMotionNotifyHint (
deviceKeyButtonPointer * /* pEvents */,
Mask /* mask */
#endif
);
Mask /* mask */);
void
CheckDeviceGrabAndHintWindow (
#if NeedFunctionPrototypes
extern void CheckDeviceGrabAndHintWindow (
WindowPtr /* pWin */,
int /* type */,
deviceKeyButtonPointer * /* xE */,
GrabPtr /* grab */,
ClientPtr /* client */,
Mask /* deliveryMask */
#endif
);
Mask /* deliveryMask */);
Mask
DeviceEventMaskForClient(
#if NeedFunctionPrototypes
extern Mask DeviceEventMaskForClient(
DeviceIntPtr /* dev */,
WindowPtr /* pWin */,
ClientPtr /* client */
#endif
);
ClientPtr /* client */);
void
MaybeStopDeviceHint(
#if NeedFunctionPrototypes
extern void MaybeStopDeviceHint(
DeviceIntPtr /* dev */,
ClientPtr /* client */
#endif
);
ClientPtr /* client */);
int
DeviceEventSuppressForWindow(
#if NeedFunctionPrototypes
extern int DeviceEventSuppressForWindow(
WindowPtr /* pWin */,
ClientPtr /* client */,
Mask /* mask */,
int /* maskndx */
#endif
);
int /* maskndx */);
#endif /* EXEVENTS_H */

27
include/extension.h
View File

@@ -45,39 +45,22 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
/* $XFree86: xc/programs/Xserver/include/extension.h,v 1.5 2001/12/14 19:59:54 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/include/extension.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */
#ifndef EXTENSION_H
#define EXTENSION_H
_XFUNCPROTOBEGIN
extern unsigned short StandardMinorOpcode(
#if NeedFunctionPrototypes
ClientPtr /*client*/
#endif
);
extern unsigned short StandardMinorOpcode(ClientPtr /*client*/);
extern unsigned short MinorOpcodeOfRequest(
#if NeedFunctionPrototypes
ClientPtr /*client*/
#endif
);
extern unsigned short MinorOpcodeOfRequest(ClientPtr /*client*/);
extern void InitExtensions(
#if NeedFunctionPrototypes
int argc,
char **argv
#endif
);
extern void InitExtensions(int argc, char **argv);
extern void InitVisualWrap(void);
extern void CloseDownExtensions(
#if NeedFunctionPrototypes
void
#endif
);
extern void CloseDownExtensions(void);
_XFUNCPROTOEND

48
include/extinit.h
View File

@@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/include/extinit.h,v 3.2 2001/08/01 00:44:58 tsi Exp $ */
/* $XFree86: xc/programs/Xserver/include/extinit.h,v 3.3 2003/11/17 22:20:43 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -35,178 +35,132 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
void
XInputExtensionInit(
#if NeedFunctionPrototypes
void
#endif
);
int
ProcIDispatch (
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
int
SProcIDispatch(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
void
SReplyIDispatch (
#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* len */,
xGrabDeviceReply * /* rep */
#endif
);
void
SEventIDispatch (
#if NeedFunctionPrototypes
xEvent * /* from */,
xEvent * /* to */
#endif
);
void
SEventDeviceValuator (
#if NeedFunctionPrototypes
deviceValuator * /* from */,
deviceValuator * /* to */
#endif
);
void
SEventFocus (
#if NeedFunctionPrototypes
deviceFocus * /* from */,
deviceFocus * /* to */
#endif
);
void
SDeviceStateNotifyEvent (
#if NeedFunctionPrototypes
deviceStateNotify * /* from */,
deviceStateNotify * /* to */
#endif
);
void
SDeviceKeyStateNotifyEvent (
#if NeedFunctionPrototypes
deviceKeyStateNotify * /* from */,
deviceKeyStateNotify * /* to */
#endif
);
void
SDeviceButtonStateNotifyEvent (
#if NeedFunctionPrototypes
deviceButtonStateNotify * /* from */,
deviceButtonStateNotify * /* to */
#endif
);
void
SChangeDeviceNotifyEvent (
#if NeedFunctionPrototypes
changeDeviceNotify * /* from */,
changeDeviceNotify * /* to */
#endif
);
void
SDeviceMappingNotifyEvent (
#if NeedFunctionPrototypes
deviceMappingNotify * /* from */,
deviceMappingNotify * /* to */
#endif
);
void
FixExtensionEvents (
#if NeedFunctionPrototypes
ExtensionEntry * /* extEntry */
#endif
);
void
RestoreExtensionEvents (
#if NeedFunctionPrototypes
void
#endif
);
void
IResetProc(
#if NeedFunctionPrototypes
ExtensionEntry * /* unused */
#endif
);
void
AssignTypeAndName (
#if NeedFunctionPrototypes
DeviceIntPtr /* dev */,
Atom /* type */,
char * /* name */
#endif
);
void
MakeDeviceTypeAtoms (
#if NeedFunctionPrototypes
void
#endif
);
DeviceIntPtr
LookupDeviceIntRec (
#if NeedFunctionPrototypes
CARD8 /* id */
#endif
);
void
SetExclusiveAccess (
#if NeedFunctionPrototypes
Mask /* mask */
#endif
);
void
AllowPropagateSuppress (
#if NeedFunctionPrototypes
Mask /* mask */
#endif
);
Mask
GetNextExtEventMask (
#if NeedFunctionPrototypes
void
#endif
);
void
SetMaskForExtEvent(
#if NeedFunctionPrototypes
Mask /* mask */,
int /* event */
#endif
);
void
SetEventInfo(
#if NeedFunctionPrototypes
Mask /* mask */,
int /* constant */
#endif
);
#endif /* EXTINIT_H */

85
include/extnsionst.h
View File

@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
/* $XFree86: xc/programs/Xserver/include/extnsionst.h,v 3.7 2001/12/14 19:59:54 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/include/extnsionst.h,v 3.9 2003/07/16 01:38:52 dawes Exp $ */
#ifndef EXTENSIONSTRUCT_H
#define EXTENSIONSTRUCT_H
@@ -58,10 +58,7 @@ SOFTWARE.
typedef struct _ExtensionEntry {
int index;
void (* CloseDown)( /* called at server shutdown */
#if NeedNestedPrototypes
struct _ExtensionEntry * /* extension */
#endif
);
struct _ExtensionEntry * /* extension */);
char *name; /* extension name */
int base; /* base request number */
int eventBase;
@@ -72,10 +69,7 @@ typedef struct _ExtensionEntry {
char **aliases;
pointer extPrivate;
unsigned short (* MinorOpcode)( /* called for errors */
#if NeedNestedPrototypes
ClientPtr /* client */
#endif
);
ClientPtr /* client */);
#ifdef XCSECURITY
Bool secure; /* extension visible to untrusted clients? */
#endif
@@ -86,25 +80,21 @@ typedef struct _ExtensionEntry {
* Deal with this by casting when initializing the event's EventSwapVector[]
* entries.
*/
typedef void (*EventSwapPtr) (
#if NeedFunctionPrototypes
xEvent *,
xEvent *
#endif
);
typedef void (*EventSwapPtr) (xEvent *, xEvent *);
extern EventSwapPtr EventSwapVector[128];
extern void NotImplemented ( /* FIXME: this may move to another file... */
#if NeedFunctionPrototypes
xEvent *,
xEvent *
#endif
);
xEvent *);
typedef void (* ExtensionLookupProc)( /*args indeterminate*/
#ifdef EXTENSION_PROC_ARGS
EXTENSION_PROC_ARGS
typedef void (* ExtensionLookupProc)(
#ifdef EXTENSION_PROC_ARGS
EXTENSION_PROC_ARGS
#else
/* args no longer indeterminate */
char *name,
GCPtr pGC
#endif
);
@@ -125,71 +115,38 @@ typedef struct _ScreenProcEntry {
extern ExtensionEntry *AddExtension(
#if NeedFunctionPrototypes
char* /*name*/,
int /*NumEvents*/,
int /*NumErrors*/,
int (* /*MainProc*/)(
#if NeedNestedPrototypes
ClientPtr /*client*/
#endif
),
int (* /*SwappedMainProc*/)(
#if NeedNestedPrototypes
ClientPtr /*client*/
#endif
),
void (* /*CloseDownProc*/)(
#if NeedNestedPrototypes
ExtensionEntry * /*extension*/
#endif
),
unsigned short (* /*MinorOpcodeProc*/)(
#if NeedNestedPrototypes
ClientPtr /*client*/
#endif
)
#endif /* NeedFunctionPrototypes */
int (* /*MainProc*/)(ClientPtr /*client*/),
int (* /*SwappedMainProc*/)(ClientPtr /*client*/),
void (* /*CloseDownProc*/)(ExtensionEntry * /*extension*/),
unsigned short (* /*MinorOpcodeProc*/)(ClientPtr /*client*/)
);
extern Bool AddExtensionAlias(
#if NeedFunctionPrototypes
char* /*alias*/,
ExtensionEntry * /*extension*/
#endif
);
ExtensionEntry * /*extension*/);
extern ExtensionEntry *CheckExtension(const char *extname);
extern ExtensionLookupProc LookupProc(
#if NeedFunctionPrototypes
char* /*name*/,
GCPtr /*pGC*/
#endif
);
GCPtr /*pGC*/);
extern Bool RegisterProc(
#if NeedFunctionPrototypes
char* /*name*/,
GCPtr /*pGC*/,
ExtensionLookupProc /*proc*/
#endif
);
ExtensionLookupProc /*proc*/);
extern Bool RegisterScreenProc(
#if NeedFunctionPrototypes
char* /*name*/,
ScreenPtr /*pScreen*/,
ExtensionLookupProc /*proc*/
#endif
);
ExtensionLookupProc /*proc*/);
extern void DeclareExtensionSecurity(
#if NeedFunctionPrototypes
char * /*extname*/,
Bool /*secure*/
#endif
);
Bool /*secure*/);
#endif /* EXTENSIONSTRUCT_H */

92
include/gc.h
View File

@@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/include/gc.h,v 1.5 2001/12/14 19:59:54 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/include/gc.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */
/***********************************************************
Copyright 1987, 1998 The Open Group
@@ -87,28 +87,19 @@ typedef struct _GC *GCPtr;
typedef struct _GCOps *GCOpsPtr;
extern void ValidateGC(
#if NeedFunctionPrototypes
DrawablePtr /*pDraw*/,
GCPtr /*pGC*/
#endif
);
GCPtr /*pGC*/);
extern int ChangeGC(
#if NeedFunctionPrototypes
GCPtr/*pGC*/,
BITS32 /*mask*/,
XID* /*pval*/
#endif
);
XID* /*pval*/);
extern int DoChangeGC(
#if NeedFunctionPrototypes
GCPtr/*pGC*/,
BITS32 /*mask*/,
XID* /*pval*/,
int /*fPointer*/
#endif
);
int /*fPointer*/);
typedef union {
CARD32 val;
@@ -116,117 +107,72 @@ typedef union {
} ChangeGCVal, *ChangeGCValPtr;
extern int dixChangeGC(
#if NeedFunctionPrototypes
ClientPtr /*client*/,
GCPtr /*pGC*/,
BITS32 /*mask*/,
CARD32 * /*pval*/,
ChangeGCValPtr /*pCGCV*/
#endif
);
ChangeGCValPtr /*pCGCV*/);
extern GCPtr CreateGC(
#if NeedFunctionPrototypes
DrawablePtr /*pDrawable*/,
BITS32 /*mask*/,
XID* /*pval*/,
int* /*pStatus*/
#endif
);
int* /*pStatus*/);
extern int CopyGC(
#if NeedFunctionPrototypes
GCPtr/*pgcSrc*/,
GCPtr/*pgcDst*/,
BITS32 /*mask*/
#endif
);
BITS32 /*mask*/);
extern int FreeGC(
#if NeedFunctionPrototypes
pointer /*pGC*/,
XID /*gid*/
#endif
);
XID /*gid*/);
extern void SetGCMask(
#if NeedFunctionPrototypes
GCPtr /*pGC*/,
Mask /*selectMask*/,
Mask /*newDataMask*/
#endif
);
Mask /*newDataMask*/);
extern GCPtr CreateScratchGC(
#if NeedFunctionPrototypes
ScreenPtr /*pScreen*/,
unsigned /*depth*/
#endif
);
unsigned /*depth*/);
extern void FreeGCperDepth(
#if NeedFunctionPrototypes
int /*screenNum*/
#endif
);
int /*screenNum*/);
extern Bool CreateGCperDepth(
#if NeedFunctionPrototypes
int /*screenNum*/
#endif
);
int /*screenNum*/);
extern Bool CreateDefaultStipple(
#if NeedFunctionPrototypes
int /*screenNum*/
#endif
);
int /*screenNum*/);
extern void FreeDefaultStipple(
#if NeedFunctionPrototypes
int /*screenNum*/
#endif
);
int /*screenNum*/);
extern int SetDashes(
#if NeedFunctionPrototypes
GCPtr /*pGC*/,
unsigned /*offset*/,
unsigned /*ndash*/,
unsigned char* /*pdash*/
#endif
);
unsigned char* /*pdash*/);
extern int VerifyRectOrder(
#if NeedFunctionPrototypes
int /*nrects*/,
xRectangle* /*prects*/,
int /*ordering*/
#endif
);
int /*ordering*/);
extern int SetClipRects(
#if NeedFunctionPrototypes
GCPtr /*pGC*/,
int /*xOrigin*/,
int /*yOrigin*/,
int /*nrects*/,
xRectangle* /*prects*/,
int /*ordering*/
#endif
);
int /*ordering*/);
extern GCPtr GetScratchGC(
#if NeedFunctionPrototypes
unsigned /*depth*/,
ScreenPtr /*pScreen*/
#endif
);
ScreenPtr /*pScreen*/);
extern void FreeScratchGC(
#if NeedFunctionPrototypes
GCPtr /*pGC*/
#endif
);
GCPtr /*pGC*/);
#endif /* GC_H */

139
include/gcstruct.h
View File

@@ -47,14 +47,14 @@ SOFTWARE.
******************************************************************/
/* $XFree86: xc/programs/Xserver/include/gcstruct.h,v 1.6 2001/12/14 19:59:54 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/include/gcstruct.h,v 1.8 2003/07/16 01:38:52 dawes Exp $ */
#ifndef GCSTRUCT_H
#define GCSTRUCT_H
#include "gc.h"
#include "miscstruct.h"
#include "regionstr.h"
#include "region.h"
#include "pixmap.h"
#include "screenint.h"
@@ -66,55 +66,34 @@ SOFTWARE.
typedef struct _GCFuncs {
void (* ValidateGC)(
#if NeedNestedPrototypes
GCPtr /*pGC*/,
unsigned long /*stateChanges*/,
DrawablePtr /*pDrawable*/
#endif
);
DrawablePtr /*pDrawable*/);
void (* ChangeGC)(
#if NeedNestedPrototypes
GCPtr /*pGC*/,
unsigned long /*mask*/
#endif
);
unsigned long /*mask*/);
void (* CopyGC)(
#if NeedNestedPrototypes
GCPtr /*pGCSrc*/,
unsigned long /*mask*/,
GCPtr /*pGCDst*/
#endif
);
GCPtr /*pGCDst*/);
void (* DestroyGC)(
#if NeedNestedPrototypes
GCPtr /*pGC*/
#endif
);
GCPtr /*pGC*/);
void (* ChangeClip)(
#if NeedNestedPrototypes
GCPtr /*pGC*/,
int /*type*/,
pointer /*pvalue*/,
int /*nrects*/
#endif
);
int /*nrects*/);
void (* DestroyClip)(
#if NeedNestedPrototypes
GCPtr /*pGC*/
#endif
);
GCPtr /*pGC*/);
void (* CopyClip)(
#if NeedNestedPrototypes
GCPtr /*pgcDst*/,
GCPtr /*pgcSrc*/
#endif
);
GCPtr /*pgcSrc*/);
DevUnion devPrivate;
} GCFuncs;
@@ -124,30 +103,23 @@ typedef struct _GCFuncs {
typedef struct _GCOps {
void (* FillSpans)(
#if NeedNestedPrototypes
DrawablePtr /*pDrawable*/,
GCPtr /*pGC*/,
int /*nInit*/,
DDXPointPtr /*pptInit*/,
int * /*pwidthInit*/,
int /*fSorted*/
#endif
);
int /*fSorted*/);
void (* SetSpans)(
#if NeedNestedPrototypes
DrawablePtr /*pDrawable*/,
GCPtr /*pGC*/,
char * /*psrc*/,
DDXPointPtr /*ppt*/,
int * /*pwidth*/,
int /*nspans*/,
int /*fSorted*/
#endif
);
int /*fSorted*/);
void (* PutImage)(
#if NeedNestedPrototypes
DrawablePtr /*pDrawable*/,
GCPtr /*pGC*/,
int /*depth*/,
@@ -157,12 +129,9 @@ typedef struct _GCOps {
int /*h*/,
int /*leftPad*/,
int /*format*/,
char * /*pBits*/
#endif
);
char * /*pBits*/);
RegionPtr (* CopyArea)(
#if NeedNestedPrototypes
DrawablePtr /*pSrc*/,
DrawablePtr /*pDst*/,
GCPtr /*pGC*/,
@@ -171,12 +140,9 @@ typedef struct _GCOps {
int /*w*/,
int /*h*/,
int /*dstx*/,
int /*dsty*/
#endif
);
int /*dsty*/);
RegionPtr (* CopyPlane)(
#if NeedNestedPrototypes
DrawablePtr /*pSrcDrawable*/,
DrawablePtr /*pDstDrawable*/,
GCPtr /*pGC*/,
@@ -186,164 +152,117 @@ typedef struct _GCOps {
int /*height*/,
int /*dstx*/,
int /*dsty*/,
unsigned long /*bitPlane*/
#endif
);
unsigned long /*bitPlane*/);
void (* PolyPoint)(
#if NeedNestedPrototypes
DrawablePtr /*pDrawable*/,
GCPtr /*pGC*/,
int /*mode*/,
int /*npt*/,
DDXPointPtr /*pptInit*/
#endif
);
DDXPointPtr /*pptInit*/);
void (* Polylines)(
#if NeedNestedPrototypes
DrawablePtr /*pDrawable*/,
GCPtr /*pGC*/,
int /*mode*/,
int /*npt*/,
DDXPointPtr /*pptInit*/
#endif
);
DDXPointPtr /*pptInit*/);
void (* PolySegment)(
#if NeedNestedPrototypes
DrawablePtr /*pDrawable*/,
GCPtr /*pGC*/,
int /*nseg*/,
xSegment * /*pSegs*/
#endif
);
xSegment * /*pSegs*/);
void (* PolyRectangle)(
#if NeedNestedPrototypes
DrawablePtr /*pDrawable*/,
GCPtr /*pGC*/,
int /*nrects*/,
xRectangle * /*pRects*/
#endif
);
xRectangle * /*pRects*/);
void (* PolyArc)(
#if NeedNestedPrototypes
DrawablePtr /*pDrawable*/,
GCPtr /*pGC*/,
int /*narcs*/,
xArc * /*parcs*/
#endif
);
xArc * /*parcs*/);
void (* FillPolygon)(
#if NeedNestedPrototypes
DrawablePtr /*pDrawable*/,
GCPtr /*pGC*/,
int /*shape*/,
int /*mode*/,
int /*count*/,
DDXPointPtr /*pPts*/
#endif
);
DDXPointPtr /*pPts*/);
void (* PolyFillRect)(
#if NeedNestedPrototypes
DrawablePtr /*pDrawable*/,
GCPtr /*pGC*/,
int /*nrectFill*/,
xRectangle * /*prectInit*/
#endif
);
xRectangle * /*prectInit*/);
void (* PolyFillArc)(
#if NeedNestedPrototypes
DrawablePtr /*pDrawable*/,
GCPtr /*pGC*/,
int /*narcs*/,
xArc * /*parcs*/
#endif
);
xArc * /*parcs*/);
int (* PolyText8)(
#if NeedNestedPrototypes
DrawablePtr /*pDrawable*/,
GCPtr /*pGC*/,
int /*x*/,
int /*y*/,
int /*count*/,
char * /*chars*/
#endif
);
char * /*chars*/);
int (* PolyText16)(
#if NeedNestedPrototypes
DrawablePtr /*pDrawable*/,
GCPtr /*pGC*/,
int /*x*/,
int /*y*/,
int /*count*/,
unsigned short * /*chars*/
#endif
);
unsigned short * /*chars*/);
void (* ImageText8)(
#if NeedNestedPrototypes
DrawablePtr /*pDrawable*/,
GCPtr /*pGC*/,
int /*x*/,
int /*y*/,
int /*count*/,
char * /*chars*/
#endif
);
char * /*chars*/);
void (* ImageText16)(
#if NeedNestedPrototypes
DrawablePtr /*pDrawable*/,
GCPtr /*pGC*/,
int /*x*/,
int /*y*/,
int /*count*/,
unsigned short * /*chars*/
#endif
);
unsigned short * /*chars*/);
void (* ImageGlyphBlt)(
#if NeedNestedPrototypes
DrawablePtr /*pDrawable*/,
GCPtr /*pGC*/,
int /*x*/,
int /*y*/,
unsigned int /*nglyph*/,
CharInfoPtr * /*ppci*/,
pointer /*pglyphBase*/
#endif
);
pointer /*pglyphBase*/);
void (* PolyGlyphBlt)(
#if NeedNestedPrototypes
DrawablePtr /*pDrawable*/,
GCPtr /*pGC*/,
int /*x*/,
int /*y*/,
unsigned int /*nglyph*/,
CharInfoPtr * /*ppci*/,
pointer /*pglyphBase*/
#endif
);
pointer /*pglyphBase*/);
void (* PushPixels)(
#if NeedNestedPrototypes
GCPtr /*pGC*/,
PixmapPtr /*pBitMap*/,
DrawablePtr /*pDst*/,
int /*w*/,
int /*h*/,
int /*x*/,
int /*y*/
#endif
);
int /*y*/);
#ifdef NEED_LINEHELPER
void (* LineHelper)();

263
include/input.h
View File

@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
/* $XFree86: xc/programs/Xserver/include/input.h,v 3.7 2001/12/14 19:59:54 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/include/input.h,v 3.8 2003/04/27 21:31:04 herrb Exp $ */
#ifndef INPUT_H
#define INPUT_H
@@ -84,19 +84,13 @@ typedef struct _InputClients *InputClientsPtr;
typedef struct _DeviceIntRec *DeviceIntPtr;
typedef int (*DeviceProc)(
#if NeedNestedPrototypes
DeviceIntPtr /*device*/,
int /*what*/
#endif
);
int /*what*/);
typedef void (*ProcessInputProc)(
#if NeedNestedPrototypes
xEventPtr /*events*/,
DeviceIntPtr /*device*/,
int /*count*/
#endif
);
int /*count*/);
typedef struct _DeviceRec {
pointer devicePrivate;
@@ -156,380 +150,227 @@ extern PtrCtrl defaultPointerControl;
#undef AddInputDevice
extern DevicePtr AddInputDevice(
#if NeedFunctionPrototypes
DeviceProc /*deviceProc*/,
Bool /*autoStart*/
#endif
);
Bool /*autoStart*/);
#define AddInputDevice(deviceProc, autoStart) \
_AddInputDevice(deviceProc, autoStart)
extern DeviceIntPtr _AddInputDevice(
#if NeedFunctionPrototypes
DeviceProc /*deviceProc*/,
Bool /*autoStart*/
#endif
);
Bool /*autoStart*/);
extern Bool EnableDevice(
#if NeedFunctionPrototypes
DeviceIntPtr /*device*/
#endif
);
DeviceIntPtr /*device*/);
extern Bool DisableDevice(
#if NeedFunctionPrototypes
DeviceIntPtr /*device*/
#endif
);
DeviceIntPtr /*device*/);
extern int InitAndStartDevices(
#if NeedFunctionPrototypes
void
#endif
);
extern int InitAndStartDevices(void);
extern void CloseDownDevices(
#if NeedFunctionPrototypes
void
#endif
);
extern void CloseDownDevices(void);
extern void RemoveDevice(
#if NeedFunctionPrototypes
DeviceIntPtr /*dev*/
#endif
);
DeviceIntPtr /*dev*/);
extern int NumMotionEvents(
#if NeedFunctionPrototypes
void
#endif
);
extern int NumMotionEvents(void);
#undef RegisterPointerDevice
extern void RegisterPointerDevice(
#if NeedFunctionPrototypes
DevicePtr /*device*/
#endif
);
DevicePtr /*device*/);
#define RegisterPointerDevice(device) \
_RegisterPointerDevice(device)
extern void _RegisterPointerDevice(
#if NeedFunctionPrototypes
DeviceIntPtr /*device*/
#endif
);
DeviceIntPtr /*device*/);
#undef RegisterKeyboardDevice
extern void RegisterKeyboardDevice(
#if NeedFunctionPrototypes
DevicePtr /*device*/
#endif
);
DevicePtr /*device*/);
#define RegisterKeyboardDevice(device) \
_RegisterKeyboardDevice(device)
extern void _RegisterKeyboardDevice(
#if NeedFunctionPrototypes
DeviceIntPtr /*device*/
#endif
);
DeviceIntPtr /*device*/);
extern DevicePtr LookupKeyboardDevice(
#if NeedFunctionPrototypes
void
#endif
);
extern DevicePtr LookupKeyboardDevice(void);
extern DevicePtr LookupPointerDevice(
#if NeedFunctionPrototypes
void
#endif
);
extern DevicePtr LookupPointerDevice(void);
extern DevicePtr LookupDevice(
#if NeedFunctionPrototypes
int /* id */
#endif
);
int /* id */);
extern void QueryMinMaxKeyCodes(
#if NeedFunctionPrototypes
KeyCode* /*minCode*/,
KeyCode* /*maxCode*/
#endif
);
KeyCode* /*maxCode*/);
extern Bool SetKeySymsMap(
#if NeedFunctionPrototypes
KeySymsPtr /*dst*/,
KeySymsPtr /*src*/
#endif
);
KeySymsPtr /*src*/);
extern Bool InitKeyClassDeviceStruct(
#if NeedFunctionPrototypes
DeviceIntPtr /*device*/,
KeySymsPtr /*pKeySyms*/,
CARD8 /*pModifiers*/[]
#endif
);
CARD8 /*pModifiers*/[]);
extern Bool InitButtonClassDeviceStruct(
#if NeedFunctionPrototypes
DeviceIntPtr /*device*/,
int /*numButtons*/,
CARD8* /*map*/
#endif
);
CARD8* /*map*/);
typedef int (*ValuatorMotionProcPtr)(
#if NeedNestedPrototypes
DeviceIntPtr /*pdevice*/,
xTimecoord * /*coords*/,
unsigned long /*start*/,
unsigned long /*stop*/,
ScreenPtr /*pScreen*/
#endif
);
ScreenPtr /*pScreen*/);
extern Bool InitValuatorClassDeviceStruct(
#if NeedFunctionPrototypes
DeviceIntPtr /*device*/,
int /*numAxes*/,
ValuatorMotionProcPtr /* motionProc */,
int /*numMotionEvents*/,
int /*mode*/
#endif
);
int /*mode*/);
extern Bool InitFocusClassDeviceStruct(
#if NeedFunctionPrototypes
DeviceIntPtr /*device*/
#endif
);
DeviceIntPtr /*device*/);
typedef void (*BellProcPtr)(
#if NeedNestedPrototypes
int /*percent*/,
DeviceIntPtr /*device*/,
pointer /*ctrl*/,
int
#endif
);
int);
typedef void (*KbdCtrlProcPtr)(
#if NeedNestedPrototypes
DeviceIntPtr /*device*/,
KeybdCtrl * /*ctrl*/
#endif
);
KeybdCtrl * /*ctrl*/);
extern Bool InitKbdFeedbackClassDeviceStruct(
#if NeedFunctionPrototypes
DeviceIntPtr /*device*/,
BellProcPtr /*bellProc*/,
KbdCtrlProcPtr /*controlProc*/
#endif
);
KbdCtrlProcPtr /*controlProc*/);
typedef void (*PtrCtrlProcPtr)(
#if NeedNestedPrototypes
DeviceIntPtr /*device*/,
PtrCtrl * /*ctrl*/
#endif
);
PtrCtrl * /*ctrl*/);
extern Bool InitPtrFeedbackClassDeviceStruct(
#if NeedFunctionPrototypes
DeviceIntPtr /*device*/,
PtrCtrlProcPtr /*controlProc*/
#endif
);
PtrCtrlProcPtr /*controlProc*/);
typedef void (*StringCtrlProcPtr)(
#if NeedNestedPrototypes
DeviceIntPtr /*device*/,
StringCtrl * /*ctrl*/
#endif
);
StringCtrl * /*ctrl*/);
extern Bool InitStringFeedbackClassDeviceStruct(
#if NeedFunctionPrototypes
DeviceIntPtr /*device*/,
StringCtrlProcPtr /*controlProc*/,
int /*max_symbols*/,
int /*num_symbols_supported*/,
KeySym* /*symbols*/
#endif
);
KeySym* /*symbols*/);
typedef void (*BellCtrlProcPtr)(
#if NeedNestedPrototypes
DeviceIntPtr /*device*/,
BellCtrl * /*ctrl*/
#endif
);
BellCtrl * /*ctrl*/);
extern Bool InitBellFeedbackClassDeviceStruct(
#if NeedFunctionPrototypes
DeviceIntPtr /*device*/,
BellProcPtr /*bellProc*/,
BellCtrlProcPtr /*controlProc*/
#endif
);
BellCtrlProcPtr /*controlProc*/);
typedef void (*LedCtrlProcPtr)(
#if NeedNestedPrototypes
DeviceIntPtr /*device*/,
LedCtrl * /*ctrl*/
#endif
);
LedCtrl * /*ctrl*/);
extern Bool InitLedFeedbackClassDeviceStruct(
#if NeedFunctionPrototypes
DeviceIntPtr /*device*/,
LedCtrlProcPtr /*controlProc*/
#endif
);
LedCtrlProcPtr /*controlProc*/);
typedef void (*IntegerCtrlProcPtr)(
#if NeedNestedPrototypes
DeviceIntPtr /*device*/,
IntegerCtrl * /*ctrl*/
#endif
);
IntegerCtrl * /*ctrl*/);
extern Bool InitIntegerFeedbackClassDeviceStruct(
#if NeedFunctionPrototypes
DeviceIntPtr /*device*/,
IntegerCtrlProcPtr /*controlProc*/
#endif
);
IntegerCtrlProcPtr /*controlProc*/);
extern Bool InitPointerDeviceStruct(
#if NeedFunctionPrototypes
DevicePtr /*device*/,
CARD8* /*map*/,
int /*numButtons*/,
ValuatorMotionProcPtr /*motionProc*/,
PtrCtrlProcPtr /*controlProc*/,
int /*numMotionEvents*/
#endif
);
int /*numMotionEvents*/);
extern Bool InitKeyboardDeviceStruct(
#if NeedFunctionPrototypes
DevicePtr /*device*/,
KeySymsPtr /*pKeySyms*/,
CARD8 /*pModifiers*/[],
BellProcPtr /*bellProc*/,
KbdCtrlProcPtr /*controlProc*/
#endif
);
KbdCtrlProcPtr /*controlProc*/);
extern void SendMappingNotify(
#if NeedFunctionPrototypes
unsigned int /*request*/,
unsigned int /*firstKeyCode*/,
unsigned int /*count*/,
ClientPtr /* client */
#endif
);
ClientPtr /* client */);
extern Bool BadDeviceMap(
#if NeedFunctionPrototypes
BYTE* /*buff*/,
int /*length*/,
unsigned /*low*/,
unsigned /*high*/,
XID* /*errval*/
#endif
);
XID* /*errval*/);
extern Bool AllModifierKeysAreUp(
#if NeedFunctionPrototypes
DeviceIntPtr /*device*/,
CARD8* /*map1*/,
int /*per1*/,
CARD8* /*map2*/,
int /*per2*/
#endif
);
int /*per2*/);
extern void NoteLedState(
#if NeedFunctionPrototypes
DeviceIntPtr /*keybd*/,
int /*led*/,
Bool /*on*/
#endif
);
Bool /*on*/);
extern void MaybeStopHint(
#if NeedFunctionPrototypes
DeviceIntPtr /*device*/,
ClientPtr /*client*/
#endif
);
ClientPtr /*client*/);
extern void ProcessPointerEvent(
#if NeedFunctionPrototypes
xEventPtr /*xE*/,
DeviceIntPtr /*mouse*/,
int /*count*/
#endif
);
int /*count*/);
extern void ProcessKeyboardEvent(
#if NeedFunctionPrototypes
xEventPtr /*xE*/,
DeviceIntPtr /*keybd*/,
int /*count*/
#endif
);
int /*count*/);
#ifdef XKB
extern void CoreProcessPointerEvent(
#if NeedFunctionPrototypes
xEventPtr /*xE*/,
DeviceIntPtr /*mouse*/,
int /*count*/
#endif
);
int /*count*/);
extern void CoreProcessKeyboardEvent(
#if NeedFunctionPrototypes
xEventPtr /*xE*/,
DeviceIntPtr /*keybd*/,
int /*count*/
#endif
);
int /*count*/);
#endif
extern Bool LegalModifier(
#if NeedFunctionPrototypes
unsigned int /*key*/,
DevicePtr /*pDev*/
#endif
);
DevicePtr /*pDev*/);
extern void ProcessInputEvents(
#if NeedFunctionPrototypes
void
#endif
);
extern void ProcessInputEvents(void);
extern void InitInput(
#if NeedFunctionPrototypes
int /*argc*/,
char ** /*argv*/
#endif
);
char ** /*argv*/);
#endif /* INPUT_H */

12
include/inputstr.h
View File

@@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/include/inputstr.h,v 1.5 2001/12/14 19:59:54 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/include/inputstr.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */
/************************************************************
Copyright 1987, 1998 The Open Group
@@ -265,18 +265,12 @@ typedef struct _DeviceIntRec {
Bool fromPassiveGrab;
GrabRec activeGrab;
void (*ActivateGrab) (
#if NeedNestedPrototypes
DeviceIntPtr /*device*/,
GrabPtr /*grab*/,
TimeStamp /*time*/,
Bool /*autoGrab*/
#endif
);
Bool /*autoGrab*/);
void (*DeactivateGrab)(
#if NeedNestedPrototypes
DeviceIntPtr /*device*/
#endif
);
DeviceIntPtr /*device*/);
KeyClassPtr key;
ValuatorClassPtr valuator;
ButtonClassPtr button;

23
include/misc.h
View File

@@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/include/misc.h,v 3.28 2001/12/14 19:59:55 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/include/misc.h,v 3.29 2003/04/27 21:31:04 herrb Exp $ */
/***********************************************************
Copyright 1987, 1998 The Open Group
@@ -238,30 +238,17 @@ typedef struct _xReq *xReqPtr;
((char *) &(dst))[1] = ((char *) &(src))[0]; }
extern void SwapLongs(
#if NeedFunctionPrototypes
CARD32 *list,
unsigned long count
#endif
);
unsigned long count);
extern void SwapShorts(
#if NeedFunctionPrototypes
short *list,
unsigned long count
#endif
);
unsigned long count);
extern void MakePredeclaredAtoms(
#if NeedFunctionPrototypes
void
#endif
);
extern void MakePredeclaredAtoms(void);
extern int Ones(
#if NeedFunctionPrototypes
unsigned long /*mask*/
#endif
);
unsigned long /*mask*/);
typedef struct _xPoint *DDXPointPtr;
typedef struct _Box *BoxPtr;

19
include/miscstruct.h
View File

@@ -45,13 +45,14 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
/* $XFree86: xc/programs/Xserver/include/miscstruct.h,v 3.3 2001/12/14 19:59:55 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/include/miscstruct.h,v 3.5 2003/07/16 01:38:52 dawes Exp $ */
#ifndef MISCSTRUCT_H
#define MISCSTRUCT_H 1
#include "misc.h"
#include "X11/Xprotostr.h"
#include "gc.h"
typedef xPoint DDXPointRec;
@@ -63,11 +64,17 @@ typedef union _DevUnion {
pointer ptr;
long val;
unsigned long uval;
pointer (*fptr)(
#if NeedFunctionPrototypes
void
#endif
);
RegionPtr (*fptr)(
DrawablePtr /* pSrcDrawable */,
DrawablePtr /* pDstDrawable */,
GCPtr /* pGC */,
int /* srcx */,
int /* srcy */,
int /* width */,
int /* height */,
int /* dstx */,
int /* dsty */,
unsigned long /* bitPlane */);
} DevUnion;
#endif /* MISCSTRUCT_H */

5
include/opaque.h
View File

@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
/* $XFree86: xc/programs/Xserver/include/opaque.h,v 1.11 2002/10/08 23:55:22 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/include/opaque.h,v 1.14 2003/09/09 03:20:41 dawes Exp $ */
#ifndef OPAQUE_H
#define OPAQUE_H
@@ -74,9 +74,10 @@ extern int limitNoFile;
#endif
extern Bool permitOldBugs;
extern Bool defeatAccessControl;
extern char* protNoListen;
extern long maxBigRequestSize;
extern Bool blackRoot;
extern Bool CoreDump;
#endif /* OPAQUE_H */

673
include/os.h
View File

@@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/include/os.h,v 3.43 2002/12/24 17:42:59 tsi Exp $ */
/* $XFree86: xc/programs/Xserver/include/os.h,v 3.54 2003/10/30 21:21:06 herrb Exp $ */
/***********************************************************
Copyright 1987, 1998 The Open Group
@@ -50,6 +50,7 @@ SOFTWARE.
#ifndef OS_H
#define OS_H
#include "misc.h"
#define ALLOCATE_LOCAL_FALLBACK(_size) Xalloc((unsigned long)(_size))
#define DEALLOCATE_LOCAL_FALLBACK(_ptr) Xfree((pointer)(_ptr))
@@ -71,7 +72,7 @@ SOFTWARE.
#define MAX_REQUEST_SIZE 65535
#endif
#ifndef MAX_BIG_REQUEST_SIZE
#define MAX_BIG_REQUEST_SIZE 1048575
#define MAX_BIG_REQUEST_SIZE 4194303
#endif
typedef pointer FID;
@@ -109,613 +110,259 @@ extern Bool OsDelayInitColors;
extern void (*OsVendorVErrorFProc)(const char *, va_list args);
extern int WaitForSomething(
#if NeedFunctionPrototypes
int* /*pClientsReady*/
#endif
);
#ifdef LBX
#define ReadRequestFromClient(client) ((client)->readRequest(client))
extern int StandardReadRequestFromClient(
#if NeedFunctionPrototypes
ClientPtr /*client*/
#endif
);
extern int StandardReadRequestFromClient(ClientPtr /*client*/);
extern int ClientConnectionNumber(
#if NeedFunctionPrototypes
ClientPtr /*client*/
#endif
);
extern int ClientConnectionNumber(ClientPtr /*client*/);
#else
extern int ReadRequestFromClient(
#if NeedFunctionPrototypes
ClientPtr /*client*/
#endif
);
extern int ReadRequestFromClient(ClientPtr /*client*/);
#endif /* LBX */
extern Bool InsertFakeRequest(
#if NeedFunctionPrototypes
ClientPtr /*client*/,
char* /*data*/,
int /*count*/
#endif
);
ClientPtr /*client*/,
char* /*data*/,
int /*count*/);
extern void ResetCurrentRequest(
#if NeedFunctionPrototypes
ClientPtr /*client*/
#endif
);
extern void ResetCurrentRequest(ClientPtr /*client*/);
extern void FlushAllOutput(
#if NeedFunctionPrototypes
void
#endif
);
extern void FlushAllOutput(void);
extern void FlushIfCriticalOutputPending(
#if NeedFunctionPrototypes
void
#endif
);
extern void FlushIfCriticalOutputPending(void);
extern void SetCriticalOutputPending(
#if NeedFunctionPrototypes
void
#endif
);
extern void SetCriticalOutputPending(void);
extern int WriteToClient(
#if NeedFunctionPrototypes
ClientPtr /*who*/,
int /*count*/,
char* /*buf*/
#endif
);
extern int WriteToClient(ClientPtr /*who*/, int /*count*/, char* /*buf*/);
extern void ResetOsBuffers(
#if NeedFunctionPrototypes
void
#endif
);
extern void ResetOsBuffers(void);
extern void InitConnectionLimits(
#if NeedFunctionPrototypes
void
#endif
);
extern void InitConnectionLimits(void);
extern void CreateWellKnownSockets(
#if NeedFunctionPrototypes
void
#endif
);
extern void CreateWellKnownSockets(void);
extern void ResetWellKnownSockets(
#if NeedFunctionPrototypes
void
#endif
);
extern void ResetWellKnownSockets(void);
extern void CloseWellKnownConnections(
#if NeedFunctionPrototypes
void
#endif
);
extern void CloseWellKnownConnections(void);
extern XID
AuthorizationIDOfClient(
#if NeedFunctionPrototypes
ClientPtr /*client*/
#endif
);
extern XID AuthorizationIDOfClient(ClientPtr /*client*/);
extern char *ClientAuthorized(
#if NeedFunctionPrototypes
ClientPtr /*client*/,
unsigned int /*proto_n*/,
char* /*auth_proto*/,
unsigned int /*string_n*/,
char* /*auth_string*/
#endif
);
char* /*auth_string*/);
extern Bool EstablishNewConnections(
#if NeedFunctionPrototypes
ClientPtr /*clientUnused*/,
pointer /*closure*/
#endif
);
pointer /*closure*/);
extern void CheckConnections(
#if NeedFunctionPrototypes
void
#endif
);
extern void CheckConnections(void);
extern void CloseDownConnection(
#if NeedFunctionPrototypes
ClientPtr /*client*/
#endif
);
extern void CloseDownConnection(ClientPtr /*client*/);
extern void AddEnabledDevice(
#if NeedFunctionPrototypes
int /*fd*/
#endif
);
extern void AddEnabledDevice(int /*fd*/);
extern void RemoveEnabledDevice(
#if NeedFunctionPrototypes
int /*fd*/
#endif
);
extern void RemoveEnabledDevice(int /*fd*/);
extern void OnlyListenToOneClient(
#if NeedFunctionPrototypes
ClientPtr /*client*/
#endif
);
extern void OnlyListenToOneClient(ClientPtr /*client*/);
extern void ListenToAllClients(
#if NeedFunctionPrototypes
void
#endif
);
extern void ListenToAllClients(void);
extern void IgnoreClient(
#if NeedFunctionPrototypes
ClientPtr /*client*/
#endif
);
extern void IgnoreClient(ClientPtr /*client*/);
extern void AttendClient(
#if NeedFunctionPrototypes
ClientPtr /*client*/
#endif
);
extern void AttendClient(ClientPtr /*client*/);
extern void MakeClientGrabImpervious(
#if NeedFunctionPrototypes
ClientPtr /*client*/
#endif
);
extern void MakeClientGrabImpervious(ClientPtr /*client*/);
extern void MakeClientGrabPervious(
#if NeedFunctionPrototypes
ClientPtr /*client*/
#endif
);
extern void MakeClientGrabPervious(ClientPtr /*client*/);
#ifdef LBX
extern void CloseDownFileDescriptor(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
extern void CloseDownFileDescriptor(ClientPtr /* client */);
#endif
extern void AvailableClientInput(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
extern void AvailableClientInput(ClientPtr /* client */);
extern void Error(
#if NeedFunctionPrototypes
char* /*str*/
#endif
);
extern CARD32 GetTimeInMillis(
#if NeedFunctionPrototypes
void
#endif
);
extern CARD32 GetTimeInMillis(void);
extern void AdjustWaitForDelay(
#if NeedFunctionPrototypes
pointer /*waitTime*/,
unsigned long /*newdelay*/
#endif
);
unsigned long /*newdelay*/);
typedef struct _OsTimerRec *OsTimerPtr;
typedef CARD32 (*OsTimerCallback)(
#if NeedFunctionPrototypes
OsTimerPtr /* timer */,
CARD32 /* time */,
pointer /* arg */
#endif
);
pointer /* arg */);
extern void TimerInit(
#if NeedFunctionPrototypes
void
#endif
);
extern void TimerInit(void);
extern Bool TimerForce(
#if NeedFunctionPrototypes
OsTimerPtr /* timer */
#endif
);
extern Bool TimerForce(OsTimerPtr /* timer */);
#define TimerAbsolute (1<<0)
#define TimerForceOld (1<<1)
extern OsTimerPtr TimerSet(
#if NeedFunctionPrototypes
OsTimerPtr /* timer */,
int /* flags */,
CARD32 /* millis */,
OsTimerCallback /* func */,
pointer /* arg */
#endif
);
pointer /* arg */);
extern void TimerCheck(
#if NeedFunctionPrototypes
void
#endif
);
extern void TimerCheck(void);
extern void TimerCancel(OsTimerPtr /* pTimer */);
extern void TimerFree(OsTimerPtr /* pTimer */);
extern void TimerCancel(
#if NeedFunctionPrototypes
OsTimerPtr /* pTimer */
#endif
);
extern void SetScreenSaverTimer(void);
extern void FreeScreenSaverTimer(void);
extern void TimerFree(
#if NeedFunctionPrototypes
OsTimerPtr /* pTimer */
#ifdef DPMSExtension
extern void SetDPMSTimers(void);
extern void FreeDPMSTimers(void);
#endif
);
extern SIGVAL AutoResetServer(
#if NeedFunctionPrototypes
int /*sig*/
#endif
);
extern SIGVAL AutoResetServer(int /*sig*/);
extern SIGVAL GiveUp(
#if NeedFunctionPrototypes
int /*sig*/
#endif
);
extern SIGVAL GiveUp(int /*sig*/);
extern void UseMsg(
#if NeedFunctionPrototypes
void
#endif
);
extern void UseMsg(void);
extern void ProcessCommandLine(
#if NeedFunctionPrototypes
int /*argc*/,
char* /*argv*/[]
#endif
);
extern void ProcessCommandLine(int /*argc*/, char* /*argv*/[]);
extern pointer Xalloc(
#if NeedFunctionPrototypes
unsigned long /*amount*/
#endif
);
extern int set_font_authorizations(
char ** /* authorizations */,
int * /*authlen */,
pointer /* client */);
extern pointer XNFalloc(
#if NeedFunctionPrototypes
unsigned long /*amount*/
#ifndef _HAVE_XALLOC_DECLS
#define _HAVE_XALLOC_DECLS
extern pointer Xalloc(unsigned long /*amount*/);
extern pointer Xcalloc(unsigned long /*amount*/);
extern pointer Xrealloc(pointer /*ptr*/, unsigned long /*amount*/);
extern void Xfree(pointer /*ptr*/);
#endif
);
extern pointer Xcalloc(
#if NeedFunctionPrototypes
unsigned long /*amount*/
#endif
);
extern pointer XNFalloc(unsigned long /*amount*/);
extern pointer XNFcalloc(unsigned long /*amount*/);
extern pointer XNFrealloc(pointer /*ptr*/, unsigned long /*amount*/);
extern pointer XNFcalloc(
#if NeedFunctionPrototypes
unsigned long /*amount*/
#endif
);
extern pointer Xrealloc(
#if NeedFunctionPrototypes
pointer /*ptr*/,
unsigned long /*amount*/
#endif
);
extern pointer XNFrealloc(
#if NeedFunctionPrototypes
pointer /*ptr*/,
unsigned long /*amount*/
#endif
);
extern void Xfree(
#if NeedFunctionPrototypes
pointer /*ptr*/
#endif
);
extern void OsInitAllocator(
#if NeedFunctionPrototypes
void
#endif
);
extern void OsInitAllocator(void);
extern char *Xstrdup(const char *s);
extern char *XNFstrdup(const char *s);
typedef SIGVAL (*OsSigHandlerPtr)(
#if NeedFunctionPrototypes
int /* sig */
#endif
);
typedef SIGVAL (*OsSigHandlerPtr)(int /* sig */);
extern OsSigHandlerPtr OsSignal(
#if NeedFunctionPrototypes
int /* sig */,
OsSigHandlerPtr /* handler */
#endif
);
extern OsSigHandlerPtr OsSignal(int /* sig */, OsSigHandlerPtr /* handler */);
extern int auditTrailLevel;
extern void AuditPrefix(
#if NeedFunctionPrototypes
const char *
#endif
);
extern void AuditF(
#if NeedVarargsPrototypes
const char* /*f*/,
...
#endif
);
extern void FatalError(
#if NeedVarargsPrototypes
const char* /*f*/,
...
#endif
)
#if defined(__GNUC__) && \
((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ > 4)))
__attribute((noreturn))
#endif
;
extern void ErrorF(
#if NeedVarargsPrototypes
const char* /*f*/,
...
#endif
);
#if NeedVarargsPrototypes
extern void VErrorF(const char *f, va_list args);
#endif
#ifdef SERVER_LOCK
extern void LockServer(
#if NeedFunctionPrototypes
void
#endif
);
extern void UnlockServer(
#if NeedFunctionPrototypes
void
#endif
);
extern void LockServer(void);
extern void UnlockServer(void);
#endif
extern int OsLookupColor(
#if NeedFunctionPrototypes
int /*screen*/,
char * /*name*/,
unsigned /*len*/,
unsigned short * /*pred*/,
unsigned short * /*pgreen*/,
unsigned short * /*pblue*/
#endif
);
unsigned short * /*pblue*/);
extern void OsInit(
#if NeedFunctionPrototypes
void
#endif
);
extern void OsInit(void);
extern void OsCleanup(
#if NeedFunctionPrototypes
void
#endif
);
extern void OsCleanup(Bool);
extern void OsVendorFatalError(
#if NeedFunctionPrototypes
void
#endif
);
extern void OsVendorFatalError(void);
extern void OsVendorInit(
#if NeedFunctionPrototypes
void
#endif
);
extern void OsVendorInit(void);
extern int OsInitColors(
#if NeedFunctionPrototypes
void
#endif
);
extern int OsInitColors(void);
void OsBlockSignals (
#if NeedFunctionPrototypes
void
#endif
);
void OsBlockSignals (void);
void OsReleaseSignals (
#if NeedFunctionPrototypes
void
#endif
);
void OsReleaseSignals (void);
#if !defined(WIN32) && !defined(__UNIXOS2__)
extern int System(char *);
extern pointer Popen(char *, char *);
extern int Pclose(pointer);
extern pointer Fopen(char *, char *);
extern int Fclose(pointer);
#else
#define System(a) system(a)
#define Popen(a,b) popen(a,b)
#define Pclose(a) pclose(a)
#define Fopen(a,b) fopen(a,b)
#define Fclose(a) fclose(a)
#endif
extern void CheckUserParameters(int argc, char **argv, char **envp);
extern void CheckUserAuthorization(void);
extern int AddHost(
#if NeedFunctionPrototypes
ClientPtr /*client*/,
int /*family*/,
unsigned /*length*/,
pointer /*pAddr*/
#endif
);
pointer /*pAddr*/);
extern Bool ForEachHostInFamily (
#if NeedFunctionPrototypes
int /*family*/,
Bool (* /*func*/ )(
#if NeedNestedPrototypes
unsigned char * /* addr */,
short /* len */,
pointer /* closure */
#endif
),
pointer /*closure*/
#endif
);
pointer /* closure */),
pointer /*closure*/);
extern int RemoveHost(
#if NeedFunctionPrototypes
ClientPtr /*client*/,
int /*family*/,
unsigned /*length*/,
pointer /*pAddr*/
#endif
);
pointer /*pAddr*/);
extern int GetHosts(
#if NeedFunctionPrototypes
pointer * /*data*/,
int * /*pnHosts*/,
int * /*pLen*/,
BOOL * /*pEnabled*/
#endif
);
BOOL * /*pEnabled*/);
typedef struct sockaddr * sockaddrPtr;
extern int InvalidHost(
#if NeedFunctionPrototypes
sockaddrPtr /*saddr*/,
int /*len*/
#endif
);
extern int InvalidHost(sockaddrPtr /*saddr*/, int /*len*/);
extern int LocalClient(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
extern int LocalClient(ClientPtr /* client */);
extern int LocalClientCred(ClientPtr, int *, int *);
extern int ChangeAccessControl(
#if NeedFunctionPrototypes
ClientPtr /*client*/,
int /*fEnabled*/
#endif
);
extern int ChangeAccessControl(ClientPtr /*client*/, int /*fEnabled*/);
extern int GetAccessControl(
#if NeedFunctionPrototypes
void
#endif
);
extern int GetAccessControl(void);
extern void AddLocalHosts(
#if NeedFunctionPrototypes
void
#endif
);
extern void AddLocalHosts(void);
extern void ResetHosts(
#if NeedFunctionPrototypes
char *display
#endif
);
extern void ResetHosts(char *display);
extern void EnableLocalHost(
#if NeedFunctionPrototypes
void
#endif
);
extern void EnableLocalHost(void);
extern void DisableLocalHost(
#if NeedFunctionPrototypes
void
#endif
);
extern void DisableLocalHost(void);
extern void AccessUsingXdmcp(
#if NeedFunctionPrototypes
void
#endif
);
extern void AccessUsingXdmcp(void);
extern void DefineSelf(
#if NeedFunctionPrototypes
int /*fd*/
#endif
);
extern void DefineSelf(int /*fd*/);
extern void AugmentSelf(
#if NeedFunctionPrototypes
pointer /*from*/,
int /*len*/
#endif
);
extern void AugmentSelf(pointer /*from*/, int /*len*/);
extern void InitAuthorization(
#if NeedFunctionPrototypes
char * /*filename*/
#endif
);
extern void InitAuthorization(char * /*filename*/);
extern int LoadAuthorization(
#if NeedFunctionPrototypes
void
#endif
);
/* extern int LoadAuthorization(void); */
extern void RegisterAuthorizations(
#if NeedFunctionPrototypes
void
#endif
);
extern void RegisterAuthorizations(void);
extern XID AuthorizationToID (
unsigned short name_length,
@@ -731,21 +378,15 @@ extern int AuthorizationFromID (
char **datap);
extern XID CheckAuthorization(
#if NeedFunctionPrototypes
unsigned int /*namelength*/,
char * /*name*/,
unsigned int /*datalength*/,
char * /*data*/,
ClientPtr /*client*/,
char ** /*reason*/
#endif
);
extern void ResetAuthorization(
#if NeedFunctionPrototypes
void
#endif
);
extern void ResetAuthorization(void);
extern int RemoveAuthorization (
unsigned short name_length,
@@ -754,41 +395,24 @@ extern int RemoveAuthorization (
char *data);
extern int AddAuthorization(
#if NeedFunctionPrototypes
unsigned int /*name_length*/,
char * /*name*/,
unsigned int /*data_length*/,
char * /*data*/
#endif
);
char * /*data*/);
extern XID GenerateAuthorization(
#if NeedFunctionPrototypes
unsigned int /* name_length */,
char * /* name */,
unsigned int /* data_length */,
char * /* data */,
unsigned int * /* data_length_return */,
char ** /* data_return */
#endif
);
char ** /* data_return */);
#ifdef COMMANDLINE_CHALLENGED_OPERATING_SYSTEMS
extern void ExpandCommandLine(
#if NeedFunctionPrototypes
int * /*pargc*/,
char *** /*pargv*/
#endif
);
extern void ExpandCommandLine(int * /*pargc*/, char *** /*pargv*/);
#endif
extern int ddxProcessArgument(
#if NeedFunctionPrototypes
int /*argc*/,
char * /*argv*/ [],
int /*i*/
#endif
);
extern int ddxProcessArgument(int /*argc*/, char * /*argv*/ [], int /*i*/);
extern void ddxUseMsg(void);
@@ -796,17 +420,9 @@ extern void ddxUseMsg(void);
* idiom processing stuff
*/
xReqPtr PeekNextRequest(
#if NeedFunctionPrototypes
xReqPtr req, ClientPtr client, Bool readmore
#endif
);
extern xReqPtr PeekNextRequest(xReqPtr req, ClientPtr client, Bool readmore);
void SkipRequests(
#if NeedFunctionPrototypes
xReqPtr req, ClientPtr client, int numskipped
#endif
);
extern void SkipRequests(xReqPtr req, ClientPtr client, int numskipped);
/* int ReqLen(xReq *req, ClientPtr client)
* Given a pointer to a *complete* request, return its length in bytes.
@@ -856,4 +472,77 @@ extern void AbortDDX(void);
extern void ddxGiveUp(void);
extern int TimeSinceLastInputEvent(void);
/* Logging. */
typedef enum _LogParameter {
XLOG_FLUSH,
XLOG_SYNC,
XLOG_VERBOSITY,
XLOG_FILE_VERBOSITY
} LogParameter;
/* Flags for log messages. */
typedef enum {
X_PROBED, /* Value was probed */
X_CONFIG, /* Value was given in the config file */
X_DEFAULT, /* Value is a default */
X_CMDLINE, /* Value was given on the command line */
X_NOTICE, /* Notice */
X_ERROR, /* Error message */
X_WARNING, /* Warning message */
X_INFO, /* Informational message */
X_NONE, /* No prefix */
X_NOT_IMPLEMENTED, /* Not implemented */
X_UNKNOWN = -1 /* unknown -- this must always be last */
} MessageType;
/* XXX Need to check which GCC versions have the format(printf) attribute. */
#if defined(__GNUC__) && \
((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ > 4)))
#define _printf_attribute(a,b) __attribute((format(printf,a,b)))
#else
#define _printf_attribute(a,b) /**/
#endif
#ifdef printf
#define printf_defined
#undef printf
#endif
extern const char *LogInit(const char *fname, const char *backup);
extern void LogClose(void);
extern Bool LogSetParameter(LogParameter param, int value);
extern void LogVWrite(int verb, const char *f, va_list args);
extern void LogWrite(int verb, const char *f, ...) _printf_attribute(2,3);
extern void LogVMessageVerb(MessageType type, int verb, const char *format,
va_list args);
extern void LogMessageVerb(MessageType type, int verb, const char *format,
...) _printf_attribute(3,4);
extern void LogMessage(MessageType type, const char *format, ...)
_printf_attribute(2,3);
extern void FreeAuditTimer(void);
extern void AuditF(const char *f, ...) _printf_attribute(1,2);
extern void VAuditF(const char *f, va_list args);
extern void FatalError(const char *f, ...) _printf_attribute(1,2)
#if defined(__GNUC__) && \
((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ > 4)))
__attribute((noreturn))
#endif
;
extern void VErrorF(const char *f, va_list args);
extern void ErrorF(const char *f, ...) _printf_attribute(1,2);
extern void Error(char *str);
extern void LogPrintMarkers(void);
#if defined(NEED_SNPRINTF) && !defined(IN_MODULE)
extern int snprintf(char *str, size_t size, const char *format, ...)
_printf_attribute(3,4);
extern int vsnprintf(char *str, size_t size, const char *format, va_list ap);
#endif
#ifdef printf_defined
#define printf xf86printf
#undef printf_defined
#endif
#endif /* OS_H */

27
include/pixmap.h
View File

@@ -45,6 +45,8 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
/* $XFree86: xc/programs/Xserver/include/pixmap.h,v 1.4 2003/11/03 05:36:35 tsi Exp $ */
#ifndef PIXMAP_H
#define PIXMAP_H
@@ -84,40 +86,25 @@ typedef union _PixUnion {
((type == DRAWABLE_WINDOW) || (type == UNDRAWABLE_WINDOW))
extern PixmapPtr GetScratchPixmapHeader(
#if NeedFunctionPrototypes
ScreenPtr /*pScreen*/,
int /*width*/,
int /*height*/,
int /*depth*/,
int /*bitsPerPixel*/,
int /*devKind*/,
pointer /*pPixData*/
#endif
);
pointer /*pPixData*/);
extern void FreeScratchPixmapHeader(
#if NeedFunctionPrototypes
PixmapPtr /*pPixmap*/
#endif
);
PixmapPtr /*pPixmap*/);
extern Bool CreateScratchPixmapsForScreen(
#if NeedFunctionPrototypes
int /*scrnum*/
#endif
);
int /*scrnum*/);
extern void FreeScratchPixmapsForScreen(
#if NeedFunctionPrototypes
int /*scrnum*/
#endif
);
int /*scrnum*/);
extern PixmapPtr AllocatePixmap(
#if NeedFunctionPrototypes
ScreenPtr /*pScreen*/,
int /*pixDataSize*/
#endif
);
int /*pixDataSize*/);
#endif /* PIXMAP_H */

3
include/pixmapstr.h
View File

@@ -45,12 +45,13 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
/* $XFree86: xc/programs/Xserver/include/pixmapstr.h,v 1.3 2003/07/16 01:38:52 dawes Exp $ */
#ifndef PIXMAPSTRUCT_H
#define PIXMAPSTRUCT_H
#include "pixmap.h"
#include "screenint.h"
#include "miscstruct.h"
#include "regionstr.h"
typedef struct _Drawable {
unsigned char type; /* DRAWABLE_<type> */

17
include/property.h
View File

@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
/* $XFree86: xc/programs/Xserver/include/property.h,v 1.3 2001/12/14 19:59:55 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/include/property.h,v 1.4 2003/04/27 21:31:04 herrb Exp $ */
#ifndef PROPERTY_H
#define PROPERTY_H
@@ -55,7 +55,6 @@ SOFTWARE.
typedef struct _Property *PropertyPtr;
extern int ChangeWindowProperty(
#if NeedFunctionPrototypes
WindowPtr /*pWin*/,
Atom /*property*/,
Atom /*type*/,
@@ -63,21 +62,13 @@ extern int ChangeWindowProperty(
int /*mode*/,
unsigned long /*len*/,
pointer /*value*/,
Bool /*sendevent*/
#endif
);
Bool /*sendevent*/);
extern int DeleteProperty(
#if NeedFunctionPrototypes
WindowPtr /*pWin*/,
Atom /*propName*/
#endif
);
Atom /*propName*/);
extern void DeleteAllWindowProperties(
#if NeedFunctionPrototypes
WindowPtr /*pWin*/
#endif
);
WindowPtr /*pWin*/);
#endif /* PROPERTY_H */

210
include/regionstr.h
View File

@@ -45,11 +45,13 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
/* $XFree86: xc/programs/Xserver/include/regionstr.h,v 1.7 2001/12/14 19:59:56 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/include/regionstr.h,v 1.11 2003/11/10 18:22:45 tsi Exp $ */
#ifndef REGIONSTRUCT_H
#define REGIONSTRUCT_H
typedef struct _Region RegionRec, *RegionPtr;
#include "miscstruct.h"
/* Return values from RectIn() */
@@ -70,10 +72,10 @@ typedef struct _RegData {
/* BoxRec rects[size]; in memory but not explicitly declared */
} RegDataRec, *RegDataPtr;
typedef struct _Region {
struct _Region {
BoxRec extents;
RegDataPtr data;
} RegionRec, *RegionPtr;
};
extern BoxRec miEmptyBox;
extern RegDataRec miEmptyData;
@@ -136,6 +138,9 @@ extern RegDataRec miBrokenData;
#define REGION_NOTEMPTY(_pScreen, _pReg) \
(*(_pScreen)->RegionNotEmpty)(_pReg)
#define REGION_EQUAL(_pScreen, _pReg1, _pReg2) \
(*(_pScreen)->RegionEqual)(_pReg1, _pReg2)
#define REGION_BROKEN(_pScreen, _pReg) \
(*(_pScreen)->RegionBroken)(_pReg)
@@ -162,99 +167,103 @@ extern RegDataRec miBrokenData;
#else /* !NEED_SCREEN_REGIONS */
/* Reference _pScreen macro argument and possibly check its type */
#undef REGION_SCREEN
#if defined(NDEBUG) && !defined(DEBUG) && !defined(BUILDDEBUG)
# define REGION_SCREEN(_pScreen_) (void)(_pScreen_)
#else
extern volatile ScreenPtr currentRegionScreen;
# define REGION_SCREEN(_pScreen_) (void)(currentRegionScreen = (_pScreen_))
#endif
#define REGION_CREATE(_pScreen, _rect, _size) \
miRegionCreate(_rect, _size)
(REGION_SCREEN(_pScreen), miRegionCreate(_rect, _size))
#define REGION_COPY(_pScreen, dst, src) \
miRegionCopy(dst, src)
(REGION_SCREEN(_pScreen), miRegionCopy(dst, src))
#define REGION_DESTROY(_pScreen, _pReg) \
miRegionDestroy(_pReg)
(REGION_SCREEN(_pScreen), miRegionDestroy(_pReg))
#define REGION_INTERSECT(_pScreen, newReg, reg1, reg2) \
miIntersect(newReg, reg1, reg2)
(REGION_SCREEN(_pScreen), miIntersect(newReg, reg1, reg2))
#define REGION_UNION(_pScreen, newReg, reg1, reg2) \
miUnion(newReg, reg1, reg2)
(REGION_SCREEN(_pScreen), miUnion(newReg, reg1, reg2))
#define REGION_SUBTRACT(_pScreen, newReg, reg1, reg2) \
miSubtract(newReg, reg1, reg2)
(REGION_SCREEN(_pScreen), miSubtract(newReg, reg1, reg2))
#define REGION_INVERSE(_pScreen, newReg, reg1, invRect) \
miInverse(newReg, reg1, invRect)
(REGION_SCREEN(_pScreen), miInverse(newReg, reg1, invRect))
#define REGION_TRANSLATE(_pScreen, _pReg, _x, _y) \
miTranslateRegion(_pReg, _x, _y)
(REGION_SCREEN(_pScreen), miTranslateRegion(_pReg, _x, _y))
#define RECT_IN_REGION(_pScreen, _pReg, prect) \
miRectIn(_pReg, prect)
(REGION_SCREEN(_pScreen), miRectIn(_pReg, prect))
#define POINT_IN_REGION(_pScreen, _pReg, _x, _y, prect) \
miPointInRegion(_pReg, _x, _y, prect)
(REGION_SCREEN(_pScreen), miPointInRegion(_pReg, _x, _y, prect))
#define REGION_APPEND(_pScreen, dstrgn, rgn) \
miRegionAppend(dstrgn, rgn)
(REGION_SCREEN(_pScreen), miRegionAppend(dstrgn, rgn))
#define REGION_VALIDATE(_pScreen, badreg, pOverlap) \
miRegionValidate(badreg, pOverlap)
(REGION_SCREEN(_pScreen), miRegionValidate(badreg, pOverlap))
#define BITMAP_TO_REGION(_pScreen, pPix) \
(*(_pScreen)->BitmapToRegion)(pPix) /* no mi version?! */
#define RECTS_TO_REGION(_pScreen, nrects, prect, ctype) \
miRectsToRegion(nrects, prect, ctype)
(REGION_SCREEN(_pScreen), miRectsToRegion(nrects, prect, ctype))
#define REGION_EQUAL(_pScreen, _pReg1, _pReg2) \
(REGION_SCREEN(_pScreen), miRegionEqual(_pReg1, _pReg2))
#define REGION_BREAK(_pScreen, _pReg) \
miRegionBreak(_pReg)
(REGION_SCREEN(_pScreen), miRegionBreak(_pReg))
#ifdef DONT_INLINE_REGION_OPS
#define REGION_INIT(_pScreen, _pReg, _rect, _size) \
miRegionInit(_pReg, _rect, _size)
(REGION_SCREEN(_pScreen), miRegionInit(_pReg, _rect, _size))
#define REGION_UNINIT(_pScreen, _pReg) \
miRegionUninit(_pReg)
(REGION_SCREEN(_pScreen), miRegionUninit(_pReg))
#define REGION_RESET(_pScreen, _pReg, _pBox) \
miRegionReset(_pReg, _pBox)
(REGION_SCREEN(_pScreen), miRegionReset(_pReg, _pBox))
#define REGION_NOTEMPTY(_pScreen, _pReg) \
miRegionNotEmpty(_pReg)
(REGION_SCREEN(_pScreen), miRegionNotEmpty(_pReg))
#define REGION_BROKEN(_pScreen, _pReg) \
miRegionBroken(_pReg)
(REGION_SCREEN(_pScreen), miRegionBroken(_pReg))
#define REGION_EMPTY(_pScreen, _pReg) \
miRegionEmpty(_pReg)
(REGION_SCREEN(_pScreen), miRegionEmpty(_pReg))
#define REGION_EXTENTS(_pScreen, _pReg) \
miRegionExtents(_pReg)
(REGION_SCREEN(_pScreen), miRegionExtents(_pReg))
#else /* inline certain simple region ops for performance */
#define REGION_INIT(_pScreen, _pReg, _rect, _size) \
{ \
if (_rect) \
{ \
REGION_SCREEN(_pScreen); \
(_pReg)->extents = *(_rect); \
(_pReg)->data = (RegDataPtr)NULL; \
} \
else \
{ \
(_pReg)->extents = miEmptyBox; \
if (((_size) > 1) && ((_pReg)->data = \
(RegDataPtr)xalloc(REGION_SZOF(_size)))) \
{ \
(_pReg)->data->size = (_size); \
(_pReg)->data->numRects = 0; \
} \
else \
(_pReg)->data = &miEmptyData; \
} \
}
#define REGION_UNINIT(_pScreen, _pReg) \
{ \
REGION_SCREEN(_pScreen); \
if ((_pReg)->data && (_pReg)->data->size) { \
xfree((_pReg)->data); \
(_pReg)->data = NULL; \
@@ -263,16 +272,17 @@ extern RegDataRec miBrokenData;
#define REGION_RESET(_pScreen, _pReg, _pBox) \
{ \
REGION_SCREEN(_pScreen); \
(_pReg)->extents = *(_pBox); \
REGION_UNINIT(_pScreen, _pReg); \
(_pReg)->data = (RegDataPtr)NULL; \
}
#define REGION_NOTEMPTY(_pScreen, _pReg) \
!REGION_NIL(_pReg)
(REGION_SCREEN(_pScreen), !REGION_NIL(_pReg))
#define REGION_BROKEN(_pScreen, _pReg) \
REGION_NAR(_pReg)
(REGION_SCREEN(_pScreen), REGION_NAR(_pReg))
#define REGION_EMPTY(_pScreen, _pReg) \
{ \
@@ -283,155 +293,111 @@ extern RegDataRec miBrokenData;
}
#define REGION_EXTENTS(_pScreen, _pReg) \
&(_pReg)->extents
(REGION_SCREEN(_pScreen), &(_pReg)->extents)
#define REGION_NULL(_pScreen, _pReg) \
{ \
REGION_SCREEN(_pScreen); \
(_pReg)->extents = miEmptyBox; \
(_pReg)->data = &miEmptyData; \
}
#endif /* DONT_INLINE_REGION_OPS */
#endif /* NEED_SCREEN_REGIONS */
#ifndef REGION_NULL
#define REGION_NULL(_pScreen, _pReg) \
REGION_INIT(_pScreen, _pReg, NullBox, 1)
#endif
/* moved from mi.h */
extern RegionPtr miRegionCreate(
#if NeedFunctionPrototypes
BoxPtr /*rect*/,
int /*size*/
#endif
);
int /*size*/);
extern void miRegionInit(
#if NeedFunctionPrototypes
RegionPtr /*pReg*/,
BoxPtr /*rect*/,
int /*size*/
#endif
);
int /*size*/);
extern void miRegionDestroy(
#if NeedFunctionPrototypes
RegionPtr /*pReg*/
#endif
);
RegionPtr /*pReg*/);
extern void miRegionUninit(
#if NeedFunctionPrototypes
RegionPtr /*pReg*/
#endif
);
RegionPtr /*pReg*/);
extern Bool miRegionCopy(
#if NeedFunctionPrototypes
RegionPtr /*dst*/,
RegionPtr /*src*/
#endif
);
RegionPtr /*src*/);
extern Bool miIntersect(
#if NeedFunctionPrototypes
RegionPtr /*newReg*/,
RegionPtr /*reg1*/,
RegionPtr /*reg2*/
#endif
);
RegionPtr /*reg2*/);
extern Bool miUnion(
#if NeedFunctionPrototypes
RegionPtr /*newReg*/,
RegionPtr /*reg1*/,
RegionPtr /*reg2*/
#endif
);
RegionPtr /*reg2*/);
extern Bool miRegionAppend(
#if NeedFunctionPrototypes
RegionPtr /*dstrgn*/,
RegionPtr /*rgn*/
#endif
);
RegionPtr /*rgn*/);
extern Bool miRegionValidate(
#if NeedFunctionPrototypes
RegionPtr /*badreg*/,
Bool * /*pOverlap*/
#endif
);
Bool * /*pOverlap*/);
extern RegionPtr miRectsToRegion(
#if NeedFunctionPrototypes
int /*nrects*/,
xRectanglePtr /*prect*/,
int /*ctype*/
#endif
);
int /*ctype*/);
extern Bool miSubtract(
#if NeedFunctionPrototypes
RegionPtr /*regD*/,
RegionPtr /*regM*/,
RegionPtr /*regS*/
#endif
);
RegionPtr /*regS*/);
extern Bool miInverse(
#if NeedFunctionPrototypes
RegionPtr /*newReg*/,
RegionPtr /*reg1*/,
BoxPtr /*invRect*/
#endif
);
BoxPtr /*invRect*/);
extern int miRectIn(
#if NeedFunctionPrototypes
RegionPtr /*region*/,
BoxPtr /*prect*/
#endif
);
BoxPtr /*prect*/);
extern void miTranslateRegion(
#if NeedFunctionPrototypes
RegionPtr /*pReg*/,
int /*x*/,
int /*y*/
#endif
);
int /*y*/);
extern void miRegionReset(
#if NeedFunctionPrototypes
RegionPtr /*pReg*/,
BoxPtr /*pBox*/
#endif
);
BoxPtr /*pBox*/);
extern Bool miRegionBreak(
#if NeedFunctionPrototypes
RegionPtr /*pReg*/
#endif
);
RegionPtr /*pReg*/);
extern Bool miPointInRegion(
#if NeedFunctionPrototypes
RegionPtr /*pReg*/,
int /*x*/,
int /*y*/,
BoxPtr /*box*/
#endif
);
BoxPtr /*box*/);
extern Bool miRegionEqual(
RegionPtr /*pReg1*/,
RegionPtr /*pReg2*/);
extern Bool miRegionNotEmpty(
#if NeedFunctionPrototypes
RegionPtr /*pReg*/
#endif
);
RegionPtr /*pReg*/);
extern void miRegionEmpty(
#if NeedFunctionPrototypes
RegionPtr /*pReg*/
#endif
);
RegionPtr /*pReg*/);
extern BoxPtr miRegionExtents(
#if NeedFunctionPrototypes
RegionPtr /*pReg*/
#endif
);
RegionPtr /*pReg*/);
#endif /* REGIONSTRUCT_H */

129
include/resource.h
View File

@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
/* $XFree86: xc/programs/Xserver/include/resource.h,v 1.11 2002/03/06 21:14:04 mvojkovi Exp $ */
/* $XFree86: xc/programs/Xserver/include/resource.h,v 1.12 2003/04/27 21:31:05 herrb Exp $ */
#ifndef RESOURCE_H
#define RESOURCE_H 1
@@ -123,60 +123,35 @@ typedef unsigned long RESTYPE;
#define BAD_RESOURCE 0xe0000000
typedef int (*DeleteType)(
#if NeedNestedPrototypes
pointer /*value*/,
XID /*id*/
#endif
);
XID /*id*/);
typedef void (*FindResType)(
#if NeedNestedPrototypes
pointer /*value*/,
XID /*id*/,
pointer /*cdata*/
#endif
);
pointer /*cdata*/);
typedef void (*FindAllRes)(
#if NeedNestedPrototypes
pointer /*value*/,
XID /*id*/,
RESTYPE /*type*/,
pointer /*cdata*/
#endif
);
pointer /*cdata*/);
typedef Bool (*FindComplexResType)(
#if NeedNestedPrototypes
pointer /*value*/,
XID /*id*/,
pointer /*cdata*/
#endif
);
pointer /*cdata*/);
extern RESTYPE CreateNewResourceType(
#if NeedFunctionPrototypes
DeleteType /*deleteFunc*/
#endif
);
DeleteType /*deleteFunc*/);
extern RESTYPE CreateNewResourceClass(
#if NeedFunctionPrototypes
void
#endif
);
extern RESTYPE CreateNewResourceClass(void);
extern Bool InitClientResources(
#if NeedFunctionPrototypes
ClientPtr /*client*/
#endif
);
ClientPtr /*client*/);
extern XID FakeClientID(
#if NeedFunctionPrototypes
int /*client*/
#endif
);
int /*client*/);
/* Quartz support on Mac OS X uses the CarbonCore
framework whose AddResource function conflicts here. */
@@ -184,100 +159,60 @@ extern XID FakeClientID(
#define AddResource Darwin_X_AddResource
#endif
extern Bool AddResource(
#if NeedFunctionPrototypes
XID /*id*/,
RESTYPE /*type*/,
pointer /*value*/
#endif
);
pointer /*value*/);
extern void FreeResource(
#if NeedFunctionPrototypes
XID /*id*/,
RESTYPE /*skipDeleteFuncType*/
#endif
);
RESTYPE /*skipDeleteFuncType*/);
extern void FreeResourceByType(
#if NeedFunctionPrototypes
XID /*id*/,
RESTYPE /*type*/,
Bool /*skipFree*/
#endif
);
Bool /*skipFree*/);
extern Bool ChangeResourceValue(
#if NeedFunctionPrototypes
XID /*id*/,
RESTYPE /*rtype*/,
pointer /*value*/
#endif
);
pointer /*value*/);
extern void FindClientResourcesByType(
#if NeedFunctionPrototypes
ClientPtr /*client*/,
RESTYPE /*type*/,
FindResType /*func*/,
pointer /*cdata*/
#endif
);
pointer /*cdata*/);
extern void FindAllClientResources(
#if NeedFunctionPrototypes
ClientPtr /*client*/,
FindAllRes /*func*/,
pointer /*cdata*/
#endif
);
pointer /*cdata*/);
extern void FreeClientNeverRetainResources(
#if NeedFunctionPrototypes
ClientPtr /*client*/
#endif
);
ClientPtr /*client*/);
extern void FreeClientResources(
#if NeedFunctionPrototypes
ClientPtr /*client*/
#endif
);
ClientPtr /*client*/);
extern void FreeAllResources(
#if NeedFunctionPrototypes
void
#endif
);
extern void FreeAllResources(void);
extern Bool LegalNewID(
#if NeedFunctionPrototypes
XID /*id*/,
ClientPtr /*client*/
#endif
);
ClientPtr /*client*/);
extern pointer LookupIDByType(
#if NeedFunctionPrototypes
XID /*id*/,
RESTYPE /*rtype*/
#endif
);
RESTYPE /*rtype*/);
extern pointer LookupIDByClass(
#if NeedFunctionPrototypes
XID /*id*/,
RESTYPE /*classes*/
#endif
);
RESTYPE /*classes*/);
extern pointer LookupClientResourceComplex(
#if NeedFunctionPrototypes
ClientPtr client,
RESTYPE type,
FindComplexResType func,
pointer cdata
#endif
);
pointer cdata);
/* These are the access modes that can be passed in the last parameter
* to SecurityLookupIDByType/Class. The Security extension doesn't
@@ -295,22 +230,16 @@ extern pointer LookupClientResourceComplex(
#ifdef XCSECURITY
extern pointer SecurityLookupIDByType(
#if NeedFunctionPrototypes
ClientPtr /*client*/,
XID /*id*/,
RESTYPE /*rtype*/,
Mask /*access_mode*/
#endif
);
Mask /*access_mode*/);
extern pointer SecurityLookupIDByClass(
#if NeedFunctionPrototypes
ClientPtr /*client*/,
XID /*id*/,
RESTYPE /*classes*/,
Mask /*access_mode*/
#endif
);
Mask /*access_mode*/);
#else /* not XCSECURITY */
@@ -323,21 +252,15 @@ extern pointer SecurityLookupIDByClass(
#endif /* XCSECURITY */
extern void GetXIDRange(
#if NeedFunctionPrototypes
int /*client*/,
Bool /*server*/,
XID * /*minp*/,
XID * /*maxp*/
#endif
);
XID * /*maxp*/);
extern unsigned int GetXIDList(
#if NeedFunctionPrototypes
ClientPtr /*client*/,
unsigned int /*count*/,
XID * /*pids*/
#endif
);
XID * /*pids*/);
extern RESTYPE lastResourceType;
extern RESTYPE TypeMask;

92
include/screenint.h
View File

@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
/* $XFree86: xc/programs/Xserver/include/screenint.h,v 1.5 2001/12/14 19:59:56 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/include/screenint.h,v 1.6 2003/04/27 21:31:05 herrb Exp $ */
#ifndef SCREENINT_H
#define SCREENINT_H
@@ -56,115 +56,57 @@ typedef struct _Visual *VisualPtr;
typedef struct _Depth *DepthPtr;
typedef struct _Screen *ScreenPtr;
extern void ResetScreenPrivates(
#if NeedFunctionPrototypes
void
#endif
);
extern void ResetScreenPrivates(void);
extern int AllocateScreenPrivateIndex(
#if NeedFunctionPrototypes
void
#endif
);
extern int AllocateScreenPrivateIndex(void);
extern void ResetWindowPrivates(
#if NeedFunctionPrototypes
void
#endif
);
extern void ResetWindowPrivates(void);
extern int AllocateWindowPrivateIndex(
#if NeedFunctionPrototypes
void
#endif
);
extern int AllocateWindowPrivateIndex(void);
extern Bool AllocateWindowPrivate(
#if NeedFunctionPrototypes
ScreenPtr /* pScreen */,
int /* index */,
unsigned /* amount */
#endif
);
unsigned /* amount */);
extern void ResetGCPrivates(
#if NeedFunctionPrototypes
void
#endif
);
extern void ResetGCPrivates(void);
extern int AllocateGCPrivateIndex(
#if NeedFunctionPrototypes
void
#endif
);
extern int AllocateGCPrivateIndex(void);
extern Bool AllocateGCPrivate(
#if NeedFunctionPrototypes
ScreenPtr /* pScreen */,
int /* index */,
unsigned /* amount */
#endif
);
unsigned /* amount */);
extern int AddScreen(
#if NeedFunctionPrototypes
Bool (* /*pfnInit*/)(
#if NeedNestedPrototypes
int /*index*/,
ScreenPtr /*pScreen*/,
int /*argc*/,
char ** /*argv*/
#endif
),
char ** /*argv*/),
int /*argc*/,
char** /*argv*/
#endif
);
char** /*argv*/);
#ifdef PIXPRIV
extern void ResetPixmapPrivates(
#if NeedFunctionPrototypes
void
#endif
);
extern void ResetPixmapPrivates(void);
extern int AllocatePixmapPrivateIndex(
#if NeedFunctionPrototypes
void
#endif
);
extern int AllocatePixmapPrivateIndex(void);
extern Bool AllocatePixmapPrivate(
#if NeedFunctionPrototypes
ScreenPtr /* pScreen */,
int /* index */,
unsigned /* amount */
#endif
);
unsigned /* amount */);
#endif /* PIXPRIV */
extern void ResetColormapPrivates(
#if NeedFunctionPrototypes
void
#endif
);
extern void ResetColormapPrivates(void);
typedef struct _ColormapRec *ColormapPtr;
typedef int (*InitCmapPrivFunc)(
#if NeedNestedPrototypes
ColormapPtr
#endif
);
typedef int (*InitCmapPrivFunc)(ColormapPtr);
extern int AllocateColormapPrivateIndex(
#if NeedFunctionPrototypes
InitCmapPrivFunc /* initPrivFunc */
#endif
);
InitCmapPrivFunc /* initPrivFunc */);
#endif /* SCREENINT_H */

453
include/scrnintstr.h
View File

@@ -45,13 +45,13 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
/* $XFree86: xc/programs/Xserver/include/scrnintstr.h,v 1.10 2001/12/14 19:59:56 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/include/scrnintstr.h,v 1.13 2003/07/16 01:38:53 dawes Exp $ */
#ifndef SCREENINTSTRUCT_H
#define SCREENINTSTRUCT_H
#include "screenint.h"
#include "miscstruct.h"
#include "regionstr.h"
#include "bstore.h"
#include "colormap.h"
#include "cursor.h"
@@ -91,30 +91,20 @@ typedef struct _Depth {
*/
typedef Bool (* CloseScreenProcPtr)(
#if NeedNestedPrototypes
int /*index*/,
ScreenPtr /*pScreen*/
#endif
);
ScreenPtr /*pScreen*/);
typedef void (* QueryBestSizeProcPtr)(
#if NeedNestedPrototypes
int /*class*/,
unsigned short * /*pwidth*/,
unsigned short * /*pheight*/,
ScreenPtr /*pScreen*/
#endif
);
ScreenPtr /*pScreen*/);
typedef Bool (* SaveScreenProcPtr)(
#if NeedNestedPrototypes
ScreenPtr /*pScreen*/,
int /*on*/
#endif
);
int /*on*/);
typedef void (* GetImageProcPtr)(
#if NeedNestedPrototypes
DrawablePtr /*pDrawable*/,
int /*sx*/,
int /*sy*/,
@@ -122,179 +112,113 @@ typedef void (* GetImageProcPtr)(
int /*h*/,
unsigned int /*format*/,
unsigned long /*planeMask*/,
char * /*pdstLine*/
#endif
);
char * /*pdstLine*/);
typedef void (* GetSpansProcPtr)(
#if NeedNestedPrototypes
DrawablePtr /*pDrawable*/,
int /*wMax*/,
DDXPointPtr /*ppt*/,
int* /*pwidth*/,
int /*nspans*/,
char * /*pdstStart*/
#endif
);
char * /*pdstStart*/);
typedef void (* PointerNonInterestBoxProcPtr)(
#if NeedNestedPrototypes
ScreenPtr /*pScreen*/,
BoxPtr /*pBox*/
#endif
);
BoxPtr /*pBox*/);
typedef void (* SourceValidateProcPtr)(
#if NeedNestedPrototypes
DrawablePtr /*pDrawable*/,
int /*x*/,
int /*y*/,
int /*width*/,
int /*height*/
#endif
);
int /*height*/);
typedef Bool (* CreateWindowProcPtr)(
#if NeedNestedPrototypes
WindowPtr /*pWindow*/
#endif
);
WindowPtr /*pWindow*/);
typedef Bool (* DestroyWindowProcPtr)(
#if NeedNestedPrototypes
WindowPtr /*pWindow*/
#endif
);
WindowPtr /*pWindow*/);
typedef Bool (* PositionWindowProcPtr)(
#if NeedNestedPrototypes
WindowPtr /*pWindow*/,
int /*x*/,
int /*y*/
#endif
);
int /*y*/);
typedef Bool (* ChangeWindowAttributesProcPtr)(
#if NeedNestedPrototypes
WindowPtr /*pWindow*/,
unsigned long /*mask*/
#endif
);
unsigned long /*mask*/);
typedef Bool (* RealizeWindowProcPtr)(
#if NeedNestedPrototypes
WindowPtr /*pWindow*/
#endif
);
WindowPtr /*pWindow*/);
typedef Bool (* UnrealizeWindowProcPtr)(
#if NeedNestedPrototypes
WindowPtr /*pWindow*/
#endif
);
WindowPtr /*pWindow*/);
typedef void (* RestackWindowProcPtr)(
#if NeedNestedPrototypes
WindowPtr /*pWindow*/,
WindowPtr /*pOldNextSib*/
#endif
);
WindowPtr /*pOldNextSib*/);
typedef int (* ValidateTreeProcPtr)(
#if NeedNestedPrototypes
WindowPtr /*pParent*/,
WindowPtr /*pChild*/,
VTKind /*kind*/
#endif
);
VTKind /*kind*/);
typedef void (* PostValidateTreeProcPtr)(
#if NeedNestedPrototypes
WindowPtr /*pParent*/,
WindowPtr /*pChild*/,
VTKind /*kind*/
#endif
);
VTKind /*kind*/);
typedef void (* WindowExposuresProcPtr)(
#if NeedNestedPrototypes
WindowPtr /*pWindow*/,
RegionPtr /*prgn*/,
RegionPtr /*other_exposed*/
#endif
);
RegionPtr /*other_exposed*/);
typedef void (* PaintWindowProcPtr)(
#if NeedNestedPrototypes
WindowPtr /*pWindow*/,
RegionPtr /*pRegion*/,
int /*what*/
#endif
);
int /*what*/);
typedef PaintWindowProcPtr PaintWindowBackgroundProcPtr;
typedef PaintWindowProcPtr PaintWindowBorderProcPtr;
typedef void (* CopyWindowProcPtr)(
#if NeedNestedPrototypes
WindowPtr /*pWindow*/,
DDXPointRec /*ptOldOrg*/,
RegionPtr /*prgnSrc*/
#endif
);
RegionPtr /*prgnSrc*/);
typedef void (* ClearToBackgroundProcPtr)(
#if NeedNestedPrototypes
WindowPtr /*pWindow*/,
int /*x*/,
int /*y*/,
int /*w*/,
int /*h*/,
Bool /*generateExposures*/
#endif
);
Bool /*generateExposures*/);
typedef void (* ClipNotifyProcPtr)(
#if NeedNestedPrototypes
WindowPtr /*pWindow*/,
int /*dx*/,
int /*dy*/
#endif
);
int /*dy*/);
typedef PixmapPtr (* CreatePixmapProcPtr)(
#if NeedNestedPrototypes
ScreenPtr /*pScreen*/,
int /*width*/,
int /*height*/,
int /*depth*/
#endif
);
int /*depth*/);
typedef Bool (* DestroyPixmapProcPtr)(
#if NeedNestedPrototypes
PixmapPtr /*pPixmap*/
#endif
);
PixmapPtr /*pPixmap*/);
typedef void (* SaveDoomedAreasProcPtr)(
#if NeedNestedPrototypes
WindowPtr /*pWindow*/,
RegionPtr /*prgnSave*/,
int /*xorg*/,
int /*yorg*/
#endif
);
int /*yorg*/);
typedef RegionPtr (* RestoreAreasProcPtr)(
#if NeedNestedPrototypes
WindowPtr /*pWindow*/,
RegionPtr /*prgnRestore*/
#endif
);
RegionPtr /*prgnRestore*/);
typedef void (* ExposeCopyProcPtr)(
#if NeedNestedPrototypes
WindowPtr /*pSrc*/,
DrawablePtr /*pDst*/,
GCPtr /*pGC*/,
@@ -303,486 +227,301 @@ typedef void (* ExposeCopyProcPtr)(
int /*srcy*/,
int /*dstx*/,
int /*dsty*/,
unsigned long /*plane*/
#endif
);
unsigned long /*plane*/);
typedef RegionPtr (* TranslateBackingStoreProcPtr)(
#if NeedNestedPrototypes
WindowPtr /*pWindow*/,
int /*windx*/,
int /*windy*/,
RegionPtr /*oldClip*/,
int /*oldx*/,
int /*oldy*/
#endif
);
int /*oldy*/);
typedef RegionPtr (* ClearBackingStoreProcPtr)(
#if NeedNestedPrototypes
WindowPtr /*pWindow*/,
int /*x*/,
int /*y*/,
int /*w*/,
int /*h*/,
Bool /*generateExposures*/
#endif
);
Bool /*generateExposures*/);
typedef void (* DrawGuaranteeProcPtr)(
#if NeedNestedPrototypes
WindowPtr /*pWindow*/,
GCPtr /*pGC*/,
int /*guarantee*/
#endif
);
int /*guarantee*/);
typedef Bool (* RealizeFontProcPtr)(
#if NeedNestedPrototypes
ScreenPtr /*pScreen*/,
FontPtr /*pFont*/
#endif
);
FontPtr /*pFont*/);
typedef Bool (* UnrealizeFontProcPtr)(
#if NeedNestedPrototypes
ScreenPtr /*pScreen*/,
FontPtr /*pFont*/
#endif
);
FontPtr /*pFont*/);
typedef void (* ConstrainCursorProcPtr)(
#if NeedNestedPrototypes
ScreenPtr /*pScreen*/,
BoxPtr /*pBox*/
#endif
);
BoxPtr /*pBox*/);
typedef void (* CursorLimitsProcPtr)(
#if NeedNestedPrototypes
ScreenPtr /*pScreen*/,
CursorPtr /*pCursor*/,
BoxPtr /*pHotBox*/,
BoxPtr /*pTopLeftBox*/
#endif
);
BoxPtr /*pTopLeftBox*/);
typedef Bool (* DisplayCursorProcPtr)(
#if NeedNestedPrototypes
ScreenPtr /*pScreen*/,
CursorPtr /*pCursor*/
#endif
);
CursorPtr /*pCursor*/);
typedef Bool (* RealizeCursorProcPtr)(
#if NeedNestedPrototypes
ScreenPtr /*pScreen*/,
CursorPtr /*pCursor*/
#endif
);
CursorPtr /*pCursor*/);
typedef Bool (* UnrealizeCursorProcPtr)(
#if NeedNestedPrototypes
ScreenPtr /*pScreen*/,
CursorPtr /*pCursor*/
#endif
);
CursorPtr /*pCursor*/);
typedef void (* RecolorCursorProcPtr)(
#if NeedNestedPrototypes
ScreenPtr /*pScreen*/,
CursorPtr /*pCursor*/,
Bool /*displayed*/
#endif
);
Bool /*displayed*/);
typedef Bool (* SetCursorPositionProcPtr)(
#if NeedNestedPrototypes
ScreenPtr /*pScreen*/,
int /*x*/,
int /*y*/,
Bool /*generateEvent*/
#endif
);
Bool /*generateEvent*/);
typedef Bool (* CreateGCProcPtr)(
#if NeedNestedPrototypes
GCPtr /*pGC*/
#endif
);
GCPtr /*pGC*/);
typedef Bool (* CreateColormapProcPtr)(
#if NeedNestedPrototypes
ColormapPtr /*pColormap*/
#endif
);
ColormapPtr /*pColormap*/);
typedef void (* DestroyColormapProcPtr)(
#if NeedNestedPrototypes
ColormapPtr /*pColormap*/
#endif
);
ColormapPtr /*pColormap*/);
typedef void (* InstallColormapProcPtr)(
#if NeedNestedPrototypes
ColormapPtr /*pColormap*/
#endif
);
ColormapPtr /*pColormap*/);
typedef void (* UninstallColormapProcPtr)(
#if NeedNestedPrototypes
ColormapPtr /*pColormap*/
#endif
);
ColormapPtr /*pColormap*/);
typedef int (* ListInstalledColormapsProcPtr) (
#if NeedNestedPrototypes
ScreenPtr /*pScreen*/,
XID* /*pmaps */
#endif
);
XID* /*pmaps */);
typedef void (* StoreColorsProcPtr)(
#if NeedNestedPrototypes
ColormapPtr /*pColormap*/,
int /*ndef*/,
xColorItem * /*pdef*/
#endif
);
xColorItem * /*pdef*/);
typedef void (* ResolveColorProcPtr)(
#if NeedNestedPrototypes
unsigned short* /*pred*/,
unsigned short* /*pgreen*/,
unsigned short* /*pblue*/,
VisualPtr /*pVisual*/
#endif
);
VisualPtr /*pVisual*/);
#ifdef NEED_SCREEN_REGIONS
typedef RegionPtr (* RegionCreateProcPtr)(
#if NeedNestedPrototypes
BoxPtr /*rect*/,
int /*size*/
#endif
);
int /*size*/);
typedef void (* RegionInitProcPtr)(
#if NeedNestedPrototypes
RegionPtr /*pReg*/,
BoxPtr /*rect*/,
int /*size*/
#endif
);
int /*size*/);
typedef Bool (* RegionCopyProcPtr)(
#if NeedNestedPrototypes
RegionPtr /*dst*/,
RegionPtr /*src*/
#endif
);
RegionPtr /*src*/);
typedef void (* RegionDestroyProcPtr)(
#if NeedNestedPrototypes
RegionPtr /*pReg*/
#endif
);
RegionPtr /*pReg*/);
typedef void (* RegionUninitProcPtr)(
#if NeedNestedPrototypes
RegionPtr /*pReg*/
#endif
);
RegionPtr /*pReg*/);
typedef Bool (* IntersectProcPtr)(
#if NeedNestedPrototypes
RegionPtr /*newReg*/,
RegionPtr /*reg1*/,
RegionPtr /*reg2*/
#endif
);
RegionPtr /*reg2*/);
typedef Bool (* UnionProcPtr)(
#if NeedNestedPrototypes
RegionPtr /*newReg*/,
RegionPtr /*reg1*/,
RegionPtr /*reg2*/
#endif
);
RegionPtr /*reg2*/);
typedef Bool (* SubtractProcPtr)(
#if NeedNestedPrototypes
RegionPtr /*regD*/,
RegionPtr /*regM*/,
RegionPtr /*regS*/
#endif
);
RegionPtr /*regS*/);
typedef Bool (* InverseProcPtr)(
#if NeedNestedPrototypes
RegionPtr /*newReg*/,
RegionPtr /*reg1*/,
BoxPtr /*invRect*/
#endif
);
BoxPtr /*invRect*/);
typedef void (* RegionResetProcPtr)(
#if NeedNestedPrototypes
RegionPtr /*pReg*/,
BoxPtr /*pBox*/
#endif
);
BoxPtr /*pBox*/);
typedef void (* TranslateRegionProcPtr)(
#if NeedNestedPrototypes
RegionPtr /*pReg*/,
int /*x*/,
int /*y*/
#endif
);
int /*y*/);
typedef int (* RectInProcPtr)(
#if NeedNestedPrototypes
RegionPtr /*region*/,
BoxPtr /*prect*/
#endif
);
BoxPtr /*prect*/);
typedef Bool (* PointInRegionProcPtr)(
#if NeedNestedPrototypes
RegionPtr /*pReg*/,
int /*x*/,
int /*y*/,
BoxPtr /*box*/
#endif
);
BoxPtr /*box*/);
typedef Bool (* RegionNotEmptyProcPtr)(
#if NeedNestedPrototypes
RegionPtr /*pReg*/
#endif
);
RegionPtr /*pReg*/);
typedef Bool (* RegionEqualProcPtr)(
RegionPtr /*pReg1*/,
RegionPtr /*pReg2*/);
typedef Bool (* RegionBrokenProcPtr)(
#if NeedNestedPrototypes
RegionPtr /*pReg*/
#endif
);
RegionPtr /*pReg*/);
typedef Bool (* RegionBreakProcPtr)(
#if NeedNestedPrototypes
RegionPtr /*pReg*/
#endif
);
RegionPtr /*pReg*/);
typedef void (* RegionEmptyProcPtr)(
#if NeedNestedPrototypes
RegionPtr /*pReg*/
#endif
);
RegionPtr /*pReg*/);
typedef BoxPtr (* RegionExtentsProcPtr)(
#if NeedNestedPrototypes
RegionPtr /*pReg*/
#endif
);
RegionPtr /*pReg*/);
typedef Bool (* RegionAppendProcPtr)(
#if NeedNestedPrototypes
RegionPtr /*dstrgn*/,
RegionPtr /*rgn*/
#endif
);
RegionPtr /*rgn*/);
typedef Bool (* RegionValidateProcPtr)(
#if NeedNestedPrototypes
RegionPtr /*badreg*/,
Bool* /*pOverlap*/
#endif
);
Bool* /*pOverlap*/);
#endif /* NEED_SCREEN_REGIONS */
typedef RegionPtr (* BitmapToRegionProcPtr)(
#if NeedNestedPrototypes
PixmapPtr /*pPix*/
#endif
);
PixmapPtr /*pPix*/);
#ifdef NEED_SCREEN_REGIONS
typedef RegionPtr (* RectsToRegionProcPtr)(
#if NeedNestedPrototypes
int /*nrects*/,
xRectangle* /*prect*/,
int /*ctype*/
#endif
);
int /*ctype*/);
#endif /* NEED_SCREEN_REGIONS */
typedef void (* SendGraphicsExposeProcPtr)(
#if NeedNestedPrototypes
ClientPtr /*client*/,
RegionPtr /*pRgn*/,
XID /*drawable*/,
int /*major*/,
int /*minor*/
#endif
);
int /*minor*/);
typedef void (* ScreenBlockHandlerProcPtr)(
#if NeedNestedPrototypes
int /*screenNum*/,
pointer /*blockData*/,
pointer /*pTimeout*/,
pointer /*pReadmask*/
#endif
);
pointer /*pReadmask*/);
typedef void (* ScreenWakeupHandlerProcPtr)(
#if NeedNestedPrototypes
int /*screenNum*/,
pointer /*wakeupData*/,
unsigned long /*result*/,
pointer /*pReadMask*/
#endif
);
pointer /*pReadMask*/);
typedef Bool (* CreateScreenResourcesProcPtr)(
#if NeedNestedPrototypes
ScreenPtr /*pScreen*/
#endif
);
ScreenPtr /*pScreen*/);
typedef Bool (* ModifyPixmapHeaderProcPtr)(
#if NeedNestedPrototypes
PixmapPtr /*pPixmap*/,
int /*width*/,
int /*height*/,
int /*depth*/,
int /*bitsPerPixel*/,
int /*devKind*/,
pointer /*pPixData*/
#endif
);
pointer /*pPixData*/);
typedef PixmapPtr (* GetWindowPixmapProcPtr)(
#if NeedNestedPrototypes
WindowPtr /*pWin*/
#endif
);
WindowPtr /*pWin*/);
typedef void (* SetWindowPixmapProcPtr)(
#if NeedNestedPrototypes
WindowPtr /*pWin*/,
PixmapPtr /*pPix*/
#endif
);
PixmapPtr /*pPix*/);
typedef PixmapPtr (* GetScreenPixmapProcPtr)(
#if NeedNestedPrototypes
ScreenPtr /*pScreen*/
#endif
);
ScreenPtr /*pScreen*/);
typedef void (* SetScreenPixmapProcPtr)(
#if NeedNestedPrototypes
PixmapPtr /*pPix*/
#endif
);
PixmapPtr /*pPix*/);
typedef void (* MarkWindowProcPtr)(
#if NeedNestedPrototypes
WindowPtr /*pWin*/
#endif
);
WindowPtr /*pWin*/);
typedef Bool (* MarkOverlappedWindowsProcPtr)(
#if NeedNestedPrototypes
WindowPtr /*parent*/,
WindowPtr /*firstChild*/,
WindowPtr * /*pLayerWin*/
#endif
);
WindowPtr * /*pLayerWin*/);
typedef Bool (* ChangeSaveUnderProcPtr)(
#if NeedNestedPrototypes
WindowPtr /*pLayerWin*/,
WindowPtr /*firstChild*/
#endif
);
WindowPtr /*firstChild*/);
typedef void (* PostChangeSaveUnderProcPtr)(
#if NeedNestedPrototypes
WindowPtr /*pLayerWin*/,
WindowPtr /*firstChild*/
#endif
);
WindowPtr /*firstChild*/);
typedef void (* MoveWindowProcPtr)(
#if NeedNestedPrototypes
WindowPtr /*pWin*/,
int /*x*/,
int /*y*/,
WindowPtr /*pSib*/,
VTKind /*kind*/
#endif
);
VTKind /*kind*/);
typedef void (* ResizeWindowProcPtr)(
#if NeedNestedPrototypes
WindowPtr /*pWin*/,
int /*x*/,
int /*y*/,
unsigned int /*w*/,
unsigned int /*h*/,
WindowPtr /*pSib*/
#endif
);
typedef WindowPtr (* GetLayerWindowProcPtr)(
#if NeedNestedPrototypes
WindowPtr /*pWin*/
#endif
);
typedef void (* HandleExposuresProcPtr)(
#if NeedNestedPrototypes
WindowPtr /*pWin*/
#endif
);
WindowPtr /*pWin*/);
typedef void (* ReparentWindowProcPtr)(
#if NeedNestedPrototypes
WindowPtr /*pWin*/,
WindowPtr /*pPriorParent*/
#endif
);
WindowPtr /*pPriorParent*/);
#ifdef SHAPE
typedef void (* SetShapeProcPtr)(
#if NeedFunctionPrototypes
WindowPtr /*pWin*/
#endif
);
WindowPtr /*pWin*/);
#endif /* SHAPE */
typedef void (* ChangeBorderWidthProcPtr)(
#if NeedFunctionPrototypes
WindowPtr /*pWin*/,
unsigned int /*width*/
#endif
);
unsigned int /*width*/);
typedef void (* MarkUnrealizedWindowProcPtr)(
#if NeedFunctionPrototypes
WindowPtr /*pChild*/,
WindowPtr /*pWin*/,
Bool /*fromConfigure*/
#endif
);
Bool /*fromConfigure*/);
typedef struct _Screen {
int myNum; /* index of this instance in Screens[] */
@@ -910,6 +649,7 @@ typedef struct _Screen {
RectInProcPtr RectIn;
PointInRegionProcPtr PointInRegion;
RegionNotEmptyProcPtr RegionNotEmpty;
RegionEqualProcPtr RegionEqual;
RegionBrokenProcPtr RegionBroken;
RegionBreakProcPtr RegionBreak;
RegionEmptyProcPtr RegionEmpty;
@@ -986,11 +726,8 @@ typedef struct _ScreenInfo {
extern ScreenInfo screenInfo;
extern void InitOutput(
#if NeedFunctionPrototypes
ScreenInfo * /*pScreenInfo*/,
int /*argc*/,
char ** /*argv*/
#endif
);
char ** /*argv*/);
#endif /* SCREENINTSTRUCT_H */

39
include/servermd.h
View File

@@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/include/servermd.h,v 3.53 2002/05/31 18:46:04 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/include/servermd.h,v 3.57 2003/11/03 05:11:59 tsi Exp $ */
/***********************************************************
Copyright 1987, 1998 The Open Group
@@ -153,7 +153,7 @@ SOFTWARE.
#endif /* __arm32__ */
#if defined (__hppa__)
#if defined (hpux)
#define IMAGE_BYTE_ORDER MSBFirst
#define BITMAP_BIT_ORDER MSBFirst
@@ -165,7 +165,7 @@ SOFTWARE.
#define LARGE_INSTRUCTION_CACHE
#define PLENTIFUL_REGISTERS
#endif /* __hppa__ */
#endif /* hpux */
#if defined(__powerpc__)
@@ -272,20 +272,6 @@ SOFTWARE.
#endif /* ibm */
#ifdef hpux
#define IMAGE_BYTE_ORDER MSBFirst /* Values for the HP only */
#define BITMAP_BIT_ORDER MSBFirst
#define GLYPHPADBYTES 2 /* to match product server */
#define GETLEFTBITS_ALIGNMENT 4 /* PA forces longs to 4 */
/* byte boundries */
#define AVOID_MEMORY_READ
#define FAST_CONSTANT_OFFSET_MODE
#define LARGE_INSTRUCTION_CACHE
#define PLENTIFUL_REGISTERS
#endif /* hpux */
#if defined (M4310) || defined(M4315) || defined(M4317) || defined(M4319) || defined(M4330)
#define IMAGE_BYTE_ORDER MSBFirst /* Values for Pegasus only */
@@ -403,7 +389,7 @@ SOFTWARE.
#endif /* ia64 */
#if defined(__x86_64__) || defined(x86_64)
#if defined(__AMD64__) || defined(AMD64)
# define IMAGE_BYTE_ORDER LSBFirst
# if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO)
@@ -422,7 +408,7 @@ SOFTWARE.
# define FAST_CONSTANT_OFFSET_MODE
/* ???? */
# define FAST_UNALIGNED_READS
#endif /* x86_64 */
#endif /* AMD64 */
#ifdef stellar
@@ -509,19 +495,8 @@ SOFTWARE.
#define IMAGE_BYTE_ORDER MSBFirst
#define BITMAP_BIT_ORDER MSBFirst
#if (_MIPS_SZLONG == 64)
# define GLYPHPADBYTES 4
# define GETLEFTBITS_ALIGNMENT 1
#else
#define GLYPHPADBYTES 2
#define GETLEFTBITS_ALIGNMENT 4
#endif
#define GLYPHPADBYTES 4
#define GETLEFTBITS_ALIGNMENT 1
#define AVOID_MEMORY_READ
#define FAST_CONSTANT_OFFSET_MODE
#define LARGE_INSTRUCTION_CACHE

10
include/site.h
View File

@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
/* $XFree86: xc/programs/Xserver/include/site.h,v 1.8 2001/12/19 21:37:35 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/include/site.h,v 1.9 2003/09/09 03:20:41 dawes Exp $ */
#ifndef SITE_H
#define SITE_H
@@ -128,4 +128,12 @@ SOFTWARE.
#define DEFAULT_ACCESS_CONTROL TRUE
#endif
/* Default logging parameters. */
#ifndef DEFAULT_LOG_VERBOSITY
#define DEFAULT_LOG_VERBOSITY 0
#endif
#ifndef DEFAULT_LOG_FILE_VERBOSITY
#define DEFAULT_LOG_FILE_VERBOSITY 3
#endif
#endif /* SITE_H */

438
include/swaprep.h
View File

@@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/include/swaprep.h,v 3.0 1996/04/15 11:34:34 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/include/swaprep.h,v 3.1 2003/04/27 21:31:05 herrb Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -27,488 +27,268 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef SWAPREP_H
#define SWAPREP_H 1
void
Swap32Write(
#if NeedFunctionPrototypes
extern void Swap32Write(
ClientPtr /* pClient */,
int /* size */,
CARD32 * /* pbuf */
#endif
);
CARD32 * /* pbuf */);
void
CopySwap32Write(
#if NeedFunctionPrototypes
extern void CopySwap32Write(
ClientPtr /* pClient */,
int /* size */,
CARD32 * /* pbuf */
#endif
);
CARD32 * /* pbuf */);
void
CopySwap16Write(
#if NeedFunctionPrototypes
extern void CopySwap16Write(
ClientPtr /* pClient */,
int /* size */,
short * /* pbuf */
#endif
);
short * /* pbuf */);
void
SGenericReply(
#if NeedFunctionPrototypes
extern void SGenericReply(
ClientPtr /* pClient */,
int /* size */,
xGenericReply * /* pRep */
#endif
);
xGenericReply * /* pRep */);
void
SGetWindowAttributesReply(
#if NeedFunctionPrototypes
extern void SGetWindowAttributesReply(
ClientPtr /* pClient */,
int /* size */,
xGetWindowAttributesReply * /* pRep */
#endif
);
xGetWindowAttributesReply * /* pRep */);
void
SGetGeometryReply(
#if NeedFunctionPrototypes
extern void SGetGeometryReply(
ClientPtr /* pClient */,
int /* size */,
xGetGeometryReply * /* pRep */
#endif
);
xGetGeometryReply * /* pRep */);
void
SQueryTreeReply(
#if NeedFunctionPrototypes
extern void SQueryTreeReply(
ClientPtr /* pClient */,
int /* size */,
xQueryTreeReply * /* pRep */
#endif
);
xQueryTreeReply * /* pRep */);
void
SInternAtomReply(
#if NeedFunctionPrototypes
extern void SInternAtomReply(
ClientPtr /* pClient */,
int /* size */,
xInternAtomReply * /* pRep */
#endif
);
xInternAtomReply * /* pRep */);
void
SGetAtomNameReply(
#if NeedFunctionPrototypes
extern void SGetAtomNameReply(
ClientPtr /* pClient */,
int /* size */,
xGetAtomNameReply * /* pRep */
#endif
);
xGetAtomNameReply * /* pRep */);
void
SGetPropertyReply(
#if NeedFunctionPrototypes
extern void SGetPropertyReply(
ClientPtr /* pClient */,
int /* size */,
xGetPropertyReply * /* pRep */
#endif
);
xGetPropertyReply * /* pRep */);
void
SListPropertiesReply(
#if NeedFunctionPrototypes
extern void SListPropertiesReply(
ClientPtr /* pClient */,
int /* size */,
xListPropertiesReply * /* pRep */
#endif
);
xListPropertiesReply * /* pRep */);
void
SGetSelectionOwnerReply(
#if NeedFunctionPrototypes
extern void SGetSelectionOwnerReply(
ClientPtr /* pClient */,
int /* size */,
xGetSelectionOwnerReply * /* pRep */
#endif
);
xGetSelectionOwnerReply * /* pRep */);
void
SQueryPointerReply(
#if NeedFunctionPrototypes
extern void SQueryPointerReply(
ClientPtr /* pClient */,
int /* size */,
xQueryPointerReply * /* pRep */
#endif
);
xQueryPointerReply * /* pRep */);
void
SwapTimecoord(
#if NeedFunctionPrototypes
xTimecoord * /* pCoord */
#endif
);
extern void SwapTimecoord(
xTimecoord * /* pCoord */);
void
SwapTimeCoordWrite(
#if NeedFunctionPrototypes
extern void SwapTimeCoordWrite(
ClientPtr /* pClient */,
int /* size */,
xTimecoord * /* pRep */
#endif
);
xTimecoord * /* pRep */);
void
SGetMotionEventsReply(
#if NeedFunctionPrototypes
extern void SGetMotionEventsReply(
ClientPtr /* pClient */,
int /* size */,
xGetMotionEventsReply * /* pRep */
#endif
);
xGetMotionEventsReply * /* pRep */);
void
STranslateCoordsReply(
#if NeedFunctionPrototypes
extern void STranslateCoordsReply(
ClientPtr /* pClient */,
int /* size */,
xTranslateCoordsReply * /* pRep */
#endif
);
xTranslateCoordsReply * /* pRep */);
void
SGetInputFocusReply(
#if NeedFunctionPrototypes
extern void SGetInputFocusReply(
ClientPtr /* pClient */,
int /* size */,
xGetInputFocusReply * /* pRep */
#endif
);
xGetInputFocusReply * /* pRep */);
void
SQueryKeymapReply(
#if NeedFunctionPrototypes
extern void SQueryKeymapReply(
ClientPtr /* pClient */,
int /* size */,
xQueryKeymapReply * /* pRep */
#endif
);
xQueryKeymapReply * /* pRep */);
#ifdef LBX
void
SwapCharInfo(
#if NeedFunctionPrototypes
xCharInfo * /* pInfo */
#endif
);
extern void SwapCharInfo(
xCharInfo * /* pInfo */);
#endif
#ifdef LBX
void
SwapFont(
#if NeedFunctionPrototypes
extern void SwapFont(
xQueryFontReply * /* pr */,
Bool /* hasGlyphs */
#endif
);
Bool /* hasGlyphs */);
#endif
void
SQueryFontReply(
#if NeedFunctionPrototypes
extern void SQueryFontReply(
ClientPtr /* pClient */,
int /* size */,
xQueryFontReply * /* pRep */
#endif
);
xQueryFontReply * /* pRep */);
void
SQueryTextExtentsReply(
#if NeedFunctionPrototypes
extern void SQueryTextExtentsReply(
ClientPtr /* pClient */,
int /* size */,
xQueryTextExtentsReply * /* pRep */
#endif
);
xQueryTextExtentsReply * /* pRep */);
void
SListFontsReply(
#if NeedFunctionPrototypes
extern void SListFontsReply(
ClientPtr /* pClient */,
int /* size */,
xListFontsReply * /* pRep */
#endif
);
xListFontsReply * /* pRep */);
void
SListFontsWithInfoReply(
#if NeedFunctionPrototypes
extern void SListFontsWithInfoReply(
ClientPtr /* pClient */,
int /* size */,
xListFontsWithInfoReply * /* pRep */
#endif
);
xListFontsWithInfoReply * /* pRep */);
void
SGetFontPathReply(
#if NeedFunctionPrototypes
extern void SGetFontPathReply(
ClientPtr /* pClient */,
int /* size */,
xGetFontPathReply * /* pRep */
#endif
);
xGetFontPathReply * /* pRep */);
void
SGetImageReply(
#if NeedFunctionPrototypes
extern void SGetImageReply(
ClientPtr /* pClient */,
int /* size */,
xGetImageReply * /* pRep */
#endif
);
xGetImageReply * /* pRep */);
void
SListInstalledColormapsReply(
#if NeedFunctionPrototypes
extern void SListInstalledColormapsReply(
ClientPtr /* pClient */,
int /* size */,
xListInstalledColormapsReply * /* pRep */
#endif
);
xListInstalledColormapsReply * /* pRep */);
void
SAllocColorReply(
#if NeedFunctionPrototypes
extern void SAllocColorReply(
ClientPtr /* pClient */,
int /* size */,
xAllocColorReply * /* pRep */
#endif
);
xAllocColorReply * /* pRep */);
void
SAllocNamedColorReply(
#if NeedFunctionPrototypes
extern void SAllocNamedColorReply(
ClientPtr /* pClient */,
int /* size */,
xAllocNamedColorReply * /* pRep */
#endif
);
xAllocNamedColorReply * /* pRep */);
void
SAllocColorCellsReply(
#if NeedFunctionPrototypes
extern void SAllocColorCellsReply(
ClientPtr /* pClient */,
int /* size */,
xAllocColorCellsReply * /* pRep */
#endif
);
xAllocColorCellsReply * /* pRep */);
void
SAllocColorPlanesReply(
#if NeedFunctionPrototypes
extern void SAllocColorPlanesReply(
ClientPtr /* pClient */,
int /* size */,
xAllocColorPlanesReply * /* pRep */
#endif
);
xAllocColorPlanesReply * /* pRep */);
void
SwapRGB(
#if NeedFunctionPrototypes
xrgb * /* prgb */
#endif
);
extern void SwapRGB(
xrgb * /* prgb */);
void
SQColorsExtend(
#if NeedFunctionPrototypes
extern void SQColorsExtend(
ClientPtr /* pClient */,
int /* size */,
xrgb * /* prgb */
#endif
);
xrgb * /* prgb */);
void
SQueryColorsReply(
#if NeedFunctionPrototypes
extern void SQueryColorsReply(
ClientPtr /* pClient */,
int /* size */,
xQueryColorsReply * /* pRep */
#endif
);
xQueryColorsReply * /* pRep */);
void
SLookupColorReply(
#if NeedFunctionPrototypes
extern void SLookupColorReply(
ClientPtr /* pClient */,
int /* size */,
xLookupColorReply * /* pRep */
#endif
);
xLookupColorReply * /* pRep */);
void
SQueryBestSizeReply(
#if NeedFunctionPrototypes
extern void SQueryBestSizeReply(
ClientPtr /* pClient */,
int /* size */,
xQueryBestSizeReply * /* pRep */
#endif
);
xQueryBestSizeReply * /* pRep */);
void
SListExtensionsReply(
#if NeedFunctionPrototypes
extern void SListExtensionsReply(
ClientPtr /* pClient */,
int /* size */,
xListExtensionsReply * /* pRep */
#endif
);
xListExtensionsReply * /* pRep */);
void
SGetKeyboardMappingReply(
#if NeedFunctionPrototypes
extern void SGetKeyboardMappingReply(
ClientPtr /* pClient */,
int /* size */,
xGetKeyboardMappingReply * /* pRep */
#endif
);
xGetKeyboardMappingReply * /* pRep */);
void
SGetPointerMappingReply(
#if NeedFunctionPrototypes
extern void SGetPointerMappingReply(
ClientPtr /* pClient */,
int /* size */,
xGetPointerMappingReply * /* pRep */
#endif
);
xGetPointerMappingReply * /* pRep */);
void
SGetModifierMappingReply(
#if NeedFunctionPrototypes
extern void SGetModifierMappingReply(
ClientPtr /* pClient */,
int /* size */,
xGetModifierMappingReply * /* pRep */
#endif
);
xGetModifierMappingReply * /* pRep */);
void
SGetKeyboardControlReply(
#if NeedFunctionPrototypes
extern void SGetKeyboardControlReply(
ClientPtr /* pClient */,
int /* size */,
xGetKeyboardControlReply * /* pRep */
#endif
);
xGetKeyboardControlReply * /* pRep */);
void
SGetPointerControlReply(
#if NeedFunctionPrototypes
extern void SGetPointerControlReply(
ClientPtr /* pClient */,
int /* size */,
xGetPointerControlReply * /* pRep */
#endif
);
xGetPointerControlReply * /* pRep */);
void
SGetScreenSaverReply(
#if NeedFunctionPrototypes
extern void SGetScreenSaverReply(
ClientPtr /* pClient */,
int /* size */,
xGetScreenSaverReply * /* pRep */
#endif
);
xGetScreenSaverReply * /* pRep */);
void
SLHostsExtend(
#if NeedFunctionPrototypes
extern void SLHostsExtend(
ClientPtr /* pClient */,
int /* size */,
char * /* buf */
#endif
);
char * /* buf */);
void
SListHostsReply(
#if NeedFunctionPrototypes
extern void SListHostsReply(
ClientPtr /* pClient */,
int /* size */,
xListHostsReply * /* pRep */
#endif
);
xListHostsReply * /* pRep */);
void
SErrorEvent(
#if NeedFunctionPrototypes
extern void SErrorEvent(
xError * /* from */,
xError * /* to */
#endif
);
xError * /* to */);
void
SwapConnSetupInfo(
#if NeedFunctionPrototypes
extern void SwapConnSetupInfo(
char * /* pInfo */,
char * /* pInfoTBase */
#endif
);
char * /* pInfoTBase */);
void
WriteSConnectionInfo(
#if NeedFunctionPrototypes
extern void WriteSConnectionInfo(
ClientPtr /* pClient */,
unsigned long /* size */,
char * /* pInfo */
#endif
);
char * /* pInfo */);
void
SwapConnSetup(
#if NeedFunctionPrototypes
extern void SwapConnSetup(
xConnSetup * /* pConnSetup */,
xConnSetup * /* pConnSetupT */
#endif
);
xConnSetup * /* pConnSetupT */);
void
SwapWinRoot(
#if NeedFunctionPrototypes
extern void SwapWinRoot(
xWindowRoot * /* pRoot */,
xWindowRoot * /* pRootT */
#endif
);
xWindowRoot * /* pRootT */);
void
SwapVisual(
#if NeedFunctionPrototypes
extern void SwapVisual(
xVisualType * /* pVis */,
xVisualType * /* pVisT */
#endif
);
xVisualType * /* pVisT */);
void
SwapConnSetupPrefix(
#if NeedFunctionPrototypes
extern void SwapConnSetupPrefix(
xConnSetupPrefix * /* pcspFrom */,
xConnSetupPrefix * /* pcspTo */
#endif
);
xConnSetupPrefix * /* pcspTo */);
void
WriteSConnSetupPrefix(
#if NeedFunctionPrototypes
extern void WriteSConnSetupPrefix(
ClientPtr /* pClient */,
xConnSetupPrefix * /* pcsp */
#endif
);
xConnSetupPrefix * /* pcsp */);
#undef SWAPREP_PROC
#if NeedFunctionPrototypes
#define SWAPREP_PROC(func) void func(xEvent * /* from */, xEvent * /* to */)
#else
#define SWAPREP_PROC(func) void func(/* xEvent * from, xEvent * to */)
#endif
SWAPREP_PROC(SCirculateEvent);
SWAPREP_PROC(SClientMessageEvent);

38
include/swapreq.h
View File

@@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/include/swapreq.h,v 1.2 2001/04/05 17:42:35 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/include/swapreq.h,v 1.4 2003/11/17 22:20:43 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -29,44 +29,24 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
/* The first two are in misc.h */
#if 0
void
SwapLongs (
#if NeedFunctionPrototypes
extern void SwapLongs (
CARD32 * /* list */,
unsigned long /* count */
#endif
);
unsigned long /* count */);
void
SwapShorts (
#if NeedFunctionPrototypes
extern void SwapShorts (
short * /* list */,
unsigned long /* count */
#endif
);
unsigned long /* count */);
#endif
void
SwapColorItem(
#if NeedFunctionPrototypes
xColorItem * /* pItem */
#endif
);
extern void SwapColorItem(
xColorItem * /* pItem */);
void
SwapConnClientPrefix(
#if NeedFunctionPrototypes
xConnClientPrefix * /* pCCP */
#endif
);
extern void SwapConnClientPrefix(
xConnClientPrefix * /* pCCP */);
#undef SWAPREQ_PROC
#if NeedFunctionPrototypes
#define SWAPREQ_PROC(func) int func(ClientPtr /* client */)
#else
#define SWAPREQ_PROC(func) int func(/* ClientPtr client */)
#endif
SWAPREQ_PROC(SProcAllocColor);
SWAPREQ_PROC(SProcAllocColorCells);

181
include/window.h
View File

@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
/* $XFree86: xc/programs/Xserver/include/window.h,v 1.6 2003/11/03 05:36:35 tsi Exp $ */
#ifndef WINDOW_H
#define WINDOW_H
@@ -71,65 +72,40 @@ typedef struct _BackingStore *BackingStorePtr;
typedef struct _Window *WindowPtr;
typedef int (*VisitWindowProcPtr)(
#if NeedNestedPrototypes
WindowPtr /*pWin*/,
pointer /*data*/
#endif
);
pointer /*data*/);
extern int TraverseTree(
#if NeedFunctionPrototypes
WindowPtr /*pWin*/,
VisitWindowProcPtr /*func*/,
pointer /*data*/
#endif
);
pointer /*data*/);
extern int WalkTree(
#if NeedFunctionPrototypes
ScreenPtr /*pScreen*/,
VisitWindowProcPtr /*func*/,
pointer /*data*/
#endif
);
pointer /*data*/);
extern WindowPtr AllocateWindow(
#if NeedFunctionPrototypes
ScreenPtr /*pScreen*/
#endif
);
ScreenPtr /*pScreen*/);
extern Bool CreateRootWindow(
#if NeedFunctionPrototypes
ScreenPtr /*pScreen*/
#endif
);
ScreenPtr /*pScreen*/);
extern void InitRootWindow(
#if NeedFunctionPrototypes
WindowPtr /*pWin*/
#endif
);
WindowPtr /*pWin*/);
extern void ClippedRegionFromBox(
#if NeedFunctionPrototypes
WindowPtr /*pWin*/,
RegionPtr /*Rgn*/,
int /*x*/,
int /*y*/,
int /*w*/,
int /*h*/
#endif
);
int /*h*/);
extern WindowPtr RealChildHead(
#if NeedFunctionPrototypes
WindowPtr /*pWin*/
#endif
);
WindowPtr /*pWin*/);
extern WindowPtr CreateWindow(
#if NeedFunctionPrototypes
Window /*wid*/,
WindowPtr /*pParent*/,
int /*x*/,
@@ -143,23 +119,15 @@ extern WindowPtr CreateWindow(
int /*depth*/,
ClientPtr /*client*/,
VisualID /*visual*/,
int* /*error*/
#endif
);
int* /*error*/);
extern int DeleteWindow(
#if NeedFunctionPrototypes
pointer /*pWin*/,
XID /*wid*/
#endif
);
XID /*wid*/);
extern void DestroySubwindows(
#if NeedFunctionPrototypes
WindowPtr /*pWin*/,
ClientPtr /*client*/
#endif
);
ClientPtr /*client*/);
/* Quartz support on Mac OS X uses the HIToolbox
framework whose ChangeWindowAttributes function conflicts here. */
@@ -167,13 +135,10 @@ extern void DestroySubwindows(
#define ChangeWindowAttributes Darwin_X_ChangeWindowAttributes
#endif
extern int ChangeWindowAttributes(
#if NeedFunctionPrototypes
WindowPtr /*pWin*/,
Mask /*vmask*/,
XID* /*vlist*/,
ClientPtr /*client*/
#endif
);
ClientPtr /*client*/);
/* Quartz support on Mac OS X uses the HIToolbox
framework whose GetWindowAttributes function conflicts here. */
@@ -183,21 +148,14 @@ extern void Darwin_X_GetWindowAttributes(
#else
extern void GetWindowAttributes(
#endif
#if NeedFunctionPrototypes
WindowPtr /*pWin*/,
ClientPtr /*client*/,
xGetWindowAttributesReply* /* wa */
#endif
);
xGetWindowAttributesReply* /* wa */);
extern RegionPtr CreateUnclippedWinSize(
#if NeedFunctionPrototypes
WindowPtr /*pWin*/
#endif
);
WindowPtr /*pWin*/);
extern void GravityTranslate(
#if NeedFunctionPrototypes
int /*x*/,
int /*y*/,
int /*oldx*/,
@@ -206,157 +164,92 @@ extern void GravityTranslate(
int /*dh*/,
unsigned /*gravity*/,
int* /*destx*/,
int* /*desty*/
#endif
);
int* /*desty*/);
extern int ConfigureWindow(
#if NeedFunctionPrototypes
WindowPtr /*pWin*/,
Mask /*mask*/,
XID* /*vlist*/,
ClientPtr /*client*/
#endif
);
ClientPtr /*client*/);
extern int CirculateWindow(
#if NeedFunctionPrototypes
WindowPtr /*pParent*/,
int /*direction*/,
ClientPtr /*client*/
#endif
);
ClientPtr /*client*/);
extern int ReparentWindow(
#if NeedFunctionPrototypes
WindowPtr /*pWin*/,
WindowPtr /*pParent*/,
int /*x*/,
int /*y*/,
ClientPtr /*client*/
#endif
);
ClientPtr /*client*/);
extern int MapWindow(
#if NeedFunctionPrototypes
WindowPtr /*pWin*/,
ClientPtr /*client*/
#endif
);
ClientPtr /*client*/);
extern void MapSubwindows(
#if NeedFunctionPrototypes
WindowPtr /*pParent*/,
ClientPtr /*client*/
#endif
);
ClientPtr /*client*/);
extern int UnmapWindow(
#if NeedFunctionPrototypes
WindowPtr /*pWin*/,
Bool /*fromConfigure*/
#endif
);
Bool /*fromConfigure*/);
extern void UnmapSubwindows(
#if NeedFunctionPrototypes
WindowPtr /*pWin*/
#endif
);
WindowPtr /*pWin*/);
extern void HandleSaveSet(
#if NeedFunctionPrototypes
ClientPtr /*client*/
#endif
);
ClientPtr /*client*/);
extern Bool VisibleBoundingBoxFromPoint(
#if NeedFunctionPrototypes
WindowPtr /*pWin*/,
int /*x*/,
int /*y*/,
BoxPtr /*box*/
#endif
);
BoxPtr /*box*/);
extern Bool PointInWindowIsVisible(
#if NeedFunctionPrototypes
WindowPtr /*pWin*/,
int /*x*/,
int /*y*/
#endif
);
int /*y*/);
extern RegionPtr NotClippedByChildren(
#if NeedFunctionPrototypes
WindowPtr /*pWin*/
#endif
);
WindowPtr /*pWin*/);
extern void SendVisibilityNotify(
#if NeedFunctionPrototypes
WindowPtr /*pWin*/
#endif
);
WindowPtr /*pWin*/);
extern void SaveScreens(
#if NeedFunctionPrototypes
int /*on*/,
int /*mode*/
#endif
);
int /*mode*/);
extern WindowPtr FindWindowWithOptional(
#if NeedFunctionPrototypes
WindowPtr /*w*/
#endif
);
WindowPtr /*w*/);
extern void CheckWindowOptionalNeed(
#if NeedFunctionPrototypes
WindowPtr /*w*/
#endif
);
WindowPtr /*w*/);
extern Bool MakeWindowOptional(
#if NeedFunctionPrototypes
WindowPtr /*pWin*/
#endif
);
WindowPtr /*pWin*/);
extern void DisposeWindowOptional(
#if NeedFunctionPrototypes
WindowPtr /*pWin*/
#endif
);
WindowPtr /*pWin*/);
extern WindowPtr MoveWindowInStack(
#if NeedFunctionPrototypes
WindowPtr /*pWin*/,
WindowPtr /*pNextSib*/
#endif
);
WindowPtr /*pNextSib*/);
void SetWinSize(
#if NeedFunctionPrototypes
WindowPtr /*pWin*/
#endif
);
WindowPtr /*pWin*/);
void SetBorderSize(
#if NeedFunctionPrototypes
WindowPtr /*pWin*/
#endif
);
WindowPtr /*pWin*/);
void ResizeChildrenWinSize(
#if NeedFunctionPrototypes
WindowPtr /*pWin*/,
int /*dx*/,
int /*dy*/,
int /*dw*/,
int /*dh*/
#endif
);
int /*dh*/);
#endif /* WINDOW_H */

7
include/windowstr.h
View File

@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
/* $XFree86: xc/programs/Xserver/include/windowstr.h,v 1.6 2001/12/14 19:59:57 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/include/windowstr.h,v 1.7 2003/04/27 21:31:05 herrb Exp $ */
#ifndef WINDOWSTRUCT_H
#define WINDOWSTRUCT_H
@@ -188,12 +188,9 @@ typedef struct _ScreenSaverStuff {
XID wid;
char blanked;
Bool (*ExternalScreenSaver)(
#if NeedNestedPrototypes
ScreenPtr /*pScreen*/,
int /*xstate*/,
Bool /*force*/
#endif
);
Bool /*force*/);
} ScreenSaverStuffRec, *ScreenSaverStuffPtr;
#define SCREEN_IS_BLANKED 0