frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rework symbol visibility for easier maintenance 

Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.

  This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)

  LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.

  xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
This commit is contained in:
Paulo Cesar Pereira de Andrade 2008-12-03 05:43:34 -02:00
parent 0b8f8b24f7
commit 49f77fff14
528 changed files with 5953 additions and 5869 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Xext/Makefile.am
View File

@ -62,6 +62,9 @@ endif
XINERAMA_SRCS = panoramiX.c panoramiX.h panoramiXh.h panoramiXsrv.h panoramiXprocs.c panoramiXSwap.c XINERAMA_SRCS = panoramiX.c panoramiX.h panoramiXh.h panoramiXsrv.h panoramiXprocs.c panoramiXSwap.c
if XINERAMA if XINERAMA
BUILTIN_SRCS += $(XINERAMA_SRCS) BUILTIN_SRCS += $(XINERAMA_SRCS)
if XORG
sdk_HEADERS += panoramiXsrv.h panoramiX.h
endif
endif endif
# X-ACE extension: provides hooks for building security policy extensions # X-ACE extension: provides hooks for building security policy extensions

24
Xext/geext.c
View File

@ -39,16 +39,16 @@
#define rClient(obj) (clients[CLIENT_ID((obj)->resource)]) #define rClient(obj) (clients[CLIENT_ID((obj)->resource)])
_X_EXPORT int GEEventBase; int GEEventBase;
_X_EXPORT int GEErrorBase; int GEErrorBase;
static int GEClientPrivateKeyIndex; static int GEClientPrivateKeyIndex;
_X_EXPORT DevPrivateKey GEClientPrivateKey = &GEClientPrivateKeyIndex; DevPrivateKey GEClientPrivateKey = &GEClientPrivateKeyIndex;
_X_EXPORT int GEEventType; /* The opcode for all GenericEvents will have. */ int GEEventType; /* The opcode for all GenericEvents will have. */
int RT_GECLIENT = 0; int RT_GECLIENT = 0;
_X_EXPORT GEExtension GEExtensions[MAXEXTENSIONS]; GEExtension GEExtensions[MAXEXTENSIONS];
/* Major available requests */ /* Major available requests */
static const int version_requests[] = { static const int version_requests[] = {
@ -101,7 +101,7 @@ ProcGEQueryVersion(ClientPtr client)
return(client->noClientException); return(client->noClientException);
} }
_X_EXPORT int (*ProcGEVector[GENumberRequests])(ClientPtr) = { int (*ProcGEVector[GENumberRequests])(ClientPtr) = {
/* Version 1.0 */ /* Version 1.0 */
ProcGEQueryVersion ProcGEQueryVersion
}; };
@ -122,7 +122,7 @@ SProcGEQueryVersion(ClientPtr client)
return(*ProcGEVector[stuff->ReqType])(client); return(*ProcGEVector[stuff->ReqType])(client);
} }
_X_EXPORT int (*SProcGEVector[GENumberRequests])(ClientPtr) = { int (*SProcGEVector[GENumberRequests])(ClientPtr) = {
/* Version 1.0 */ /* Version 1.0 */
SProcGEQueryVersion SProcGEQueryVersion
}; };
@ -258,7 +258,7 @@ GEClientGone(WindowPtr pWin, XID id)
* Since other extensions may rely on XGE (XInput does already), it is a good * Since other extensions may rely on XGE (XInput does already), it is a good
* idea to init XGE first, before any other extension. * idea to init XGE first, before any other extension.
*/ */
_X_EXPORT void void
GEExtensionInit(void) GEExtensionInit(void)
{ {
ExtensionEntry *extEntry; ExtensionEntry *extEntry;
@ -300,7 +300,7 @@ GEExtensionInit(void)
* @param ev_fill Called for an event before delivery. The extension now has * @param ev_fill Called for an event before delivery. The extension now has
* the chance to fill in necessary fields for the event. * the chance to fill in necessary fields for the event.
*/ */
_X_EXPORT void void
GERegisterExtension(int extension, GERegisterExtension(int extension,
void (*ev_swap)(xGenericEvent* from, xGenericEvent* to), void (*ev_swap)(xGenericEvent* from, xGenericEvent* to),
void (*ev_fill)(xGenericEvent* ev, DeviceIntPtr pDev, void (*ev_fill)(xGenericEvent* ev, DeviceIntPtr pDev,
@ -318,7 +318,7 @@ GERegisterExtension(int extension,
/* Sets type and extension field for a generic event. This is just an /* Sets type and extension field for a generic event. This is just an
* auxiliary function, extensions could do it manually too. * auxiliary function, extensions could do it manually too.
*/ */
_X_EXPORT void void
GEInitEvent(xGenericEvent* ev, int extension) GEInitEvent(xGenericEvent* ev, int extension)
{ {
ev->type = GenericEvent; ev->type = GenericEvent;
@ -356,7 +356,7 @@ GERecalculateWinMask(WindowPtr pWin)
} }
/* Set generic event mask for given window. */ /* Set generic event mask for given window. */
_X_EXPORT void void
GEWindowSetMask(ClientPtr pClient, DeviceIntPtr pDev, GEWindowSetMask(ClientPtr pClient, DeviceIntPtr pDev,
WindowPtr pWin, int extension, Mask mask) WindowPtr pWin, int extension, Mask mask)
{ {
@ -443,7 +443,7 @@ GEWindowSetMask(ClientPtr pClient, DeviceIntPtr pDev,
* @param extension Extension ID * @param extension Extension ID
* @param mask Event mask * @param mask Event mask
*/ */
_X_EXPORT BOOL BOOL
GEDeviceMaskIsSet(WindowPtr pWin, DeviceIntPtr pDev, GEDeviceMaskIsSet(WindowPtr pWin, DeviceIntPtr pDev,
int extension, Mask mask) int extension, Mask mask)
{ {

12
Xext/geext.h
View File

@ -66,7 +66,7 @@ typedef struct _GEExtension {
/* All registered extensions and their handling functions. */ /* All registered extensions and their handling functions. */
extern GEExtension GEExtensions[MAXEXTENSIONS]; extern _X_EXPORT GEExtension GEExtensions[MAXEXTENSIONS];
/* Returns the extension offset from the event */ /* Returns the extension offset from the event */
#define GEEXT(ev) (((xGenericEvent*)(ev))->extension) #define GEEXT(ev) (((xGenericEvent*)(ev))->extension)
@ -95,20 +95,20 @@ extern GEExtension GEExtensions[MAXEXTENSIONS];
/* Interface for other extensions */ /* Interface for other extensions */
void GEWindowSetMask(ClientPtr pClient, DeviceIntPtr pDev, extern _X_EXPORT void GEWindowSetMask(ClientPtr pClient, DeviceIntPtr pDev,
WindowPtr pWin, int extension, Mask mask); WindowPtr pWin, int extension, Mask mask);
void GERegisterExtension( extern _X_EXPORT void GERegisterExtension(
int extension, int extension,
void (*ev_dispatch)(xGenericEvent* from, xGenericEvent* to), void (*ev_dispatch)(xGenericEvent* from, xGenericEvent* to),
void (*ev_fill)(xGenericEvent* ev, DeviceIntPtr pDev, void (*ev_fill)(xGenericEvent* ev, DeviceIntPtr pDev,
WindowPtr pWin, GrabPtr pGrab) WindowPtr pWin, GrabPtr pGrab)
); );
void GEInitEvent(xGenericEvent* ev, int extension); extern _X_EXPORT void GEInitEvent(xGenericEvent* ev, int extension);
BOOL GEDeviceMaskIsSet(WindowPtr pWin, DeviceIntPtr pDev, extern _X_EXPORT BOOL GEDeviceMaskIsSet(WindowPtr pWin, DeviceIntPtr pDev,
int extension, Mask mask); int extension, Mask mask);
void GEExtensionInit(void); extern _X_EXPORT void GEExtensionInit(void);
#endif /* _GEEXT_H_ */ #endif /* _GEEXT_H_ */

12
Xext/geint.h
View File

@ -38,10 +38,10 @@
#include "extnsionst.h" #include "extnsionst.h"
#include <X11/extensions/geproto.h> #include <X11/extensions/geproto.h>
extern int GEEventType; extern _X_EXPORT int GEEventType;
extern int GEEventBase; extern _X_EXPORT int GEEventBase;
extern int GEErrorBase; extern _X_EXPORT int GEErrorBase;
extern DevPrivateKey GEClientPrivateKey; extern _X_EXPORT DevPrivateKey GEClientPrivateKey;
typedef struct _GEClientInfo { typedef struct _GEClientInfo {
CARD32 major_version; CARD32 major_version;
@ -50,7 +50,7 @@ typedef struct _GEClientInfo {
#define GEGetClient(pClient) ((GEClientInfoPtr)(dixLookupPrivate(&((pClient)->devPrivates), GEClientPrivateKey))) #define GEGetClient(pClient) ((GEClientInfoPtr)(dixLookupPrivate(&((pClient)->devPrivates), GEClientPrivateKey)))
extern int (*ProcGEVector[/*GENumRequests*/])(ClientPtr); extern _X_EXPORT int (*ProcGEVector[/*GENumRequests*/])(ClientPtr);
extern int (*SProcGEVector[/*GENumRequests*/])(ClientPtr); extern _X_EXPORT int (*SProcGEVector[/*GENumRequests*/])(ClientPtr);
#endif /* _GEINT_H_ */ #endif /* _GEINT_H_ */

22
Xext/panoramiX.c
View File

@ -71,9 +71,9 @@ extern VisualPtr glxMatchVisual(ScreenPtr pScreen,
int PanoramiXPixWidth = 0; int PanoramiXPixWidth = 0;
int PanoramiXPixHeight = 0; int PanoramiXPixHeight = 0;
_X_EXPORT int PanoramiXNumScreens = 0; int PanoramiXNumScreens = 0;
_X_EXPORT PanoramiXData *panoramiXdataPtr = NULL; PanoramiXData *panoramiXdataPtr = NULL;
static RegionRec PanoramiXScreenRegion = {{0, 0, 0, 0}, NULL}; static RegionRec PanoramiXScreenRegion = {{0, 0, 0, 0}, NULL};
static int PanoramiXNumDepths; static int PanoramiXNumDepths;
@ -81,14 +81,14 @@ static DepthPtr PanoramiXDepths;
static int PanoramiXNumVisuals; static int PanoramiXNumVisuals;
static VisualPtr PanoramiXVisuals; static VisualPtr PanoramiXVisuals;
_X_EXPORT unsigned long XRC_DRAWABLE; unsigned long XRC_DRAWABLE;
_X_EXPORT unsigned long XRT_WINDOW; unsigned long XRT_WINDOW;
_X_EXPORT unsigned long XRT_PIXMAP; unsigned long XRT_PIXMAP;
_X_EXPORT unsigned long XRT_GC; unsigned long XRT_GC;
_X_EXPORT unsigned long XRT_COLORMAP; unsigned long XRT_COLORMAP;
static Bool VisualsEqual(VisualPtr, ScreenPtr, VisualPtr); static Bool VisualsEqual(VisualPtr, ScreenPtr, VisualPtr);
_X_EXPORT XineramaVisualsEqualProcPtr XineramaVisualsEqualPtr = &VisualsEqual; XineramaVisualsEqualProcPtr XineramaVisualsEqualPtr = &VisualsEqual;
/* /*
* Function prototypes * Function prototypes
@ -328,7 +328,7 @@ XineramaDestroyClip(GCPtr pGC)
Xinerama_GC_FUNC_EPILOGUE (pGC); Xinerama_GC_FUNC_EPILOGUE (pGC);
} }
_X_EXPORT int int
XineramaDeleteResource(pointer data, XID id) XineramaDeleteResource(pointer data, XID id)
{ {
xfree(data); xfree(data);
@ -371,7 +371,7 @@ typedef struct _connect_callback_list {
static XineramaConnectionCallbackList *ConnectionCallbackList = NULL; static XineramaConnectionCallbackList *ConnectionCallbackList = NULL;
_X_EXPORT Bool Bool
XineramaRegisterConnectionBlockCallback(void (*func)(void)) XineramaRegisterConnectionBlockCallback(void (*func)(void))
{ {
XineramaConnectionCallbackList *newlist; XineramaConnectionCallbackList *newlist;
@ -839,7 +839,7 @@ PanoramiXConsolidate(void)
AddResource(defmap->info[0].id, XRT_COLORMAP, defmap); AddResource(defmap->info[0].id, XRT_COLORMAP, defmap);
} }
_X_EXPORT VisualID VisualID
PanoramiXTranslateVisualID(int screen, VisualID orig) PanoramiXTranslateVisualID(int screen, VisualID orig)
{ {
ScreenPtr pOtherScreen = screenInfo.screens[screen]; ScreenPtr pOtherScreen = screenInfo.screens[screen];

38
Xext/panoramiXsrv.h
View File

@ -8,27 +8,27 @@
#include "panoramiX.h" #include "panoramiX.h"
extern int PanoramiXNumScreens; extern _X_EXPORT int PanoramiXNumScreens;
extern PanoramiXData *panoramiXdataPtr; extern _X_EXPORT PanoramiXData *panoramiXdataPtr;
extern int PanoramiXPixWidth; extern _X_EXPORT int PanoramiXPixWidth;
extern int PanoramiXPixHeight; extern _X_EXPORT int PanoramiXPixHeight;
extern VisualID PanoramiXTranslateVisualID(int screen, VisualID orig); extern _X_EXPORT VisualID PanoramiXTranslateVisualID(int screen, VisualID orig);
extern void PanoramiXConsolidate(void); extern _X_EXPORT void PanoramiXConsolidate(void);
extern Bool PanoramiXCreateConnectionBlock(void); extern _X_EXPORT Bool PanoramiXCreateConnectionBlock(void);
extern PanoramiXRes * PanoramiXFindIDByScrnum(RESTYPE, XID, int); extern _X_EXPORT PanoramiXRes * PanoramiXFindIDByScrnum(RESTYPE, XID, int);
extern Bool XineramaRegisterConnectionBlockCallback(void (*func)(void)); extern _X_EXPORT Bool XineramaRegisterConnectionBlockCallback(void (*func)(void));
extern int XineramaDeleteResource(pointer, XID); extern _X_EXPORT int XineramaDeleteResource(pointer, XID);
extern void XineramaReinitData(ScreenPtr); extern _X_EXPORT void XineramaReinitData(ScreenPtr);
extern RegionRec XineramaScreenRegions[MAXSCREENS]; extern _X_EXPORT RegionRec XineramaScreenRegions[MAXSCREENS];
extern unsigned long XRC_DRAWABLE; extern _X_EXPORT unsigned long XRC_DRAWABLE;
extern unsigned long XRT_WINDOW; extern _X_EXPORT unsigned long XRT_WINDOW;
extern unsigned long XRT_PIXMAP; extern _X_EXPORT unsigned long XRT_PIXMAP;
extern unsigned long XRT_GC; extern _X_EXPORT unsigned long XRT_GC;
extern unsigned long XRT_COLORMAP; extern _X_EXPORT unsigned long XRT_COLORMAP;
/* /*
* Drivers are allowed to wrap this function. Each wrapper can decide that the * Drivers are allowed to wrap this function. Each wrapper can decide that the
@ -38,9 +38,9 @@ extern unsigned long XRT_COLORMAP;
* screen 0. * screen 0.
*/ */
typedef Bool (*XineramaVisualsEqualProcPtr)(VisualPtr, ScreenPtr, VisualPtr); typedef Bool (*XineramaVisualsEqualProcPtr)(VisualPtr, ScreenPtr, VisualPtr);
extern XineramaVisualsEqualProcPtr XineramaVisualsEqualPtr; extern _X_EXPORT XineramaVisualsEqualProcPtr XineramaVisualsEqualPtr;
extern void XineramaGetImageData( extern _X_EXPORT void XineramaGetImageData(
DrawablePtr *pDrawables, DrawablePtr *pDrawables,
int left, int left,
int top, int top,

8
Xext/shape.c
View File

@ -136,7 +136,7 @@ typedef struct _ShapeEvent {
* *
****************/ ****************/
_X_EXPORT void void
ShapeExtensionInit(void) ShapeExtensionInit(void)
{ {
ExtensionEntry *extEntry; ExtensionEntry *extEntry;
@ -238,7 +238,7 @@ RegionOperate (client, pWin, kind, destRgnp, srcRgn, op, xoff, yoff, create)
return Success; return Success;
} }
_X_EXPORT RegionPtr RegionPtr
CreateBoundingShape (pWin) CreateBoundingShape (pWin)
WindowPtr pWin; WindowPtr pWin;
{ {
@ -251,7 +251,7 @@ CreateBoundingShape (pWin)
return REGION_CREATE(pWin->drawable.pScreen, &extents, 1); return REGION_CREATE(pWin->drawable.pScreen, &extents, 1);
} }
_X_EXPORT RegionPtr RegionPtr
CreateClipShape (pWin) CreateClipShape (pWin)
WindowPtr pWin; WindowPtr pWin;
{ {
@ -895,7 +895,7 @@ ProcShapeSelectInput (client)
* deliver the event * deliver the event
*/ */
_X_EXPORT void void
SendShapeNotify (pWin, which) SendShapeNotify (pWin, which)
WindowPtr pWin; WindowPtr pWin;
int which; int which;

10
Xext/shm.c
View File

@ -132,9 +132,9 @@ static DISPATCH_PROC(SProcShmPutImage);
static DISPATCH_PROC(SProcShmQueryVersion); static DISPATCH_PROC(SProcShmQueryVersion);
static unsigned char ShmReqCode; static unsigned char ShmReqCode;
_X_EXPORT int ShmCompletionCode; int ShmCompletionCode;
_X_EXPORT int BadShmSegCode; int BadShmSegCode;
_X_EXPORT RESTYPE ShmSegType; RESTYPE ShmSegType;
static ShmDescPtr Shmsegs; static ShmDescPtr Shmsegs;
static Bool sharedPixmaps; static Bool sharedPixmaps;
static ShmFuncsPtr shmFuncs[MAXSCREENS]; static ShmFuncsPtr shmFuncs[MAXSCREENS];
@ -271,7 +271,7 @@ ShmResetProc(ExtensionEntry *extEntry)
} }
} }
_X_EXPORT void void
ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs) ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs)
{ {
shmFuncs[pScreen->myNum] = funcs; shmFuncs[pScreen->myNum] = funcs;
@ -298,7 +298,7 @@ ShmDestroyPixmap (PixmapPtr pPixmap)
return ret; return ret;
} }
_X_EXPORT void void
ShmRegisterFbFuncs(ScreenPtr pScreen) ShmRegisterFbFuncs(ScreenPtr pScreen)
{ {
shmFuncs[pScreen->myNum] = &fbFuncs; shmFuncs[pScreen->myNum] = &fbFuncs;

8
Xext/shmint.h
View File

@ -30,10 +30,14 @@
#include "pixmap.h" #include "pixmap.h"
#include "gc.h" #include "gc.h"
void extern _X_EXPORT void
ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs); ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs);
void extern _X_EXPORT void
ShmRegisterFbFuncs(ScreenPtr pScreen); ShmRegisterFbFuncs(ScreenPtr pScreen);
extern _X_EXPORT RESTYPE ShmSegType;
extern _X_EXPORT int ShmCompletionCode;
extern _X_EXPORT int BadShmSegCode;
#endif /* _SHMINT_H_ */ #endif /* _SHMINT_H_ */

2
Xext/sleepuntil.c
View File

@ -77,7 +77,7 @@ static void SertafiedWakeupHandler(
pointer /* LastSelectMask */ pointer /* LastSelectMask */
); );
_X_EXPORT int int
ClientSleepUntil (client, revive, notifyFunc, closure) ClientSleepUntil (client, revive, notifyFunc, closure)
ClientPtr client; ClientPtr client;
TimeStamp *revive; TimeStamp *revive;

2
Xext/xace.c
View File

@ -80,7 +80,7 @@ void XaceHookAuditEnd(ClientPtr ptr, int result)
/* Entry point for hook functions. Called by Xserver. /* Entry point for hook functions. Called by Xserver.
*/ */
_X_EXPORT int XaceHook(int hook, ...) int XaceHook(int hook, ...)
{ {
pointer calldata; /* data passed to callback */ pointer calldata; /* data passed to callback */
int *prv = NULL; /* points to return value from callback */ int *prv = NULL; /* points to return value from callback */

3
Xext/xace.h
View File

@ -59,8 +59,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
extern CallbackListPtr XaceHooks[XACE_NUM_HOOKS]; extern CallbackListPtr XaceHooks[XACE_NUM_HOOKS];
/* Entry point for hook functions. Called by Xserver. /* Entry point for hook functions. Called by Xserver.
* Required by libdbe and libextmod
*/ */
extern int XaceHook( extern _X_EXPORT int XaceHook(
int /*hook*/, int /*hook*/,
... /*appropriate args for hook*/ ... /*appropriate args for hook*/
); );

4
Xext/xvdisp.c
View File

@ -1349,7 +1349,7 @@ static int (*XvProcVector[xvNumRequests])(ClientPtr) = {
ProcXvShmPutImage, ProcXvShmPutImage,
}; };
_X_EXPORT int int
ProcXvDispatch(ClientPtr client) ProcXvDispatch(ClientPtr client)
{ {
REQUEST(xReq); REQUEST(xReq);
@ -1673,7 +1673,7 @@ static int (*SXvProcVector[xvNumRequests])(ClientPtr) = {
SProcXvShmPutImage, SProcXvShmPutImage,
}; };
_X_EXPORT int int
SProcXvDispatch(ClientPtr client) SProcXvDispatch(ClientPtr client)
{ {
REQUEST(xReq); REQUEST(xReq);

68
Xext/xvdix.h
View File

@ -55,20 +55,20 @@ SOFTWARE.
#include "scrnintstr.h" #include "scrnintstr.h"
#include <X11/extensions/Xvproto.h> #include <X11/extensions/Xvproto.h>
extern unsigned long XvExtensionGeneration; extern _X_EXPORT unsigned long XvExtensionGeneration;
extern unsigned long XvScreenGeneration; extern _X_EXPORT unsigned long XvScreenGeneration;
extern unsigned long XvResourceGeneration; extern _X_EXPORT unsigned long XvResourceGeneration;
extern int XvReqCode; extern _X_EXPORT int XvReqCode;
extern int XvEventBase; extern _X_EXPORT int XvEventBase;
extern int XvErrorBase; extern _X_EXPORT int XvErrorBase;
extern unsigned long XvRTPort; extern _X_EXPORT unsigned long XvRTPort;
extern unsigned long XvRTEncoding; extern _X_EXPORT unsigned long XvRTEncoding;
extern unsigned long XvRTGrab; extern _X_EXPORT unsigned long XvRTGrab;
extern unsigned long XvRTVideoNotify; extern _X_EXPORT unsigned long XvRTVideoNotify;
extern unsigned long XvRTVideoNotifyList; extern _X_EXPORT unsigned long XvRTVideoNotifyList;
extern unsigned long XvRTPortNotify; extern _X_EXPORT unsigned long XvRTPortNotify;
typedef struct { typedef struct {
int numerator; int numerator;
@ -234,42 +234,42 @@ typedef struct {
#define _XvBadPort (XvBadPort+XvErrorBase) #define _XvBadPort (XvBadPort+XvErrorBase)
#define _XvBadEncoding (XvBadEncoding+XvErrorBase) #define _XvBadEncoding (XvBadEncoding+XvErrorBase)
extern int ProcXvDispatch(ClientPtr); extern _X_EXPORT int ProcXvDispatch(ClientPtr);
extern int SProcXvDispatch(ClientPtr); extern _X_EXPORT int SProcXvDispatch(ClientPtr);
extern void XvExtensionInit(void); extern _X_EXPORT void XvExtensionInit(void);
extern int XvScreenInit(ScreenPtr); extern _X_EXPORT int XvScreenInit(ScreenPtr);
extern DevPrivateKey XvGetScreenKey(void); extern _X_EXPORT DevPrivateKey XvGetScreenKey(void);
extern unsigned long XvGetRTPort(void); extern _X_EXPORT unsigned long XvGetRTPort(void);
extern int XvdiSendPortNotify(XvPortPtr, Atom, INT32); extern _X_EXPORT int XvdiSendPortNotify(XvPortPtr, Atom, INT32);
extern int XvdiVideoStopped(XvPortPtr, int); extern _X_EXPORT int XvdiVideoStopped(XvPortPtr, int);
extern int XvdiPutVideo(ClientPtr, DrawablePtr, XvPortPtr, GCPtr, extern _X_EXPORT int XvdiPutVideo(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
INT16, INT16, CARD16, CARD16, INT16, INT16, CARD16, CARD16,
INT16, INT16, CARD16, CARD16); INT16, INT16, CARD16, CARD16);
extern int XvdiPutStill(ClientPtr, DrawablePtr, XvPortPtr, GCPtr, extern _X_EXPORT int XvdiPutStill(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
INT16, INT16, CARD16, CARD16, INT16, INT16, CARD16, CARD16,
INT16, INT16, CARD16, CARD16); INT16, INT16, CARD16, CARD16);
extern int XvdiGetVideo(ClientPtr, DrawablePtr, XvPortPtr, GCPtr, extern _X_EXPORT int XvdiGetVideo(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
INT16, INT16, CARD16, CARD16, INT16, INT16, CARD16, CARD16,
INT16, INT16, CARD16, CARD16); INT16, INT16, CARD16, CARD16);
extern int XvdiGetStill(ClientPtr, DrawablePtr, XvPortPtr, GCPtr, extern _X_EXPORT int XvdiGetStill(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
INT16, INT16, CARD16, CARD16, INT16, INT16, CARD16, CARD16,
INT16, INT16, CARD16, CARD16); INT16, INT16, CARD16, CARD16);
extern int XvdiPutImage(ClientPtr, DrawablePtr, XvPortPtr, GCPtr, extern _X_EXPORT int XvdiPutImage(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
INT16, INT16, CARD16, CARD16, INT16, INT16, CARD16, CARD16,
INT16, INT16, CARD16, CARD16, INT16, INT16, CARD16, CARD16,
XvImagePtr, unsigned char*, Bool, XvImagePtr, unsigned char*, Bool,
CARD16, CARD16); CARD16, CARD16);
extern int XvdiSelectVideoNotify(ClientPtr, DrawablePtr, BOOL); extern _X_EXPORT int XvdiSelectVideoNotify(ClientPtr, DrawablePtr, BOOL);
extern int XvdiSelectPortNotify(ClientPtr, XvPortPtr, BOOL); extern _X_EXPORT int XvdiSelectPortNotify(ClientPtr, XvPortPtr, BOOL);
extern int XvdiSetPortAttribute(ClientPtr, XvPortPtr, Atom, INT32); extern _X_EXPORT int XvdiSetPortAttribute(ClientPtr, XvPortPtr, Atom, INT32);
extern int XvdiGetPortAttribute(ClientPtr, XvPortPtr, Atom, INT32*); extern _X_EXPORT int XvdiGetPortAttribute(ClientPtr, XvPortPtr, Atom, INT32*);
extern int XvdiStopVideo(ClientPtr, XvPortPtr, DrawablePtr); extern _X_EXPORT int XvdiStopVideo(ClientPtr, XvPortPtr, DrawablePtr);
extern int XvdiPreemptVideo(ClientPtr, XvPortPtr, DrawablePtr); extern _X_EXPORT int XvdiPreemptVideo(ClientPtr, XvPortPtr, DrawablePtr);
extern int XvdiMatchPort(XvPortPtr, DrawablePtr); extern _X_EXPORT int XvdiMatchPort(XvPortPtr, DrawablePtr);
extern int XvdiGrabPort(ClientPtr, XvPortPtr, Time, int *); extern _X_EXPORT int XvdiGrabPort(ClientPtr, XvPortPtr, Time, int *);
extern int XvdiUngrabPort( ClientPtr, XvPortPtr, Time); extern _X_EXPORT int XvdiUngrabPort( ClientPtr, XvPortPtr, Time);
#if !defined(UNIXCPP) #if !defined(UNIXCPP)

64
Xext/xvmain.c
View File

@ -107,20 +107,20 @@ SOFTWARE.
static int XvScreenKeyIndex; static int XvScreenKeyIndex;
static DevPrivateKey XvScreenKey = &XvScreenKeyIndex; static DevPrivateKey XvScreenKey = &XvScreenKeyIndex;
_X_EXPORT unsigned long XvExtensionGeneration = 0; unsigned long XvExtensionGeneration = 0;
_X_EXPORT unsigned long XvScreenGeneration = 0; unsigned long XvScreenGeneration = 0;
_X_EXPORT unsigned long XvResourceGeneration = 0; unsigned long XvResourceGeneration = 0;
_X_EXPORT int XvReqCode; int XvReqCode;
_X_EXPORT int XvEventBase; int XvEventBase;
_X_EXPORT int XvErrorBase; int XvErrorBase;
_X_EXPORT unsigned long XvRTPort; unsigned long XvRTPort;
_X_EXPORT unsigned long XvRTEncoding; unsigned long XvRTEncoding;
_X_EXPORT unsigned long XvRTGrab; unsigned long XvRTGrab;
_X_EXPORT unsigned long XvRTVideoNotify; unsigned long XvRTVideoNotify;
_X_EXPORT unsigned long XvRTVideoNotifyList; unsigned long XvRTVideoNotifyList;
_X_EXPORT unsigned long XvRTPortNotify; unsigned long XvRTPortNotify;
@ -153,7 +153,7 @@ static int XvdiSendVideoNotify(XvPortPtr, DrawablePtr, int);
** **
*/ */
_X_EXPORT void void
XvExtensionInit(void) XvExtensionInit(void)
{ {
ExtensionEntry *extEntry; ExtensionEntry *extEntry;
@ -248,7 +248,7 @@ CreateResourceTypes(void)
} }
_X_EXPORT int int
XvScreenInit(ScreenPtr pScreen) XvScreenInit(ScreenPtr pScreen)
{ {
XvScreenPtr pxvs; XvScreenPtr pxvs;
@ -323,13 +323,13 @@ XvResetProc(ExtensionEntry* extEntry)
XvResetProcVector(); XvResetProcVector();
} }
_X_EXPORT DevPrivateKey DevPrivateKey
XvGetScreenKey(void) XvGetScreenKey(void)
{ {
return XvScreenKey; return XvScreenKey;
} }
_X_EXPORT unsigned long unsigned long
XvGetRTPort(void) XvGetRTPort(void)
{ {
return XvRTPort; return XvRTPort;
@ -445,7 +445,7 @@ XvDestroyWindow(WindowPtr pWin)
stopped in a port for reasons that the di layer had no control over; note stopped in a port for reasons that the di layer had no control over; note
that it doesn't call back into the dd layer */ that it doesn't call back into the dd layer */
_X_EXPORT int int
XvdiVideoStopped(XvPortPtr pPort, int reason) XvdiVideoStopped(XvPortPtr pPort, int reason)
{ {
@ -553,7 +553,7 @@ int reason;
} }
_X_EXPORT int int
XvdiSendPortNotify( XvdiSendPortNotify(
XvPortPtr pPort, XvPortPtr pPort,
Atom attribute, Atom attribute,
@ -593,7 +593,7 @@ XvdiSendPortNotify(
} }
_X_EXPORT int int
XvdiPutVideo( XvdiPutVideo(
ClientPtr client, ClientPtr client,
DrawablePtr pDraw, DrawablePtr pDraw,
@ -646,7 +646,7 @@ XvdiPutVideo(
} }
_X_EXPORT int int
XvdiPutStill( XvdiPutStill(
ClientPtr client, ClientPtr client,
DrawablePtr pDraw, DrawablePtr pDraw,
@ -684,7 +684,7 @@ XvdiPutStill(
} }
_X_EXPORT int int
XvdiPutImage( XvdiPutImage(
ClientPtr client, ClientPtr client,
DrawablePtr pDraw, DrawablePtr pDraw,
@ -723,7 +723,7 @@ XvdiPutImage(
} }
_X_EXPORT int int
XvdiGetVideo( XvdiGetVideo(
ClientPtr client, ClientPtr client,
DrawablePtr pDraw, DrawablePtr pDraw,
@ -776,7 +776,7 @@ XvdiGetVideo(
} }
_X_EXPORT int int
XvdiGetStill( XvdiGetStill(
ClientPtr client, ClientPtr client,
DrawablePtr pDraw, DrawablePtr pDraw,
@ -814,7 +814,7 @@ XvdiGetStill(
} }
_X_EXPORT int int
XvdiGrabPort( XvdiGrabPort(
ClientPtr client, ClientPtr client,
XvPortPtr pPort, XvPortPtr pPort,
@ -871,7 +871,7 @@ XvdiGrabPort(
} }
_X_EXPORT int int
XvdiUngrabPort( XvdiUngrabPort(
ClientPtr client, ClientPtr client,
XvPortPtr pPort, XvPortPtr pPort,
@ -905,7 +905,7 @@ XvdiUngrabPort(
} }
_X_EXPORT int int
XvdiSelectVideoNotify( XvdiSelectVideoNotify(
ClientPtr client, ClientPtr client,
DrawablePtr pDraw, DrawablePtr pDraw,
@ -983,7 +983,7 @@ XvdiSelectVideoNotify(
} }
_X_EXPORT int int
XvdiSelectPortNotify( XvdiSelectPortNotify(
ClientPtr client, ClientPtr client,
XvPortPtr pPort, XvPortPtr pPort,
@ -1036,7 +1036,7 @@ XvdiSelectPortNotify(
} }
_X_EXPORT int int
XvdiStopVideo( XvdiStopVideo(
ClientPtr client, ClientPtr client,
XvPortPtr pPort, XvPortPtr pPort,
@ -1073,7 +1073,7 @@ XvdiStopVideo(
} }
_X_EXPORT int int
XvdiPreemptVideo( XvdiPreemptVideo(
ClientPtr client, ClientPtr client,
XvPortPtr pPort, XvPortPtr pPort,
@ -1097,7 +1097,7 @@ XvdiPreemptVideo(
} }
_X_EXPORT int int
XvdiMatchPort( XvdiMatchPort(
XvPortPtr pPort, XvPortPtr pPort,
DrawablePtr pDraw DrawablePtr pDraw
@ -1130,7 +1130,7 @@ XvdiMatchPort(
} }
_X_EXPORT int int
XvdiSetPortAttribute( XvdiSetPortAttribute(
ClientPtr client, ClientPtr client,
XvPortPtr pPort, XvPortPtr pPort,
@ -1145,7 +1145,7 @@ XvdiSetPortAttribute(
} }
_X_EXPORT int int
XvdiGetPortAttribute( XvdiGetPortAttribute(
ClientPtr client, ClientPtr client,
XvPortPtr pPort, XvPortPtr pPort,

8
Xext/xvmc.c
View File

@ -664,7 +664,7 @@ SProcXvMCDispatch (ClientPtr client)
return BadImplementation; return BadImplementation;
} }
_X_EXPORT void void
XvMCExtensionInit(void) XvMCExtensionInit(void)
{ {
ExtensionEntry *extEntry; ExtensionEntry *extEntry;
@ -705,7 +705,7 @@ XvMCCloseScreen (int i, ScreenPtr pScreen)
} }
_X_EXPORT int int
XvMCScreenInit(ScreenPtr pScreen, int num, XvMCAdaptorPtr pAdapt) XvMCScreenInit(ScreenPtr pScreen, int num, XvMCAdaptorPtr pAdapt)
{ {
XvMCScreenPtr pScreenPriv; XvMCScreenPtr pScreenPriv;
@ -731,7 +731,7 @@ XvMCScreenInit(ScreenPtr pScreen, int num, XvMCAdaptorPtr pAdapt)
return Success; return Success;
} }
_X_EXPORT XvImagePtr XvMCFindXvImage(XvPortPtr pPort, CARD32 id) XvImagePtr XvMCFindXvImage(XvPortPtr pPort, CARD32 id)
{ {
XvImagePtr pImage = NULL; XvImagePtr pImage = NULL;
ScreenPtr pScreen = pPort->pAdaptor->pScreen; ScreenPtr pScreen = pPort->pAdaptor->pScreen;
@ -763,7 +763,7 @@ _X_EXPORT XvImagePtr XvMCFindXvImage(XvPortPtr pPort, CARD32 id)
return pImage; return pImage;
} }
_X_EXPORT int int
xf86XvMCRegisterDRInfo(ScreenPtr pScreen, char *name, xf86XvMCRegisterDRInfo(ScreenPtr pScreen, char *name,
char *busID, int major, int minor, char *busID, int major, int minor,
int patchLevel) int patchLevel)

10
Xext/xvmcext.h
View File

@ -101,13 +101,15 @@ typedef struct {
XvMCDestroySubpictureProcPtr DestroySubpicture; XvMCDestroySubpictureProcPtr DestroySubpicture;
} XvMCAdaptorRec, *XvMCAdaptorPtr; } XvMCAdaptorRec, *XvMCAdaptorPtr;
void XvMCExtensionInit(void); extern _X_EXPORT void XvMCExtensionInit(void);
int XvMCScreenInit(ScreenPtr pScreen, int num, XvMCAdaptorPtr adapt); extern _X_EXPORT int XvMCScreenInit(ScreenPtr pScreen,
int num,
XvMCAdaptorPtr adapt);
XvImagePtr XvMCFindXvImage(XvPortPtr pPort, CARD32 id); extern _X_EXPORT XvImagePtr XvMCFindXvImage(XvPortPtr pPort, CARD32 id);
int xf86XvMCRegisterDRInfo(ScreenPtr pScreen, char *name, extern _X_EXPORT int xf86XvMCRegisterDRInfo(ScreenPtr pScreen, char *name,
char *busID, int major, int minor, char *busID, int major, int minor,
int patchLevel); int patchLevel);

52
Xi/exevents.c
View File

@ -100,14 +100,14 @@ static Bool MakeInputMasks(WindowPtr /* pWin */
extern DevPrivateKey UnusedClassesPrivateKey; extern DevPrivateKey UnusedClassesPrivateKey;
_X_EXPORT void void
RegisterOtherDevice(DeviceIntPtr device) RegisterOtherDevice(DeviceIntPtr device)
{ {
device->public.processInputProc = ProcessOtherEvent; device->public.processInputProc = ProcessOtherEvent;
device->public.realInputProc = ProcessOtherEvent; device->public.realInputProc = ProcessOtherEvent;
} }
_X_EXPORT Bool Bool
IsPointerEvent(xEvent* xE) IsPointerEvent(xEvent* xE)
{ {
switch(xE->u.u.type) switch(xE->u.u.type)
@ -137,7 +137,7 @@ IsPointerEvent(xEvent* xE)
* @return the device matching the deviceid of the device set in the event, or * @return the device matching the deviceid of the device set in the event, or
* NULL if the event is not an XInput event. * NULL if the event is not an XInput event.
*/ */
_X_EXPORT DeviceIntPtr DeviceIntPtr
XIGetDevice(xEvent* xE) XIGetDevice(xEvent* xE)
{ {
DeviceIntPtr pDev = NULL; DeviceIntPtr pDev = NULL;
@ -521,7 +521,7 @@ DeepCopyFeedbackClasses(DeviceIntPtr from, DeviceIntPtr to)
* Saves a few memory allocations. * Saves a few memory allocations.
*/ */
_X_EXPORT void void
DeepCopyDeviceClasses(DeviceIntPtr from, DeviceIntPtr to) DeepCopyDeviceClasses(DeviceIntPtr from, DeviceIntPtr to)
{ {
ClassesPtr classes; ClassesPtr classes;
@ -789,7 +789,7 @@ ChangeMasterDeviceClasses(DeviceIntPtr device,
#define DEFAULT 0 #define DEFAULT 0
#define DONT_PROCESS 1 #define DONT_PROCESS 1
#define IS_REPEAT 2 #define IS_REPEAT 2
_X_EXPORT int int
UpdateDeviceState(DeviceIntPtr device, xEvent* xE, int count) UpdateDeviceState(DeviceIntPtr device, xEvent* xE, int count)
{ {
int i; int i;
@ -994,7 +994,7 @@ UpdateDeviceState(DeviceIntPtr device, xEvent* xE, int count)
* Called from when processing the events from the event queue. * Called from when processing the events from the event queue.
* *
*/ */
_X_EXPORT void void
ProcessOtherEvent(xEventPtr xE, DeviceIntPtr device, int count) ProcessOtherEvent(xEventPtr xE, DeviceIntPtr device, int count)
{ {
int i; int i;
@ -1131,7 +1131,7 @@ ProcessOtherEvent(xEventPtr xE, DeviceIntPtr device, int count)
xE->u.u.detail = key; xE->u.u.detail = key;
} }
_X_EXPORT int int
InitProximityClassDeviceStruct(DeviceIntPtr dev) InitProximityClassDeviceStruct(DeviceIntPtr dev)
{ {
ProximityClassPtr proxc; ProximityClassPtr proxc;
@ -1152,7 +1152,7 @@ InitProximityClassDeviceStruct(DeviceIntPtr dev)
* *
* @see InitValuatorClassDeviceStruct * @see InitValuatorClassDeviceStruct
*/ */
_X_EXPORT void void
InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, int minval, int maxval, InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, int minval, int maxval,
int resolution, int min_res, int max_res) int resolution, int min_res, int max_res)
{ {
@ -1231,7 +1231,7 @@ FixDeviceValuator(DeviceIntPtr dev, deviceValuator * ev, ValuatorClassPtr v,
first += ev->num_valuators; first += ev->num_valuators;
} }
_X_EXPORT void void
DeviceFocusEvent(DeviceIntPtr dev, int type, int mode, int detail, DeviceFocusEvent(DeviceIntPtr dev, int type, int mode, int detail,
WindowPtr pWin) WindowPtr pWin)
{ {
@ -1351,7 +1351,7 @@ DeviceFocusEvent(DeviceIntPtr dev, int type, int mode, int detail,
} }
} }
_X_EXPORT int int
GrabButton(ClientPtr client, DeviceIntPtr dev, BYTE this_device_mode, GrabButton(ClientPtr client, DeviceIntPtr dev, BYTE this_device_mode,
BYTE other_devices_mode, CARD16 modifiers, BYTE other_devices_mode, CARD16 modifiers,
DeviceIntPtr modifier_device, CARD8 button, Window grabWindow, DeviceIntPtr modifier_device, CARD8 button, Window grabWindow,
@ -1418,7 +1418,7 @@ GrabButton(ClientPtr client, DeviceIntPtr dev, BYTE this_device_mode,
return AddPassiveGrabToList(client, grab); return AddPassiveGrabToList(client, grab);
} }
_X_EXPORT int int
GrabKey(ClientPtr client, DeviceIntPtr dev, BYTE this_device_mode, GrabKey(ClientPtr client, DeviceIntPtr dev, BYTE this_device_mode,
BYTE other_devices_mode, CARD16 modifiers, BYTE other_devices_mode, CARD16 modifiers,
DeviceIntPtr modifier_device, CARD8 key, Window grabWindow, DeviceIntPtr modifier_device, CARD8 key, Window grabWindow,
@ -1473,7 +1473,7 @@ GrabKey(ClientPtr client, DeviceIntPtr dev, BYTE this_device_mode,
return AddPassiveGrabToList(client, grab); return AddPassiveGrabToList(client, grab);
} }
_X_EXPORT int int
SelectForWindow(DeviceIntPtr dev, WindowPtr pWin, ClientPtr client, SelectForWindow(DeviceIntPtr dev, WindowPtr pWin, ClientPtr client,
Mask mask, Mask exclusivemasks, Mask validmasks) Mask mask, Mask exclusivemasks, Mask validmasks)
{ {
@ -1534,7 +1534,7 @@ SelectForWindow(DeviceIntPtr dev, WindowPtr pWin, ClientPtr client,
return Success; return Success;
} }
_X_EXPORT int int
AddExtensionClient(WindowPtr pWin, ClientPtr client, Mask mask, int mskidx) AddExtensionClient(WindowPtr pWin, ClientPtr client, Mask mask, int mskidx)
{ {
InputClientsPtr others; InputClientsPtr others;
@ -1567,7 +1567,7 @@ MakeInputMasks(WindowPtr pWin)
return TRUE; return TRUE;
} }
_X_EXPORT void void
RecalculateDeviceDeliverableEvents(WindowPtr pWin) RecalculateDeviceDeliverableEvents(WindowPtr pWin)
{ {
InputClientsPtr others; InputClientsPtr others;
@ -1605,7 +1605,7 @@ RecalculateDeviceDeliverableEvents(WindowPtr pWin)
} }
} }
_X_EXPORT int int
InputClientGone(WindowPtr pWin, XID id) InputClientGone(WindowPtr pWin, XID id)
{ {
InputClientsPtr other, prev; InputClientsPtr other, prev;
@ -1644,7 +1644,7 @@ InputClientGone(WindowPtr pWin, XID id)
FatalError("client not on device event list"); FatalError("client not on device event list");
} }
_X_EXPORT int int
SendEvent(ClientPtr client, DeviceIntPtr d, Window dest, Bool propagate, SendEvent(ClientPtr client, DeviceIntPtr d, Window dest, Bool propagate,
xEvent * ev, Mask mask, int count) xEvent * ev, Mask mask, int count)
{ {
@ -1703,7 +1703,7 @@ SendEvent(ClientPtr client, DeviceIntPtr d, Window dest, Bool propagate,
return Success; return Success;
} }
_X_EXPORT int int
SetButtonMapping(ClientPtr client, DeviceIntPtr dev, int nElts, BYTE * map) SetButtonMapping(ClientPtr client, DeviceIntPtr dev, int nElts, BYTE * map)
{ {
int i; int i;
@ -1726,7 +1726,7 @@ SetButtonMapping(ClientPtr client, DeviceIntPtr dev, int nElts, BYTE * map)
return Success; return Success;
} }
_X_EXPORT int int
SetModifierMapping(ClientPtr client, DeviceIntPtr dev, int len, int rlen, SetModifierMapping(ClientPtr client, DeviceIntPtr dev, int len, int rlen,
int numKeyPerModifier, KeyCode * inputMap, KeyClassPtr * k) int numKeyPerModifier, KeyCode * inputMap, KeyClassPtr * k)
{ {
@ -1806,7 +1806,7 @@ SetModifierMapping(ClientPtr client, DeviceIntPtr dev, int len, int rlen,
return (MappingSuccess); return (MappingSuccess);
} }
_X_EXPORT void void
SendDeviceMappingNotify(ClientPtr client, CARD8 request, SendDeviceMappingNotify(ClientPtr client, CARD8 request,
KeyCode firstKeyCode, CARD8 count, DeviceIntPtr dev) KeyCode firstKeyCode, CARD8 count, DeviceIntPtr dev)
{ {
@ -1830,7 +1830,7 @@ SendDeviceMappingNotify(ClientPtr client, CARD8 request,
SendEventToAllWindows(dev, DeviceMappingNotifyMask, (xEvent *) ev, 1); SendEventToAllWindows(dev, DeviceMappingNotifyMask, (xEvent *) ev, 1);
} }
_X_EXPORT int int
ChangeKeyMapping(ClientPtr client, ChangeKeyMapping(ClientPtr client,
DeviceIntPtr dev, DeviceIntPtr dev,
unsigned len, unsigned len,
@ -1931,7 +1931,7 @@ DeleteDeviceFromAnyExtEvents(WindowPtr pWin, DeviceIntPtr dev)
dev->valuator->motionHintWindow = NullWindow; dev->valuator->motionHintWindow = NullWindow;
} }
_X_EXPORT void void
DeleteWindowFromAnyExtEvents(WindowPtr pWin, Bool freeResources) DeleteWindowFromAnyExtEvents(WindowPtr pWin, Bool freeResources)
{ {
int i; int i;
@ -1957,7 +1957,7 @@ DeleteWindowFromAnyExtEvents(WindowPtr pWin, Bool freeResources)
} }
} }
_X_EXPORT int int
MaybeSendDeviceMotionNotifyHint(deviceKeyButtonPointer * pEvents, Mask mask) MaybeSendDeviceMotionNotifyHint(deviceKeyButtonPointer * pEvents, Mask mask)
{ {
DeviceIntPtr dev; DeviceIntPtr dev;
@ -1980,7 +1980,7 @@ MaybeSendDeviceMotionNotifyHint(deviceKeyButtonPointer * pEvents, Mask mask)
return (0); return (0);
} }
_X_EXPORT void void
CheckDeviceGrabAndHintWindow(WindowPtr pWin, int type, CheckDeviceGrabAndHintWindow(WindowPtr pWin, int type,
deviceKeyButtonPointer * xE, GrabPtr grab, deviceKeyButtonPointer * xE, GrabPtr grab,
ClientPtr client, Mask deliveryMask) ClientPtr client, Mask deliveryMask)
@ -2029,7 +2029,7 @@ DeviceEventMaskForClient(DeviceIntPtr dev, WindowPtr pWin, ClientPtr client)
return 0; return 0;
} }
_X_EXPORT void void
MaybeStopDeviceHint(DeviceIntPtr dev, ClientPtr client) MaybeStopDeviceHint(DeviceIntPtr dev, ClientPtr client)
{ {
WindowPtr pWin; WindowPtr pWin;
@ -2048,7 +2048,7 @@ MaybeStopDeviceHint(DeviceIntPtr dev, ClientPtr client)
dev->valuator->motionHintWindow = NullWindow; dev->valuator->motionHintWindow = NullWindow;
} }
_X_EXPORT int int
DeviceEventSuppressForWindow(WindowPtr pWin, ClientPtr client, Mask mask, DeviceEventSuppressForWindow(WindowPtr pWin, ClientPtr client, Mask mask,
int maskndx) int maskndx)
{ {
@ -2119,7 +2119,7 @@ FindInterestedChildren(DeviceIntPtr dev, WindowPtr p1, Mask mask,
* *
*/ */
_X_EXPORT void void
SendEventToAllWindows(DeviceIntPtr dev, Mask mask, xEvent * ev, int count) SendEventToAllWindows(DeviceIntPtr dev, Mask mask, xEvent * ev, int count)
{ {
int i; int i;

20
Xi/extinit.c
View File

@ -304,11 +304,11 @@ Mask DeviceEnterWindowMask;
Mask DeviceLeaveWindowMask; Mask DeviceLeaveWindowMask;
int DeviceValuator; int DeviceValuator;
_X_EXPORT int DeviceKeyPress; int DeviceKeyPress;
_X_EXPORT int DeviceKeyRelease; int DeviceKeyRelease;
_X_EXPORT int DeviceButtonPress; int DeviceButtonPress;
_X_EXPORT int DeviceButtonRelease; int DeviceButtonRelease;
_X_EXPORT int DeviceMotionNotify; int DeviceMotionNotify;
int DeviceFocusIn; int DeviceFocusIn;
int DeviceFocusOut; int DeviceFocusOut;
int ProximityIn; int ProximityIn;
@ -320,8 +320,8 @@ int DeviceMappingNotify;
int ChangeDeviceNotify; int ChangeDeviceNotify;
int DevicePresenceNotify; int DevicePresenceNotify;
int DevicePropertyNotify; int DevicePropertyNotify;
_X_EXPORT int DeviceEnterNotify; int DeviceEnterNotify;
_X_EXPORT int DeviceLeaveNotify; int DeviceLeaveNotify;
int RT_INPUTCLIENT; int RT_INPUTCLIENT;
@ -982,7 +982,7 @@ IResetProc(ExtensionEntry * unused)
* *
*/ */
_X_EXPORT Bool Bool
DeviceIsPointerType(DeviceIntPtr dev) DeviceIsPointerType(DeviceIntPtr dev)
{ {
if (dev_type[1].type == dev->type) if (dev_type[1].type == dev->type)
@ -998,7 +998,7 @@ DeviceIsPointerType(DeviceIntPtr dev)
* *
*/ */
_X_EXPORT void void
AssignTypeAndName(DeviceIntPtr dev, Atom type, char *name) AssignTypeAndName(DeviceIntPtr dev, Atom type, char *name)
{ {
dev->type = type; dev->type = type;
@ -1127,7 +1127,7 @@ XIGEEventFill(xGenericEvent* ev, DeviceIntPtr pDev,
* XI is mandatory nowadays, so if we fail to init XI, we die. * XI is mandatory nowadays, so if we fail to init XI, we die.
*/ */
_X_EXPORT void void
XInputExtensionInit(void) XInputExtensionInit(void)
{ {
ExtensionEntry *extEntry; ExtensionEntry *extEntry;

16
Xi/stubs.c
View File

@ -80,7 +80,7 @@ SOFTWARE.
* *
*/ */
_X_EXPORT void void
CloseInputDevice(DeviceIntPtr d, ClientPtr client) CloseInputDevice(DeviceIntPtr d, ClientPtr client)
{ {
} }
@ -111,7 +111,7 @@ CloseInputDevice(DeviceIntPtr d, ClientPtr client)
* *
*/ */
_X_EXPORT void void
AddOtherInputDevices(void) AddOtherInputDevices(void)
{ {
/********************************************************************** /**********************************************************************
@ -151,7 +151,7 @@ AddOtherInputDevices(void)
* *
*/ */
_X_EXPORT void void
OpenInputDevice(DeviceIntPtr dev, ClientPtr client, int *status) OpenInputDevice(DeviceIntPtr dev, ClientPtr client, int *status)
{ {
*status = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixReadAccess); *status = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixReadAccess);
@ -169,7 +169,7 @@ OpenInputDevice(DeviceIntPtr dev, ClientPtr client, int *status)
* *
*/ */
_X_EXPORT int int
SetDeviceMode(ClientPtr client, DeviceIntPtr dev, int mode) SetDeviceMode(ClientPtr client, DeviceIntPtr dev, int mode)
{ {
return BadMatch; return BadMatch;
@ -187,7 +187,7 @@ SetDeviceMode(ClientPtr client, DeviceIntPtr dev, int mode)
* *
*/ */
_X_EXPORT int int
SetDeviceValuators(ClientPtr client, DeviceIntPtr dev, SetDeviceValuators(ClientPtr client, DeviceIntPtr dev,
int *valuators, int first_valuator, int num_valuators) int *valuators, int first_valuator, int num_valuators)
{ {
@ -202,7 +202,7 @@ SetDeviceValuators(ClientPtr client, DeviceIntPtr dev,
* *
*/ */
_X_EXPORT int int
ChangeDeviceControl(ClientPtr client, DeviceIntPtr dev, ChangeDeviceControl(ClientPtr client, DeviceIntPtr dev,
xDeviceCtl * control) xDeviceCtl * control)
{ {
@ -227,7 +227,7 @@ ChangeDeviceControl(ClientPtr client, DeviceIntPtr dev,
* Add a new device with the specified options. * Add a new device with the specified options.
* *
*/ */
_X_EXPORT int int
NewInputDeviceRequest(InputOption *options, DeviceIntPtr *pdev) NewInputDeviceRequest(InputOption *options, DeviceIntPtr *pdev)
{ {
return BadValue; return BadValue;
@ -240,7 +240,7 @@ NewInputDeviceRequest(InputOption *options, DeviceIntPtr *pdev)
* Remove the specified device previously added. * Remove the specified device previously added.
* *
*/ */
_X_EXPORT void void
DeleteInputDeviceRequest(DeviceIntPtr dev) DeleteInputDeviceRequest(DeviceIntPtr dev)
{ {
} }

16
Xi/xiproperty.c
View File

@ -57,7 +57,7 @@ static long XIPropHandlerID = 1;
* Return the type assigned to the specified atom or 0 if the atom isn't known * Return the type assigned to the specified atom or 0 if the atom isn't known
* to the DIX. * to the DIX.
*/ */
_X_EXPORT Atom Atom
XIGetKnownProperty(char *name) XIGetKnownProperty(char *name)
{ {
int i; int i;
@ -93,7 +93,7 @@ XIInitKnownProperties(void)
* property handler again. * property handler again.
* @return The handler's identifier or 0 if an error occured. * @return The handler's identifier or 0 if an error occured.
*/ */
_X_EXPORT long long
XIRegisterPropertyHandler(DeviceIntPtr dev, XIRegisterPropertyHandler(DeviceIntPtr dev,
int (*SetProperty) (DeviceIntPtr dev, int (*SetProperty) (DeviceIntPtr dev,
Atom property, Atom property,
@ -120,7 +120,7 @@ XIRegisterPropertyHandler(DeviceIntPtr dev,
return new_handler->id; return new_handler->id;
} }
_X_EXPORT void void
XIUnRegisterPropertyHandler(DeviceIntPtr dev, long id) XIUnRegisterPropertyHandler(DeviceIntPtr dev, long id)
{ {
XIPropertyHandlerPtr curr, prev = NULL; XIPropertyHandlerPtr curr, prev = NULL;
@ -186,7 +186,7 @@ XIDestroyDeviceProperty (XIPropertyPtr prop)
* including removing all device handlers. * including removing all device handlers.
* DO NOT CALL FROM THE DRIVER. * DO NOT CALL FROM THE DRIVER.
*/ */
_X_EXPORT void void
XIDeleteAllDeviceProperties (DeviceIntPtr device) XIDeleteAllDeviceProperties (DeviceIntPtr device)
{ {
XIPropertyPtr prop, next; XIPropertyPtr prop, next;
@ -219,7 +219,7 @@ XIDeleteAllDeviceProperties (DeviceIntPtr device)
} }
_X_EXPORT int int
XIDeleteDeviceProperty (DeviceIntPtr device, Atom property, Bool fromClient) XIDeleteDeviceProperty (DeviceIntPtr device, Atom property, Bool fromClient)
{ {
XIPropertyPtr prop, *prev; XIPropertyPtr prop, *prev;
@ -263,7 +263,7 @@ XIDeleteDeviceProperty (DeviceIntPtr device, Atom property, Bool fromClient)
return Success; return Success;
} }
_X_EXPORT int int
XIChangeDeviceProperty (DeviceIntPtr dev, Atom property, Atom type, XIChangeDeviceProperty (DeviceIntPtr dev, Atom property, Atom type,
int format, int mode, unsigned long len, int format, int mode, unsigned long len,
pointer value, Bool sendevent) pointer value, Bool sendevent)
@ -400,7 +400,7 @@ XIChangeDeviceProperty (DeviceIntPtr dev, Atom property, Atom type,
return(Success); return(Success);
} }
_X_EXPORT int int
XIGetDeviceProperty (DeviceIntPtr dev, Atom property, XIPropertyValuePtr *value) XIGetDeviceProperty (DeviceIntPtr dev, Atom property, XIPropertyValuePtr *value)
{ {
XIPropertyPtr prop = XIFetchDeviceProperty (dev, property); XIPropertyPtr prop = XIFetchDeviceProperty (dev, property);
@ -435,7 +435,7 @@ XIGetDeviceProperty (DeviceIntPtr dev, Atom property, XIPropertyValuePtr *value)
return Success; return Success;
} }
_X_EXPORT int int
XISetDevicePropertyDeletable(DeviceIntPtr dev, Atom property, Bool deletable) XISetDevicePropertyDeletable(DeviceIntPtr dev, Atom property, Bool deletable)
{ {
XIPropertyPtr prop = XIFetchDeviceProperty(dev, property); XIPropertyPtr prop = XIFetchDeviceProperty(dev, property);

1
composite/compinit.c
View File

@ -213,7 +213,6 @@ compRegisterAlternateVisuals (CompScreenPtr cs, VisualID *vids, int nVisuals)
return TRUE; return TRUE;
} }
_X_EXPORT
Bool CompositeRegisterAlternateVisuals (ScreenPtr pScreen, VisualID *vids, Bool CompositeRegisterAlternateVisuals (ScreenPtr pScreen, VisualID *vids,
int nVisuals) int nVisuals)
{ {

4
config/config.c
View File

@ -31,7 +31,7 @@
#include "hotplug.h" #include "hotplug.h"
#include "config-backends.h" #include "config-backends.h"
_X_EXPORT void void
config_init() config_init()
{ {
#if defined(CONFIG_DBUS_API) || defined(CONFIG_HAL) #if defined(CONFIG_DBUS_API) || defined(CONFIG_HAL)
@ -51,7 +51,7 @@ config_init()
#endif #endif
} }
_X_EXPORT void void
config_fini() config_fini()
{ {
#if defined(CONFIG_DBUS_API) || defined(CONFIG_HAL) #if defined(CONFIG_DBUS_API) || defined(CONFIG_HAL)

2
dbe/dbe.c
View File

@ -1553,7 +1553,7 @@ DbeDestroyWindow(WindowPtr pWin)
* *
*****************************************************************************/ *****************************************************************************/
_X_EXPORT void void
DbeExtensionInit(void) DbeExtensionInit(void)
{ {
ExtensionEntry *extEntry; ExtensionEntry *extEntry;

2
dbe/dbestruct.h
View File

@ -74,7 +74,7 @@
/* Marker for free elements in the buffer ID array. */ /* Marker for free elements in the buffer ID array. */
#define DBE_FREE_ID_ELEMENT 0 #define DBE_FREE_ID_ELEMENT 0
extern void DbeExtensionInit (void); extern _X_EXPORT void DbeExtensionInit (void);
/* TYPEDEFS */ /* TYPEDEFS */

12
dix/atom.c
View File

@ -74,7 +74,7 @@ static NodePtr *nodeTable;
void FreeAtom(NodePtr patom); void FreeAtom(NodePtr patom);
_X_EXPORT Atom Atom
MakeAtom(char *string, unsigned len, Bool makeit) MakeAtom(char *string, unsigned len, Bool makeit)
{ {
NodePtr * np; NodePtr * np;
@ -151,13 +151,13 @@ MakeAtom(char *string, unsigned len, Bool makeit)
return None; return None;
} }
_X_EXPORT Bool Bool
ValidAtom(Atom atom) ValidAtom(Atom atom)
{ {
return (atom != None) && (atom <= lastAtom); return (atom != None) && (atom <= lastAtom);
} }
_X_EXPORT char * char *
NameForAtom(Atom atom) NameForAtom(Atom atom)
{ {
NodePtr node; NodePtr node;
@ -166,7 +166,7 @@ NameForAtom(Atom atom)
return node->string; return node->string;
} }
_X_EXPORT void void
AtomError(void) AtomError(void)
{ {
FatalError("initializing atoms"); FatalError("initializing atoms");
@ -184,7 +184,7 @@ FreeAtom(NodePtr patom)
xfree(patom); xfree(patom);
} }
_X_EXPORT void void
FreeAllAtoms(void) FreeAllAtoms(void)
{ {
if(atomRoot == (NodePtr)NULL) if(atomRoot == (NodePtr)NULL)
@ -196,7 +196,7 @@ FreeAllAtoms(void)
lastAtom = None; lastAtom = None;
} }
_X_EXPORT void void
InitAtoms(void) InitAtoms(void)
{ {
FreeAllAtoms(); FreeAllAtoms();

32
dix/colormap.c
View File

@ -253,7 +253,7 @@ typedef struct _colorResource
* \param mid resource to use for this colormap * \param mid resource to use for this colormap
* \param alloc 1 iff all entries are allocated writable * \param alloc 1 iff all entries are allocated writable
*/ */
_X_EXPORT int int
CreateColormap (Colormap mid, ScreenPtr pScreen, VisualPtr pVisual, CreateColormap (Colormap mid, ScreenPtr pScreen, VisualPtr pVisual,
ColormapPtr *ppcmap, int alloc, int client) ColormapPtr *ppcmap, int alloc, int client)
{ {
@ -420,7 +420,7 @@ CreateColormap (Colormap mid, ScreenPtr pScreen, VisualPtr pVisual,
* *
* \param value must conform to DeleteType * \param value must conform to DeleteType
*/ */
_X_EXPORT int int
FreeColormap (pointer value, XID mid) FreeColormap (pointer value, XID mid)
{ {
int i; int i;
@ -502,7 +502,7 @@ TellNoMap (WindowPtr pwin, Colormap *pmid)
} }
/* Tell window that pmid got uninstalled */ /* Tell window that pmid got uninstalled */
_X_EXPORT int int
TellLostMap (WindowPtr pwin, pointer value) TellLostMap (WindowPtr pwin, pointer value)
{ {
Colormap *pmid = (Colormap *)value; Colormap *pmid = (Colormap *)value;
@ -527,7 +527,7 @@ TellLostMap (WindowPtr pwin, pointer value)
} }
/* Tell window that pmid got installed */ /* Tell window that pmid got installed */
_X_EXPORT int int
TellGainedMap (WindowPtr pwin, pointer value) TellGainedMap (WindowPtr pwin, pointer value)
{ {
Colormap *pmid = (Colormap *)value; Colormap *pmid = (Colormap *)value;
@ -552,7 +552,7 @@ TellGainedMap (WindowPtr pwin, pointer value)
} }
_X_EXPORT int int
CopyColormapAndFree (Colormap mid, ColormapPtr pSrc, int client) CopyColormapAndFree (Colormap mid, ColormapPtr pSrc, int client)
{ {
ColormapPtr pmap = (ColormapPtr) NULL; ColormapPtr pmap = (ColormapPtr) NULL;
@ -800,7 +800,7 @@ UpdateColors (ColormapPtr pmap)
/* Get a read-only color from a ColorMap (probably slow for large maps) /* Get a read-only color from a ColorMap (probably slow for large maps)
* Returns by changing the value in pred, pgreen, pblue and pPix * Returns by changing the value in pred, pgreen, pblue and pPix
*/ */
_X_EXPORT int int
AllocColor (ColormapPtr pmap, AllocColor (ColormapPtr pmap,
unsigned short *pred, unsigned short *pgreen, unsigned short *pblue, unsigned short *pred, unsigned short *pgreen, unsigned short *pblue,
Pixel *pPix, int client) Pixel *pPix, int client)
@ -985,7 +985,7 @@ AllocColor (ColormapPtr pmap,
* is that this routine will never return failure. * is that this routine will never return failure.
*/ */
_X_EXPORT void void
FakeAllocColor (ColormapPtr pmap, xColorItem *item) FakeAllocColor (ColormapPtr pmap, xColorItem *item)
{ {
Pixel pixR, pixG, pixB; Pixel pixR, pixG, pixB;
@ -1052,7 +1052,7 @@ FakeAllocColor (ColormapPtr pmap, xColorItem *item)
} }
/* free a pixel value obtained from FakeAllocColor */ /* free a pixel value obtained from FakeAllocColor */
_X_EXPORT void void
FakeFreeColor(ColormapPtr pmap, Pixel pixel) FakeFreeColor(ColormapPtr pmap, Pixel pixel)
{ {
VisualPtr pVisual; VisualPtr pVisual;
@ -1203,7 +1203,7 @@ FindColorInRootCmap (ColormapPtr pmap, EntryPtr pentFirst, int size,
* Starts looking at pentFirst + *pPixel, so if you want a specific pixel, * Starts looking at pentFirst + *pPixel, so if you want a specific pixel,
* load *pPixel with that value, otherwise set it to 0 * load *pPixel with that value, otherwise set it to 0
*/ */
_X_EXPORT int int
FindColor (ColormapPtr pmap, EntryPtr pentFirst, int size, xrgb *prgb, FindColor (ColormapPtr pmap, EntryPtr pentFirst, int size, xrgb *prgb,
Pixel *pPixel, int channel, int client, Pixel *pPixel, int channel, int client,
ColorCompareProcPtr comp) ColorCompareProcPtr comp)
@ -1415,7 +1415,7 @@ BlueComp (EntryPtr pent, xrgb *prgb)
/* Read the color value of a cell */ /* Read the color value of a cell */
_X_EXPORT int int
QueryColors (ColormapPtr pmap, int count, Pixel *ppixIn, xrgb *prgbList) QueryColors (ColormapPtr pmap, int count, Pixel *ppixIn, xrgb *prgbList)
{ {
Pixel *ppix, pixel; Pixel *ppix, pixel;
@ -1548,7 +1548,7 @@ FreePixels(ColormapPtr pmap, int client)
* \param value must conform to DeleteType * \param value must conform to DeleteType
* \unused fakeid * \unused fakeid
*/ */
_X_EXPORT int int
FreeClientPixels (pointer value, XID fakeid) FreeClientPixels (pointer value, XID fakeid)
{ {
ColormapPtr pmap; ColormapPtr pmap;
@ -1561,7 +1561,7 @@ FreeClientPixels (pointer value, XID fakeid)
return Success; return Success;
} }
_X_EXPORT int int
AllocColorCells (int client, ColormapPtr pmap, int colors, int planes, AllocColorCells (int client, ColormapPtr pmap, int colors, int planes,
Bool contig, Pixel *ppix, Pixel *masks) Bool contig, Pixel *ppix, Pixel *masks)
{ {
@ -1633,7 +1633,7 @@ AllocColorCells (int client, ColormapPtr pmap, int colors, int planes,
} }
_X_EXPORT int int
AllocColorPlanes (int client, ColormapPtr pmap, int colors, AllocColorPlanes (int client, ColormapPtr pmap, int colors,
int r, int g, int b, Bool contig, Pixel *pixels, int r, int g, int b, Bool contig, Pixel *pixels,
Pixel *prmask, Pixel *pgmask, Pixel *pbmask) Pixel *prmask, Pixel *pgmask, Pixel *pbmask)
@ -2206,7 +2206,7 @@ AllocShared (ColormapPtr pmap, Pixel *ppix, int c, int r, int g, int b,
/** FreeColors /** FreeColors
* Free colors and/or cells (probably slow for large numbers) * Free colors and/or cells (probably slow for large numbers)
*/ */
_X_EXPORT int int
FreeColors (ColormapPtr pmap, int client, int count, Pixel *pixels, Pixel mask) FreeColors (ColormapPtr pmap, int client, int count, Pixel *pixels, Pixel mask)
{ {
int rval, result, class; int rval, result, class;
@ -2400,7 +2400,7 @@ FreeCo (ColormapPtr pmap, int client, int color, int npixIn, Pixel *ppixIn, Pixe
/* Redefine color values */ /* Redefine color values */
_X_EXPORT int int
StoreColors (ColormapPtr pmap, int count, xColorItem *defs) StoreColors (ColormapPtr pmap, int count, xColorItem *defs)
{ {
Pixel pix; Pixel pix;
@ -2667,7 +2667,7 @@ StoreColors (ColormapPtr pmap, int count, xColorItem *defs)
return (errVal); return (errVal);
} }
_X_EXPORT int int
IsMapInstalled(Colormap map, WindowPtr pWin) IsMapInstalled(Colormap map, WindowPtr pWin)
{ {
Colormap *pmaps; Colormap *pmaps;

8
dix/cursor.c
View File

@ -110,7 +110,7 @@ FreeCursorBits(CursorBitsPtr bits)
* *
* \param value must conform to DeleteType * \param value must conform to DeleteType
*/ */
_X_EXPORT int int
FreeCursor(pointer value, XID cid) FreeCursor(pointer value, XID cid)
{ {
int nscr; int nscr;
@ -166,7 +166,7 @@ CheckForEmptyMask(CursorBitsPtr bits)
* \param pmaskbits server-defined padding * \param pmaskbits server-defined padding
* \param argb no padding * \param argb no padding
*/ */
_X_EXPORT int int
AllocARGBCursor(unsigned char *psrcbits, unsigned char *pmaskbits, AllocARGBCursor(unsigned char *psrcbits, unsigned char *pmaskbits,
CARD32 *argb, CursorMetricPtr cm, CARD32 *argb, CursorMetricPtr cm,
unsigned foreRed, unsigned foreGreen, unsigned foreBlue, unsigned foreRed, unsigned foreGreen, unsigned foreBlue,
@ -280,7 +280,7 @@ AllocARGBCursor(unsigned char *psrcbits, unsigned char *pmaskbits,
return rc; return rc;
} }
_X_EXPORT int int
AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar, AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar,
unsigned foreRed, unsigned foreGreen, unsigned foreBlue, unsigned foreRed, unsigned foreGreen, unsigned foreBlue,
unsigned backRed, unsigned backGreen, unsigned backBlue, unsigned backRed, unsigned backGreen, unsigned backBlue,
@ -515,7 +515,7 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar,
* add the cursor to the resource table * add the cursor to the resource table
*************************************************************/ *************************************************************/
_X_EXPORT CursorPtr CursorPtr
CreateRootCursor(char *unused1, unsigned int unused2) CreateRootCursor(char *unused1, unsigned int unused2)
{ {
CursorPtr curs; CursorPtr curs;

18
dix/deprecated.c
View File

@ -61,7 +61,7 @@ SOFTWARE.
*/ */
/* replaced by dixLookupWindow */ /* replaced by dixLookupWindow */
_X_EXPORT WindowPtr WindowPtr
SecurityLookupWindow(XID id, ClientPtr client, Mask access_mode) SecurityLookupWindow(XID id, ClientPtr client, Mask access_mode)
{ {
WindowPtr pWin; WindowPtr pWin;
@ -75,14 +75,14 @@ SecurityLookupWindow(XID id, ClientPtr client, Mask access_mode)
} }
/* replaced by dixLookupWindow */ /* replaced by dixLookupWindow */
_X_EXPORT WindowPtr WindowPtr
LookupWindow(XID id, ClientPtr client) LookupWindow(XID id, ClientPtr client)
{ {
return SecurityLookupWindow(id, client, DixUnknownAccess); return SecurityLookupWindow(id, client, DixUnknownAccess);
} }
/* replaced by dixLookupDrawable */ /* replaced by dixLookupDrawable */
_X_EXPORT pointer pointer
SecurityLookupDrawable(XID id, ClientPtr client, Mask access_mode) SecurityLookupDrawable(XID id, ClientPtr client, Mask access_mode)
{ {
DrawablePtr pDraw; DrawablePtr pDraw;
@ -96,14 +96,14 @@ SecurityLookupDrawable(XID id, ClientPtr client, Mask access_mode)
} }
/* replaced by dixLookupDrawable */ /* replaced by dixLookupDrawable */
_X_EXPORT pointer pointer
LookupDrawable(XID id, ClientPtr client) LookupDrawable(XID id, ClientPtr client)
{ {
return SecurityLookupDrawable(id, client, DixUnknownAccess); return SecurityLookupDrawable(id, client, DixUnknownAccess);
} }
/* replaced by dixLookupClient */ /* replaced by dixLookupClient */
_X_EXPORT ClientPtr ClientPtr
LookupClient(XID id, ClientPtr client) LookupClient(XID id, ClientPtr client)
{ {
ClientPtr pClient; ClientPtr pClient;
@ -116,7 +116,7 @@ LookupClient(XID id, ClientPtr client)
} }
/* replaced by dixLookupResource */ /* replaced by dixLookupResource */
_X_EXPORT pointer pointer
SecurityLookupIDByType(ClientPtr client, XID id, RESTYPE rtype, SecurityLookupIDByType(ClientPtr client, XID id, RESTYPE rtype,
Mask access_mode) Mask access_mode)
{ {
@ -131,7 +131,7 @@ SecurityLookupIDByType(ClientPtr client, XID id, RESTYPE rtype,
} }
/* replaced by dixLookupResource */ /* replaced by dixLookupResource */
_X_EXPORT pointer pointer
SecurityLookupIDByClass(ClientPtr client, XID id, RESTYPE classes, SecurityLookupIDByClass(ClientPtr client, XID id, RESTYPE classes,
Mask access_mode) Mask access_mode)
{ {
@ -146,14 +146,14 @@ SecurityLookupIDByClass(ClientPtr client, XID id, RESTYPE classes,
} }
/* replaced by dixLookupResource */ /* replaced by dixLookupResource */
_X_EXPORT pointer pointer
LookupIDByType(XID id, RESTYPE rtype) LookupIDByType(XID id, RESTYPE rtype)
{ {
return SecurityLookupIDByType(NullClient, id, rtype, DixUnknownAccess); return SecurityLookupIDByType(NullClient, id, rtype, DixUnknownAccess);
} }
/* replaced by dixLookupResource */ /* replaced by dixLookupResource */
_X_EXPORT pointer pointer
LookupIDByClass(XID id, RESTYPE classes) LookupIDByClass(XID id, RESTYPE classes)
{ {
return SecurityLookupIDByClass(NullClient, id, classes, DixUnknownAccess); return SecurityLookupIDByClass(NullClient, id, classes, DixUnknownAccess);

78
dix/devices.c
View File

@ -94,7 +94,7 @@ SOFTWARE.
*/ */
static int CoreDevicePrivateKeyIndex; static int CoreDevicePrivateKeyIndex;
_X_EXPORT DevPrivateKey CoreDevicePrivateKey = &CoreDevicePrivateKeyIndex; DevPrivateKey CoreDevicePrivateKey = &CoreDevicePrivateKeyIndex;
/* Used to sture classes currently not in use by an MD */ /* Used to sture classes currently not in use by an MD */
static int UnusedClassesPrivateKeyIndex; static int UnusedClassesPrivateKeyIndex;
DevPrivateKey UnusedClassesPrivateKey = &UnusedClassesPrivateKeyIndex; DevPrivateKey UnusedClassesPrivateKey = &UnusedClassesPrivateKeyIndex;
@ -184,7 +184,7 @@ NextFreePointerDevice(void)
* @param deviceProc Callback for device control function (switch dev on/off). * @param deviceProc Callback for device control function (switch dev on/off).
* @return The newly created device. * @return The newly created device.
*/ */
_X_EXPORT DeviceIntPtr DeviceIntPtr
AddInputDevice(ClientPtr client, DeviceProc deviceProc, Bool autoStart) AddInputDevice(ClientPtr client, DeviceProc deviceProc, Bool autoStart)
{ {
DeviceIntPtr dev, *prev; /* not a typo */ DeviceIntPtr dev, *prev; /* not a typo */
@ -258,7 +258,7 @@ AddInputDevice(ClientPtr client, DeviceProc deviceProc, Bool autoStart)
* @param The device to be enabled. * @param The device to be enabled.
* @return TRUE on success or FALSE otherwise. * @return TRUE on success or FALSE otherwise.
*/ */
_X_EXPORT Bool Bool
EnableDevice(DeviceIntPtr dev) EnableDevice(DeviceIntPtr dev)
{ {
DeviceIntPtr *prev; DeviceIntPtr *prev;
@ -356,7 +356,7 @@ EnableDevice(DeviceIntPtr dev)
* *
* @return TRUE on success or FALSE otherwise. * @return TRUE on success or FALSE otherwise.
*/ */
_X_EXPORT Bool Bool
DisableDevice(DeviceIntPtr dev) DisableDevice(DeviceIntPtr dev)
{ {
DeviceIntPtr *prev, other; DeviceIntPtr *prev, other;
@ -433,7 +433,7 @@ DisableDevice(DeviceIntPtr dev)
* *
* @return Success or an error code on failure. * @return Success or an error code on failure.
*/ */
_X_EXPORT int int
ActivateDevice(DeviceIntPtr dev) ActivateDevice(DeviceIntPtr dev)
{ {
int ret = Success; int ret = Success;
@ -597,7 +597,7 @@ CorePointerProc(DeviceIntPtr pDev, int what)
* Note that the server MUST have two core devices at all times, even if there * Note that the server MUST have two core devices at all times, even if there
* is no physical device connected. * is no physical device connected.
*/ */
_X_EXPORT void void
InitCoreDevices(void) InitCoreDevices(void)
{ {
if (AllocMasterDevice(serverClient, "Virtual core", if (AllocMasterDevice(serverClient, "Virtual core",
@ -624,7 +624,7 @@ InitCoreDevices(void)
* *
* @return Success or error code on failure. * @return Success or error code on failure.
*/ */
_X_EXPORT int int
InitAndStartDevices() InitAndStartDevices()
{ {
DeviceIntPtr dev, next; DeviceIntPtr dev, next;
@ -889,7 +889,7 @@ CloseDevice(DeviceIntPtr dev)
* Shut down all devices, free all resources, etc. * Shut down all devices, free all resources, etc.
* Only useful if you're shutting down the server! * Only useful if you're shutting down the server!
*/ */
_X_EXPORT void void
CloseDownDevices(void) CloseDownDevices(void)
{ {
DeviceIntPtr dev, next; DeviceIntPtr dev, next;
@ -929,7 +929,7 @@ CloseDownDevices(void)
* Remove the cursor sprite for all devices. This needs to be done before any * Remove the cursor sprite for all devices. This needs to be done before any
* resources are freed or any device is deleted. * resources are freed or any device is deleted.
*/ */
_X_EXPORT void void
UndisplayDevices() UndisplayDevices()
{ {
DeviceIntPtr dev; DeviceIntPtr dev;
@ -950,7 +950,7 @@ UndisplayDevices()
* dev->init is FALSE it means the client never received a DeviceAdded event, * dev->init is FALSE it means the client never received a DeviceAdded event,
* so let's not send a DeviceRemoved event either. * so let's not send a DeviceRemoved event either.
*/ */
_X_EXPORT int int
RemoveDevice(DeviceIntPtr dev) RemoveDevice(DeviceIntPtr dev)
{ {
DeviceIntPtr prev,tmp,next; DeviceIntPtr prev,tmp,next;
@ -1017,7 +1017,7 @@ RemoveDevice(DeviceIntPtr dev)
return ret; return ret;
} }
_X_EXPORT int int
NumMotionEvents(void) NumMotionEvents(void)
{ {
/* only called to fill data in initial connection reply. /* only called to fill data in initial connection reply.
@ -1025,19 +1025,19 @@ NumMotionEvents(void)
return inputInfo.pointer->valuator->numMotionEvents; return inputInfo.pointer->valuator->numMotionEvents;
} }
_X_EXPORT void void
RegisterPointerDevice(DeviceIntPtr device) RegisterPointerDevice(DeviceIntPtr device)
{ {
RegisterOtherDevice(device); RegisterOtherDevice(device);
} }
_X_EXPORT void void
RegisterKeyboardDevice(DeviceIntPtr device) RegisterKeyboardDevice(DeviceIntPtr device)
{ {
RegisterOtherDevice(device); RegisterOtherDevice(device);
} }
_X_EXPORT int int
dixLookupDevice(DeviceIntPtr *pDev, int id, ClientPtr client, Mask access_mode) dixLookupDevice(DeviceIntPtr *pDev, int id, ClientPtr client, Mask access_mode)
{ {
DeviceIntPtr dev; DeviceIntPtr dev;
@ -1061,7 +1061,7 @@ found:
return rc; return rc;
} }
_X_EXPORT void void
QueryMinMaxKeyCodes(KeyCode *minCode, KeyCode *maxCode) QueryMinMaxKeyCodes(KeyCode *minCode, KeyCode *maxCode)
{ {
if (inputInfo.keyboard) { if (inputInfo.keyboard) {
@ -1070,7 +1070,7 @@ QueryMinMaxKeyCodes(KeyCode *minCode, KeyCode *maxCode)
} }
} }
_X_EXPORT Bool Bool
SetKeySymsMap(KeySymsPtr dst, KeySymsPtr src) SetKeySymsMap(KeySymsPtr dst, KeySymsPtr src)
{ {
int i, j; int i, j;
@ -1169,7 +1169,7 @@ InitModMap(KeyClassPtr keyc)
return TRUE; return TRUE;
} }
_X_EXPORT Bool Bool
InitKeyClassDeviceStruct(DeviceIntPtr dev, KeySymsPtr pKeySyms, CARD8 pModifiers[]) InitKeyClassDeviceStruct(DeviceIntPtr dev, KeySymsPtr pKeySyms, CARD8 pModifiers[])
{ {
KeyClassPtr keyc; KeyClassPtr keyc;
@ -1196,7 +1196,7 @@ InitKeyClassDeviceStruct(DeviceIntPtr dev, KeySymsPtr pKeySyms, CARD8 pModifiers
return TRUE; return TRUE;
} }
_X_EXPORT Bool Bool
InitButtonClassDeviceStruct(DeviceIntPtr dev, int numButtons, InitButtonClassDeviceStruct(DeviceIntPtr dev, int numButtons,
CARD8 *map) CARD8 *map)
{ {
@ -1213,7 +1213,7 @@ InitButtonClassDeviceStruct(DeviceIntPtr dev, int numButtons,
return TRUE; return TRUE;
} }
_X_EXPORT Bool Bool
InitValuatorClassDeviceStruct(DeviceIntPtr dev, int numAxes, InitValuatorClassDeviceStruct(DeviceIntPtr dev, int numAxes,
int numMotionEvents, int mode) int numMotionEvents, int mode)
{ {
@ -1269,7 +1269,7 @@ ValuatorAccelerationRec pointerAccelerationScheme[] = {
* install an acceleration scheme. returns TRUE on success, and should not * install an acceleration scheme. returns TRUE on success, and should not
* change anything if unsuccessful. * change anything if unsuccessful.
*/ */
_X_EXPORT Bool Bool
InitPointerAccelerationScheme(DeviceIntPtr dev, InitPointerAccelerationScheme(DeviceIntPtr dev,
int scheme) int scheme)
{ {
@ -1318,7 +1318,7 @@ InitPointerAccelerationScheme(DeviceIntPtr dev,
return TRUE; return TRUE;
} }
_X_EXPORT Bool Bool
InitAbsoluteClassDeviceStruct(DeviceIntPtr dev) InitAbsoluteClassDeviceStruct(DeviceIntPtr dev)
{ {
AbsoluteClassPtr abs; AbsoluteClassPtr abs;
@ -1349,7 +1349,7 @@ InitAbsoluteClassDeviceStruct(DeviceIntPtr dev)
return TRUE; return TRUE;
} }
_X_EXPORT Bool Bool
InitFocusClassDeviceStruct(DeviceIntPtr dev) InitFocusClassDeviceStruct(DeviceIntPtr dev)
{ {
FocusClassPtr focc; FocusClassPtr focc;
@ -1367,7 +1367,7 @@ InitFocusClassDeviceStruct(DeviceIntPtr dev)
return TRUE; return TRUE;
} }
_X_EXPORT Bool Bool
InitKbdFeedbackClassDeviceStruct(DeviceIntPtr dev, BellProcPtr bellProc, InitKbdFeedbackClassDeviceStruct(DeviceIntPtr dev, BellProcPtr bellProc,
KbdCtrlProcPtr controlProc) KbdCtrlProcPtr controlProc)
{ {
@ -1395,7 +1395,7 @@ InitKbdFeedbackClassDeviceStruct(DeviceIntPtr dev, BellProcPtr bellProc,
return TRUE; return TRUE;
} }
_X_EXPORT Bool Bool
InitPtrFeedbackClassDeviceStruct(DeviceIntPtr dev, PtrCtrlProcPtr controlProc) InitPtrFeedbackClassDeviceStruct(DeviceIntPtr dev, PtrCtrlProcPtr controlProc)
{ {
PtrFeedbackPtr feedc; PtrFeedbackPtr feedc;
@ -1430,7 +1430,7 @@ static IntegerCtrl defaultIntegerControl = {
DEFAULT_INT_DISPLAYED, DEFAULT_INT_DISPLAYED,
0}; 0};
_X_EXPORT Bool Bool
InitStringFeedbackClassDeviceStruct ( InitStringFeedbackClassDeviceStruct (
DeviceIntPtr dev, StringCtrlProcPtr controlProc, DeviceIntPtr dev, StringCtrlProcPtr controlProc,
int max_symbols, int num_symbols_supported, KeySym *symbols) int max_symbols, int num_symbols_supported, KeySym *symbols)
@ -1470,7 +1470,7 @@ InitStringFeedbackClassDeviceStruct (
return TRUE; return TRUE;
} }
_X_EXPORT Bool Bool
InitBellFeedbackClassDeviceStruct (DeviceIntPtr dev, BellProcPtr bellProc, InitBellFeedbackClassDeviceStruct (DeviceIntPtr dev, BellProcPtr bellProc,
BellCtrlProcPtr controlProc) BellCtrlProcPtr controlProc)
{ {
@ -1490,7 +1490,7 @@ InitBellFeedbackClassDeviceStruct (DeviceIntPtr dev, BellProcPtr bellProc,
return TRUE; return TRUE;
} }
_X_EXPORT Bool Bool
InitLedFeedbackClassDeviceStruct (DeviceIntPtr dev, LedCtrlProcPtr controlProc) InitLedFeedbackClassDeviceStruct (DeviceIntPtr dev, LedCtrlProcPtr controlProc)
{ {
LedFeedbackPtr feedc; LedFeedbackPtr feedc;
@ -1511,7 +1511,7 @@ InitLedFeedbackClassDeviceStruct (DeviceIntPtr dev, LedCtrlProcPtr controlProc)
return TRUE; return TRUE;
} }
_X_EXPORT Bool Bool
InitIntegerFeedbackClassDeviceStruct (DeviceIntPtr dev, IntegerCtrlProcPtr controlProc) InitIntegerFeedbackClassDeviceStruct (DeviceIntPtr dev, IntegerCtrlProcPtr controlProc)
{ {
IntegerFeedbackPtr feedc; IntegerFeedbackPtr feedc;
@ -1529,7 +1529,7 @@ InitIntegerFeedbackClassDeviceStruct (DeviceIntPtr dev, IntegerCtrlProcPtr contr
return TRUE; return TRUE;
} }
_X_EXPORT Bool Bool
InitPointerDeviceStruct(DevicePtr device, CARD8 *map, int numButtons, InitPointerDeviceStruct(DevicePtr device, CARD8 *map, int numButtons,
PtrCtrlProcPtr controlProc, int numMotionEvents, PtrCtrlProcPtr controlProc, int numMotionEvents,
int numAxes) int numAxes)
@ -1542,7 +1542,7 @@ InitPointerDeviceStruct(DevicePtr device, CARD8 *map, int numButtons,
InitPtrFeedbackClassDeviceStruct(dev, controlProc)); InitPtrFeedbackClassDeviceStruct(dev, controlProc));
} }
_X_EXPORT Bool Bool
InitKeyboardDeviceStruct(DevicePtr device, KeySymsPtr pKeySyms, InitKeyboardDeviceStruct(DevicePtr device, KeySymsPtr pKeySyms,
CARD8 pModifiers[], BellProcPtr bellProc, CARD8 pModifiers[], BellProcPtr bellProc,
KbdCtrlProcPtr controlProc) KbdCtrlProcPtr controlProc)
@ -1554,7 +1554,7 @@ InitKeyboardDeviceStruct(DevicePtr device, KeySymsPtr pKeySyms,
InitKbdFeedbackClassDeviceStruct(dev, bellProc, controlProc)); InitKbdFeedbackClassDeviceStruct(dev, bellProc, controlProc));
} }
_X_EXPORT void void
SendMappingNotify(DeviceIntPtr pDev, unsigned request, unsigned firstKeyCode, SendMappingNotify(DeviceIntPtr pDev, unsigned request, unsigned firstKeyCode,
unsigned count, ClientPtr client) unsigned count, ClientPtr client)
{ {
@ -1599,7 +1599,7 @@ SendMappingNotify(DeviceIntPtr pDev, unsigned request, unsigned firstKeyCode,
* *
* @return TRUE if the device map is invalid, FALSE otherwise. * @return TRUE if the device map is invalid, FALSE otherwise.
*/ */
_X_EXPORT Bool Bool
BadDeviceMap(BYTE *buff, int length, unsigned low, unsigned high, XID *errval) BadDeviceMap(BYTE *buff, int length, unsigned low, unsigned high, XID *errval)
{ {
int i; int i;
@ -1616,7 +1616,7 @@ BadDeviceMap(BYTE *buff, int length, unsigned low, unsigned high, XID *errval)
return FALSE; return FALSE;
} }
_X_EXPORT Bool Bool
AllModifierKeysAreUp(dev, map1, per1, map2, per2) AllModifierKeysAreUp(dev, map1, per1, map2, per2)
DeviceIntPtr dev; DeviceIntPtr dev;
CARD8 *map1, *map2; CARD8 *map1, *map2;
@ -1986,7 +1986,7 @@ ProcGetPointerMapping(ClientPtr client)
return Success; return Success;
} }
_X_EXPORT void void
NoteLedState(DeviceIntPtr keybd, int led, Bool on) NoteLedState(DeviceIntPtr keybd, int led, Bool on)
{ {
KeybdCtrl *ctrl = &keybd->kbdfeed->ctrl; KeybdCtrl *ctrl = &keybd->kbdfeed->ctrl;
@ -1996,7 +1996,7 @@ NoteLedState(DeviceIntPtr keybd, int led, Bool on)
ctrl->leds &= ~((Leds)1 << (led - 1)); ctrl->leds &= ~((Leds)1 << (led - 1));
} }
_X_EXPORT int int
Ones(unsigned long mask) /* HACKMEM 169 */ Ones(unsigned long mask) /* HACKMEM 169 */
{ {
unsigned long y; unsigned long y;
@ -2391,7 +2391,7 @@ ProcGetPointerControl(ClientPtr client)
return Success; return Success;
} }
_X_EXPORT void void
MaybeStopHint(DeviceIntPtr dev, ClientPtr client) MaybeStopHint(DeviceIntPtr dev, ClientPtr client)
{ {
GrabPtr grab = dev->deviceGrab.grab; GrabPtr grab = dev->deviceGrab.grab;
@ -2508,7 +2508,7 @@ ProcQueryKeymap(ClientPtr client)
* We don't allow multi-layer hierarchies right now. You can't attach a slave * We don't allow multi-layer hierarchies right now. You can't attach a slave
* to another slave. * to another slave.
*/ */
_X_EXPORT int int
AttachDevice(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr master) AttachDevice(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr master)
{ {
ScreenPtr screen; ScreenPtr screen;
@ -2597,7 +2597,7 @@ AttachDevice(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr master)
* Returns the device paired with the parent master if the given device is a * Returns the device paired with the parent master if the given device is a
* slave device. * slave device.
*/ */
_X_EXPORT DeviceIntPtr DeviceIntPtr
GetPairedDevice(DeviceIntPtr dev) GetPairedDevice(DeviceIntPtr dev)
{ {
if (!dev->isMaster && dev->u.master) if (!dev->isMaster && dev->u.master)
@ -2612,7 +2612,7 @@ GetPairedDevice(DeviceIntPtr dev)
* Only allocates the devices, you will need to call ActivateDevice() and * Only allocates the devices, you will need to call ActivateDevice() and
* EnableDevice() manually. * EnableDevice() manually.
*/ */
_X_EXPORT int int
AllocMasterDevice(ClientPtr client, char* name, DeviceIntPtr* ptr, DeviceIntPtr* keybd) AllocMasterDevice(ClientPtr client, char* name, DeviceIntPtr* ptr, DeviceIntPtr* keybd)
{ {
DeviceIntPtr pointer; DeviceIntPtr pointer;

42
dix/dispatch.c
View File

@ -167,8 +167,8 @@ static ClientPtr grabClient;
#define GrabKickout 2 #define GrabKickout 2
static int grabState = GrabNone; static int grabState = GrabNone;
static long grabWaiters[mskcnt]; static long grabWaiters[mskcnt];
_X_EXPORT CallbackListPtr ServerGrabCallback = NULL; CallbackListPtr ServerGrabCallback = NULL;
_X_EXPORT HWEventQueuePtr checkForInput[2]; HWEventQueuePtr checkForInput[2];
extern int connBlockScreenStart; extern int connBlockScreenStart;
static void KillAllClients(void); static void KillAllClients(void);
@ -177,15 +177,15 @@ static int nextFreeClientID; /* always MIN free client ID */
static int nClients; /* number of authorized clients */ static int nClients; /* number of authorized clients */
_X_EXPORT CallbackListPtr ClientStateCallback; CallbackListPtr ClientStateCallback;
/* dispatchException & isItTimeToYield must be declared volatile since they /* dispatchException & isItTimeToYield must be declared volatile since they
* are modified by signal handlers - otherwise optimizer may assume it doesn't * are modified by signal handlers - otherwise optimizer may assume it doesn't
* need to actually check value in memory when used and may miss changes from * need to actually check value in memory when used and may miss changes from
* signal handlers. * signal handlers.
*/ */
_X_EXPORT volatile char dispatchException = 0; volatile char dispatchException = 0;
_X_EXPORT volatile char isItTimeToYield; volatile char isItTimeToYield;
/* Various of the DIX function interfaces were not designed to allow /* Various of the DIX function interfaces were not designed to allow
* the client->errorValue to be set on BadValue and other errors. * the client->errorValue to be set on BadValue and other errors.
@ -197,14 +197,14 @@ XID clientErrorValue; /* XXX this is a kludge */
#define SAME_SCREENS(a, b) (\ #define SAME_SCREENS(a, b) (\
(a.pScreen == b.pScreen)) (a.pScreen == b.pScreen))
_X_EXPORT void void
SetInputCheck(HWEventQueuePtr c0, HWEventQueuePtr c1) SetInputCheck(HWEventQueuePtr c0, HWEventQueuePtr c1)
{ {
checkForInput[0] = c0; checkForInput[0] = c0;
checkForInput[1] = c1; checkForInput[1] = c1;
} }
_X_EXPORT void void
UpdateCurrentTime(void) UpdateCurrentTime(void)
{ {
TimeStamp systime; TimeStamp systime;
@ -223,7 +223,7 @@ UpdateCurrentTime(void)
} }
/* Like UpdateCurrentTime, but can't call ProcessInputEvents */ /* Like UpdateCurrentTime, but can't call ProcessInputEvents */
_X_EXPORT void void
UpdateCurrentTimeIf(void) UpdateCurrentTimeIf(void)
{ {
TimeStamp systime; TimeStamp systime;
@ -242,11 +242,11 @@ UpdateCurrentTimeIf(void)
#define SMART_SCHEDULE_DEFAULT_INTERVAL 20 /* ms */ #define SMART_SCHEDULE_DEFAULT_INTERVAL 20 /* ms */
#define SMART_SCHEDULE_MAX_SLICE 200 /* ms */ #define SMART_SCHEDULE_MAX_SLICE 200 /* ms */
_X_EXPORT Bool SmartScheduleDisable = FALSE; Bool SmartScheduleDisable = FALSE;
_X_EXPORT long SmartScheduleSlice = SMART_SCHEDULE_DEFAULT_INTERVAL; long SmartScheduleSlice = SMART_SCHEDULE_DEFAULT_INTERVAL;
_X_EXPORT long SmartScheduleInterval = SMART_SCHEDULE_DEFAULT_INTERVAL; long SmartScheduleInterval = SMART_SCHEDULE_DEFAULT_INTERVAL;
_X_EXPORT long SmartScheduleMaxSlice = SMART_SCHEDULE_MAX_SLICE; long SmartScheduleMaxSlice = SMART_SCHEDULE_MAX_SLICE;
_X_EXPORT long SmartScheduleTime; long SmartScheduleTime;
static ClientPtr SmartLastClient; static ClientPtr SmartLastClient;
static int SmartLastIndex[SMART_MAX_PRIORITY-SMART_MIN_PRIORITY+1]; static int SmartLastIndex[SMART_MAX_PRIORITY-SMART_MIN_PRIORITY+1];
@ -470,7 +470,7 @@ Dispatch(void)
#undef MAJOROP #undef MAJOROP
_X_EXPORT int int
ProcBadRequest(ClientPtr client) ProcBadRequest(ClientPtr client)
{ {
return (BadRequest); return (BadRequest);
@ -1239,7 +1239,7 @@ ProcListFontsWithInfo(ClientPtr client)
* *
* \param value must conform to DeleteType * \param value must conform to DeleteType
*/ */
_X_EXPORT int int
dixDestroyPixmap(pointer value, XID pid) dixDestroyPixmap(pointer value, XID pid)
{ {
PixmapPtr pPixmap = (PixmapPtr)value; PixmapPtr pPixmap = (PixmapPtr)value;
@ -3356,9 +3356,9 @@ InitProcVectors(void)
* then killed again, the client is really destroyed. * then killed again, the client is really destroyed.
*********************/ *********************/
_X_EXPORT char dispatchExceptionAtReset = DE_RESET; char dispatchExceptionAtReset = DE_RESET;
_X_EXPORT void void
CloseDownClient(ClientPtr client) CloseDownClient(ClientPtr client)
{ {
Bool really_close_down = client->clientGone || Bool really_close_down = client->clientGone ||
@ -3458,7 +3458,7 @@ KillAllClients(void)
} }
} }
_X_EXPORT void InitClient(ClientPtr client, int i, pointer ospriv) void InitClient(ClientPtr client, int i, pointer ospriv)
{ {
client->index = i; client->index = i;
client->sequence = 0; client->sequence = 0;
@ -3504,7 +3504,7 @@ _X_EXPORT void InitClient(ClientPtr client, int i, pointer ospriv)
* Returns NULL if there are no free clients. * Returns NULL if there are no free clients.
*************************/ *************************/
_X_EXPORT ClientPtr NextAvailableClient(pointer ospriv) ClientPtr NextAvailableClient(pointer ospriv)
{ {
int i; int i;
ClientPtr client; ClientPtr client;
@ -3704,7 +3704,7 @@ ProcEstablishConnection(ClientPtr client)
return(client->noClientException); return(client->noClientException);
} }
_X_EXPORT void void
SendErrorToClient(ClientPtr client, unsigned majorCode, unsigned minorCode, SendErrorToClient(ClientPtr client, unsigned majorCode, unsigned minorCode,
XID resId, int errorCode) XID resId, int errorCode)
{ {
@ -3720,7 +3720,7 @@ SendErrorToClient(ClientPtr client, unsigned majorCode, unsigned minorCode,
WriteEventsToClient (client, 1, (xEvent *)&rep); WriteEventsToClient (client, 1, (xEvent *)&rep);
} }
_X_EXPORT void void
MarkClientException(ClientPtr client) MarkClientException(ClientPtr client)
{ {
client->noClientException = -1; client->noClientException = -1;

58
dix/dixfonts.c
View File

@ -130,7 +130,7 @@ LoadGlyphs(ClientPtr client, FontPtr pfont, unsigned nchars, int item_size,
/* /*
* adding RT_FONT prevents conflict with default cursor font * adding RT_FONT prevents conflict with default cursor font
*/ */
_X_EXPORT Bool Bool
SetDefaultFont(char *defaultfontname) SetDefaultFont(char *defaultfontname)
{ {
int err; int err;
@ -158,7 +158,7 @@ SetDefaultFont(char *defaultfontname)
* init_fpe() and free_fpe(), there shouldn't be any problem in using * init_fpe() and free_fpe(), there shouldn't be any problem in using
* freed data. * freed data.
*/ */
_X_EXPORT void void
QueueFontWakeup(FontPathElementPtr fpe) QueueFontWakeup(FontPathElementPtr fpe)
{ {
int i; int i;
@ -182,7 +182,7 @@ QueueFontWakeup(FontPathElementPtr fpe)
num_slept_fpes++; num_slept_fpes++;
} }
_X_EXPORT void void
RemoveFontWakeup(FontPathElementPtr fpe) RemoveFontWakeup(FontPathElementPtr fpe)
{ {
int i, int i,
@ -199,7 +199,7 @@ RemoveFontWakeup(FontPathElementPtr fpe)
} }
} }
_X_EXPORT void void
FontWakeup(pointer data, int count, pointer LastSelectMask) FontWakeup(pointer data, int count, pointer LastSelectMask)
{ {
int i; int i;
@ -389,7 +389,7 @@ bail:
return TRUE; return TRUE;
} }
_X_EXPORT int int
OpenFont(ClientPtr client, XID fid, Mask flags, unsigned lenfname, char *pfontname) OpenFont(ClientPtr client, XID fid, Mask flags, unsigned lenfname, char *pfontname)
{ {
OFclosurePtr c; OFclosurePtr c;
@ -479,7 +479,7 @@ OpenFont(ClientPtr client, XID fid, Mask flags, unsigned lenfname, char *pfontna
* *
* \param value must conform to DeleteType * \param value must conform to DeleteType
*/ */
_X_EXPORT int int
CloseFont(pointer value, XID fid) CloseFont(pointer value, XID fid)
{ {
int nscr; int nscr;
@ -522,7 +522,7 @@ CloseFont(pointer value, XID fid)
* *
* \param pReply caller must allocate this storage * \param pReply caller must allocate this storage
*/ */
_X_EXPORT void void
QueryFont(FontPtr pFont, xQueryFontReply *pReply, int nProtoCCIStructs) QueryFont(FontPtr pFont, xQueryFontReply *pReply, int nProtoCCIStructs)
{ {
FontPropPtr pFP; FontPropPtr pFP;
@ -840,7 +840,7 @@ bail:
return TRUE; return TRUE;
} }
_X_EXPORT int int
ListFonts(ClientPtr client, unsigned char *pattern, unsigned length, ListFonts(ClientPtr client, unsigned char *pattern, unsigned length,
unsigned max_names) unsigned max_names)
{ {
@ -894,7 +894,7 @@ ListFonts(ClientPtr client, unsigned char *pattern, unsigned length,
return Success; return Success;
} }
_X_EXPORT int int
doListFontsWithInfo(ClientPtr client, LFWIclosurePtr c) doListFontsWithInfo(ClientPtr client, LFWIclosurePtr c)
{ {
FontPathElementPtr fpe; FontPathElementPtr fpe;
@ -1175,7 +1175,7 @@ badAlloc:
static XID clearGC[] = { CT_NONE }; static XID clearGC[] = { CT_NONE };
#define clearGCmask (GCClipMask) #define clearGCmask (GCClipMask)
_X_EXPORT int int
doPolyText(ClientPtr client, PTclosurePtr c) doPolyText(ClientPtr client, PTclosurePtr c)
{ {
FontPtr pFont = c->pGC->font, oldpFont; FontPtr pFont = c->pGC->font, oldpFont;
@ -1442,7 +1442,7 @@ bail:
return TRUE; return TRUE;
} }
_X_EXPORT int int
PolyText(ClientPtr client, DrawablePtr pDraw, GC *pGC, unsigned char *pElt, PolyText(ClientPtr client, DrawablePtr pDraw, GC *pGC, unsigned char *pElt,
unsigned char *endReq, int xorg, int yorg, int reqType, XID did) unsigned char *endReq, int xorg, int yorg, int reqType, XID did)
{ {
@ -1477,7 +1477,7 @@ PolyText(ClientPtr client, DrawablePtr pDraw, GC *pGC, unsigned char *pElt,
#undef TextEltHeader #undef TextEltHeader
#undef FontShiftSize #undef FontShiftSize
_X_EXPORT int int
doImageText(ClientPtr client, ITclosurePtr c) doImageText(ClientPtr client, ITclosurePtr c)
{ {
int err = Success, lgerr; /* err is in X error, not font error, space */ int err = Success, lgerr; /* err is in X error, not font error, space */
@ -1598,7 +1598,7 @@ bail:
return TRUE; return TRUE;
} }
_X_EXPORT int int
ImageText(ClientPtr client, DrawablePtr pDraw, GC *pGC, int nChars, ImageText(ClientPtr client, DrawablePtr pDraw, GC *pGC, int nChars,
unsigned char *data, int xorg, int yorg, int reqType, XID did) unsigned char *data, int xorg, int yorg, int reqType, XID did)
{ {
@ -1796,7 +1796,7 @@ bail:
} }
/* XXX -- do we need to pass error down to each renderer? */ /* XXX -- do we need to pass error down to each renderer? */
_X_EXPORT int int
SetFontPath(ClientPtr client, int npaths, unsigned char *paths, int *error) SetFontPath(ClientPtr client, int npaths, unsigned char *paths, int *error)
{ {
int err = XaceHook(XACE_SERVER_ACCESS, client, DixManageAccess); int err = XaceHook(XACE_SERVER_ACCESS, client, DixManageAccess);
@ -1812,7 +1812,7 @@ SetFontPath(ClientPtr client, int npaths, unsigned char *paths, int *error)
return err; return err;
} }
_X_EXPORT int int
SetDefaultFontPath(char *path) SetDefaultFontPath(char *path)
{ {
unsigned char *cp, unsigned char *cp,
@ -1853,7 +1853,7 @@ SetDefaultFontPath(char *path)
return err; return err;
} }
_X_EXPORT int int
GetFontPath(ClientPtr client, int *count, int *length, unsigned char **result) GetFontPath(ClientPtr client, int *count, int *length, unsigned char **result)
{ {
int i; int i;
@ -1888,7 +1888,7 @@ GetFontPath(ClientPtr client, int *count, int *length, unsigned char **result)
return Success; return Success;
} }
_X_EXPORT void void
DeleteClientFontStuff(ClientPtr client) DeleteClientFontStuff(ClientPtr client)
{ {
int i; int i;
@ -1902,7 +1902,7 @@ DeleteClientFontStuff(ClientPtr client)
} }
} }
_X_EXPORT void void
InitFonts (void) InitFonts (void)
{ {
patternCache = MakeFontPatternCache(); patternCache = MakeFontPatternCache();
@ -1915,14 +1915,14 @@ InitFonts (void)
#endif #endif
} }
_X_EXPORT int int
GetDefaultPointSize () GetDefaultPointSize ()
{ {
return 120; return 120;
} }
_X_EXPORT FontResolutionPtr FontResolutionPtr
GetClientResolutions (int *num) GetClientResolutions (int *num)
{ {
static struct _FontResolution res; static struct _FontResolution res;
@ -1954,7 +1954,7 @@ GetClientResolutions (int *num)
* should be called (only once!) by each type of fpe when initialized * should be called (only once!) by each type of fpe when initialized
*/ */
_X_EXPORT int int
RegisterFPEFunctions(NameCheckFunc name_func, RegisterFPEFunctions(NameCheckFunc name_func,
InitFpeFunc init_func, InitFpeFunc init_func,
FreeFpeFunc free_func, FreeFpeFunc free_func,
@ -2003,7 +2003,7 @@ RegisterFPEFunctions(NameCheckFunc name_func,
return num_fpe_types++; return num_fpe_types++;
} }
_X_EXPORT void void
FreeFonts(void) FreeFonts(void)
{ {
if (patternCache) { if (patternCache) {
@ -2020,32 +2020,32 @@ FreeFonts(void)
/* convenience functions for FS interface */ /* convenience functions for FS interface */
_X_EXPORT FontPtr FontPtr
find_old_font(XID id) find_old_font(XID id)
{ {
return (FontPtr) SecurityLookupIDByType(NullClient, id, RT_NONE, return (FontPtr) SecurityLookupIDByType(NullClient, id, RT_NONE,
DixUnknownAccess); DixUnknownAccess);
} }
_X_EXPORT Font Font
GetNewFontClientID() GetNewFontClientID()
{ {
return FakeClientID(0); return FakeClientID(0);
} }
_X_EXPORT int int
StoreFontClientFont(FontPtr pfont, Font id) StoreFontClientFont(FontPtr pfont, Font id)
{ {
return AddResource(id, RT_NONE, (pointer) pfont); return AddResource(id, RT_NONE, (pointer) pfont);
} }
_X_EXPORT void void
DeleteFontClientID(Font id) DeleteFontClientID(Font id)
{ {
FreeResource(id, RT_NONE); FreeResource(id, RT_NONE);
} }
_X_EXPORT int int
client_auth_generation(ClientPtr client) client_auth_generation(ClientPtr client)
{ {
return 0; return 0;
@ -2054,7 +2054,7 @@ client_auth_generation(ClientPtr client)
static int fs_handlers_installed = 0; static int fs_handlers_installed = 0;
static unsigned int last_server_gen; static unsigned int last_server_gen;
_X_EXPORT int int
init_fs_handlers(FontPathElementPtr fpe, BlockHandlerProcPtr block_handler) init_fs_handlers(FontPathElementPtr fpe, BlockHandlerProcPtr block_handler)
{ {
/* if server has reset, make sure the b&w handlers are reinstalled */ /* if server has reset, make sure the b&w handlers are reinstalled */
@ -2072,7 +2072,7 @@ init_fs_handlers(FontPathElementPtr fpe, BlockHandlerProcPtr block_handler)
return Successful; return Successful;
} }
_X_EXPORT void void
remove_fs_handlers(FontPathElementPtr fpe, BlockHandlerProcPtr block_handler, Bool all) remove_fs_handlers(FontPathElementPtr fpe, BlockHandlerProcPtr block_handler, Bool all)
{ {
if (all) { if (all) {

58
dix/dixutils.c
View File

@ -102,7 +102,7 @@ Author: Adobe Systems Incorporated
* argument is less than, equal to or greater than the second argument. * argument is less than, equal to or greater than the second argument.
*/ */
_X_EXPORT int int
CompareTimeStamps(TimeStamp a, TimeStamp b) CompareTimeStamps(TimeStamp a, TimeStamp b)
{ {
if (a.months < b.months) if (a.months < b.months)
@ -121,7 +121,7 @@ CompareTimeStamps(TimeStamp a, TimeStamp b)
*/ */
#define HALFMONTH ((unsigned long) 1<<31) #define HALFMONTH ((unsigned long) 1<<31)
_X_EXPORT TimeStamp TimeStamp
ClientTimeToServerTime(CARD32 c) ClientTimeToServerTime(CARD32 c)
{ {
TimeStamp ts; TimeStamp ts;
@ -165,7 +165,7 @@ ISOLatin1ToLower (unsigned char source)
} }
_X_EXPORT void void
CopyISOLatin1Lowered(unsigned char *dest, unsigned char *source, int length) CopyISOLatin1Lowered(unsigned char *dest, unsigned char *source, int length)
{ {
int i; int i;
@ -175,7 +175,7 @@ CopyISOLatin1Lowered(unsigned char *dest, unsigned char *source, int length)
*dest = '\0'; *dest = '\0';
} }
_X_EXPORT int int
CompareISOLatin1Lowered(unsigned char *s1, int s1len, CompareISOLatin1Lowered(unsigned char *s1, int s1len,
unsigned char *s2, int s2len) unsigned char *s2, int s2len)
{ {
@ -203,7 +203,7 @@ CompareISOLatin1Lowered(unsigned char *s1, int s1len,
* access mask values are defined in resource.h. The type mask values are * access mask values are defined in resource.h. The type mask values are
* defined in pixmap.h, with zero equivalent to M_DRAWABLE. * defined in pixmap.h, with zero equivalent to M_DRAWABLE.
*/ */
_X_EXPORT int int
dixLookupDrawable(DrawablePtr *pDraw, XID id, ClientPtr client, dixLookupDrawable(DrawablePtr *pDraw, XID id, ClientPtr client,
Mask type, Mask access) Mask type, Mask access)
{ {
@ -229,7 +229,7 @@ dixLookupDrawable(DrawablePtr *pDraw, XID id, ClientPtr client,
return Success; return Success;
} }
_X_EXPORT int int
dixLookupWindow(WindowPtr *pWin, XID id, ClientPtr client, Mask access) dixLookupWindow(WindowPtr *pWin, XID id, ClientPtr client, Mask access)
{ {
int rc; int rc;
@ -237,7 +237,7 @@ dixLookupWindow(WindowPtr *pWin, XID id, ClientPtr client, Mask access)
return (rc == BadDrawable) ? BadWindow : rc; return (rc == BadDrawable) ? BadWindow : rc;
} }
_X_EXPORT int int
dixLookupGC(GCPtr *pGC, XID id, ClientPtr client, Mask access) dixLookupGC(GCPtr *pGC, XID id, ClientPtr client, Mask access)
{ {
GCPtr pTmp = (GCPtr)SecurityLookupIDByType(client, id, RT_GC, access); GCPtr pTmp = (GCPtr)SecurityLookupIDByType(client, id, RT_GC, access);
@ -250,7 +250,7 @@ dixLookupGC(GCPtr *pGC, XID id, ClientPtr client, Mask access)
return BadGC; return BadGC;
} }
_X_EXPORT int int
dixLookupClient(ClientPtr *pClient, XID rid, ClientPtr client, Mask access) dixLookupClient(ClientPtr *pClient, XID rid, ClientPtr client, Mask access)
{ {
pointer pRes; pointer pRes;
@ -276,7 +276,7 @@ bad:
return rc; return rc;
} }
_X_EXPORT int int
AlterSaveSetForClient(ClientPtr client, WindowPtr pWin, unsigned mode, AlterSaveSetForClient(ClientPtr client, WindowPtr pWin, unsigned mode,
Bool toRoot, Bool map) Bool toRoot, Bool map)
{ {
@ -332,7 +332,7 @@ AlterSaveSetForClient(ClientPtr client, WindowPtr pWin, unsigned mode,
return(Success); return(Success);
} }
_X_EXPORT void void
DeleteWindowFromAnySaveSet(WindowPtr pWin) DeleteWindowFromAnySaveSet(WindowPtr pWin)
{ {
int i; int i;
@ -351,7 +351,7 @@ DeleteWindowFromAnySaveSet(WindowPtr pWin)
* colormaps, if someone calls install colormap, it's easier to have a dummy * colormaps, if someone calls install colormap, it's easier to have a dummy
* procedure to call than to check if there's a procedure * procedure to call than to check if there's a procedure
*/ */
_X_EXPORT void void
NoopDDA(void) NoopDDA(void)
{ {
} }
@ -374,7 +374,7 @@ static Bool handlerDeleted;
* \param pTimeout DIX doesn't want to know how OS represents time * \param pTimeout DIX doesn't want to know how OS represents time
* \param pReadMask nor how it represents the det of descriptors * \param pReadMask nor how it represents the det of descriptors
*/ */
_X_EXPORT void void
BlockHandler(pointer pTimeout, pointer pReadmask) BlockHandler(pointer pTimeout, pointer pReadmask)
{ {
int i, j; int i, j;
@ -408,7 +408,7 @@ BlockHandler(pointer pTimeout, pointer pReadmask)
* \param result 32 bits of undefined result from the wait * \param result 32 bits of undefined result from the wait
* \param pReadmask the resulting descriptor mask * \param pReadmask the resulting descriptor mask
*/ */
_X_EXPORT void void
WakeupHandler(int result, pointer pReadmask) WakeupHandler(int result, pointer pReadmask)
{ {
int i, j; int i, j;
@ -441,7 +441,7 @@ WakeupHandler(int result, pointer pReadmask)
* Reentrant with BlockHandler and WakeupHandler, except wakeup won't * Reentrant with BlockHandler and WakeupHandler, except wakeup won't
* get called until next time * get called until next time
*/ */
_X_EXPORT Bool Bool
RegisterBlockAndWakeupHandlers (BlockHandlerProcPtr blockHandler, RegisterBlockAndWakeupHandlers (BlockHandlerProcPtr blockHandler,
WakeupHandlerProcPtr wakeupHandler, WakeupHandlerProcPtr wakeupHandler,
pointer blockData) pointer blockData)
@ -465,7 +465,7 @@ RegisterBlockAndWakeupHandlers (BlockHandlerProcPtr blockHandler,
return TRUE; return TRUE;
} }
_X_EXPORT void void
RemoveBlockAndWakeupHandlers (BlockHandlerProcPtr blockHandler, RemoveBlockAndWakeupHandlers (BlockHandlerProcPtr blockHandler,
WakeupHandlerProcPtr wakeupHandler, WakeupHandlerProcPtr wakeupHandler,
pointer blockData) pointer blockData)
@ -492,7 +492,7 @@ RemoveBlockAndWakeupHandlers (BlockHandlerProcPtr blockHandler,
} }
} }
_X_EXPORT void void
InitBlockAndWakeupHandlers (void) InitBlockAndWakeupHandlers (void)
{ {
xfree (handlers); xfree (handlers);
@ -509,7 +509,7 @@ InitBlockAndWakeupHandlers (void)
WorkQueuePtr workQueue; WorkQueuePtr workQueue;
static WorkQueuePtr *workQueueLast = &workQueue; static WorkQueuePtr *workQueueLast = &workQueue;
_X_EXPORT void void
ProcessWorkQueue(void) ProcessWorkQueue(void)
{ {
WorkQueuePtr q, *p; WorkQueuePtr q, *p;
@ -537,7 +537,7 @@ ProcessWorkQueue(void)
workQueueLast = p; workQueueLast = p;
} }
_X_EXPORT void void
ProcessWorkQueueZombies(void) ProcessWorkQueueZombies(void)
{ {
WorkQueuePtr q, *p; WorkQueuePtr q, *p;
@ -560,7 +560,7 @@ ProcessWorkQueueZombies(void)
workQueueLast = p; workQueueLast = p;
} }
_X_EXPORT Bool Bool
QueueWorkProc ( QueueWorkProc (
Bool (*function)(ClientPtr /* pClient */, pointer /* closure */), Bool (*function)(ClientPtr /* pClient */, pointer /* closure */),
ClientPtr client, pointer closure) ClientPtr client, pointer closure)
@ -596,7 +596,7 @@ typedef struct _SleepQueue {
static SleepQueuePtr sleepQueue = NULL; static SleepQueuePtr sleepQueue = NULL;
_X_EXPORT Bool Bool
ClientSleep (ClientPtr client, ClientSleepProcPtr function, pointer closure) ClientSleep (ClientPtr client, ClientSleepProcPtr function, pointer closure)
{ {
SleepQueuePtr q; SleepQueuePtr q;
@ -614,7 +614,7 @@ ClientSleep (ClientPtr client, ClientSleepProcPtr function, pointer closure)
return TRUE; return TRUE;
} }
_X_EXPORT Bool Bool
ClientSignal (ClientPtr client) ClientSignal (ClientPtr client)
{ {
SleepQueuePtr q; SleepQueuePtr q;
@ -627,7 +627,7 @@ ClientSignal (ClientPtr client)
return FALSE; return FALSE;
} }
_X_EXPORT void void
ClientWakeup (ClientPtr client) ClientWakeup (ClientPtr client)
{ {
SleepQueuePtr q, *prev; SleepQueuePtr q, *prev;
@ -653,7 +653,7 @@ ClientWakeup (ClientPtr client)
} }
} }
_X_EXPORT Bool Bool
ClientIsAsleep (ClientPtr client) ClientIsAsleep (ClientPtr client)
{ {
SleepQueuePtr q; SleepQueuePtr q;
@ -673,7 +673,7 @@ ClientIsAsleep (ClientPtr client)
static int numCallbackListsToCleanup = 0; static int numCallbackListsToCleanup = 0;
static CallbackListPtr **listsToCleanup = NULL; static CallbackListPtr **listsToCleanup = NULL;
static Bool static Bool
_AddCallback( _AddCallback(
CallbackListPtr *pcbl, CallbackListPtr *pcbl,
CallbackProcPtr callback, CallbackProcPtr callback,
@ -850,7 +850,7 @@ CreateCallbackList(CallbackListPtr *pcbl)
/* ===== Public Procedures ===== */ /* ===== Public Procedures ===== */
_X_EXPORT Bool Bool
AddCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, pointer data) AddCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, pointer data)
{ {
if (!pcbl) return FALSE; if (!pcbl) return FALSE;
@ -862,28 +862,28 @@ AddCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, pointer data)
return _AddCallback(pcbl, callback, data); return _AddCallback(pcbl, callback, data);
} }
_X_EXPORT Bool Bool
DeleteCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, pointer data) DeleteCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, pointer data)
{ {
if (!pcbl || !*pcbl) return FALSE; if (!pcbl || !*pcbl) return FALSE;
return _DeleteCallback(pcbl, callback, data); return _DeleteCallback(pcbl, callback, data);
} }
_X_EXPORT void void
CallCallbacks(CallbackListPtr *pcbl, pointer call_data) CallCallbacks(CallbackListPtr *pcbl, pointer call_data)
{ {
if (!pcbl || !*pcbl) return; if (!pcbl || !*pcbl) return;
_CallCallbacks(pcbl, call_data); _CallCallbacks(pcbl, call_data);
} }
_X_EXPORT void void
DeleteCallbackList(CallbackListPtr *pcbl) DeleteCallbackList(CallbackListPtr *pcbl)
{ {
if (!pcbl || !*pcbl) return; if (!pcbl || !*pcbl) return;
_DeleteCallbackList(pcbl); _DeleteCallbackList(pcbl);
} }
_X_EXPORT void void
InitCallbackManager(void) InitCallbackManager(void)
{ {
int i; int i;

162
dix/events.c
View File

@ -210,12 +210,12 @@ typedef const char *string;
#define rClient(obj) (clients[CLIENT_ID((obj)->resource)]) #define rClient(obj) (clients[CLIENT_ID((obj)->resource)])
_X_EXPORT CallbackListPtr EventCallback; CallbackListPtr EventCallback;
_X_EXPORT CallbackListPtr DeviceEventCallback; CallbackListPtr DeviceEventCallback;
#define DNPMCOUNT 8 #define DNPMCOUNT 8
_X_EXPORT Mask DontPropagateMasks[DNPMCOUNT]; Mask DontPropagateMasks[DNPMCOUNT];
static int DontPropagateRefCnts[DNPMCOUNT]; static int DontPropagateRefCnts[DNPMCOUNT];
@ -239,7 +239,7 @@ static int DontPropagateRefCnts[DNPMCOUNT];
* inputInfo.numDevices * inputInfo.numDevices
* Total number of devices. * Total number of devices.
*/ */
_X_EXPORT InputInfo inputInfo; InputInfo inputInfo;
/** /**
* syncEvents is the global structure for queued events. * syncEvents is the global structure for queued events.
@ -276,7 +276,7 @@ static int swapEventLen = 0;
* Convert the given event type from an XI event to a core event. * Convert the given event type from an XI event to a core event.
* @return The matching core event type or 0 if there is none. * @return The matching core event type or 0 if there is none.
*/ */
_X_EXPORT int int
XItoCoreType(int xitype) XItoCoreType(int xitype)
{ {
int coretype = 0; int coretype = 0;
@ -298,7 +298,7 @@ XItoCoreType(int xitype)
* True if device owns a cursor, false if device shares a cursor sprite with * True if device owns a cursor, false if device shares a cursor sprite with
* another device. * another device.
*/ */
_X_EXPORT Bool Bool
DevHasCursor(DeviceIntPtr pDev) DevHasCursor(DeviceIntPtr pDev)
{ {
return pDev->spriteInfo->spriteOwner; return pDev->spriteInfo->spriteOwner;
@ -308,7 +308,7 @@ DevHasCursor(DeviceIntPtr pDev)
* Return true if a device is a pointer, check is the same as used by XI to * Return true if a device is a pointer, check is the same as used by XI to
* fill the 'use' field. * fill the 'use' field.
*/ */
_X_EXPORT Bool Bool
IsPointerDevice(DeviceIntPtr dev) IsPointerDevice(DeviceIntPtr dev)
{ {
return (dev->valuator && dev->button); return (dev->valuator && dev->button);
@ -321,7 +321,7 @@ IsPointerDevice(DeviceIntPtr dev)
* Some pointer devices have keys as well (e.g. multimedia keys). Try to not * Some pointer devices have keys as well (e.g. multimedia keys). Try to not
* count them as keyboard devices. * count them as keyboard devices.
*/ */
_X_EXPORT Bool Bool
IsKeyboardDevice(DeviceIntPtr dev) IsKeyboardDevice(DeviceIntPtr dev)
{ {
return (dev->key && dev->kbdfeed) && !IsPointerDevice(dev); return (dev->key && dev->kbdfeed) && !IsPointerDevice(dev);
@ -756,7 +756,7 @@ XineramaChangeToCursor(DeviceIntPtr pDev, CursorPtr cursor)
#endif /* PANORAMIX */ #endif /* PANORAMIX */
_X_EXPORT void void
SetMaskForEvent(int deviceid, Mask mask, int event) SetMaskForEvent(int deviceid, Mask mask, int event)
{ {
int coretype; int coretype;
@ -772,7 +772,7 @@ SetMaskForEvent(int deviceid, Mask mask, int event)
filters[deviceid][coretype] = mask; filters[deviceid][coretype] = mask;
} }
_X_EXPORT void void
SetCriticalEvent(int event) SetCriticalEvent(int event)
{ {
if (event >= 128) if (event >= 128)
@ -780,7 +780,7 @@ SetCriticalEvent(int event)
criticalEvents[event >> 3] |= 1 << (event & 7); criticalEvents[event >> 3] |= 1 << (event & 7);
} }
_X_EXPORT void void
ConfineToShape(DeviceIntPtr pDev, RegionPtr shape, int *px, int *py) ConfineToShape(DeviceIntPtr pDev, RegionPtr shape, int *px, int *py)
{ {
BoxRec box; BoxRec box;
@ -944,7 +944,7 @@ ConfineCursorToWindow(DeviceIntPtr pDev, WindowPtr pWin, Bool generateEvents, Bo
} }
} }
_X_EXPORT Bool Bool
PointerConfinedToScreen(DeviceIntPtr pDev) PointerConfinedToScreen(DeviceIntPtr pDev)
{ {
return pDev->spriteInfo->sprite->confined; return pDev->spriteInfo->sprite->confined;
@ -987,7 +987,7 @@ ChangeToCursor(DeviceIntPtr pDev, CursorPtr cursor)
/** /**
* @returns true if b is a descendent of a * @returns true if b is a descendent of a
*/ */
_X_EXPORT Bool Bool
IsParent(WindowPtr a, WindowPtr b) IsParent(WindowPtr a, WindowPtr b)
{ {
for (b = b->parent; b; b = b->parent) for (b = b->parent; b; b = b->parent)
@ -1045,7 +1045,7 @@ PostNewCursor(DeviceIntPtr pDev)
* @param dev device which you want to know its current root window * @param dev device which you want to know its current root window
* @return root window where dev's sprite is located * @return root window where dev's sprite is located
*/ */
_X_EXPORT WindowPtr WindowPtr
GetCurrentRootWindow(DeviceIntPtr dev) GetCurrentRootWindow(DeviceIntPtr dev)
{ {
return RootWindow(dev); return RootWindow(dev);
@ -1054,7 +1054,7 @@ GetCurrentRootWindow(DeviceIntPtr dev)
/** /**
* @return window underneath the cursor sprite. * @return window underneath the cursor sprite.
*/ */
_X_EXPORT WindowPtr WindowPtr
GetSpriteWindow(DeviceIntPtr pDev) GetSpriteWindow(DeviceIntPtr pDev)
{ {
return pDev->spriteInfo->sprite->win; return pDev->spriteInfo->sprite->win;
@ -1063,7 +1063,7 @@ GetSpriteWindow(DeviceIntPtr pDev)
/** /**
* @return current sprite cursor. * @return current sprite cursor.
*/ */
_X_EXPORT CursorPtr CursorPtr
GetSpriteCursor(DeviceIntPtr pDev) GetSpriteCursor(DeviceIntPtr pDev)
{ {
return pDev->spriteInfo->sprite->current; return pDev->spriteInfo->sprite->current;
@ -1072,7 +1072,7 @@ GetSpriteCursor(DeviceIntPtr pDev)
/** /**
* Set x/y current sprite position in screen coordinates. * Set x/y current sprite position in screen coordinates.
*/ */
_X_EXPORT void void
GetSpritePosition(DeviceIntPtr pDev, int *px, int *py) GetSpritePosition(DeviceIntPtr pDev, int *px, int *py)
{ {
SpritePtr pSprite = pDev->spriteInfo->sprite; SpritePtr pSprite = pDev->spriteInfo->sprite;
@ -1081,7 +1081,7 @@ GetSpritePosition(DeviceIntPtr pDev, int *px, int *py)
} }
#ifdef PANORAMIX #ifdef PANORAMIX
_X_EXPORT int int
XineramaGetCursorScreen(DeviceIntPtr pDev) XineramaGetCursorScreen(DeviceIntPtr pDev)
{ {
if(!noPanoramiXExtension) { if(!noPanoramiXExtension) {
@ -1113,7 +1113,7 @@ MonthChangedOrBadTime(xEvent *xE)
currentTime.milliseconds = (xE)->u.keyButtonPointer.time; \ currentTime.milliseconds = (xE)->u.keyButtonPointer.time; \
lastDeviceEventTime = currentTime; } lastDeviceEventTime = currentTime; }
_X_EXPORT void void
NoticeEventTime(xEvent *xE) NoticeEventTime(xEvent *xE)
{ {
if (!syncEvents.playingEvents) if (!syncEvents.playingEvents)
@ -1129,7 +1129,7 @@ NoticeEventTime(xEvent *xE)
* Instead of delivering the events to the client, the event is tacked onto a * Instead of delivering the events to the client, the event is tacked onto a
* linked list for later delivery. * linked list for later delivery.
*/ */
_X_EXPORT void void
EnqueueEvent(xEvent *xE, DeviceIntPtr device, int count) EnqueueEvent(xEvent *xE, DeviceIntPtr device, int count)
{ {
QdEventPtr tail = *syncEvents.pendtail; QdEventPtr tail = *syncEvents.pendtail;
@ -1399,7 +1399,7 @@ playmore:
} }
#ifdef RANDR #ifdef RANDR
_X_EXPORT void void
ScreenRestructured (ScreenPtr pScreen) ScreenRestructured (ScreenPtr pScreen)
{ {
GrabPtr grab; GrabPtr grab;
@ -1525,7 +1525,7 @@ RestoreOldMaster(DeviceIntPtr dev)
* @param autoGrab True if the grab was caused by a button down event and not * @param autoGrab True if the grab was caused by a button down event and not
* explicitely by a client. * explicitely by a client.
*/ */
_X_EXPORT void void
ActivatePointerGrab(DeviceIntPtr mouse, GrabPtr grab, ActivatePointerGrab(DeviceIntPtr mouse, GrabPtr grab,
TimeStamp time, Bool autoGrab) TimeStamp time, Bool autoGrab)
{ {
@ -1571,7 +1571,7 @@ ActivatePointerGrab(DeviceIntPtr mouse, GrabPtr grab,
* *
* Extension devices are set up for ActivateKeyboardGrab(). * Extension devices are set up for ActivateKeyboardGrab().
*/ */
_X_EXPORT void void
DeactivatePointerGrab(DeviceIntPtr mouse) DeactivatePointerGrab(DeviceIntPtr mouse)
{ {
GrabPtr grab = mouse->deviceGrab.grab; GrabPtr grab = mouse->deviceGrab.grab;
@ -1614,7 +1614,7 @@ DeactivatePointerGrab(DeviceIntPtr mouse)
* *
* Extension devices have ActivateKeyboardGrab() set as their grabbing proc. * Extension devices have ActivateKeyboardGrab() set as their grabbing proc.
*/ */
_X_EXPORT void void
ActivateKeyboardGrab(DeviceIntPtr keybd, GrabPtr grab, TimeStamp time, Bool passive) ActivateKeyboardGrab(DeviceIntPtr keybd, GrabPtr grab, TimeStamp time, Bool passive)
{ {
GrabInfoPtr grabinfo = &keybd->deviceGrab; GrabInfoPtr grabinfo = &keybd->deviceGrab;
@ -1651,7 +1651,7 @@ ActivateKeyboardGrab(DeviceIntPtr keybd, GrabPtr grab, TimeStamp time, Bool pass
/** /**
* Delete keyboard grab for the given device. * Delete keyboard grab for the given device.
*/ */
_X_EXPORT void void
DeactivateKeyboardGrab(DeviceIntPtr keybd) DeactivateKeyboardGrab(DeviceIntPtr keybd)
{ {
GrabPtr grab = keybd->deviceGrab.grab; GrabPtr grab = keybd->deviceGrab.grab;
@ -1686,7 +1686,7 @@ DeactivateKeyboardGrab(DeviceIntPtr keybd)
ComputeFreezes(); ComputeFreezes();
} }
_X_EXPORT void void
AllowSome(ClientPtr client, AllowSome(ClientPtr client,
TimeStamp time, TimeStamp time,
DeviceIntPtr thisDev, DeviceIntPtr thisDev,
@ -1816,7 +1816,7 @@ AllowSome(ClientPtr client,
* *
* Release some events from a frozen device. * Release some events from a frozen device.
*/ */
_X_EXPORT int int
ProcAllowEvents(ClientPtr client) ProcAllowEvents(ClientPtr client)
{ {
TimeStamp time; TimeStamp time;
@ -1866,7 +1866,7 @@ ProcAllowEvents(ClientPtr client)
/** /**
* Deactivate grabs from any device that has been grabbed by the client. * Deactivate grabs from any device that has been grabbed by the client.
*/ */
_X_EXPORT void void
ReleaseActiveGrabs(ClientPtr client) ReleaseActiveGrabs(ClientPtr client)
{ {
DeviceIntPtr dev; DeviceIntPtr dev;
@ -1917,7 +1917,7 @@ ReleaseActiveGrabs(ClientPtr client)
* @return 1 if event was delivered, 0 if not or -1 if grab was not set by the * @return 1 if event was delivered, 0 if not or -1 if grab was not set by the
* client. * client.
*/ */
_X_EXPORT int int
TryClientEvents (ClientPtr client, DeviceIntPtr dev, xEvent *pEvents, TryClientEvents (ClientPtr client, DeviceIntPtr dev, xEvent *pEvents,
int count, Mask mask, Mask filter, GrabPtr grab) int count, Mask mask, Mask filter, GrabPtr grab)
{ {
@ -2012,7 +2012,7 @@ TryClientEvents (ClientPtr client, DeviceIntPtr dev, xEvent *pEvents,
* *
* @return Number of events delivered to various clients. * @return Number of events delivered to various clients.
*/ */
_X_EXPORT int int
DeliverEventsToWindow(DeviceIntPtr pDev, WindowPtr pWin, xEvent DeliverEventsToWindow(DeviceIntPtr pDev, WindowPtr pWin, xEvent
*pEvents, int count, Mask filter, GrabPtr grab, int mskidx) *pEvents, int count, Mask filter, GrabPtr grab, int mskidx)
{ {
@ -2224,7 +2224,7 @@ XineramaTryClientEventsResult(
* @param filter Mask based on event type. * @param filter Mask based on event type.
* @param dontClient Don't deliver to the dontClient. * @param dontClient Don't deliver to the dontClient.
*/ */
_X_EXPORT int int
MaybeDeliverEventsToClient(WindowPtr pWin, xEvent *pEvents, MaybeDeliverEventsToClient(WindowPtr pWin, xEvent *pEvents,
int count, Mask filter, ClientPtr dontClient) int count, Mask filter, ClientPtr dontClient)
{ {
@ -2354,7 +2354,7 @@ FixUpEventFromWindow(
* @see DeliverGrabbedEvent * @see DeliverGrabbedEvent
* @see DeliverFocusedEvent * @see DeliverFocusedEvent
*/ */
_X_EXPORT int int
DeliverDeviceEvents(WindowPtr pWin, xEvent *xE, GrabPtr grab, DeliverDeviceEvents(WindowPtr pWin, xEvent *xE, GrabPtr grab,
WindowPtr stopAt, DeviceIntPtr dev, int count) WindowPtr stopAt, DeviceIntPtr dev, int count)
{ {
@ -2469,7 +2469,7 @@ DeliverDeviceEvents(WindowPtr pWin, xEvent *xE, GrabPtr grab,
* @param count number of events in xE. * @param count number of events in xE.
* @param otherParent Used for ReparentNotify events. * @param otherParent Used for ReparentNotify events.
*/ */
_X_EXPORT int int
DeliverEvents(WindowPtr pWin, xEvent *xE, int count, DeliverEvents(WindowPtr pWin, xEvent *xE, int count,
WindowPtr otherParent) WindowPtr otherParent)
{ {
@ -2612,7 +2612,7 @@ XYToWindow(DeviceIntPtr pDev, int x, int y)
* *
* @return TRUE if the sprite has moved or FALSE otherwise. * @return TRUE if the sprite has moved or FALSE otherwise.
*/ */
_X_EXPORT Bool Bool
CheckMotion(xEvent *xE, DeviceIntPtr pDev) CheckMotion(xEvent *xE, DeviceIntPtr pDev)
{ {
INT16 *rootX, *rootY; INT16 *rootX, *rootY;
@ -2709,7 +2709,7 @@ CheckMotion(xEvent *xE, DeviceIntPtr pDev)
* Windows have restructured, we need to update the sprite position and the * Windows have restructured, we need to update the sprite position and the
* sprite's cursor. * sprite's cursor.
*/ */
_X_EXPORT void void
WindowsRestructured(void) WindowsRestructured(void)
{ {
DeviceIntPtr pDev = inputInfo.devices; DeviceIntPtr pDev = inputInfo.devices;
@ -2727,7 +2727,7 @@ WindowsRestructured(void)
* other than 0,0, the information in the private sprite structure must * other than 0,0, the information in the private sprite structure must
* be updated accordingly, or XYToWindow (and other routines) will not * be updated accordingly, or XYToWindow (and other routines) will not
* compute correctly. */ * compute correctly. */
_X_EXPORT void ReinitializeRootWindow(WindowPtr win, int xoff, int yoff) void ReinitializeRootWindow(WindowPtr win, int xoff, int yoff)
{ {
GrabPtr grab; GrabPtr grab;
DeviceIntPtr pDev; DeviceIntPtr pDev;
@ -2781,7 +2781,7 @@ _X_EXPORT void ReinitializeRootWindow(WindowPtr win, int xoff, int yoff)
* *
* Should delete this now? -ds * Should delete this now? -ds
*/ */
_X_EXPORT void void
DefineInitialRootWindow(WindowPtr win) DefineInitialRootWindow(WindowPtr win)
{ {
} }
@ -2801,7 +2801,7 @@ DefineInitialRootWindow(WindowPtr win)
* @param pWin The window where to generate the sprite in. * @param pWin The window where to generate the sprite in.
* *
*/ */
_X_EXPORT void void
InitializeSprite(DeviceIntPtr pDev, WindowPtr pWin) InitializeSprite(DeviceIntPtr pDev, WindowPtr pWin)
{ {
SpritePtr pSprite; SpritePtr pSprite;
@ -2917,7 +2917,7 @@ InitializeSprite(DeviceIntPtr pDev, WindowPtr pWin)
* reset the mouse pointer position. * reset the mouse pointer position.
* @param win must be the new pScreen we are switching to. * @param win must be the new pScreen we are switching to.
*/ */
_X_EXPORT void void
UpdateSpriteForScreen(DeviceIntPtr pDev, ScreenPtr pScreen) UpdateSpriteForScreen(DeviceIntPtr pDev, ScreenPtr pScreen)
{ {
SpritePtr pSprite = NULL; SpritePtr pSprite = NULL;
@ -2969,7 +2969,7 @@ UpdateSpriteForScreen(DeviceIntPtr pDev, ScreenPtr pScreen)
* between the one the pointer is in and the one that the last cursor was * between the one the pointer is in and the one that the last cursor was
* instantiated from. * instantiated from.
*/ */
_X_EXPORT void void
WindowHasNewCursor(WindowPtr pWin) WindowHasNewCursor(WindowPtr pWin)
{ {
DeviceIntPtr pDev; DeviceIntPtr pDev;
@ -2979,7 +2979,7 @@ WindowHasNewCursor(WindowPtr pWin)
PostNewCursor(pDev); PostNewCursor(pDev);
} }
_X_EXPORT void void
NewCurrentScreen(DeviceIntPtr pDev, ScreenPtr newScreen, int x, int y) NewCurrentScreen(DeviceIntPtr pDev, ScreenPtr newScreen, int x, int y)
{ {
SpritePtr pSprite = pDev->spriteInfo->sprite; SpritePtr pSprite = pDev->spriteInfo->sprite;
@ -3138,7 +3138,7 @@ XineramaWarpPointer(ClientPtr client)
* Server-side protocol handling for WarpPointer request. * Server-side protocol handling for WarpPointer request.
* Warps the cursor position to the coordinates given in the request. * Warps the cursor position to the coordinates given in the request.
*/ */
_X_EXPORT int int
ProcWarpPointer(ClientPtr client) ProcWarpPointer(ClientPtr client)
{ {
WindowPtr dest = NULL; WindowPtr dest = NULL;
@ -3437,7 +3437,7 @@ CheckPassiveGrabsOnWindow(
* @return TRUE if a grab has been activated or false otherwise. * @return TRUE if a grab has been activated or false otherwise.
*/ */
_X_EXPORT Bool Bool
CheckDeviceGrabs(DeviceIntPtr device, xEvent *xE, CheckDeviceGrabs(DeviceIntPtr device, xEvent *xE,
int checkFirst, int count) int checkFirst, int count)
{ {
@ -3511,7 +3511,7 @@ CheckDeviceGrabs(DeviceIntPtr device, xEvent *xE,
* @param window Window underneath the sprite. * @param window Window underneath the sprite.
* @param count number of events in xE. * @param count number of events in xE.
*/ */
_X_EXPORT void void
DeliverFocusedEvent(DeviceIntPtr keybd, xEvent *xE, WindowPtr window, int count) DeliverFocusedEvent(DeviceIntPtr keybd, xEvent *xE, WindowPtr window, int count)
{ {
DeviceIntPtr pointer; DeviceIntPtr pointer;
@ -3569,7 +3569,7 @@ DeliverFocusedEvent(DeviceIntPtr keybd, xEvent *xE, WindowPtr window, int count)
* *
* @param deactivateGrab True if the device's grab should be deactivated. * @param deactivateGrab True if the device's grab should be deactivated.
*/ */
_X_EXPORT void void
DeliverGrabbedEvent(xEvent *xE, DeviceIntPtr thisDev, DeliverGrabbedEvent(xEvent *xE, DeviceIntPtr thisDev,
Bool deactivateGrab, int count) Bool deactivateGrab, int count)
{ {
@ -3741,7 +3741,7 @@ DeliverGrabbedEvent(xEvent *xE, DeviceIntPtr thisDev,
* @param keybd The device that caused an event. * @param keybd The device that caused an event.
* @param count Number of elements in xE. * @param count Number of elements in xE.
*/ */
_X_EXPORT void void
#ifdef XKB #ifdef XKB
CoreProcessKeyboardEvent (xEvent *xE, DeviceIntPtr keybd, int count) CoreProcessKeyboardEvent (xEvent *xE, DeviceIntPtr keybd, int count)
#else #else
@ -3822,7 +3822,7 @@ ProcessKeyboardEvent (xEvent *xE, DeviceIntPtr keybd, int count)
this is only used when the pressing of keys does not cause this is only used when the pressing of keys does not cause
the device's processInputProc to be called, as in for example Mouse Keys. the device's processInputProc to be called, as in for example Mouse Keys.
*/ */
_X_EXPORT void void
FixKeyState (xEvent *xE, DeviceIntPtr keybd) FixKeyState (xEvent *xE, DeviceIntPtr keybd)
{ {
int key, bit; int key, bit;
@ -3861,7 +3861,7 @@ FixKeyState (xEvent *xE, DeviceIntPtr keybd)
* @param mouse The device that caused an event. * @param mouse The device that caused an event.
* @param count Number of elements in xE. * @param count Number of elements in xE.
*/ */
_X_EXPORT void void
#ifdef XKB #ifdef XKB
CoreProcessPointerEvent (xEvent *xE, DeviceIntPtr mouse, int count) CoreProcessPointerEvent (xEvent *xE, DeviceIntPtr mouse, int count)
#else #else
@ -3968,7 +3968,7 @@ ProcessPointerEvent (xEvent *xE, DeviceIntPtr mouse, int count)
* *
* Traverses to siblings and parents of the window. * Traverses to siblings and parents of the window.
*/ */
_X_EXPORT void void
RecalculateDeliverableEvents(pWin) RecalculateDeliverableEvents(pWin)
WindowPtr pWin; WindowPtr pWin;
{ {
@ -4009,7 +4009,7 @@ RecalculateDeliverableEvents(pWin)
* *
* \param value must conform to DeleteType * \param value must conform to DeleteType
*/ */
_X_EXPORT int int
OtherClientGone(pointer value, XID id) OtherClientGone(pointer value, XID id)
{ {
OtherClientsPtr other, prev; OtherClientsPtr other, prev;
@ -4038,7 +4038,7 @@ OtherClientGone(pointer value, XID id)
return -1; /* make compiler happy */ return -1; /* make compiler happy */
} }
_X_EXPORT int int
EventSelectForWindow(WindowPtr pWin, ClientPtr client, Mask mask) EventSelectForWindow(WindowPtr pWin, ClientPtr client, Mask mask)
{ {
Mask check; Mask check;
@ -4122,7 +4122,7 @@ maskSet:
return Success; return Success;
} }
_X_EXPORT int int
EventSuppressForWindow(WindowPtr pWin, ClientPtr client, EventSuppressForWindow(WindowPtr pWin, ClientPtr client,
Mask mask, Bool *checkOptional) Mask mask, Bool *checkOptional)
{ {
@ -4477,7 +4477,7 @@ FocusOutEvents(
FocusEvent(dev, FocusOut, mode, detail, ancestor); FocusEvent(dev, FocusOut, mode, detail, ancestor);
} }
_X_EXPORT void void
DoFocusEvents(DeviceIntPtr dev, WindowPtr fromWin, WindowPtr toWin, int mode) DoFocusEvents(DeviceIntPtr dev, WindowPtr fromWin, WindowPtr toWin, int mode)
{ {
int out, in; /* for holding details for to/from int out, in; /* for holding details for to/from
@ -4621,7 +4621,7 @@ DoFocusEvents(DeviceIntPtr dev, WindowPtr fromWin, WindowPtr toWin, int mode)
* @param ctime Specifies the time. * @param ctime Specifies the time.
* @param followOK True if pointer is allowed to follow the keyboard. * @param followOK True if pointer is allowed to follow the keyboard.
*/ */
_X_EXPORT int int
SetInputFocus( SetInputFocus(
ClientPtr client, ClientPtr client,
DeviceIntPtr dev, DeviceIntPtr dev,
@ -4713,7 +4713,7 @@ SetInputFocus(
* *
* Sets the input focus for the virtual core keyboard. * Sets the input focus for the virtual core keyboard.
*/ */
_X_EXPORT int int
ProcSetInputFocus(client) ProcSetInputFocus(client)
ClientPtr client; ClientPtr client;
{ {
@ -4732,7 +4732,7 @@ ProcSetInputFocus(client)
* Sends the current input focus for the client's keyboard back to the * Sends the current input focus for the client's keyboard back to the
* client. * client.
*/ */
_X_EXPORT int int
ProcGetInputFocus(ClientPtr client) ProcGetInputFocus(ClientPtr client)
{ {
DeviceIntPtr kbd = PickKeyboard(client); DeviceIntPtr kbd = PickKeyboard(client);
@ -4765,7 +4765,7 @@ ProcGetInputFocus(ClientPtr client)
* Sets an active grab on the client's ClientPointer and returns success * Sets an active grab on the client's ClientPointer and returns success
* status to client. * status to client.
*/ */
_X_EXPORT int int
ProcGrabPointer(ClientPtr client) ProcGrabPointer(ClientPtr client)
{ {
xGrabPointerReply rep; xGrabPointerReply rep;
@ -4899,7 +4899,7 @@ ProcGrabPointer(ClientPtr client)
* Changes properties of the grab hold by the client. If the client does not * Changes properties of the grab hold by the client. If the client does not
* hold an active grab on the device, nothing happens. * hold an active grab on the device, nothing happens.
*/ */
_X_EXPORT int int
ProcChangeActivePointerGrab(ClientPtr client) ProcChangeActivePointerGrab(ClientPtr client)
{ {
DeviceIntPtr device; DeviceIntPtr device;
@ -4954,7 +4954,7 @@ ProcChangeActivePointerGrab(ClientPtr client)
* *
* Deletes a pointer grab on a device the client has grabbed. * Deletes a pointer grab on a device the client has grabbed.
*/ */
_X_EXPORT int int
ProcUngrabPointer(ClientPtr client) ProcUngrabPointer(ClientPtr client)
{ {
DeviceIntPtr device = PickPointer(client); DeviceIntPtr device = PickPointer(client);
@ -4992,7 +4992,7 @@ ProcUngrabPointer(ClientPtr client)
* *
* @returns Success or BadValue. * @returns Success or BadValue.
*/ */
_X_EXPORT int int
GrabDevice(ClientPtr client, DeviceIntPtr dev, GrabDevice(ClientPtr client, DeviceIntPtr dev,
unsigned this_mode, unsigned other_mode, Window grabWindow, unsigned this_mode, unsigned other_mode, Window grabWindow,
unsigned ownerEvents, Time ctime, Mask mask, CARD8 *status, unsigned ownerEvents, Time ctime, Mask mask, CARD8 *status,
@ -5073,7 +5073,7 @@ GrabDevice(ClientPtr client, DeviceIntPtr dev,
* *
* Grabs the client's keyboard and returns success status to client. * Grabs the client's keyboard and returns success status to client.
*/ */
_X_EXPORT int int
ProcGrabKeyboard(ClientPtr client) ProcGrabKeyboard(ClientPtr client)
{ {
xGrabKeyboardReply rep; xGrabKeyboardReply rep;
@ -5102,7 +5102,7 @@ ProcGrabKeyboard(ClientPtr client)
* *
* Deletes a possible grab on the client's keyboard. * Deletes a possible grab on the client's keyboard.
*/ */
_X_EXPORT int int
ProcUngrabKeyboard(ClientPtr client) ProcUngrabKeyboard(ClientPtr client)
{ {
DeviceIntPtr device = PickKeyboard(client); DeviceIntPtr device = PickKeyboard(client);
@ -5129,7 +5129,7 @@ ProcUngrabKeyboard(ClientPtr client)
* Returns the current state and position of the client's ClientPointer to the * Returns the current state and position of the client's ClientPointer to the
* client. * client.
*/ */
_X_EXPORT int int
ProcQueryPointer(ClientPtr client) ProcQueryPointer(ClientPtr client)
{ {
xQueryPointerReply rep; xQueryPointerReply rep;
@ -5197,7 +5197,7 @@ ProcQueryPointer(ClientPtr client)
* Initializes the device list and the DIX sprite to sane values. Allocates * Initializes the device list and the DIX sprite to sane values. Allocates
* trace memory used for quick window traversal. * trace memory used for quick window traversal.
*/ */
_X_EXPORT void void
InitEvents(void) InitEvents(void)
{ {
int i; int i;
@ -5241,7 +5241,7 @@ InitEvents(void)
FatalError("[dix] Failed to allocate input event list.\n"); FatalError("[dix] Failed to allocate input event list.\n");
} }
_X_EXPORT void void
CloseDownEvents(void) CloseDownEvents(void)
{ {
int len; int len;
@ -5257,7 +5257,7 @@ CloseDownEvents(void)
* *
* Locates the window to send the event to and forwards the event. * Locates the window to send the event to and forwards the event.
*/ */
_X_EXPORT int int
ProcSendEvent(ClientPtr client) ProcSendEvent(ClientPtr client)
{ {
WindowPtr pWin; WindowPtr pWin;
@ -5354,7 +5354,7 @@ ProcSendEvent(ClientPtr client)
* Deletes a passive grab for the given key. Works on the * Deletes a passive grab for the given key. Works on the
* client's keyboard. * client's keyboard.
*/ */
_X_EXPORT int int
ProcUngrabKey(ClientPtr client) ProcUngrabKey(ClientPtr client)
{ {
REQUEST(xUngrabKeyReq); REQUEST(xUngrabKeyReq);
@ -5403,7 +5403,7 @@ ProcUngrabKey(ClientPtr client)
* Creates a grab for the client's keyboard and adds it to the list of passive * Creates a grab for the client's keyboard and adds it to the list of passive
* grabs. * grabs.
*/ */
_X_EXPORT int int
ProcGrabKey(ClientPtr client) ProcGrabKey(ClientPtr client)
{ {
WindowPtr pWin; WindowPtr pWin;
@ -5464,7 +5464,7 @@ ProcGrabKey(ClientPtr client)
* Creates a grab for the client's ClientPointer and adds it as a passive grab * Creates a grab for the client's ClientPointer and adds it as a passive grab
* to the list. * to the list.
*/ */
_X_EXPORT int int
ProcGrabButton(ClientPtr client) ProcGrabButton(ClientPtr client)
{ {
WindowPtr pWin, confineTo; WindowPtr pWin, confineTo;
@ -5599,7 +5599,7 @@ ProcUngrabButton(ClientPtr client)
* @param freeResources True if resources associated with the window should be * @param freeResources True if resources associated with the window should be
* deleted. * deleted.
*/ */
_X_EXPORT void void
DeleteWindowFromAnyEvents(WindowPtr pWin, Bool freeResources) DeleteWindowFromAnyEvents(WindowPtr pWin, Bool freeResources)
{ {
WindowPtr parent; WindowPtr parent;
@ -5713,7 +5713,7 @@ DeleteWindowFromAnyEvents(WindowPtr pWin, Bool freeResources)
* there is a grab on the window, the cursor will be re-confined into the * there is a grab on the window, the cursor will be re-confined into the
* window. * window.
*/ */
_X_EXPORT void void
CheckCursorConfinement(WindowPtr pWin) CheckCursorConfinement(WindowPtr pWin)
{ {
GrabPtr grab; GrabPtr grab;
@ -5740,7 +5740,7 @@ CheckCursorConfinement(WindowPtr pWin)
} }
} }
_X_EXPORT Mask Mask
EventMaskForClient(WindowPtr pWin, ClientPtr client) EventMaskForClient(WindowPtr pWin, ClientPtr client)
{ {
OtherClientsPtr other; OtherClientsPtr other;
@ -5758,7 +5758,7 @@ EventMaskForClient(WindowPtr pWin, ClientPtr client)
/** /**
* Server-side protocol handling for RecolorCursor request. * Server-side protocol handling for RecolorCursor request.
*/ */
_X_EXPORT int int
ProcRecolorCursor(ClientPtr client) ProcRecolorCursor(ClientPtr client)
{ {
CursorPtr pCursor; CursorPtr pCursor;
@ -5814,7 +5814,7 @@ ProcRecolorCursor(ClientPtr client)
* @param count Number of events. * @param count Number of events.
* @param events The event list. * @param events The event list.
*/ */
_X_EXPORT void void
WriteEventsToClient(ClientPtr pClient, int count, xEvent *events) WriteEventsToClient(ClientPtr pClient, int count, xEvent *events)
{ {
#ifdef PANORAMIX #ifdef PANORAMIX
@ -5940,7 +5940,7 @@ WriteEventsToClient(ClientPtr pClient, int count, xEvent *events)
* PickPointer()). * PickPointer()).
* If a keyboard is needed, the first keyboard paired with the CP is used. * If a keyboard is needed, the first keyboard paired with the CP is used.
*/ */
_X_EXPORT Bool Bool
SetClientPointer(ClientPtr client, ClientPtr setter, DeviceIntPtr device) SetClientPointer(ClientPtr client, ClientPtr setter, DeviceIntPtr device)
{ {
if (!device->isMaster) if (!device->isMaster)
@ -5964,7 +5964,7 @@ SetClientPointer(ClientPtr client, ClientPtr setter, DeviceIntPtr device)
* 2) A device set as ClientPointer for the given client. * 2) A device set as ClientPointer for the given client.
* 3) The first master device. * 3) The first master device.
*/ */
_X_EXPORT DeviceIntPtr DeviceIntPtr
PickPointer(ClientPtr client) PickPointer(ClientPtr client)
{ {
DeviceIntPtr it = inputInfo.devices; DeviceIntPtr it = inputInfo.devices;
@ -6002,7 +6002,7 @@ PickPointer(ClientPtr client)
* searching the list of devices for the keyboard device that is paired with * searching the list of devices for the keyboard device that is paired with
* the client's pointer. * the client's pointer.
*/ */
_X_EXPORT DeviceIntPtr DeviceIntPtr
PickKeyboard(ClientPtr client) PickKeyboard(ClientPtr client)
{ {
DeviceIntPtr ptr = PickPointer(client); DeviceIntPtr ptr = PickPointer(client);
@ -6025,7 +6025,7 @@ PickKeyboard(ClientPtr client)
* Return true if a core event from the device would interfere and should not * Return true if a core event from the device would interfere and should not
* be delivered. * be delivered.
*/ */
_X_EXPORT Bool Bool
IsInterferingGrab(ClientPtr client, DeviceIntPtr dev, xEvent* event) IsInterferingGrab(ClientPtr client, DeviceIntPtr dev, xEvent* event)
{ {
DeviceIntPtr it = inputInfo.devices; DeviceIntPtr it = inputInfo.devices;
@ -6072,7 +6072,7 @@ IsInterferingGrab(ClientPtr client, DeviceIntPtr dev, xEvent* event)
* e.g. if generic event type 2 should be let through for windows with * e.g. if generic event type 2 should be let through for windows with
* MyExampleMask set, make sure that filters[2] == MyExampleMask. * MyExampleMask set, make sure that filters[2] == MyExampleMask.
*/ */
_X_EXPORT void void
SetGenericFilter(int extension, Mask* filters) SetGenericFilter(int extension, Mask* filters)
{ {
generic_filters[extension & 0x7f] = filters; generic_filters[extension & 0x7f] = filters;
@ -6083,7 +6083,7 @@ SetGenericFilter(int extension, Mask* filters)
* Grab a device for XI events and XGE events. * Grab a device for XI events and XGE events.
* grabmode is used to ungrab a device. * grabmode is used to ungrab a device.
*/ */
_X_EXPORT int int
ExtGrabDevice(ClientPtr client, ExtGrabDevice(ClientPtr client,
DeviceIntPtr dev, DeviceIntPtr dev,
int device_mode, int device_mode,
@ -6151,7 +6151,7 @@ ExtGrabDevice(ClientPtr client,
/* /*
* @return Zero if no devices has focus on the window, non-zero otherwise. * @return Zero if no devices has focus on the window, non-zero otherwise.
*/ */
_X_EXPORT int int
FocusSemaphoresIsset(WindowPtr win) FocusSemaphoresIsset(WindowPtr win)
{ {
int set = 0; int set = 0;

14
dix/extension.c
View File

@ -72,7 +72,7 @@ int lastEvent = EXTENSION_EVENT_BASE;
static int lastError = FirstExtensionError; static int lastError = FirstExtensionError;
static unsigned int NumExtensions = 0; static unsigned int NumExtensions = 0;
_X_EXPORT ExtensionEntry * ExtensionEntry *
AddExtension(char *name, int NumEvents, int NumErrors, AddExtension(char *name, int NumEvents, int NumErrors,
int (*MainProc)(ClientPtr c1), int (*MainProc)(ClientPtr c1),
int (*SwappedMainProc)(ClientPtr c2), int (*SwappedMainProc)(ClientPtr c2),
@ -146,7 +146,7 @@ AddExtension(char *name, int NumEvents, int NumErrors,
return(ext); return(ext);
} }
_X_EXPORT Bool AddExtensionAlias(char *alias, ExtensionEntry *ext) Bool AddExtensionAlias(char *alias, ExtensionEntry *ext)
{ {
char *name; char *name;
char **aliases; char **aliases;
@ -192,7 +192,7 @@ FindExtension(char *extname, int len)
* CheckExtension returns the extensions[] entry for the requested * CheckExtension returns the extensions[] entry for the requested
* extension name. Maybe this could just return a Bool instead? * extension name. Maybe this could just return a Bool instead?
*/ */
_X_EXPORT ExtensionEntry * ExtensionEntry *
CheckExtension(const char *extname) CheckExtension(const char *extname)
{ {
int n; int n;
@ -207,7 +207,7 @@ CheckExtension(const char *extname)
/* /*
* Added as part of Xace. * Added as part of Xace.
*/ */
_X_EXPORT ExtensionEntry * ExtensionEntry *
GetExtensionEntry(int major) GetExtensionEntry(int major)
{ {
if (major < EXTENSION_BASE) if (major < EXTENSION_BASE)
@ -218,13 +218,13 @@ GetExtensionEntry(int major)
return extensions[major]; return extensions[major];
} }
_X_EXPORT unsigned short unsigned short
StandardMinorOpcode(ClientPtr client) StandardMinorOpcode(ClientPtr client)
{ {
return ((xReq *)client->requestBuffer)->data; return ((xReq *)client->requestBuffer)->data;
} }
_X_EXPORT unsigned short unsigned short
MinorOpcodeOfRequest(ClientPtr client) MinorOpcodeOfRequest(ClientPtr client)
{ {
unsigned char major; unsigned char major;
@ -238,7 +238,7 @@ MinorOpcodeOfRequest(ClientPtr client)
return (*extensions[major]->MinorOpcode)(client); return (*extensions[major]->MinorOpcode)(client);
} }
_X_EXPORT void void
CloseDownExtensions(void) CloseDownExtensions(void)
{ {
int i,j; int i,j;

2
dix/ffs.c
View File

@ -34,7 +34,7 @@ The Open Group.
#include "dix.h" #include "dix.h"
_X_EXPORT int int
ffs(int i) ffs(int i)
{ {
int j; int j;

34
dix/gc.c
View File

@ -73,7 +73,7 @@ static Bool CreateDefaultTile(GCPtr pGC);
static unsigned char DefaultDash[2] = {4, 4}; static unsigned char DefaultDash[2] = {4, 4};
_X_EXPORT void void
ValidateGC(DrawablePtr pDraw, GC *pGC) ValidateGC(DrawablePtr pDraw, GC *pGC)
{ {
(*pGC->funcs->ValidateGC) (pGC, pGC->stateChanges, pDraw); (*pGC->funcs->ValidateGC) (pGC, pGC->stateChanges, pDraw);
@ -145,7 +145,7 @@ ValidateGC(DrawablePtr pDraw, GC *pGC)
#define NEXT_PTR(_type, _var) { \ #define NEXT_PTR(_type, _var) { \
assert(pUnion); _var = (_type)pUnion->ptr; pUnion++; } assert(pUnion); _var = (_type)pUnion->ptr; pUnion++; }
_X_EXPORT int int
dixChangeGC(ClientPtr client, GC *pGC, BITS32 mask, CARD32 *pC32, ChangeGCValPtr pUnion) dixChangeGC(ClientPtr client, GC *pGC, BITS32 mask, CARD32 *pC32, ChangeGCValPtr pUnion)
{ {
BITS32 index2; BITS32 index2;
@ -527,7 +527,7 @@ dixChangeGC(ClientPtr client, GC *pGC, BITS32 mask, CARD32 *pC32, ChangeGCValPtr
/* Publically defined entry to ChangeGC. Just calls dixChangeGC and tells /* Publically defined entry to ChangeGC. Just calls dixChangeGC and tells
* it that all of the entries are constants or IDs */ * it that all of the entries are constants or IDs */
_X_EXPORT int int
ChangeGC(GC *pGC, BITS32 mask, XID *pval) ChangeGC(GC *pGC, BITS32 mask, XID *pval)
{ {
return (dixChangeGC(NullClient, pGC, mask, pval, NULL)); return (dixChangeGC(NullClient, pGC, mask, pval, NULL));
@ -553,7 +553,7 @@ NOTE:
all values sent over the protocol for ChangeGC requests are all values sent over the protocol for ChangeGC requests are
32 bits long 32 bits long
*/ */
_X_EXPORT int int
DoChangeGC(GC *pGC, BITS32 mask, XID *pval, int fPointer) DoChangeGC(GC *pGC, BITS32 mask, XID *pval, int fPointer)
{ {
if (fPointer) if (fPointer)
@ -573,7 +573,7 @@ BUG:
should check for failure to create default tile should check for failure to create default tile
*/ */
_X_EXPORT GCPtr GCPtr
CreateGC(DrawablePtr pDrawable, BITS32 mask, XID *pval, int *pStatus, CreateGC(DrawablePtr pDrawable, BITS32 mask, XID *pval, int *pStatus,
XID gcid, ClientPtr client) XID gcid, ClientPtr client)
{ {
@ -706,7 +706,7 @@ CreateDefaultTile (GCPtr pGC)
return TRUE; return TRUE;
} }
_X_EXPORT int int
CopyGC(GC *pgcSrc, GC *pgcDst, BITS32 mask) CopyGC(GC *pgcSrc, GC *pgcDst, BITS32 mask)
{ {
BITS32 index2; BITS32 index2;
@ -870,7 +870,7 @@ CopyGC(GC *pgcSrc, GC *pgcDst, BITS32 mask)
* *
* \param value must conform to DeleteType * \param value must conform to DeleteType
*/ */
_X_EXPORT int int
FreeGC(pointer value, XID gid) FreeGC(pointer value, XID gid)
{ {
GCPtr pGC = (GCPtr)value; GCPtr pGC = (GCPtr)value;
@ -904,7 +904,7 @@ is what fills the default tile. (maybe this comment should
go with CreateGC() or ChangeGC().) go with CreateGC() or ChangeGC().)
*/ */
_X_EXPORT GCPtr GCPtr
CreateScratchGC(ScreenPtr pScreen, unsigned depth) CreateScratchGC(ScreenPtr pScreen, unsigned depth)
{ {
GCPtr pGC; GCPtr pGC;
@ -956,7 +956,7 @@ CreateScratchGC(ScreenPtr pScreen, unsigned depth)
return pGC; return pGC;
} }
_X_EXPORT void void
FreeGCperDepth(int screenNum) FreeGCperDepth(int screenNum)
{ {
int i; int i;
@ -972,7 +972,7 @@ FreeGCperDepth(int screenNum)
} }
_X_EXPORT Bool Bool
CreateGCperDepth(int screenNum) CreateGCperDepth(int screenNum)
{ {
int i; int i;
@ -1005,7 +1005,7 @@ CreateGCperDepth(int screenNum)
return TRUE; return TRUE;
} }
_X_EXPORT Bool Bool
CreateDefaultStipple(int screenNum) CreateDefaultStipple(int screenNum)
{ {
ScreenPtr pScreen; ScreenPtr pScreen;
@ -1042,14 +1042,14 @@ CreateDefaultStipple(int screenNum)
return TRUE; return TRUE;
} }
_X_EXPORT void void
FreeDefaultStipple(int screenNum) FreeDefaultStipple(int screenNum)
{ {
ScreenPtr pScreen = screenInfo.screens[screenNum]; ScreenPtr pScreen = screenInfo.screens[screenNum];
(*pScreen->DestroyPixmap)(pScreen->PixmapPerDepth[0]); (*pScreen->DestroyPixmap)(pScreen->PixmapPerDepth[0]);
} }
_X_EXPORT int int
SetDashes(GCPtr pGC, unsigned offset, unsigned ndash, unsigned char *pdash) SetDashes(GCPtr pGC, unsigned offset, unsigned ndash, unsigned char *pdash)
{ {
long i; long i;
@ -1105,7 +1105,7 @@ SetDashes(GCPtr pGC, unsigned offset, unsigned ndash, unsigned char *pdash)
return Success; return Success;
} }
_X_EXPORT int int
VerifyRectOrder(int nrects, xRectangle *prects, int ordering) VerifyRectOrder(int nrects, xRectangle *prects, int ordering)
{ {
xRectangle *prectP, *prectN; xRectangle *prectP, *prectN;
@ -1155,7 +1155,7 @@ VerifyRectOrder(int nrects, xRectangle *prects, int ordering)
return -1; return -1;
} }
_X_EXPORT int int
SetClipRects(GCPtr pGC, int xOrigin, int yOrigin, int nrects, SetClipRects(GCPtr pGC, int xOrigin, int yOrigin, int nrects,
xRectangle *prects, int ordering) xRectangle *prects, int ordering)
{ {
@ -1192,7 +1192,7 @@ SetClipRects(GCPtr pGC, int xOrigin, int yOrigin, int nrects,
if we can't, create one out of whole cloth (The Velveteen GC -- if if we can't, create one out of whole cloth (The Velveteen GC -- if
you use it often enough it will become real.) you use it often enough it will become real.)
*/ */
_X_EXPORT GCPtr GCPtr
GetScratchGC(unsigned depth, ScreenPtr pScreen) GetScratchGC(unsigned depth, ScreenPtr pScreen)
{ {
int i; int i;
@ -1241,7 +1241,7 @@ GetScratchGC(unsigned depth, ScreenPtr pScreen)
mark it as available. mark it as available.
if not, free it for real if not, free it for real
*/ */
_X_EXPORT void void
FreeScratchGC(GCPtr pGC) FreeScratchGC(GCPtr pGC)
{ {
ScreenPtr pScreen = pGC->pScreen; ScreenPtr pScreen = pGC->pScreen;

32
dix/getevents.c
View File

@ -73,10 +73,10 @@
* DDX. The DDX is expected to call GetEventList() and then pass the list into * DDX. The DDX is expected to call GetEventList() and then pass the list into
* Get{Pointer|Keyboard}Events. * Get{Pointer|Keyboard}Events.
*/ */
_X_EXPORT EventListPtr InputEventList = NULL; EventListPtr InputEventList = NULL;
_X_EXPORT int InputEventListLen = 0; int InputEventListLen = 0;
_X_EXPORT int int
GetEventList(EventListPtr* list) GetEventList(EventListPtr* list)
{ {
*list = InputEventList; *list = InputEventList;
@ -86,7 +86,7 @@ GetEventList(EventListPtr* list)
/** /**
* Pick some arbitrary size for Xi motion history. * Pick some arbitrary size for Xi motion history.
*/ */
_X_EXPORT int int
GetMotionHistorySize(void) GetMotionHistorySize(void)
{ {
return MOTION_HISTORY_SIZE; return MOTION_HISTORY_SIZE;
@ -117,7 +117,7 @@ key_autorepeats(DeviceIntPtr pDev, int key_code)
(1 << (key_code & 7))); (1 << (key_code & 7)));
} }
_X_EXPORT void void
CreateClassesChangedEvent(EventList* event, CreateClassesChangedEvent(EventList* event,
DeviceIntPtr master, DeviceIntPtr master,
DeviceIntPtr slave) DeviceIntPtr slave)
@ -232,7 +232,7 @@ updateSlaveDeviceCoords(DeviceIntPtr master, DeviceIntPtr pDev)
/** /**
* Allocate the motion history buffer. * Allocate the motion history buffer.
*/ */
_X_EXPORT void void
AllocateMotionHistory(DeviceIntPtr pDev) AllocateMotionHistory(DeviceIntPtr pDev)
{ {
int size; int size;
@ -268,7 +268,7 @@ AllocateMotionHistory(DeviceIntPtr pDev)
* *
* If core is set, we only generate x/y, in INT16, scaled to screen coords. * If core is set, we only generate x/y, in INT16, scaled to screen coords.
*/ */
_X_EXPORT int int
GetMotionHistory(DeviceIntPtr pDev, xTimecoord **buff, unsigned long start, GetMotionHistory(DeviceIntPtr pDev, xTimecoord **buff, unsigned long start,
unsigned long stop, ScreenPtr pScreen, BOOL core) unsigned long stop, ScreenPtr pScreen, BOOL core)
{ {
@ -475,7 +475,7 @@ updateMotionHistory(DeviceIntPtr pDev, CARD32 ms, int first_valuator,
* *
* This MUST be absolutely constant, from init until exit. * This MUST be absolutely constant, from init until exit.
*/ */
_X_EXPORT int int
GetMaximumEventsNum(void) { GetMaximumEventsNum(void) {
/* One base event -- device, plus valuator events. /* One base event -- device, plus valuator events.
* Multiply by two if we're doing non-XKB key repeats. */ * Multiply by two if we're doing non-XKB key repeats. */
@ -783,7 +783,7 @@ countValuatorEvents(int num_valuators)
* Convenience wrapper around GetKeyboardValuatorEvents, that takes no * Convenience wrapper around GetKeyboardValuatorEvents, that takes no
* valuators. * valuators.
*/ */
_X_EXPORT int int
GetKeyboardEvents(EventList *events, DeviceIntPtr pDev, int type, int key_code) { GetKeyboardEvents(EventList *events, DeviceIntPtr pDev, int type, int key_code) {
return GetKeyboardValuatorEvents(events, pDev, type, key_code, 0, 0, NULL); return GetKeyboardValuatorEvents(events, pDev, type, key_code, 0, 0, NULL);
} }
@ -809,7 +809,7 @@ GetKeyboardEvents(EventList *events, DeviceIntPtr pDev, int type, int key_code)
* key press will trigger a matching KeyRelease, as well as the * key press will trigger a matching KeyRelease, as well as the
* KeyPresses. * KeyPresses.
*/ */
_X_EXPORT int int
GetKeyboardValuatorEvents(EventList *events, DeviceIntPtr pDev, int type, GetKeyboardValuatorEvents(EventList *events, DeviceIntPtr pDev, int type,
int key_code, int first_valuator, int key_code, int first_valuator,
int num_valuators, int *valuators) { int num_valuators, int *valuators) {
@ -906,7 +906,7 @@ GetKeyboardValuatorEvents(EventList *events, DeviceIntPtr pDev, int type,
* *
* @param num_events Number of elements in list. * @param num_events Number of elements in list.
*/ */
_X_EXPORT EventListPtr EventListPtr
InitEventList(int num_events) InitEventList(int num_events)
{ {
EventListPtr events; EventListPtr events;
@ -937,7 +937,7 @@ InitEventList(int num_events)
/** /**
* Allocs min_size memory for each event in the list. * Allocs min_size memory for each event in the list.
*/ */
_X_EXPORT void void
SetMinimumEventSize(EventListPtr list, int num_events, int min_size) SetMinimumEventSize(EventListPtr list, int num_events, int min_size)
{ {
if (!list) if (!list)
@ -964,7 +964,7 @@ SetMinimumEventSize(EventListPtr list, int num_events, int min_size)
* @param list The list to be freed. * @param list The list to be freed.
* @param num_events Number of elements in list. * @param num_events Number of elements in list.
*/ */
_X_EXPORT void void
FreeEventList(EventListPtr list, int num_events) FreeEventList(EventListPtr list, int num_events)
{ {
if (!list) if (!list)
@ -993,7 +993,7 @@ FreeEventList(EventListPtr list, int num_events)
* *
* master->last.valuators[x] for x > 2 is undefined. * master->last.valuators[x] for x > 2 is undefined.
*/ */
_X_EXPORT int int
GetPointerEvents(EventList *events, DeviceIntPtr pDev, int type, int buttons, GetPointerEvents(EventList *events, DeviceIntPtr pDev, int type, int buttons,
int flags, int first_valuator, int num_valuators, int flags, int first_valuator, int num_valuators,
int *valuators) { int *valuators) {
@ -1076,7 +1076,7 @@ GetPointerEvents(EventList *events, DeviceIntPtr pDev, int type, int buttons,
* The DDX is responsible for allocating the event structure in the first * The DDX is responsible for allocating the event structure in the first
* place via GetMaximumEventsNum(), and for freeing it. * place via GetMaximumEventsNum(), and for freeing it.
*/ */
_X_EXPORT int int
GetProximityEvents(EventList *events, DeviceIntPtr pDev, int type, GetProximityEvents(EventList *events, DeviceIntPtr pDev, int type,
int first_valuator, int num_valuators, int *valuators) int first_valuator, int num_valuators, int *valuators)
{ {
@ -1128,7 +1128,7 @@ GetProximityEvents(EventList *events, DeviceIntPtr pDev, int type,
* Used in cursor functions, e.g. when cursor confinement changes, and we need * Used in cursor functions, e.g. when cursor confinement changes, and we need
* to shift the pointer to get it inside the new bounds. * to shift the pointer to get it inside the new bounds.
*/ */
_X_EXPORT void void
PostSyntheticMotion(DeviceIntPtr pDev, PostSyntheticMotion(DeviceIntPtr pDev,
int x, int x,
int y, int y,

94
dix/globals.c
View File

@ -61,8 +61,8 @@ SOFTWARE.
#include "dixstruct.h" #include "dixstruct.h"
#include "os.h" #include "os.h"
_X_EXPORT ScreenInfo screenInfo; ScreenInfo screenInfo;
_X_EXPORT KeybdCtrl defaultKeyboardControl = { KeybdCtrl defaultKeyboardControl = {
DEFAULT_KEYBOARD_CLICK, DEFAULT_KEYBOARD_CLICK,
DEFAULT_BELL, DEFAULT_BELL,
DEFAULT_BELL_PITCH, DEFAULT_BELL_PITCH,
@ -72,27 +72,27 @@ _X_EXPORT KeybdCtrl defaultKeyboardControl = {
DEFAULT_LEDS, DEFAULT_LEDS,
0}; 0};
_X_EXPORT PtrCtrl defaultPointerControl = { PtrCtrl defaultPointerControl = {
DEFAULT_PTR_NUMERATOR, DEFAULT_PTR_NUMERATOR,
DEFAULT_PTR_DENOMINATOR, DEFAULT_PTR_DENOMINATOR,
DEFAULT_PTR_THRESHOLD, DEFAULT_PTR_THRESHOLD,
0}; 0};
_X_EXPORT ClientPtr clients[MAXCLIENTS]; ClientPtr clients[MAXCLIENTS];
_X_EXPORT ClientPtr serverClient; ClientPtr serverClient;
_X_EXPORT int currentMaxClients; /* current size of clients array */ int currentMaxClients; /* current size of clients array */
_X_EXPORT long maxBigRequestSize = MAX_BIG_REQUEST_SIZE; long maxBigRequestSize = MAX_BIG_REQUEST_SIZE;
_X_EXPORT WindowPtr WindowTable[MAXSCREENS]; WindowPtr WindowTable[MAXSCREENS];
_X_EXPORT unsigned long globalSerialNumber = 0; unsigned long globalSerialNumber = 0;
_X_EXPORT unsigned long serverGeneration = 0; unsigned long serverGeneration = 0;
/* these next four are initialized in main.c */ /* these next four are initialized in main.c */
_X_EXPORT CARD32 ScreenSaverTime; CARD32 ScreenSaverTime;
_X_EXPORT CARD32 ScreenSaverInterval; CARD32 ScreenSaverInterval;
_X_EXPORT int ScreenSaverBlanking; int ScreenSaverBlanking;
_X_EXPORT int ScreenSaverAllowExposures; int ScreenSaverAllowExposures;
#ifdef DPMSExtension #ifdef DPMSExtension
# ifndef DEFAULT_STANDBY_TIME # ifndef DEFAULT_STANDBY_TIME
@ -107,52 +107,52 @@ _X_EXPORT int ScreenSaverAllowExposures;
# ifndef DEFAULT_DPMS_ENABLED # ifndef DEFAULT_DPMS_ENABLED
# define DEFAULT_DPMS_ENABLED TRUE # define DEFAULT_DPMS_ENABLED TRUE
# endif # endif
_X_EXPORT CARD32 defaultDPMSStandbyTime = DEFAULT_STANDBY_TIME; CARD32 defaultDPMSStandbyTime = DEFAULT_STANDBY_TIME;
_X_EXPORT CARD32 defaultDPMSSuspendTime = DEFAULT_SUSPEND_TIME; CARD32 defaultDPMSSuspendTime = DEFAULT_SUSPEND_TIME;
_X_EXPORT CARD32 defaultDPMSOffTime = DEFAULT_OFF_TIME; CARD32 defaultDPMSOffTime = DEFAULT_OFF_TIME;
_X_EXPORT CARD16 DPMSPowerLevel = 0; CARD16 DPMSPowerLevel = 0;
_X_EXPORT Bool defaultDPMSEnabled = DEFAULT_DPMS_ENABLED; Bool defaultDPMSEnabled = DEFAULT_DPMS_ENABLED;
_X_EXPORT Bool DPMSEnabledSwitch = FALSE; /* these denote the DPMS command */ Bool DPMSEnabledSwitch = FALSE; /* these denote the DPMS command */
_X_EXPORT Bool DPMSDisabledSwitch = FALSE; /* lind switch states */ Bool DPMSDisabledSwitch = FALSE; /* lind switch states */
_X_EXPORT Bool DPMSCapableFlag = FALSE; Bool DPMSCapableFlag = FALSE;
_X_EXPORT CARD32 DPMSStandbyTime; CARD32 DPMSStandbyTime;
_X_EXPORT CARD32 DPMSSuspendTime; CARD32 DPMSSuspendTime;
_X_EXPORT CARD32 DPMSOffTime; CARD32 DPMSOffTime;
_X_EXPORT Bool DPMSEnabled; Bool DPMSEnabled;
#endif #endif
_X_EXPORT CARD32 defaultScreenSaverTime = DEFAULT_SCREEN_SAVER_TIME; CARD32 defaultScreenSaverTime = DEFAULT_SCREEN_SAVER_TIME;
_X_EXPORT CARD32 defaultScreenSaverInterval = DEFAULT_SCREEN_SAVER_INTERVAL; CARD32 defaultScreenSaverInterval = DEFAULT_SCREEN_SAVER_INTERVAL;
_X_EXPORT int defaultScreenSaverBlanking = DEFAULT_SCREEN_SAVER_BLANKING; int defaultScreenSaverBlanking = DEFAULT_SCREEN_SAVER_BLANKING;
_X_EXPORT int defaultScreenSaverAllowExposures = DEFAULT_SCREEN_SAVER_EXPOSURES; int defaultScreenSaverAllowExposures = DEFAULT_SCREEN_SAVER_EXPOSURES;
#ifndef NOLOGOHACK #ifndef NOLOGOHACK
_X_EXPORT int logoScreenSaver = DEFAULT_LOGO_SCREEN_SAVER; int logoScreenSaver = DEFAULT_LOGO_SCREEN_SAVER;
#endif #endif
#ifdef SCREENSAVER #ifdef SCREENSAVER
_X_EXPORT Bool screenSaverSuspended = FALSE; Bool screenSaverSuspended = FALSE;
#endif #endif
_X_EXPORT char *defaultFontPath = COMPILEDDEFAULTFONTPATH; char *defaultFontPath = COMPILEDDEFAULTFONTPATH;
_X_EXPORT char *defaultTextFont = COMPILEDDEFAULTFONT; char *defaultTextFont = COMPILEDDEFAULTFONT;
_X_EXPORT char *defaultCursorFont = COMPILEDCURSORFONT; char *defaultCursorFont = COMPILEDCURSORFONT;
FontPtr defaultFont; /* not declared in dix.h to avoid including font.h in FontPtr defaultFont; /* not declared in dix.h to avoid including font.h in
every compilation of dix code */ every compilation of dix code */
_X_EXPORT CursorPtr rootCursor; CursorPtr rootCursor;
_X_EXPORT Bool party_like_its_1989 = FALSE; Bool party_like_its_1989 = FALSE;
_X_EXPORT Bool whiteRoot = FALSE; Bool whiteRoot = FALSE;
_X_EXPORT int cursorScreenDevPriv[MAXSCREENS]; int cursorScreenDevPriv[MAXSCREENS];
_X_EXPORT TimeStamp currentTime; TimeStamp currentTime;
_X_EXPORT TimeStamp lastDeviceEventTime; TimeStamp lastDeviceEventTime;
_X_EXPORT int defaultColorVisualClass = -1; int defaultColorVisualClass = -1;
_X_EXPORT int monitorResolution = 0; int monitorResolution = 0;
_X_EXPORT char *display; char *display;
_X_EXPORT char *ConnectionInfo; char *ConnectionInfo;
_X_EXPORT CARD32 TimeOutValue = DEFAULT_TIMEOUT * MILLI_PER_SECOND; CARD32 TimeOutValue = DEFAULT_TIMEOUT * MILLI_PER_SECOND;
_X_EXPORT DDXPointRec dixScreenOrigins[MAXSCREENS]; DDXPointRec dixScreenOrigins[MAXSCREENS];

4
dix/glyphcurs.c
View File

@ -73,7 +73,7 @@ the first one we find.
cursor metrics. cursor metrics.
*/ */
_X_EXPORT int int
ServerBitsFromGlyph(FontPtr pfont, unsigned ch, CursorMetricPtr cm, unsigned char **ppbits) ServerBitsFromGlyph(FontPtr pfont, unsigned ch, CursorMetricPtr cm, unsigned char **ppbits)
{ {
ScreenPtr pScreen; ScreenPtr pScreen;
@ -138,7 +138,7 @@ ServerBitsFromGlyph(FontPtr pfont, unsigned ch, CursorMetricPtr cm, unsigned cha
} }
_X_EXPORT Bool Bool
CursorMetricsFromGlyph(FontPtr pfont, unsigned ch, CursorMetricPtr cm) CursorMetricsFromGlyph(FontPtr pfont, unsigned ch, CursorMetricPtr cm)
{ {
CharInfoPtr pci; CharInfoPtr pci;

10
dix/grabs.c
View File

@ -67,7 +67,7 @@ SOFTWARE.
#define BITCLEAR(buf, i) MASKWORD(buf, i) &= ~BITMASK(i) #define BITCLEAR(buf, i) MASKWORD(buf, i) &= ~BITMASK(i)
#define GETBIT(buf, i) (MASKWORD(buf, i) & BITMASK(i)) #define GETBIT(buf, i) (MASKWORD(buf, i) & BITMASK(i))
_X_EXPORT GrabPtr GrabPtr
CreateGrab( CreateGrab(
int client, int client,
DeviceIntPtr device, DeviceIntPtr device,
@ -128,7 +128,7 @@ FreeGrab(GrabPtr pGrab)
xfree(pGrab); xfree(pGrab);
} }
_X_EXPORT int int
DeletePassiveGrab(pointer value, XID id) DeletePassiveGrab(pointer value, XID id)
{ {
GrabPtr g, prev; GrabPtr g, prev;
@ -254,7 +254,7 @@ GrabSupersedesSecond(GrabPtr pFirstGrab, GrabPtr pSecondGrab)
* ignored. * ignored.
* @return TRUE if the grabs match or FALSE otherwise. * @return TRUE if the grabs match or FALSE otherwise.
*/ */
_X_EXPORT Bool Bool
GrabMatchesSecond(GrabPtr pFirstGrab, GrabPtr pSecondGrab, Bool ignoreDevice) GrabMatchesSecond(GrabPtr pFirstGrab, GrabPtr pSecondGrab, Bool ignoreDevice)
{ {
if (!ignoreDevice && if (!ignoreDevice &&
@ -324,7 +324,7 @@ GrabsAreIdentical(GrabPtr pFirstGrab, GrabPtr pSecondGrab)
* *
* @return Success or X error code on failure. * @return Success or X error code on failure.
*/ */
_X_EXPORT int int
AddPassiveGrabToList(ClientPtr client, GrabPtr pGrab) AddPassiveGrabToList(ClientPtr client, GrabPtr pGrab)
{ {
GrabPtr grab; GrabPtr grab;
@ -376,7 +376,7 @@ AddPassiveGrabToList(ClientPtr client, GrabPtr pGrab)
* if any allocation fails * if any allocation fails
*/ */
_X_EXPORT Bool Bool
DeletePassiveGrabFromList(GrabPtr pMinuendGrab) DeletePassiveGrabFromList(GrabPtr pMinuendGrab)
{ {
GrabPtr grab; GrabPtr grab;

2
dix/initatoms.c
View File

@ -11,7 +11,7 @@
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include "misc.h" #include "misc.h"
#include "dix.h" #include "dix.h"
_X_EXPORT void MakePredeclaredAtoms(void) void MakePredeclaredAtoms(void)
{ {
if (MakeAtom("PRIMARY", 7, 1) != XA_PRIMARY) AtomError(); if (MakeAtom("PRIMARY", 7, 1) != XA_PRIMARY) AtomError();
if (MakeAtom("SECONDARY", 9, 1) != XA_SECONDARY) AtomError(); if (MakeAtom("SECONDARY", 9, 1) != XA_SECONDARY) AtomError();

12
dix/main.c
View File

@ -130,11 +130,11 @@ static
#endif #endif
Bool CreateConnectionBlock(void); Bool CreateConnectionBlock(void);
_X_EXPORT PaddingInfo PixmapWidthPaddingInfo[33]; PaddingInfo PixmapWidthPaddingInfo[33];
int connBlockScreenStart; int connBlockScreenStart;
_X_EXPORT void void
NotImplemented(xEvent *from, xEvent *to) NotImplemented(xEvent *from, xEvent *to)
{ {
FatalError("Not implemented"); FatalError("Not implemented");
@ -144,7 +144,7 @@ NotImplemented(xEvent *from, xEvent *to)
* Dummy entry for ReplySwapVector[] * Dummy entry for ReplySwapVector[]
*/ */
_X_EXPORT void void
ReplyNotSwappd( ReplyNotSwappd(
ClientPtr pClient , ClientPtr pClient ,
int size , int size ,
@ -446,13 +446,13 @@ int main(int argc, char *argv[], char *envp[])
static int VendorRelease = VENDOR_RELEASE; static int VendorRelease = VENDOR_RELEASE;
static char *VendorString = VENDOR_NAME; static char *VendorString = VENDOR_NAME;
_X_EXPORT void void
SetVendorRelease(int release) SetVendorRelease(int release)
{ {
VendorRelease = release; VendorRelease = release;
} }
_X_EXPORT void void
SetVendorString(char *string) SetVendorString(char *string)
{ {
VendorString = string; VendorString = string;
@ -609,7 +609,7 @@ with its screen number, a pointer to its ScreenRec, argc, and argv.
*/ */
_X_EXPORT int int
AddScreen( AddScreen(
Bool (* pfnInit)( Bool (* pfnInit)(
int /*index*/, int /*index*/,

10
dix/pixmap.c
View File

@ -49,7 +49,7 @@ from The Open Group.
/* callable by ddx */ /* callable by ddx */
_X_EXPORT PixmapPtr PixmapPtr
GetScratchPixmapHeader(ScreenPtr pScreen, int width, int height, int depth, GetScratchPixmapHeader(ScreenPtr pScreen, int width, int height, int depth,
int bitsPerPixel, int devKind, pointer pPixData) int bitsPerPixel, int devKind, pointer pPixData)
{ {
@ -72,7 +72,7 @@ GetScratchPixmapHeader(ScreenPtr pScreen, int width, int height, int depth,
/* callable by ddx */ /* callable by ddx */
_X_EXPORT void void
FreeScratchPixmapHeader(PixmapPtr pPixmap) FreeScratchPixmapHeader(PixmapPtr pPixmap)
{ {
if (pPixmap) if (pPixmap)
@ -88,7 +88,7 @@ FreeScratchPixmapHeader(PixmapPtr pPixmap)
} }
_X_EXPORT Bool Bool
CreateScratchPixmapsForScreen(int scrnum) CreateScratchPixmapsForScreen(int scrnum)
{ {
/* let it be created on first use */ /* let it be created on first use */
@ -97,7 +97,7 @@ CreateScratchPixmapsForScreen(int scrnum)
} }
_X_EXPORT void void
FreeScratchPixmapsForScreen(int scrnum) FreeScratchPixmapsForScreen(int scrnum)
{ {
FreeScratchPixmapHeader(screenInfo.screens[scrnum]->pScratchPixmap); FreeScratchPixmapHeader(screenInfo.screens[scrnum]->pScratchPixmap);
@ -105,7 +105,7 @@ FreeScratchPixmapsForScreen(int scrnum)
/* callable by ddx */ /* callable by ddx */
_X_EXPORT PixmapPtr PixmapPtr
AllocatePixmap(ScreenPtr pScreen, int pixDataSize) AllocatePixmap(ScreenPtr pScreen, int pixDataSize)
{ {
PixmapPtr pPixmap; PixmapPtr pPixmap;

22
dix/privates.c
View File

@ -84,7 +84,7 @@ privateExists(PrivateRec **privates, const DevPrivateKey key)
/* /*
* Request pre-allocated space. * Request pre-allocated space.
*/ */
_X_EXPORT int int
dixRequestPrivate(const DevPrivateKey key, unsigned size) dixRequestPrivate(const DevPrivateKey key, unsigned size)
{ {
PrivateDescRec *item = findItem(key); PrivateDescRec *item = findItem(key);
@ -98,7 +98,7 @@ dixRequestPrivate(const DevPrivateKey key, unsigned size)
/* /*
* Allocate a private and attach it to an existing object. * Allocate a private and attach it to an existing object.
*/ */
_X_EXPORT pointer * pointer *
dixAllocatePrivate(PrivateRec **privates, const DevPrivateKey key) dixAllocatePrivate(PrivateRec **privates, const DevPrivateKey key)
{ {
PrivateDescRec *item = findItem(key); PrivateDescRec *item = findItem(key);
@ -154,7 +154,7 @@ dixAllocatePrivate(PrivateRec **privates, const DevPrivateKey key)
/* /*
* Look up a private pointer. * Look up a private pointer.
*/ */
_X_EXPORT pointer pointer
dixLookupPrivate(PrivateRec **privates, const DevPrivateKey key) dixLookupPrivate(PrivateRec **privates, const DevPrivateKey key)
{ {
pointer *ptr; pointer *ptr;
@ -169,7 +169,7 @@ dixLookupPrivate(PrivateRec **privates, const DevPrivateKey key)
/* /*
* Look up the address of a private pointer. * Look up the address of a private pointer.
*/ */
_X_EXPORT pointer * pointer *
dixLookupPrivateAddr(PrivateRec **privates, const DevPrivateKey key) dixLookupPrivateAddr(PrivateRec **privates, const DevPrivateKey key)
{ {
if (privateExists(privates, key)) if (privateExists(privates, key))
@ -181,7 +181,7 @@ dixLookupPrivateAddr(PrivateRec **privates, const DevPrivateKey key)
/* /*
* Set a private pointer. * Set a private pointer.
*/ */
_X_EXPORT int int
dixSetPrivate(PrivateRec **privates, const DevPrivateKey key, pointer val) dixSetPrivate(PrivateRec **privates, const DevPrivateKey key, pointer val)
{ {
top: top:
@ -198,7 +198,7 @@ dixSetPrivate(PrivateRec **privates, const DevPrivateKey key, pointer val)
/* /*
* Called to free privates at object deletion time. * Called to free privates at object deletion time.
*/ */
_X_EXPORT void void
dixFreePrivates(PrivateRec *privates) dixFreePrivates(PrivateRec *privates)
{ {
int i; int i;
@ -223,7 +223,7 @@ dixFreePrivates(PrivateRec *privates)
/* /*
* Callback registration * Callback registration
*/ */
_X_EXPORT int int
dixRegisterPrivateInitFunc(const DevPrivateKey key, dixRegisterPrivateInitFunc(const DevPrivateKey key,
CallbackProcPtr callback, pointer data) CallbackProcPtr callback, pointer data)
{ {
@ -234,7 +234,7 @@ dixRegisterPrivateInitFunc(const DevPrivateKey key,
return AddCallback(&item->initfuncs, callback, data); return AddCallback(&item->initfuncs, callback, data);
} }
_X_EXPORT int int
dixRegisterPrivateDeleteFunc(const DevPrivateKey key, dixRegisterPrivateDeleteFunc(const DevPrivateKey key,
CallbackProcPtr callback, pointer data) CallbackProcPtr callback, pointer data)
{ {
@ -265,7 +265,7 @@ static int offsetsSize = 0;
/* /*
* Specify where the devPrivates field is located in a structure type * Specify where the devPrivates field is located in a structure type
*/ */
_X_EXPORT int int
dixRegisterPrivateOffset(RESTYPE type, int offset) dixRegisterPrivateOffset(RESTYPE type, int offset)
{ {
type = type & TypeMask; type = type & TypeMask;
@ -287,7 +287,7 @@ dixRegisterPrivateOffset(RESTYPE type, int offset)
return TRUE; return TRUE;
} }
_X_EXPORT int int
dixLookupPrivateOffset(RESTYPE type) dixLookupPrivateOffset(RESTYPE type)
{ {
type = type & TypeMask; type = type & TypeMask;
@ -295,7 +295,7 @@ dixLookupPrivateOffset(RESTYPE type)
return offsets[type]; return offsets[type];
} }
_X_EXPORT int int
dixResetPrivates(void) dixResetPrivates(void)
{ {
int i; int i;

10
dix/property.c
View File

@ -90,7 +90,7 @@ PrintPropertys(WindowPtr pWin)
} }
#endif #endif
_X_EXPORT int int
dixLookupProperty(PropertyPtr *result, WindowPtr pWin, Atom propertyName, dixLookupProperty(PropertyPtr *result, WindowPtr pWin, Atom propertyName,
ClientPtr client, Mask access_mode) ClientPtr client, Mask access_mode)
{ {
@ -248,7 +248,7 @@ ProcChangeProperty(ClientPtr client)
return client->noClientException; return client->noClientException;
} }
_X_EXPORT int int
dixChangeWindowProperty(ClientPtr pClient, WindowPtr pWin, Atom property, dixChangeWindowProperty(ClientPtr pClient, WindowPtr pWin, Atom property,
Atom type, int format, int mode, unsigned long len, Atom type, int format, int mode, unsigned long len,
pointer value, Bool sendevent) pointer value, Bool sendevent)
@ -361,7 +361,7 @@ dixChangeWindowProperty(ClientPtr pClient, WindowPtr pWin, Atom property,
return(Success); return(Success);
} }
_X_EXPORT int int
ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format, ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format,
int mode, unsigned long len, pointer value, int mode, unsigned long len, pointer value,
Bool sendevent) Bool sendevent)
@ -370,7 +370,7 @@ ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format,
mode, len, value, sendevent); mode, len, value, sendevent);
} }
_X_EXPORT int int
DeleteProperty(ClientPtr client, WindowPtr pWin, Atom propName) DeleteProperty(ClientPtr client, WindowPtr pWin, Atom propName)
{ {
PropertyPtr pProp, prevProp; PropertyPtr pProp, prevProp;
@ -401,7 +401,7 @@ DeleteProperty(ClientPtr client, WindowPtr pWin, Atom propName)
return rc; return rc;
} }
_X_EXPORT void void
DeleteAllWindowProperties(WindowPtr pWin) DeleteAllWindowProperties(WindowPtr pWin)
{ {
PropertyPtr pProp, pNextProp; PropertyPtr pProp, pNextProp;

16
dix/ptrveloc.c
View File

@ -93,7 +93,7 @@ SimpleSmoothProfile(DeviceVelocityPtr pVel, float velocity,
/** /**
* Init struct so it should match the average case * Init struct so it should match the average case
*/ */
_X_EXPORT void void
InitVelocityData(DeviceVelocityPtr s) InitVelocityData(DeviceVelocityPtr s)
{ {
memset(s, 0, sizeof(DeviceVelocityRec)); memset(s, 0, sizeof(DeviceVelocityRec));
@ -123,7 +123,7 @@ FreeVelocityData(DeviceVelocityPtr s){
/* /*
* dix uninit helper, called through scheme * dix uninit helper, called through scheme
*/ */
_X_EXPORT void void
AccelerationDefaultCleanup(DeviceIntPtr pDev) AccelerationDefaultCleanup(DeviceIntPtr pDev)
{ {
/*sanity check*/ /*sanity check*/
@ -149,7 +149,7 @@ and is being coupled to account for fast-changing input, or you have 'one for
every situation'. You might want to have tighter coupling then, e.g. 0.1. every situation'. You might want to have tighter coupling then, e.g. 0.1.
In the filter stats, you can see if a reasonable filter useage emerges. In the filter stats, you can see if a reasonable filter useage emerges.
*/ */
_X_EXPORT void void
InitFilterChain(DeviceVelocityPtr s, float rdecay, float progression, int stages, int lutsize) InitFilterChain(DeviceVelocityPtr s, float rdecay, float progression, int stages, int lutsize)
{ {
int fn; int fn;
@ -683,7 +683,7 @@ LinearProfile(
* would be a good place, since FreeVelocityData() also calls this with -1. * would be a good place, since FreeVelocityData() also calls this with -1.
* returns FALSE (0) if profile number is unavailable. * returns FALSE (0) if profile number is unavailable.
*/ */
_X_EXPORT int int
SetAccelerationProfile( SetAccelerationProfile(
DeviceVelocityPtr s, DeviceVelocityPtr s,
int profile_num) int profile_num)
@ -746,7 +746,7 @@ SetAccelerationProfile(
* it should do init/uninit in the driver (ie. with DEVICE_INIT and friends). * it should do init/uninit in the driver (ie. with DEVICE_INIT and friends).
* Users may override or choose it. * Users may override or choose it.
*/ */
_X_EXPORT void void
SetDeviceSpecificAccelerationProfile( SetDeviceSpecificAccelerationProfile(
DeviceVelocityPtr s, DeviceVelocityPtr s,
PointerAccelerationProfileFunc profile) PointerAccelerationProfileFunc profile)
@ -759,7 +759,7 @@ SetDeviceSpecificAccelerationProfile(
* Use this function to obtain a DeviceVelocityPtr for a device. Will return NULL if * Use this function to obtain a DeviceVelocityPtr for a device. Will return NULL if
* the predictable acceleration scheme is not in effect. * the predictable acceleration scheme is not in effect.
*/ */
_X_EXPORT DeviceVelocityPtr DeviceVelocityPtr
GetDevicePredictableAccelData( GetDevicePredictableAccelData(
DeviceIntPtr pDev) DeviceIntPtr pDev)
{ {
@ -787,7 +787,7 @@ GetDevicePredictableAccelData(
* This version employs a velocity approximation algorithm to * This version employs a velocity approximation algorithm to
* enable fine-grained predictable acceleration profiles. * enable fine-grained predictable acceleration profiles.
*/ */
_X_EXPORT void void
acceleratePointerPredictable( acceleratePointerPredictable(
DeviceIntPtr pDev, DeviceIntPtr pDev,
int first_valuator, int first_valuator,
@ -863,7 +863,7 @@ acceleratePointerPredictable(
* Originally a part of xf86PostMotionEvent; modifies valuators * Originally a part of xf86PostMotionEvent; modifies valuators
* in-place. Retained mostly for embedded scenarios. * in-place. Retained mostly for embedded scenarios.
*/ */
_X_EXPORT void void
acceleratePointerLightweight( acceleratePointerLightweight(
DeviceIntPtr pDev, DeviceIntPtr pDev,
int first_valuator, int first_valuator,

16
dix/registry.c
View File

@ -114,7 +114,7 @@ RegisterErrorName(unsigned error, char *name) {
errors[error] = name; errors[error] = name;
} }
_X_EXPORT void void
RegisterExtensionNames(ExtensionEntry *extEntry) RegisterExtensionNames(ExtensionEntry *extEntry)
{ {
char buf[256], *lineobj, *ptr; char buf[256], *lineobj, *ptr;
@ -196,7 +196,7 @@ RegisterExtensionNames(ExtensionEntry *extEntry)
* Registration functions * Registration functions
*/ */
_X_EXPORT void void
RegisterResourceName(RESTYPE resource, char *name) RegisterResourceName(RESTYPE resource, char *name)
{ {
resource &= TypeMask; resource &= TypeMask;
@ -214,7 +214,7 @@ RegisterResourceName(RESTYPE resource, char *name)
* Lookup functions * Lookup functions
*/ */
_X_EXPORT const char * const char *
LookupRequestName(int major, int minor) LookupRequestName(int major, int minor)
{ {
if (major >= nmajor) if (major >= nmajor)
@ -225,7 +225,7 @@ LookupRequestName(int major, int minor)
return requests[major][minor] ? requests[major][minor] : XREGISTRY_UNKNOWN; return requests[major][minor] ? requests[major][minor] : XREGISTRY_UNKNOWN;
} }
_X_EXPORT const char * const char *
LookupMajorName(int major) LookupMajorName(int major)
{ {
if (major < 128) { if (major < 128) {
@ -244,7 +244,7 @@ LookupMajorName(int major)
} }
} }
_X_EXPORT const char * const char *
LookupEventName(int event) LookupEventName(int event)
{ {
event &= 127; event &= 127;
@ -254,7 +254,7 @@ LookupEventName(int event)
return events[event] ? events[event] : XREGISTRY_UNKNOWN; return events[event] ? events[event] : XREGISTRY_UNKNOWN;
} }
_X_EXPORT const char * const char *
LookupErrorName(int error) LookupErrorName(int error)
{ {
if (error >= nerror) if (error >= nerror)
@ -263,7 +263,7 @@ LookupErrorName(int error)
return errors[error] ? errors[error] : XREGISTRY_UNKNOWN; return errors[error] ? errors[error] : XREGISTRY_UNKNOWN;
} }
_X_EXPORT const char * const char *
LookupResourceName(RESTYPE resource) LookupResourceName(RESTYPE resource)
{ {
resource &= TypeMask; resource &= TypeMask;
@ -276,7 +276,7 @@ LookupResourceName(RESTYPE resource)
/* /*
* Setup and teardown * Setup and teardown
*/ */
_X_EXPORT void void
dixResetRegistry(void) dixResetRegistry(void)
{ {
ExtensionEntry extEntry; ExtensionEntry extEntry;

42
dix/resource.c
View File

@ -186,13 +186,13 @@ typedef struct _ClientResource {
XID expectID; XID expectID;
} ClientResourceRec; } ClientResourceRec;
_X_EXPORT RESTYPE lastResourceType; RESTYPE lastResourceType;
static RESTYPE lastResourceClass; static RESTYPE lastResourceClass;
_X_EXPORT RESTYPE TypeMask; RESTYPE TypeMask;
static DeleteType *DeleteFuncs = (DeleteType *)NULL; static DeleteType *DeleteFuncs = (DeleteType *)NULL;
_X_EXPORT CallbackListPtr ResourceStateCallback; CallbackListPtr ResourceStateCallback;
static _X_INLINE void static _X_INLINE void
CallResourceStateCallback(ResourceState state, ResourceRec *res) CallResourceStateCallback(ResourceState state, ResourceRec *res)
@ -203,7 +203,7 @@ CallResourceStateCallback(ResourceState state, ResourceRec *res)
} }
} }
_X_EXPORT RESTYPE RESTYPE
CreateNewResourceType(DeleteType deleteFunc) CreateNewResourceType(DeleteType deleteFunc)
{ {
RESTYPE next = lastResourceType + 1; RESTYPE next = lastResourceType + 1;
@ -224,7 +224,7 @@ CreateNewResourceType(DeleteType deleteFunc)
return next; return next;
} }
_X_EXPORT RESTYPE RESTYPE
CreateNewResourceClass(void) CreateNewResourceClass(void)
{ {
RESTYPE next = lastResourceClass >> 1; RESTYPE next = lastResourceClass >> 1;
@ -244,7 +244,7 @@ static ClientResourceRec clientTable[MAXCLIENTS];
* in resource table * in resource table
*****************/ *****************/
_X_EXPORT Bool Bool
InitClientResources(ClientPtr client) InitClientResources(ClientPtr client)
{ {
int i, j; int i, j;
@ -339,7 +339,7 @@ AvailableID(
return 0; return 0;
} }
_X_EXPORT void void
GetXIDRange(int client, Bool server, XID *minp, XID *maxp) GetXIDRange(int client, Bool server, XID *minp, XID *maxp)
{ {
XID id, maxid; XID id, maxid;
@ -390,7 +390,7 @@ GetXIDRange(int client, Bool server, XID *minp, XID *maxp)
* invented, but this will be used so rarely that this should suffice. * invented, but this will be used so rarely that this should suffice.
*/ */
_X_EXPORT unsigned int unsigned int
GetXIDList(ClientPtr pClient, unsigned count, XID *pids) GetXIDList(ClientPtr pClient, unsigned count, XID *pids)
{ {
unsigned int found = 0; unsigned int found = 0;
@ -417,7 +417,7 @@ GetXIDList(ClientPtr pClient, unsigned count, XID *pids)
* over-running another client. * over-running another client.
*/ */
_X_EXPORT XID XID
FakeClientID(int client) FakeClientID(int client)
{ {
XID id, maxid; XID id, maxid;
@ -438,7 +438,7 @@ FakeClientID(int client)
return id; return id;
} }
_X_EXPORT Bool Bool
AddResource(XID id, RESTYPE type, pointer value) AddResource(XID id, RESTYPE type, pointer value)
{ {
int client; int client;
@ -527,7 +527,7 @@ RebuildTable(int client)
clientTable[client].resources = resources; clientTable[client].resources = resources;
} }
_X_EXPORT void void
FreeResource(XID id, RESTYPE skipDeleteFuncType) FreeResource(XID id, RESTYPE skipDeleteFuncType)
{ {
int cid; int cid;
@ -570,7 +570,7 @@ FreeResource(XID id, RESTYPE skipDeleteFuncType)
} }
_X_EXPORT void void
FreeResourceByType(XID id, RESTYPE type, Bool skipFree) FreeResourceByType(XID id, RESTYPE type, Bool skipFree)
{ {
int cid; int cid;
@ -610,7 +610,7 @@ FreeResourceByType(XID id, RESTYPE type, Bool skipFree)
* data * data
*/ */
_X_EXPORT Bool Bool
ChangeResourceValue (XID id, RESTYPE rtype, pointer value) ChangeResourceValue (XID id, RESTYPE rtype, pointer value)
{ {
int cid; int cid;
@ -636,7 +636,7 @@ ChangeResourceValue (XID id, RESTYPE rtype, pointer value)
* add and delete an equal number of resources! * add and delete an equal number of resources!
*/ */
_X_EXPORT void void
FindClientResourcesByType( FindClientResourcesByType(
ClientPtr client, ClientPtr client,
RESTYPE type, RESTYPE type,
@ -668,7 +668,7 @@ FindClientResourcesByType(
} }
} }
_X_EXPORT void void
FindAllClientResources( FindAllClientResources(
ClientPtr client, ClientPtr client,
FindAllRes func, FindAllRes func,
@ -698,7 +698,7 @@ FindAllClientResources(
} }
_X_EXPORT pointer pointer
LookupClientResourceComplex( LookupClientResourceComplex(
ClientPtr client, ClientPtr client,
RESTYPE type, RESTYPE type,
@ -725,7 +725,7 @@ LookupClientResourceComplex(
} }
_X_EXPORT void void
FreeClientNeverRetainResources(ClientPtr client) FreeClientNeverRetainResources(ClientPtr client)
{ {
ResourcePtr *resources; ResourcePtr *resources;
@ -762,7 +762,7 @@ FreeClientNeverRetainResources(ClientPtr client)
} }
} }
_X_EXPORT void void
FreeClientResources(ClientPtr client) FreeClientResources(ClientPtr client)
{ {
ResourcePtr *resources; ResourcePtr *resources;
@ -813,7 +813,7 @@ FreeClientResources(ClientPtr client)
clientTable[client->index].buckets = 0; clientTable[client->index].buckets = 0;
} }
_X_EXPORT void void
FreeAllResources(void) FreeAllResources(void)
{ {
int i; int i;
@ -825,7 +825,7 @@ FreeAllResources(void)
} }
} }
_X_EXPORT Bool Bool
LegalNewID(XID id, ClientPtr client) LegalNewID(XID id, ClientPtr client)
{ {
@ -845,7 +845,7 @@ LegalNewID(XID id, ClientPtr client)
!LookupIDByClass(id, RC_ANY))); !LookupIDByClass(id, RC_ANY)));
} }
_X_EXPORT int int
dixLookupResource(pointer *result, XID id, RESTYPE rtype, dixLookupResource(pointer *result, XID id, RESTYPE rtype,
ClientPtr client, Mask mode) ClientPtr client, Mask mode)
{ {

12
dix/selection.c
View File

@ -65,10 +65,10 @@ SOFTWARE.
* *
*****************************************************************/ *****************************************************************/
_X_EXPORT Selection *CurrentSelections; Selection *CurrentSelections;
_X_EXPORT CallbackListPtr SelectionCallback; CallbackListPtr SelectionCallback;
_X_EXPORT int int
dixLookupSelection(Selection **result, Atom selectionName, dixLookupSelection(Selection **result, Atom selectionName,
ClientPtr client, Mask access_mode) ClientPtr client, Mask access_mode)
{ {
@ -86,7 +86,7 @@ dixLookupSelection(Selection **result, Atom selectionName,
return rc; return rc;
} }
_X_EXPORT void void
InitSelections(void) InitSelections(void)
{ {
Selection *pSel, *pNextSel; Selection *pSel, *pNextSel;
@ -110,7 +110,7 @@ CallSelectionCallback(Selection *pSel, ClientPtr client,
CallCallbacks(&SelectionCallback, &info); CallCallbacks(&SelectionCallback, &info);
} }
_X_EXPORT void void
DeleteWindowFromAnySelections(WindowPtr pWin) DeleteWindowFromAnySelections(WindowPtr pWin)
{ {
Selection *pSel; Selection *pSel;
@ -125,7 +125,7 @@ DeleteWindowFromAnySelections(WindowPtr pWin)
} }
} }
_X_EXPORT void void
DeleteClientFromAnySelections(ClientPtr client) DeleteClientFromAnySelections(ClientPtr client)
{ {
Selection *pSel; Selection *pSel;

146
dix/swaprep.c
View File

@ -72,7 +72,7 @@ static void SwapFont(xQueryFontReply *pr, Bool hasGlyphs);
* *
* \param size size in bytes * \param size size in bytes
*/ */
_X_EXPORT void void
Swap32Write(ClientPtr pClient, int size, CARD32 *pbuf) Swap32Write(ClientPtr pClient, int size, CARD32 *pbuf)
{ {
int i; int i;
@ -92,7 +92,7 @@ Swap32Write(ClientPtr pClient, int size, CARD32 *pbuf)
* *
* \param size size in bytes * \param size size in bytes
*/ */
_X_EXPORT void void
CopySwap32Write(ClientPtr pClient, int size, CARD32 *pbuf) CopySwap32Write(ClientPtr pClient, int size, CARD32 *pbuf)
{ {
int bufsize = size; int bufsize = size;
@ -140,7 +140,7 @@ CopySwap32Write(ClientPtr pClient, int size, CARD32 *pbuf)
* *
* \param size size in bytes * \param size size in bytes
*/ */
_X_EXPORT void void
CopySwap16Write(ClientPtr pClient, int size, short *pbuf) CopySwap16Write(ClientPtr pClient, int size, short *pbuf)
{ {
int bufsize = size; int bufsize = size;
@ -186,7 +186,7 @@ CopySwap16Write(ClientPtr pClient, int size, short *pbuf)
/* Extra-small reply */ /* Extra-small reply */
_X_EXPORT void void
SGenericReply(ClientPtr pClient, int size, xGenericReply *pRep) SGenericReply(ClientPtr pClient, int size, xGenericReply *pRep)
{ {
char n; char n;
@ -196,7 +196,7 @@ SGenericReply(ClientPtr pClient, int size, xGenericReply *pRep)
} }
/* Extra-large reply */ /* Extra-large reply */
_X_EXPORT void void
SGetWindowAttributesReply(ClientPtr pClient, int size, SGetWindowAttributesReply(ClientPtr pClient, int size,
xGetWindowAttributesReply *pRep) xGetWindowAttributesReply *pRep)
{ {
@ -215,7 +215,7 @@ SGetWindowAttributesReply(ClientPtr pClient, int size,
(void)WriteToClient(pClient, size, (char *) pRep); (void)WriteToClient(pClient, size, (char *) pRep);
} }
_X_EXPORT void void
SGetGeometryReply(ClientPtr pClient, int size, xGetGeometryReply *pRep) SGetGeometryReply(ClientPtr pClient, int size, xGetGeometryReply *pRep)
{ {
char n; char n;
@ -230,7 +230,7 @@ SGetGeometryReply(ClientPtr pClient, int size, xGetGeometryReply *pRep)
(void)WriteToClient(pClient, size, (char *) pRep); (void)WriteToClient(pClient, size, (char *) pRep);
} }
_X_EXPORT void void
SQueryTreeReply(ClientPtr pClient, int size, xQueryTreeReply *pRep) SQueryTreeReply(ClientPtr pClient, int size, xQueryTreeReply *pRep)
{ {
char n; char n;
@ -243,7 +243,7 @@ SQueryTreeReply(ClientPtr pClient, int size, xQueryTreeReply *pRep)
(void)WriteToClient(pClient, size, (char *) pRep); (void)WriteToClient(pClient, size, (char *) pRep);
} }
_X_EXPORT void void
SInternAtomReply(ClientPtr pClient, int size, xInternAtomReply *pRep) SInternAtomReply(ClientPtr pClient, int size, xInternAtomReply *pRep)
{ {
char n; char n;
@ -253,7 +253,7 @@ SInternAtomReply(ClientPtr pClient, int size, xInternAtomReply *pRep)
(void)WriteToClient(pClient, size, (char *) pRep); (void)WriteToClient(pClient, size, (char *) pRep);
} }
_X_EXPORT void void
SGetAtomNameReply(ClientPtr pClient, int size, xGetAtomNameReply *pRep) SGetAtomNameReply(ClientPtr pClient, int size, xGetAtomNameReply *pRep)
{ {
char n; char n;
@ -265,7 +265,7 @@ SGetAtomNameReply(ClientPtr pClient, int size, xGetAtomNameReply *pRep)
} }
_X_EXPORT void void
SGetPropertyReply(ClientPtr pClient, int size, xGetPropertyReply *pRep) SGetPropertyReply(ClientPtr pClient, int size, xGetPropertyReply *pRep)
{ {
char n; char n;
@ -278,7 +278,7 @@ SGetPropertyReply(ClientPtr pClient, int size, xGetPropertyReply *pRep)
(void)WriteToClient(pClient, size, (char *) pRep); (void)WriteToClient(pClient, size, (char *) pRep);
} }
_X_EXPORT void void
SListPropertiesReply(ClientPtr pClient, int size, xListPropertiesReply *pRep) SListPropertiesReply(ClientPtr pClient, int size, xListPropertiesReply *pRep)
{ {
char n; char n;
@ -289,7 +289,7 @@ SListPropertiesReply(ClientPtr pClient, int size, xListPropertiesReply *pRep)
(void)WriteToClient(pClient, size, (char *) pRep); (void)WriteToClient(pClient, size, (char *) pRep);
} }
_X_EXPORT void void
SGetSelectionOwnerReply(ClientPtr pClient, int size, SGetSelectionOwnerReply(ClientPtr pClient, int size,
xGetSelectionOwnerReply *pRep) xGetSelectionOwnerReply *pRep)
{ {
@ -301,7 +301,7 @@ SGetSelectionOwnerReply(ClientPtr pClient, int size,
} }
_X_EXPORT void void
SQueryPointerReply(ClientPtr pClient, int size, xQueryPointerReply *pRep) SQueryPointerReply(ClientPtr pClient, int size, xQueryPointerReply *pRep)
{ {
char n; char n;
@ -327,7 +327,7 @@ SwapTimecoord(xTimecoord* pCoord)
swaps(&pCoord->y, n); swaps(&pCoord->y, n);
} }
_X_EXPORT void void
SwapTimeCoordWrite(ClientPtr pClient, int size, xTimecoord *pRep) SwapTimeCoordWrite(ClientPtr pClient, int size, xTimecoord *pRep)
{ {
int i, n; int i, n;
@ -343,7 +343,7 @@ SwapTimeCoordWrite(ClientPtr pClient, int size, xTimecoord *pRep)
(void)WriteToClient(pClient, size, (char *) pRep); (void)WriteToClient(pClient, size, (char *) pRep);
} }
_X_EXPORT void void
SGetMotionEventsReply(ClientPtr pClient, int size, xGetMotionEventsReply *pRep) SGetMotionEventsReply(ClientPtr pClient, int size, xGetMotionEventsReply *pRep)
{ {
char n; char n;
@ -354,7 +354,7 @@ SGetMotionEventsReply(ClientPtr pClient, int size, xGetMotionEventsReply *pRep)
(void)WriteToClient(pClient, size, (char *) pRep); (void)WriteToClient(pClient, size, (char *) pRep);
} }
_X_EXPORT void void
STranslateCoordsReply(ClientPtr pClient, int size, xTranslateCoordsReply *pRep) STranslateCoordsReply(ClientPtr pClient, int size, xTranslateCoordsReply *pRep)
{ {
char n; char n;
@ -366,7 +366,7 @@ STranslateCoordsReply(ClientPtr pClient, int size, xTranslateCoordsReply *pRep)
(void)WriteToClient(pClient, size, (char *) pRep); (void)WriteToClient(pClient, size, (char *) pRep);
} }
_X_EXPORT void void
SGetInputFocusReply(ClientPtr pClient, int size, xGetInputFocusReply *pRep) SGetInputFocusReply(ClientPtr pClient, int size, xGetInputFocusReply *pRep)
{ {
char n; char n;
@ -377,7 +377,7 @@ SGetInputFocusReply(ClientPtr pClient, int size, xGetInputFocusReply *pRep)
} }
/* extra long reply */ /* extra long reply */
_X_EXPORT void void
SQueryKeymapReply(ClientPtr pClient, int size, xQueryKeymapReply *pRep) SQueryKeymapReply(ClientPtr pClient, int size, xQueryKeymapReply *pRep)
{ {
char n; char n;
@ -448,14 +448,14 @@ SwapFont(xQueryFontReply *pr, Bool hasGlyphs)
} }
} }
_X_EXPORT void void
SQueryFontReply(ClientPtr pClient, int size, xQueryFontReply *pRep) SQueryFontReply(ClientPtr pClient, int size, xQueryFontReply *pRep)
{ {
SwapFont(pRep, TRUE); SwapFont(pRep, TRUE);
(void)WriteToClient(pClient, size, (char *) pRep); (void)WriteToClient(pClient, size, (char *) pRep);
} }
_X_EXPORT void void
SQueryTextExtentsReply(ClientPtr pClient, int size, xQueryTextExtentsReply *pRep) SQueryTextExtentsReply(ClientPtr pClient, int size, xQueryTextExtentsReply *pRep)
{ {
char n; char n;
@ -471,7 +471,7 @@ SQueryTextExtentsReply(ClientPtr pClient, int size, xQueryTextExtentsReply *pRep
(void)WriteToClient(pClient, size, (char *) pRep); (void)WriteToClient(pClient, size, (char *) pRep);
} }
_X_EXPORT void void
SListFontsReply(ClientPtr pClient, int size, xListFontsReply *pRep) SListFontsReply(ClientPtr pClient, int size, xListFontsReply *pRep)
{ {
char n; char n;
@ -482,7 +482,7 @@ SListFontsReply(ClientPtr pClient, int size, xListFontsReply *pRep)
(void)WriteToClient(pClient, size, (char *) pRep); (void)WriteToClient(pClient, size, (char *) pRep);
} }
_X_EXPORT void void
SListFontsWithInfoReply(ClientPtr pClient, int size, SListFontsWithInfoReply(ClientPtr pClient, int size,
xListFontsWithInfoReply *pRep) xListFontsWithInfoReply *pRep)
{ {
@ -490,7 +490,7 @@ SListFontsWithInfoReply(ClientPtr pClient, int size,
(void)WriteToClient(pClient, size, (char *) pRep); (void)WriteToClient(pClient, size, (char *) pRep);
} }
_X_EXPORT void void
SGetFontPathReply(ClientPtr pClient, int size, xGetFontPathReply *pRep) SGetFontPathReply(ClientPtr pClient, int size, xGetFontPathReply *pRep)
{ {
char n; char n;
@ -501,7 +501,7 @@ SGetFontPathReply(ClientPtr pClient, int size, xGetFontPathReply *pRep)
(void)WriteToClient(pClient, size, (char *) pRep); (void)WriteToClient(pClient, size, (char *) pRep);
} }
_X_EXPORT void void
SGetImageReply(ClientPtr pClient, int size, xGetImageReply *pRep) SGetImageReply(ClientPtr pClient, int size, xGetImageReply *pRep)
{ {
char n; char n;
@ -513,7 +513,7 @@ SGetImageReply(ClientPtr pClient, int size, xGetImageReply *pRep)
/* Fortunately, image doesn't need swapping */ /* Fortunately, image doesn't need swapping */
} }
_X_EXPORT void void
SListInstalledColormapsReply(ClientPtr pClient, int size, SListInstalledColormapsReply(ClientPtr pClient, int size,
xListInstalledColormapsReply *pRep) xListInstalledColormapsReply *pRep)
{ {
@ -525,7 +525,7 @@ SListInstalledColormapsReply(ClientPtr pClient, int size,
(void)WriteToClient(pClient, size, (char *) pRep); (void)WriteToClient(pClient, size, (char *) pRep);
} }
_X_EXPORT void void
SAllocColorReply(pClient, size, pRep) SAllocColorReply(pClient, size, pRep)
ClientPtr pClient; ClientPtr pClient;
int size; int size;
@ -541,7 +541,7 @@ SAllocColorReply(pClient, size, pRep)
(void)WriteToClient(pClient, size, (char *) pRep); (void)WriteToClient(pClient, size, (char *) pRep);
} }
_X_EXPORT void void
SAllocNamedColorReply(ClientPtr pClient, int size, xAllocNamedColorReply *pRep) SAllocNamedColorReply(ClientPtr pClient, int size, xAllocNamedColorReply *pRep)
{ {
char n; char n;
@ -557,7 +557,7 @@ SAllocNamedColorReply(ClientPtr pClient, int size, xAllocNamedColorReply *pRep)
(void)WriteToClient(pClient, size, (char *) pRep); (void)WriteToClient(pClient, size, (char *) pRep);
} }
_X_EXPORT void void
SAllocColorCellsReply(ClientPtr pClient, int size, xAllocColorCellsReply *pRep) SAllocColorCellsReply(ClientPtr pClient, int size, xAllocColorCellsReply *pRep)
{ {
char n; char n;
@ -570,7 +570,7 @@ SAllocColorCellsReply(ClientPtr pClient, int size, xAllocColorCellsReply *pRep)
} }
_X_EXPORT void void
SAllocColorPlanesReply(ClientPtr pClient, int size, xAllocColorPlanesReply *pRep) SAllocColorPlanesReply(ClientPtr pClient, int size, xAllocColorPlanesReply *pRep)
{ {
char n; char n;
@ -594,7 +594,7 @@ SwapRGB(xrgb *prgb)
swaps(&prgb->blue, n); swaps(&prgb->blue, n);
} }
_X_EXPORT void void
SQColorsExtend(ClientPtr pClient, int size, xrgb *prgb) SQColorsExtend(ClientPtr pClient, int size, xrgb *prgb)
{ {
int i, n; int i, n;
@ -610,7 +610,7 @@ SQColorsExtend(ClientPtr pClient, int size, xrgb *prgb)
(void)WriteToClient(pClient, size, (char *) prgb); (void)WriteToClient(pClient, size, (char *) prgb);
} }
_X_EXPORT void void
SQueryColorsReply(ClientPtr pClient, int size, xQueryColorsReply* pRep) SQueryColorsReply(ClientPtr pClient, int size, xQueryColorsReply* pRep)
{ {
char n; char n;
@ -621,7 +621,7 @@ SQueryColorsReply(ClientPtr pClient, int size, xQueryColorsReply* pRep)
(void)WriteToClient(pClient, size, (char *) pRep); (void)WriteToClient(pClient, size, (char *) pRep);
} }
_X_EXPORT void void
SLookupColorReply(ClientPtr pClient, int size, xLookupColorReply *pRep) SLookupColorReply(ClientPtr pClient, int size, xLookupColorReply *pRep)
{ {
char n; char n;
@ -636,7 +636,7 @@ SLookupColorReply(ClientPtr pClient, int size, xLookupColorReply *pRep)
(void)WriteToClient(pClient, size, (char *) pRep); (void)WriteToClient(pClient, size, (char *) pRep);
} }
_X_EXPORT void void
SQueryBestSizeReply(ClientPtr pClient, int size, xQueryBestSizeReply *pRep) SQueryBestSizeReply(ClientPtr pClient, int size, xQueryBestSizeReply *pRep)
{ {
char n; char n;
@ -647,7 +647,7 @@ SQueryBestSizeReply(ClientPtr pClient, int size, xQueryBestSizeReply *pRep)
(void)WriteToClient(pClient, size, (char *) pRep); (void)WriteToClient(pClient, size, (char *) pRep);
} }
_X_EXPORT void void
SListExtensionsReply(ClientPtr pClient, int size, xListExtensionsReply *pRep) SListExtensionsReply(ClientPtr pClient, int size, xListExtensionsReply *pRep)
{ {
char n; char n;
@ -657,7 +657,7 @@ SListExtensionsReply(ClientPtr pClient, int size, xListExtensionsReply *pRep)
(void)WriteToClient(pClient, size, (char *) pRep); (void)WriteToClient(pClient, size, (char *) pRep);
} }
_X_EXPORT void void
SGetKeyboardMappingReply(ClientPtr pClient, int size, SGetKeyboardMappingReply(ClientPtr pClient, int size,
xGetKeyboardMappingReply *pRep) xGetKeyboardMappingReply *pRep)
{ {
@ -668,7 +668,7 @@ SGetKeyboardMappingReply(ClientPtr pClient, int size,
(void)WriteToClient(pClient, size, (char *) pRep); (void)WriteToClient(pClient, size, (char *) pRep);
} }
_X_EXPORT void void
SGetPointerMappingReply(ClientPtr pClient, int size, SGetPointerMappingReply(ClientPtr pClient, int size,
xGetPointerMappingReply *pRep) xGetPointerMappingReply *pRep)
{ {
@ -679,7 +679,7 @@ SGetPointerMappingReply(ClientPtr pClient, int size,
(void)WriteToClient(pClient, size, (char *) pRep); (void)WriteToClient(pClient, size, (char *) pRep);
} }
_X_EXPORT void void
SGetModifierMappingReply(ClientPtr pClient, int size, SGetModifierMappingReply(ClientPtr pClient, int size,
xGetModifierMappingReply *pRep) xGetModifierMappingReply *pRep)
{ {
@ -690,7 +690,7 @@ SGetModifierMappingReply(ClientPtr pClient, int size,
(void)WriteToClient(pClient, size, (char *) pRep); (void)WriteToClient(pClient, size, (char *) pRep);
} }
_X_EXPORT void void
SGetKeyboardControlReply(ClientPtr pClient, int size, xGetKeyboardControlReply *pRep) SGetKeyboardControlReply(ClientPtr pClient, int size, xGetKeyboardControlReply *pRep)
{ {
char n; char n;
@ -703,7 +703,7 @@ SGetKeyboardControlReply(ClientPtr pClient, int size, xGetKeyboardControlReply *
(void)WriteToClient(pClient, size, (char *) pRep); (void)WriteToClient(pClient, size, (char *) pRep);
} }
_X_EXPORT void void
SGetPointerControlReply(ClientPtr pClient, int size, xGetPointerControlReply *pRep) SGetPointerControlReply(ClientPtr pClient, int size, xGetPointerControlReply *pRep)
{ {
char n; char n;
@ -715,7 +715,7 @@ SGetPointerControlReply(ClientPtr pClient, int size, xGetPointerControlReply *pR
(void)WriteToClient(pClient, size, (char *) pRep); (void)WriteToClient(pClient, size, (char *) pRep);
} }
_X_EXPORT void void
SGetScreenSaverReply(ClientPtr pClient, int size, xGetScreenSaverReply *pRep) SGetScreenSaverReply(ClientPtr pClient, int size, xGetScreenSaverReply *pRep)
{ {
char n; char n;
@ -726,7 +726,7 @@ SGetScreenSaverReply(ClientPtr pClient, int size, xGetScreenSaverReply *pRep)
(void)WriteToClient(pClient, size, (char *) pRep); (void)WriteToClient(pClient, size, (char *) pRep);
} }
_X_EXPORT void void
SLHostsExtend(ClientPtr pClient, int size, char *buf) SLHostsExtend(ClientPtr pClient, int size, char *buf)
{ {
char *bufT = buf; char *bufT = buf;
@ -741,7 +741,7 @@ SLHostsExtend(ClientPtr pClient, int size, char *buf)
(void)WriteToClient (pClient, size, buf); (void)WriteToClient (pClient, size, buf);
} }
_X_EXPORT void void
SListHostsReply(ClientPtr pClient, int size, xListHostsReply *pRep) SListHostsReply(ClientPtr pClient, int size, xListHostsReply *pRep)
{ {
char n; char n;
@ -754,7 +754,7 @@ SListHostsReply(ClientPtr pClient, int size, xListHostsReply *pRep)
_X_EXPORT void void
SErrorEvent(xError *from, xError *to) SErrorEvent(xError *from, xError *to)
{ {
to->type = X_Error; to->type = X_Error;
@ -765,7 +765,7 @@ SErrorEvent(xError *from, xError *to)
to->majorCode = from->majorCode; to->majorCode = from->majorCode;
} }
_X_EXPORT void void
SKeyButtonPtrEvent(xEvent *from, xEvent *to) SKeyButtonPtrEvent(xEvent *from, xEvent *to)
{ {
to->u.u.type = from->u.u.type; to->u.u.type = from->u.u.type;
@ -793,7 +793,7 @@ SKeyButtonPtrEvent(xEvent *from, xEvent *to)
from->u.keyButtonPointer.sameScreen; from->u.keyButtonPointer.sameScreen;
} }
_X_EXPORT void void
SEnterLeaveEvent(xEvent *from, xEvent *to) SEnterLeaveEvent(xEvent *from, xEvent *to)
{ {
to->u.u.type = from->u.u.type; to->u.u.type = from->u.u.type;
@ -812,7 +812,7 @@ SEnterLeaveEvent(xEvent *from, xEvent *to)
to->u.enterLeave.flags = from->u.enterLeave.flags; to->u.enterLeave.flags = from->u.enterLeave.flags;
} }
_X_EXPORT void void
SFocusEvent(xEvent *from, xEvent *to) SFocusEvent(xEvent *from, xEvent *to)
{ {
to->u.u.type = from->u.u.type; to->u.u.type = from->u.u.type;
@ -822,7 +822,7 @@ SFocusEvent(xEvent *from, xEvent *to)
to->u.focus.mode = from->u.focus.mode; to->u.focus.mode = from->u.focus.mode;
} }
_X_EXPORT void void
SExposeEvent(xEvent *from, xEvent *to) SExposeEvent(xEvent *from, xEvent *to)
{ {
to->u.u.type = from->u.u.type; to->u.u.type = from->u.u.type;
@ -835,7 +835,7 @@ SExposeEvent(xEvent *from, xEvent *to)
cpswaps(from->u.expose.count, to->u.expose.count); cpswaps(from->u.expose.count, to->u.expose.count);
} }
_X_EXPORT void void
SGraphicsExposureEvent(xEvent *from, xEvent *to) SGraphicsExposureEvent(xEvent *from, xEvent *to)
{ {
to->u.u.type = from->u.u.type; to->u.u.type = from->u.u.type;
@ -858,7 +858,7 @@ SGraphicsExposureEvent(xEvent *from, xEvent *to)
from->u.graphicsExposure.majorEvent; from->u.graphicsExposure.majorEvent;
} }
_X_EXPORT void void
SNoExposureEvent(xEvent *from, xEvent *to) SNoExposureEvent(xEvent *from, xEvent *to)
{ {
to->u.u.type = from->u.u.type; to->u.u.type = from->u.u.type;
@ -868,7 +868,7 @@ SNoExposureEvent(xEvent *from, xEvent *to)
to->u.noExposure.majorEvent = from->u.noExposure.majorEvent; to->u.noExposure.majorEvent = from->u.noExposure.majorEvent;
} }
_X_EXPORT void void
SVisibilityEvent(xEvent *from, xEvent *to) SVisibilityEvent(xEvent *from, xEvent *to)
{ {
to->u.u.type = from->u.u.type; to->u.u.type = from->u.u.type;
@ -877,7 +877,7 @@ SVisibilityEvent(xEvent *from, xEvent *to)
to->u.visibility.state = from->u.visibility.state; to->u.visibility.state = from->u.visibility.state;
} }
_X_EXPORT void void
SCreateNotifyEvent(xEvent *from, xEvent *to) SCreateNotifyEvent(xEvent *from, xEvent *to)
{ {
to->u.u.type = from->u.u.type; to->u.u.type = from->u.u.type;
@ -893,7 +893,7 @@ SCreateNotifyEvent(xEvent *from, xEvent *to)
to->u.createNotify.override = from->u.createNotify.override; to->u.createNotify.override = from->u.createNotify.override;
} }
_X_EXPORT void void
SDestroyNotifyEvent(xEvent *from, xEvent *to) SDestroyNotifyEvent(xEvent *from, xEvent *to)
{ {
to->u.u.type = from->u.u.type; to->u.u.type = from->u.u.type;
@ -902,7 +902,7 @@ SDestroyNotifyEvent(xEvent *from, xEvent *to)
cpswapl(from->u.destroyNotify.window, to->u.destroyNotify.window); cpswapl(from->u.destroyNotify.window, to->u.destroyNotify.window);
} }
_X_EXPORT void void
SUnmapNotifyEvent(xEvent *from, xEvent *to) SUnmapNotifyEvent(xEvent *from, xEvent *to)
{ {
to->u.u.type = from->u.u.type; to->u.u.type = from->u.u.type;
@ -912,7 +912,7 @@ SUnmapNotifyEvent(xEvent *from, xEvent *to)
to->u.unmapNotify.fromConfigure = from->u.unmapNotify.fromConfigure; to->u.unmapNotify.fromConfigure = from->u.unmapNotify.fromConfigure;
} }
_X_EXPORT void void
SMapNotifyEvent(xEvent *from, xEvent *to) SMapNotifyEvent(xEvent *from, xEvent *to)
{ {
to->u.u.type = from->u.u.type; to->u.u.type = from->u.u.type;
@ -922,7 +922,7 @@ SMapNotifyEvent(xEvent *from, xEvent *to)
to->u.mapNotify.override = from->u.mapNotify.override; to->u.mapNotify.override = from->u.mapNotify.override;
} }
_X_EXPORT void void
SMapRequestEvent(xEvent *from, xEvent *to) SMapRequestEvent(xEvent *from, xEvent *to)
{ {
to->u.u.type = from->u.u.type; to->u.u.type = from->u.u.type;
@ -931,7 +931,7 @@ SMapRequestEvent(xEvent *from, xEvent *to)
cpswapl(from->u.mapRequest.window, to->u.mapRequest.window); cpswapl(from->u.mapRequest.window, to->u.mapRequest.window);
} }
_X_EXPORT void void
SReparentEvent(xEvent *from, xEvent *to) SReparentEvent(xEvent *from, xEvent *to)
{ {
to->u.u.type = from->u.u.type; to->u.u.type = from->u.u.type;
@ -944,7 +944,7 @@ SReparentEvent(xEvent *from, xEvent *to)
to->u.reparent.override = from->u.reparent.override; to->u.reparent.override = from->u.reparent.override;
} }
_X_EXPORT void void
SConfigureNotifyEvent(xEvent *from, xEvent *to) SConfigureNotifyEvent(xEvent *from, xEvent *to)
{ {
to->u.u.type = from->u.u.type; to->u.u.type = from->u.u.type;
@ -965,7 +965,7 @@ SConfigureNotifyEvent(xEvent *from, xEvent *to)
to->u.configureNotify.override = from->u.configureNotify.override; to->u.configureNotify.override = from->u.configureNotify.override;
} }
_X_EXPORT void void
SConfigureRequestEvent(xEvent *from, xEvent *to) SConfigureRequestEvent(xEvent *from, xEvent *to)
{ {
to->u.u.type = from->u.u.type; to->u.u.type = from->u.u.type;
@ -990,7 +990,7 @@ SConfigureRequestEvent(xEvent *from, xEvent *to)
} }
_X_EXPORT void void
SGravityEvent(xEvent *from, xEvent *to) SGravityEvent(xEvent *from, xEvent *to)
{ {
to->u.u.type = from->u.u.type; to->u.u.type = from->u.u.type;
@ -1001,7 +1001,7 @@ SGravityEvent(xEvent *from, xEvent *to)
cpswaps(from->u.gravity.y, to->u.gravity.y); cpswaps(from->u.gravity.y, to->u.gravity.y);
} }
_X_EXPORT void void
SResizeRequestEvent(xEvent *from, xEvent *to) SResizeRequestEvent(xEvent *from, xEvent *to)
{ {
to->u.u.type = from->u.u.type; to->u.u.type = from->u.u.type;
@ -1011,7 +1011,7 @@ SResizeRequestEvent(xEvent *from, xEvent *to)
cpswaps(from->u.resizeRequest.height, to->u.resizeRequest.height); cpswaps(from->u.resizeRequest.height, to->u.resizeRequest.height);
} }
_X_EXPORT void void
SCirculateEvent(xEvent *from, xEvent *to) SCirculateEvent(xEvent *from, xEvent *to)
{ {
to->u.u.type = from->u.u.type; to->u.u.type = from->u.u.type;
@ -1023,7 +1023,7 @@ SCirculateEvent(xEvent *from, xEvent *to)
to->u.circulate.place = from->u.circulate.place; to->u.circulate.place = from->u.circulate.place;
} }
_X_EXPORT void void
SPropertyEvent(xEvent *from, xEvent *to) SPropertyEvent(xEvent *from, xEvent *to)
{ {
to->u.u.type = from->u.u.type; to->u.u.type = from->u.u.type;
@ -1034,7 +1034,7 @@ SPropertyEvent(xEvent *from, xEvent *to)
to->u.property.state = from->u.property.state; to->u.property.state = from->u.property.state;
} }
_X_EXPORT void void
SSelectionClearEvent(xEvent *from, xEvent *to) SSelectionClearEvent(xEvent *from, xEvent *to)
{ {
to->u.u.type = from->u.u.type; to->u.u.type = from->u.u.type;
@ -1044,7 +1044,7 @@ SSelectionClearEvent(xEvent *from, xEvent *to)
cpswapl(from->u.selectionClear.atom, to->u.selectionClear.atom); cpswapl(from->u.selectionClear.atom, to->u.selectionClear.atom);
} }
_X_EXPORT void void
SSelectionRequestEvent(xEvent *from, xEvent *to) SSelectionRequestEvent(xEvent *from, xEvent *to)
{ {
to->u.u.type = from->u.u.type; to->u.u.type = from->u.u.type;
@ -1062,7 +1062,7 @@ SSelectionRequestEvent(xEvent *from, xEvent *to)
to->u.selectionRequest.property); to->u.selectionRequest.property);
} }
_X_EXPORT void void
SSelectionNotifyEvent(xEvent *from, xEvent *to) SSelectionNotifyEvent(xEvent *from, xEvent *to)
{ {
to->u.u.type = from->u.u.type; to->u.u.type = from->u.u.type;
@ -1078,7 +1078,7 @@ SSelectionNotifyEvent(xEvent *from, xEvent *to)
to->u.selectionNotify.property); to->u.selectionNotify.property);
} }
_X_EXPORT void void
SColormapEvent(xEvent *from, xEvent *to) SColormapEvent(xEvent *from, xEvent *to)
{ {
to->u.u.type = from->u.u.type; to->u.u.type = from->u.u.type;
@ -1089,7 +1089,7 @@ SColormapEvent(xEvent *from, xEvent *to)
to->u.colormap.state = from->u.colormap.state; to->u.colormap.state = from->u.colormap.state;
} }
_X_EXPORT void void
SMappingEvent(xEvent *from, xEvent *to) SMappingEvent(xEvent *from, xEvent *to)
{ {
to->u.u.type = from->u.u.type; to->u.u.type = from->u.u.type;
@ -1100,7 +1100,7 @@ SMappingEvent(xEvent *from, xEvent *to)
to->u.mappingNotify.count = from->u.mappingNotify.count; to->u.mappingNotify.count = from->u.mappingNotify.count;
} }
_X_EXPORT void void
SClientMessageEvent(xEvent *from, xEvent *to) SClientMessageEvent(xEvent *from, xEvent *to)
{ {
to->u.u.type = from->u.u.type; to->u.u.type = from->u.u.type;
@ -1151,7 +1151,7 @@ SClientMessageEvent(xEvent *from, xEvent *to)
} }
} }
_X_EXPORT void void
SKeymapNotifyEvent(xEvent *from, xEvent *to) SKeymapNotifyEvent(xEvent *from, xEvent *to)
{ {
/* Keymap notify events are special; they have no /* Keymap notify events are special; they have no
@ -1211,7 +1211,7 @@ SwapVisual(xVisualType *pVis, xVisualType *pVisT)
cpswapl(pVis->blueMask, pVisT->blueMask); cpswapl(pVis->blueMask, pVisT->blueMask);
} }
_X_EXPORT void void
SwapConnSetupInfo( SwapConnSetupInfo(
char *pInfo, char *pInfo,
char *pInfoT char *pInfoT
@ -1262,7 +1262,7 @@ SwapConnSetupInfo(
} }
} }
_X_EXPORT void void
WriteSConnectionInfo(ClientPtr pClient, unsigned long size, char *pInfo) WriteSConnectionInfo(ClientPtr pClient, unsigned long size, char *pInfo)
{ {
char *pInfoTBase; char *pInfoTBase;
@ -1278,7 +1278,7 @@ WriteSConnectionInfo(ClientPtr pClient, unsigned long size, char *pInfo)
xfree(pInfoTBase); xfree(pInfoTBase);
} }
_X_EXPORT void void
SwapConnSetupPrefix(xConnSetupPrefix *pcspFrom, xConnSetupPrefix *pcspTo) SwapConnSetupPrefix(xConnSetupPrefix *pcspFrom, xConnSetupPrefix *pcspTo)
{ {
pcspTo->success = pcspFrom->success; pcspTo->success = pcspFrom->success;
@ -1288,7 +1288,7 @@ SwapConnSetupPrefix(xConnSetupPrefix *pcspFrom, xConnSetupPrefix *pcspTo)
cpswaps(pcspFrom->length, pcspTo->length); cpswaps(pcspFrom->length, pcspTo->length);
} }
_X_EXPORT void void
WriteSConnSetupPrefix(ClientPtr pClient, xConnSetupPrefix *pcsp) WriteSConnSetupPrefix(ClientPtr pClient, xConnSetupPrefix *pcsp)
{ {
xConnSetupPrefix cspT; xConnSetupPrefix cspT;

140
dix/swapreq.c
View File

@ -62,7 +62,7 @@ SOFTWARE.
/* Thanks to Jack Palevich for testing and subsequently rewriting all this */ /* Thanks to Jack Palevich for testing and subsequently rewriting all this */
/* Byte swap a list of longs */ /* Byte swap a list of longs */
_X_EXPORT void void
SwapLongs (CARD32 *list, unsigned long count) SwapLongs (CARD32 *list, unsigned long count)
{ {
char n; char n;
@ -88,7 +88,7 @@ SwapLongs (CARD32 *list, unsigned long count)
} }
/* Byte swap a list of shorts */ /* Byte swap a list of shorts */
_X_EXPORT void void
SwapShorts (short *list, unsigned long count) SwapShorts (short *list, unsigned long count)
{ {
char n; char n;
@ -123,7 +123,7 @@ SwapShorts (short *list, unsigned long count)
/* The following is used for all requests that have /* The following is used for all requests that have
no fields to be swapped (except "length") */ no fields to be swapped (except "length") */
_X_EXPORT int int
SProcSimpleReq(ClientPtr client) SProcSimpleReq(ClientPtr client)
{ {
char n; char n;
@ -136,7 +136,7 @@ SProcSimpleReq(ClientPtr client)
/* The following is used for all requests that have /* The following is used for all requests that have
only a single 32-bit field to be swapped, coming only a single 32-bit field to be swapped, coming
right after the "length" field */ right after the "length" field */
_X_EXPORT int int
SProcResourceReq(ClientPtr client) SProcResourceReq(ClientPtr client)
{ {
char n; char n;
@ -148,7 +148,7 @@ SProcResourceReq(ClientPtr client)
return(*ProcVector[stuff->reqType])(client); return(*ProcVector[stuff->reqType])(client);
} }
_X_EXPORT int int
SProcCreateWindow(ClientPtr client) SProcCreateWindow(ClientPtr client)
{ {
char n; char n;
@ -170,7 +170,7 @@ SProcCreateWindow(ClientPtr client)
return((* ProcVector[X_CreateWindow])(client)); return((* ProcVector[X_CreateWindow])(client));
} }
_X_EXPORT int int
SProcChangeWindowAttributes(ClientPtr client) SProcChangeWindowAttributes(ClientPtr client)
{ {
char n; char n;
@ -184,7 +184,7 @@ SProcChangeWindowAttributes(ClientPtr client)
return((* ProcVector[X_ChangeWindowAttributes])(client)); return((* ProcVector[X_ChangeWindowAttributes])(client));
} }
_X_EXPORT int int
SProcReparentWindow(ClientPtr client) SProcReparentWindow(ClientPtr client)
{ {
char n; char n;
@ -198,7 +198,7 @@ SProcReparentWindow(ClientPtr client)
return((* ProcVector[X_ReparentWindow])(client)); return((* ProcVector[X_ReparentWindow])(client));
} }
_X_EXPORT int int
SProcConfigureWindow(ClientPtr client) SProcConfigureWindow(ClientPtr client)
{ {
char n; char n;
@ -213,7 +213,7 @@ SProcConfigureWindow(ClientPtr client)
} }
_X_EXPORT int int
SProcInternAtom(ClientPtr client) SProcInternAtom(ClientPtr client)
{ {
char n; char n;
@ -224,7 +224,7 @@ SProcInternAtom(ClientPtr client)
return((* ProcVector[X_InternAtom])(client)); return((* ProcVector[X_InternAtom])(client));
} }
_X_EXPORT int int
SProcChangeProperty(ClientPtr client) SProcChangeProperty(ClientPtr client)
{ {
char n; char n;
@ -248,7 +248,7 @@ SProcChangeProperty(ClientPtr client)
return((* ProcVector[X_ChangeProperty])(client)); return((* ProcVector[X_ChangeProperty])(client));
} }
_X_EXPORT int int
SProcDeleteProperty(ClientPtr client) SProcDeleteProperty(ClientPtr client)
{ {
char n; char n;
@ -261,7 +261,7 @@ SProcDeleteProperty(ClientPtr client)
} }
_X_EXPORT int int
SProcGetProperty(ClientPtr client) SProcGetProperty(ClientPtr client)
{ {
char n; char n;
@ -276,7 +276,7 @@ SProcGetProperty(ClientPtr client)
return((* ProcVector[X_GetProperty])(client)); return((* ProcVector[X_GetProperty])(client));
} }
_X_EXPORT int int
SProcSetSelectionOwner(ClientPtr client) SProcSetSelectionOwner(ClientPtr client)
{ {
char n; char n;
@ -289,7 +289,7 @@ SProcSetSelectionOwner(ClientPtr client)
return((* ProcVector[X_SetSelectionOwner])(client)); return((* ProcVector[X_SetSelectionOwner])(client));
} }
_X_EXPORT int int
SProcConvertSelection(ClientPtr client) SProcConvertSelection(ClientPtr client)
{ {
char n; char n;
@ -304,7 +304,7 @@ SProcConvertSelection(ClientPtr client)
return((* ProcVector[X_ConvertSelection])(client)); return((* ProcVector[X_ConvertSelection])(client));
} }
_X_EXPORT int int
SProcSendEvent(ClientPtr client) SProcSendEvent(ClientPtr client)
{ {
char n; char n;
@ -326,7 +326,7 @@ SProcSendEvent(ClientPtr client)
return((* ProcVector[X_SendEvent])(client)); return((* ProcVector[X_SendEvent])(client));
} }
_X_EXPORT int int
SProcGrabPointer(ClientPtr client) SProcGrabPointer(ClientPtr client)
{ {
char n; char n;
@ -341,7 +341,7 @@ SProcGrabPointer(ClientPtr client)
return((* ProcVector[X_GrabPointer])(client)); return((* ProcVector[X_GrabPointer])(client));
} }
_X_EXPORT int int
SProcGrabButton(ClientPtr client) SProcGrabButton(ClientPtr client)
{ {
char n; char n;
@ -356,7 +356,7 @@ SProcGrabButton(ClientPtr client)
return((* ProcVector[X_GrabButton])(client)); return((* ProcVector[X_GrabButton])(client));
} }
_X_EXPORT int int
SProcUngrabButton(ClientPtr client) SProcUngrabButton(ClientPtr client)
{ {
char n; char n;
@ -368,7 +368,7 @@ SProcUngrabButton(ClientPtr client)
return((* ProcVector[X_UngrabButton])(client)); return((* ProcVector[X_UngrabButton])(client));
} }
_X_EXPORT int int
SProcChangeActivePointerGrab(ClientPtr client) SProcChangeActivePointerGrab(ClientPtr client)
{ {
char n; char n;
@ -381,7 +381,7 @@ SProcChangeActivePointerGrab(ClientPtr client)
return((* ProcVector[X_ChangeActivePointerGrab])(client)); return((* ProcVector[X_ChangeActivePointerGrab])(client));
} }
_X_EXPORT int int
SProcGrabKeyboard(ClientPtr client) SProcGrabKeyboard(ClientPtr client)
{ {
char n; char n;
@ -393,7 +393,7 @@ SProcGrabKeyboard(ClientPtr client)
return((* ProcVector[X_GrabKeyboard])(client)); return((* ProcVector[X_GrabKeyboard])(client));
} }
_X_EXPORT int int
SProcGrabKey(ClientPtr client) SProcGrabKey(ClientPtr client)
{ {
char n; char n;
@ -405,7 +405,7 @@ SProcGrabKey(ClientPtr client)
return((* ProcVector[X_GrabKey])(client)); return((* ProcVector[X_GrabKey])(client));
} }
_X_EXPORT int int
SProcUngrabKey(ClientPtr client) SProcUngrabKey(ClientPtr client)
{ {
char n; char n;
@ -417,7 +417,7 @@ SProcUngrabKey(ClientPtr client)
return((* ProcVector[X_UngrabKey])(client)); return((* ProcVector[X_UngrabKey])(client));
} }
_X_EXPORT int int
SProcGetMotionEvents(ClientPtr client) SProcGetMotionEvents(ClientPtr client)
{ {
char n; char n;
@ -430,7 +430,7 @@ SProcGetMotionEvents(ClientPtr client)
return((* ProcVector[X_GetMotionEvents])(client)); return((* ProcVector[X_GetMotionEvents])(client));
} }
_X_EXPORT int int
SProcTranslateCoords(ClientPtr client) SProcTranslateCoords(ClientPtr client)
{ {
char n; char n;
@ -444,7 +444,7 @@ SProcTranslateCoords(ClientPtr client)
return((* ProcVector[X_TranslateCoords])(client)); return((* ProcVector[X_TranslateCoords])(client));
} }
_X_EXPORT int int
SProcWarpPointer(ClientPtr client) SProcWarpPointer(ClientPtr client)
{ {
char n; char n;
@ -462,7 +462,7 @@ SProcWarpPointer(ClientPtr client)
return((* ProcVector[X_WarpPointer])(client)); return((* ProcVector[X_WarpPointer])(client));
} }
_X_EXPORT int int
SProcSetInputFocus(ClientPtr client) SProcSetInputFocus(ClientPtr client)
{ {
char n; char n;
@ -474,7 +474,7 @@ SProcSetInputFocus(ClientPtr client)
return((* ProcVector[X_SetInputFocus])(client)); return((* ProcVector[X_SetInputFocus])(client));
} }
_X_EXPORT int int
SProcOpenFont(ClientPtr client) SProcOpenFont(ClientPtr client)
{ {
char n; char n;
@ -486,7 +486,7 @@ SProcOpenFont(ClientPtr client)
return((* ProcVector[X_OpenFont])(client)); return((* ProcVector[X_OpenFont])(client));
} }
_X_EXPORT int int
SProcListFonts(ClientPtr client) SProcListFonts(ClientPtr client)
{ {
char n; char n;
@ -498,7 +498,7 @@ SProcListFonts(ClientPtr client)
return((* ProcVector[X_ListFonts])(client)); return((* ProcVector[X_ListFonts])(client));
} }
_X_EXPORT int int
SProcListFontsWithInfo(ClientPtr client) SProcListFontsWithInfo(ClientPtr client)
{ {
char n; char n;
@ -510,7 +510,7 @@ SProcListFontsWithInfo(ClientPtr client)
return((* ProcVector[X_ListFontsWithInfo])(client)); return((* ProcVector[X_ListFontsWithInfo])(client));
} }
_X_EXPORT int int
SProcSetFontPath(ClientPtr client) SProcSetFontPath(ClientPtr client)
{ {
char n; char n;
@ -521,7 +521,7 @@ SProcSetFontPath(ClientPtr client)
return((* ProcVector[X_SetFontPath])(client)); return((* ProcVector[X_SetFontPath])(client));
} }
_X_EXPORT int int
SProcCreatePixmap(ClientPtr client) SProcCreatePixmap(ClientPtr client)
{ {
char n; char n;
@ -536,7 +536,7 @@ SProcCreatePixmap(ClientPtr client)
return((* ProcVector[X_CreatePixmap])(client)); return((* ProcVector[X_CreatePixmap])(client));
} }
_X_EXPORT int int
SProcCreateGC(ClientPtr client) SProcCreateGC(ClientPtr client)
{ {
char n; char n;
@ -550,7 +550,7 @@ SProcCreateGC(ClientPtr client)
return((* ProcVector[X_CreateGC])(client)); return((* ProcVector[X_CreateGC])(client));
} }
_X_EXPORT int int
SProcChangeGC(ClientPtr client) SProcChangeGC(ClientPtr client)
{ {
char n; char n;
@ -563,7 +563,7 @@ SProcChangeGC(ClientPtr client)
return((* ProcVector[X_ChangeGC])(client)); return((* ProcVector[X_ChangeGC])(client));
} }
_X_EXPORT int int
SProcCopyGC(ClientPtr client) SProcCopyGC(ClientPtr client)
{ {
char n; char n;
@ -576,7 +576,7 @@ SProcCopyGC(ClientPtr client)
return((* ProcVector[X_CopyGC])(client)); return((* ProcVector[X_CopyGC])(client));
} }
_X_EXPORT int int
SProcSetDashes(ClientPtr client) SProcSetDashes(ClientPtr client)
{ {
char n; char n;
@ -590,7 +590,7 @@ SProcSetDashes(ClientPtr client)
} }
_X_EXPORT int int
SProcSetClipRectangles(ClientPtr client) SProcSetClipRectangles(ClientPtr client)
{ {
char n; char n;
@ -604,7 +604,7 @@ SProcSetClipRectangles(ClientPtr client)
return((* ProcVector[X_SetClipRectangles])(client)); return((* ProcVector[X_SetClipRectangles])(client));
} }
_X_EXPORT int int
SProcClearToBackground(ClientPtr client) SProcClearToBackground(ClientPtr client)
{ {
char n; char n;
@ -619,7 +619,7 @@ SProcClearToBackground(ClientPtr client)
return((* ProcVector[X_ClearArea])(client)); return((* ProcVector[X_ClearArea])(client));
} }
_X_EXPORT int int
SProcCopyArea(ClientPtr client) SProcCopyArea(ClientPtr client)
{ {
char n; char n;
@ -638,7 +638,7 @@ SProcCopyArea(ClientPtr client)
return((* ProcVector[X_CopyArea])(client)); return((* ProcVector[X_CopyArea])(client));
} }
_X_EXPORT int int
SProcCopyPlane(ClientPtr client) SProcCopyPlane(ClientPtr client)
{ {
char n; char n;
@ -660,7 +660,7 @@ SProcCopyPlane(ClientPtr client)
/* The following routine is used for all Poly drawing requests /* The following routine is used for all Poly drawing requests
(except FillPoly, which uses a different request format) */ (except FillPoly, which uses a different request format) */
_X_EXPORT int int
SProcPoly(ClientPtr client) SProcPoly(ClientPtr client)
{ {
char n; char n;
@ -677,7 +677,7 @@ SProcPoly(ClientPtr client)
/* cannot use SProcPoly for this one, because xFillPolyReq /* cannot use SProcPoly for this one, because xFillPolyReq
is longer than xPolyPointReq, and we don't want to swap is longer than xPolyPointReq, and we don't want to swap
the difference as shorts! */ the difference as shorts! */
_X_EXPORT int int
SProcFillPoly(ClientPtr client) SProcFillPoly(ClientPtr client)
{ {
char n; char n;
@ -691,7 +691,7 @@ SProcFillPoly(ClientPtr client)
return((* ProcVector[X_FillPoly])(client)); return((* ProcVector[X_FillPoly])(client));
} }
_X_EXPORT int int
SProcPutImage(ClientPtr client) SProcPutImage(ClientPtr client)
{ {
char n; char n;
@ -709,7 +709,7 @@ SProcPutImage(ClientPtr client)
} }
_X_EXPORT int int
SProcGetImage(ClientPtr client) SProcGetImage(ClientPtr client)
{ {
char n; char n;
@ -727,7 +727,7 @@ SProcGetImage(ClientPtr client)
/* ProcPolyText used for both PolyText8 and PolyText16 */ /* ProcPolyText used for both PolyText8 and PolyText16 */
_X_EXPORT int int
SProcPolyText(ClientPtr client) SProcPolyText(ClientPtr client)
{ {
char n; char n;
@ -743,7 +743,7 @@ SProcPolyText(ClientPtr client)
/* ProcImageText used for both ImageText8 and ImageText16 */ /* ProcImageText used for both ImageText8 and ImageText16 */
_X_EXPORT int int
SProcImageText(ClientPtr client) SProcImageText(ClientPtr client)
{ {
char n; char n;
@ -757,7 +757,7 @@ SProcImageText(ClientPtr client)
return((* ProcVector[stuff->reqType])(client)); return((* ProcVector[stuff->reqType])(client));
} }
_X_EXPORT int int
SProcCreateColormap(ClientPtr client) SProcCreateColormap(ClientPtr client)
{ {
char n; char n;
@ -771,7 +771,7 @@ SProcCreateColormap(ClientPtr client)
} }
_X_EXPORT int int
SProcCopyColormapAndFree(ClientPtr client) SProcCopyColormapAndFree(ClientPtr client)
{ {
char n; char n;
@ -784,7 +784,7 @@ SProcCopyColormapAndFree(ClientPtr client)
} }
_X_EXPORT int int
SProcAllocColor(ClientPtr client) SProcAllocColor(ClientPtr client)
{ {
char n; char n;
@ -798,7 +798,7 @@ SProcAllocColor(ClientPtr client)
return((* ProcVector[X_AllocColor])(client)); return((* ProcVector[X_AllocColor])(client));
} }
_X_EXPORT int int
SProcAllocNamedColor(ClientPtr client) SProcAllocNamedColor(ClientPtr client)
{ {
char n; char n;
@ -811,7 +811,7 @@ SProcAllocNamedColor(ClientPtr client)
return((* ProcVector[X_AllocNamedColor])(client)); return((* ProcVector[X_AllocNamedColor])(client));
} }
_X_EXPORT int int
SProcAllocColorCells(ClientPtr client) SProcAllocColorCells(ClientPtr client)
{ {
char n; char n;
@ -824,7 +824,7 @@ SProcAllocColorCells(ClientPtr client)
return((* ProcVector[X_AllocColorCells])(client)); return((* ProcVector[X_AllocColorCells])(client));
} }
_X_EXPORT int int
SProcAllocColorPlanes(ClientPtr client) SProcAllocColorPlanes(ClientPtr client)
{ {
char n; char n;
@ -839,7 +839,7 @@ SProcAllocColorPlanes(ClientPtr client)
return((* ProcVector[X_AllocColorPlanes])(client)); return((* ProcVector[X_AllocColorPlanes])(client));
} }
_X_EXPORT int int
SProcFreeColors(ClientPtr client) SProcFreeColors(ClientPtr client)
{ {
char n; char n;
@ -853,7 +853,7 @@ SProcFreeColors(ClientPtr client)
} }
_X_EXPORT void void
SwapColorItem(xColorItem *pItem) SwapColorItem(xColorItem *pItem)
{ {
char n; char n;
@ -864,7 +864,7 @@ SwapColorItem(xColorItem *pItem)
swaps(&pItem->blue, n); swaps(&pItem->blue, n);
} }
_X_EXPORT int int
SProcStoreColors(ClientPtr client) SProcStoreColors(ClientPtr client)
{ {
char n; char n;
@ -881,7 +881,7 @@ SProcStoreColors(ClientPtr client)
return((* ProcVector[X_StoreColors])(client)); return((* ProcVector[X_StoreColors])(client));
} }
_X_EXPORT int int
SProcStoreNamedColor (ClientPtr client) SProcStoreNamedColor (ClientPtr client)
{ {
char n; char n;
@ -894,7 +894,7 @@ SProcStoreNamedColor (ClientPtr client)
return((* ProcVector[X_StoreNamedColor])(client)); return((* ProcVector[X_StoreNamedColor])(client));
} }
_X_EXPORT int int
SProcQueryColors (ClientPtr client) SProcQueryColors (ClientPtr client)
{ {
char n; char n;
@ -906,7 +906,7 @@ SProcQueryColors (ClientPtr client)
return((* ProcVector[X_QueryColors])(client)); return((* ProcVector[X_QueryColors])(client));
} }
_X_EXPORT int int
SProcLookupColor (ClientPtr client) SProcLookupColor (ClientPtr client)
{ {
char n; char n;
@ -918,7 +918,7 @@ SProcLookupColor (ClientPtr client)
return((* ProcVector[X_LookupColor])(client)); return((* ProcVector[X_LookupColor])(client));
} }
_X_EXPORT int int
SProcCreateCursor (ClientPtr client) SProcCreateCursor (ClientPtr client)
{ {
char n; char n;
@ -939,7 +939,7 @@ SProcCreateCursor (ClientPtr client)
return((* ProcVector[X_CreateCursor])(client)); return((* ProcVector[X_CreateCursor])(client));
} }
_X_EXPORT int int
SProcCreateGlyphCursor (ClientPtr client) SProcCreateGlyphCursor (ClientPtr client)
{ {
char n; char n;
@ -961,7 +961,7 @@ SProcCreateGlyphCursor (ClientPtr client)
} }
_X_EXPORT int int
SProcRecolorCursor (ClientPtr client) SProcRecolorCursor (ClientPtr client)
{ {
char n; char n;
@ -978,7 +978,7 @@ SProcRecolorCursor (ClientPtr client)
return((* ProcVector[X_RecolorCursor])(client)); return((* ProcVector[X_RecolorCursor])(client));
} }
_X_EXPORT int int
SProcQueryBestSize (ClientPtr client) SProcQueryBestSize (ClientPtr client)
{ {
char n; char n;
@ -992,7 +992,7 @@ SProcQueryBestSize (ClientPtr client)
} }
_X_EXPORT int int
SProcQueryExtension (ClientPtr client) SProcQueryExtension (ClientPtr client)
{ {
char n; char n;
@ -1003,7 +1003,7 @@ SProcQueryExtension (ClientPtr client)
return((* ProcVector[X_QueryExtension])(client)); return((* ProcVector[X_QueryExtension])(client));
} }
_X_EXPORT int int
SProcChangeKeyboardMapping (ClientPtr client) SProcChangeKeyboardMapping (ClientPtr client)
{ {
char n; char n;
@ -1015,7 +1015,7 @@ SProcChangeKeyboardMapping (ClientPtr client)
} }
_X_EXPORT int int
SProcChangeKeyboardControl (ClientPtr client) SProcChangeKeyboardControl (ClientPtr client)
{ {
char n; char n;
@ -1027,7 +1027,7 @@ SProcChangeKeyboardControl (ClientPtr client)
return((* ProcVector[X_ChangeKeyboardControl])(client)); return((* ProcVector[X_ChangeKeyboardControl])(client));
} }
_X_EXPORT int int
SProcChangePointerControl (ClientPtr client) SProcChangePointerControl (ClientPtr client)
{ {
char n; char n;
@ -1041,7 +1041,7 @@ SProcChangePointerControl (ClientPtr client)
} }
_X_EXPORT int int
SProcSetScreenSaver (ClientPtr client) SProcSetScreenSaver (ClientPtr client)
{ {
char n; char n;
@ -1053,7 +1053,7 @@ SProcSetScreenSaver (ClientPtr client)
return((* ProcVector[X_SetScreenSaver])(client)); return((* ProcVector[X_SetScreenSaver])(client));
} }
_X_EXPORT int int
SProcChangeHosts (ClientPtr client) SProcChangeHosts (ClientPtr client)
{ {
char n; char n;
@ -1066,7 +1066,7 @@ SProcChangeHosts (ClientPtr client)
} }
_X_EXPORT int SProcRotateProperties (ClientPtr client) int SProcRotateProperties (ClientPtr client)
{ {
char n; char n;
REQUEST(xRotatePropertiesReq); REQUEST(xRotatePropertiesReq);
@ -1079,7 +1079,7 @@ _X_EXPORT int SProcRotateProperties (ClientPtr client)
return ((* ProcVector[X_RotateProperties])(client)); return ((* ProcVector[X_RotateProperties])(client));
} }
_X_EXPORT int int
SProcNoOperation(ClientPtr client) SProcNoOperation(ClientPtr client)
{ {
char n; char n;
@ -1088,7 +1088,7 @@ SProcNoOperation(ClientPtr client)
return ((* ProcVector[X_NoOperation])(client)); return ((* ProcVector[X_NoOperation])(client));
} }
_X_EXPORT void void
SwapConnClientPrefix(xConnClientPrefix *pCCP) SwapConnClientPrefix(xConnClientPrefix *pCCP)
{ {
char n; char n;

10
dix/tables.c
View File

@ -61,7 +61,7 @@ SOFTWARE.
#include "swaprep.h" #include "swaprep.h"
#include "swapreq.h" #include "swapreq.h"
_X_EXPORT int (* InitialVector[3]) ( int (* InitialVector[3]) (
ClientPtr /* client */ ClientPtr /* client */
) = ) =
{ {
@ -70,7 +70,7 @@ _X_EXPORT int (* InitialVector[3]) (
ProcEstablishConnection ProcEstablishConnection
}; };
_X_EXPORT int (* ProcVector[256]) ( int (* ProcVector[256]) (
ClientPtr /* client */ ClientPtr /* client */
) = ) =
{ {
@ -204,7 +204,7 @@ _X_EXPORT int (* ProcVector[256]) (
ProcNoOperation ProcNoOperation
}; };
_X_EXPORT int (* SwappedProcVector[256]) ( int (* SwappedProcVector[256]) (
ClientPtr /* client */ ClientPtr /* client */
) = ) =
{ {
@ -338,7 +338,7 @@ _X_EXPORT int (* SwappedProcVector[256]) (
SProcNoOperation SProcNoOperation
}; };
_X_EXPORT EventSwapPtr EventSwapVector[128] = EventSwapPtr EventSwapVector[128] =
{ {
(EventSwapPtr)SErrorEvent, (EventSwapPtr)SErrorEvent,
NotImplemented, NotImplemented,
@ -378,7 +378,7 @@ _X_EXPORT EventSwapPtr EventSwapVector[128] =
}; };
_X_EXPORT ReplySwapPtr ReplySwapVector[256] = ReplySwapPtr ReplySwapVector[256] =
{ {
ReplyNotSwappd, ReplyNotSwappd,
ReplyNotSwappd, ReplyNotSwappd,

86
dix/window.c
View File

@ -150,12 +150,12 @@ WindowSeekDeviceCursor(WindowPtr pWin,
DevCursNodePtr* pNode, DevCursNodePtr* pNode,
DevCursNodePtr* pPrev); DevCursNodePtr* pPrev);
_X_EXPORT int screenIsSaved = SCREEN_SAVER_OFF; int screenIsSaved = SCREEN_SAVER_OFF;
_X_EXPORT ScreenSaverStuffRec savedScreenInfo[MAXSCREENS]; ScreenSaverStuffRec savedScreenInfo[MAXSCREENS];
static int FocusPrivatesKeyIndex; static int FocusPrivatesKeyIndex;
_X_EXPORT DevPrivateKey FocusPrivatesKey = &FocusPrivatesKeyIndex; DevPrivateKey FocusPrivatesKey = &FocusPrivatesKeyIndex;
static Bool TileScreenSaver(int i, int kind); static Bool TileScreenSaver(int i, int kind);
@ -221,7 +221,7 @@ PrintWindowTree(void)
} }
#endif #endif
_X_EXPORT int int
TraverseTree(WindowPtr pWin, VisitWindowProcPtr func, pointer data) TraverseTree(WindowPtr pWin, VisitWindowProcPtr func, pointer data)
{ {
int result; int result;
@ -256,17 +256,17 @@ TraverseTree(WindowPtr pWin, VisitWindowProcPtr func, pointer data)
* exit WalkTree. Does depth-first traverse. * exit WalkTree. Does depth-first traverse.
*****/ *****/
_X_EXPORT int int
WalkTree(ScreenPtr pScreen, VisitWindowProcPtr func, pointer data) WalkTree(ScreenPtr pScreen, VisitWindowProcPtr func, pointer data)
{ {
return(TraverseTree(WindowTable[pScreen->myNum], func, data)); return(TraverseTree(WindowTable[pScreen->myNum], func, data));
} }
/* hack for forcing backing store on all windows */ /* hack for forcing backing store on all windows */
_X_EXPORT int defaultBackingStore = NotUseful; int defaultBackingStore = NotUseful;
/* hack to force no backing store */ /* hack to force no backing store */
_X_EXPORT Bool disableBackingStore = FALSE; Bool disableBackingStore = FALSE;
_X_EXPORT Bool enableBackingStore = FALSE; Bool enableBackingStore = FALSE;
static void static void
SetWindowToDefaults(WindowPtr pWin) SetWindowToDefaults(WindowPtr pWin)
@ -356,7 +356,7 @@ MakeRootTile(WindowPtr pWin)
* Makes a window at initialization time for specified screen * Makes a window at initialization time for specified screen
*****/ *****/
_X_EXPORT Bool Bool
CreateRootWindow(ScreenPtr pScreen) CreateRootWindow(ScreenPtr pScreen)
{ {
WindowPtr pWin; WindowPtr pWin;
@ -469,7 +469,7 @@ CreateRootWindow(ScreenPtr pScreen)
return TRUE; return TRUE;
} }
_X_EXPORT void void
InitRootWindow(WindowPtr pWin) InitRootWindow(WindowPtr pWin)
{ {
ScreenPtr pScreen = pWin->drawable.pScreen; ScreenPtr pScreen = pWin->drawable.pScreen;
@ -540,14 +540,14 @@ ClippedRegionFromBox(WindowPtr pWin, RegionPtr Rgn,
static RealChildHeadProc realChildHeadProc = NULL; static RealChildHeadProc realChildHeadProc = NULL;
_X_EXPORT void void
RegisterRealChildHeadProc (RealChildHeadProc proc) RegisterRealChildHeadProc (RealChildHeadProc proc)
{ {
realChildHeadProc = proc; realChildHeadProc = proc;
} }
_X_EXPORT WindowPtr WindowPtr
RealChildHead(WindowPtr pWin) RealChildHead(WindowPtr pWin)
{ {
if (realChildHeadProc) { if (realChildHeadProc) {
@ -567,7 +567,7 @@ RealChildHead(WindowPtr pWin)
* Makes a window in response to client request * Makes a window in response to client request
*****/ *****/
_X_EXPORT WindowPtr WindowPtr
CreateWindow(Window wid, WindowPtr pParent, int x, int y, unsigned w, CreateWindow(Window wid, WindowPtr pParent, int x, int y, unsigned w,
unsigned h, unsigned bw, unsigned class, Mask vmask, XID *vlist, unsigned h, unsigned bw, unsigned class, Mask vmask, XID *vlist,
int depth, ClientPtr client, VisualID visual, int *error) int depth, ClientPtr client, VisualID visual, int *error)
@ -933,7 +933,7 @@ CrushTree(WindowPtr pWin)
* If wid is None, don't send any events * If wid is None, don't send any events
*****/ *****/
_X_EXPORT int int
DeleteWindow(pointer value, XID wid) DeleteWindow(pointer value, XID wid)
{ {
WindowPtr pParent; WindowPtr pParent;
@ -970,7 +970,7 @@ DeleteWindow(pointer value, XID wid)
return Success; return Success;
} }
_X_EXPORT int int
DestroySubwindows(WindowPtr pWin, ClientPtr client) DestroySubwindows(WindowPtr pWin, ClientPtr client)
{ {
/* XXX /* XXX
@ -1004,7 +1004,7 @@ DestroySubwindows(WindowPtr pWin, ClientPtr client)
* to most significant bit in the mask. * to most significant bit in the mask.
*****/ *****/
_X_EXPORT int int
ChangeWindowAttributes(WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client) ChangeWindowAttributes(WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client)
{ {
XID *pVlist; XID *pVlist;
@ -1480,7 +1480,7 @@ PatchUp:
* Notice that this is different than ChangeWindowAttributes * Notice that this is different than ChangeWindowAttributes
*****/ *****/
_X_EXPORT void void
GetWindowAttributes(WindowPtr pWin, ClientPtr client, xGetWindowAttributesReply *wa) GetWindowAttributes(WindowPtr pWin, ClientPtr client, xGetWindowAttributesReply *wa)
{ {
wa->type = X_Reply; wa->type = X_Reply;
@ -1516,7 +1516,7 @@ GetWindowAttributes(WindowPtr pWin, ClientPtr client, xGetWindowAttributesReply
} }
_X_EXPORT WindowPtr WindowPtr
MoveWindowInStack(WindowPtr pWin, WindowPtr pNextSib) MoveWindowInStack(WindowPtr pWin, WindowPtr pNextSib)
{ {
WindowPtr pParent = pWin->parent; WindowPtr pParent = pWin->parent;
@ -1600,7 +1600,7 @@ MoveWindowInStack(WindowPtr pWin, WindowPtr pNextSib)
return( pFirstChange ); return( pFirstChange );
} }
_X_EXPORT RegionPtr RegionPtr
CreateUnclippedWinSize (WindowPtr pWin) CreateUnclippedWinSize (WindowPtr pWin)
{ {
RegionPtr pRgn; RegionPtr pRgn;
@ -1626,7 +1626,7 @@ CreateUnclippedWinSize (WindowPtr pWin)
return pRgn; return pRgn;
} }
_X_EXPORT void void
SetWinSize (WindowPtr pWin) SetWinSize (WindowPtr pWin)
{ {
#ifdef COMPOSITE #ifdef COMPOSITE
@ -1667,7 +1667,7 @@ SetWinSize (WindowPtr pWin)
} }
} }
_X_EXPORT void void
SetBorderSize (WindowPtr pWin) SetBorderSize (WindowPtr pWin)
{ {
int bw; int bw;
@ -1721,7 +1721,7 @@ SetBorderSize (WindowPtr pWin)
* \param destx,desty position relative to gravity * \param destx,desty position relative to gravity
*/ */
_X_EXPORT void void
GravityTranslate (int x, int y, int oldx, int oldy, GravityTranslate (int x, int y, int oldx, int oldy,
int dw, int dh, unsigned gravity, int dw, int dh, unsigned gravity,
int *destx, int *desty) int *destx, int *desty)
@ -1771,7 +1771,7 @@ GravityTranslate (int x, int y, int oldx, int oldy,
} }
/* XXX need to retile border on each window with ParentRelative origin */ /* XXX need to retile border on each window with ParentRelative origin */
_X_EXPORT void void
ResizeChildrenWinSize(WindowPtr pWin, int dx, int dy, int dw, int dh) ResizeChildrenWinSize(WindowPtr pWin, int dx, int dy, int dw, int dh)
{ {
ScreenPtr pScreen; ScreenPtr pScreen;
@ -2165,7 +2165,7 @@ ReflectStackChange(
* ConfigureWindow * ConfigureWindow
*****/ *****/
_X_EXPORT int int
ConfigureWindow(WindowPtr pWin, Mask mask, XID *vlist, ClientPtr client) ConfigureWindow(WindowPtr pWin, Mask mask, XID *vlist, ClientPtr client)
{ {
#define RESTACK_WIN 0 #define RESTACK_WIN 0
@ -2427,7 +2427,7 @@ ActuallyDoSomething:
* *
******/ ******/
_X_EXPORT int int
CirculateWindow(WindowPtr pParent, int direction, ClientPtr client) CirculateWindow(WindowPtr pParent, int direction, ClientPtr client)
{ {
WindowPtr pWin, pHead, pFirst; WindowPtr pWin, pHead, pFirst;
@ -2499,7 +2499,7 @@ CompareWIDs(
* ReparentWindow * ReparentWindow
*****/ *****/
_X_EXPORT int int
ReparentWindow(WindowPtr pWin, WindowPtr pParent, ReparentWindow(WindowPtr pWin, WindowPtr pParent,
int x, int y, ClientPtr client) int x, int y, ClientPtr client)
{ {
@ -2622,7 +2622,7 @@ RealizeTree(WindowPtr pWin)
static WindowPtr windowDisableMapUnmapEvents; static WindowPtr windowDisableMapUnmapEvents;
_X_EXPORT void void
DisableMapUnmapEvents(WindowPtr pWin) DisableMapUnmapEvents(WindowPtr pWin)
{ {
assert (windowDisableMapUnmapEvents == NULL); assert (windowDisableMapUnmapEvents == NULL);
@ -2630,7 +2630,7 @@ DisableMapUnmapEvents(WindowPtr pWin)
windowDisableMapUnmapEvents = pWin; windowDisableMapUnmapEvents = pWin;
} }
_X_EXPORT void void
EnableMapUnmapEvents(WindowPtr pWin) EnableMapUnmapEvents(WindowPtr pWin)
{ {
assert (windowDisableMapUnmapEvents != NULL); assert (windowDisableMapUnmapEvents != NULL);
@ -2652,7 +2652,7 @@ MapUnmapEventsEnabled(WindowPtr pWin)
* MapNotify event is generated. * MapNotify event is generated.
*****/ *****/
_X_EXPORT int int
MapWindow(WindowPtr pWin, ClientPtr client) MapWindow(WindowPtr pWin, ClientPtr client)
{ {
ScreenPtr pScreen; ScreenPtr pScreen;
@ -2742,7 +2742,7 @@ MapWindow(WindowPtr pWin, ClientPtr client)
* to bottom stacking order. * to bottom stacking order.
*****/ *****/
_X_EXPORT void void
MapSubwindows(WindowPtr pParent, ClientPtr client) MapSubwindows(WindowPtr pParent, ClientPtr client)
{ {
WindowPtr pWin; WindowPtr pWin;
@ -2874,7 +2874,7 @@ UnrealizeTree(
* generated. Cannot unmap a root window. * generated. Cannot unmap a root window.
*****/ *****/
_X_EXPORT int int
UnmapWindow(WindowPtr pWin, Bool fromConfigure) UnmapWindow(WindowPtr pWin, Bool fromConfigure)
{ {
WindowPtr pParent; WindowPtr pParent;
@ -2923,7 +2923,7 @@ UnmapWindow(WindowPtr pWin, Bool fromConfigure)
* children of the window, in bottom to top stacking order. * children of the window, in bottom to top stacking order.
*****/ *****/
_X_EXPORT void void
UnmapSubwindows(WindowPtr pWin) UnmapSubwindows(WindowPtr pWin)
{ {
WindowPtr pChild, pHead; WindowPtr pChild, pHead;
@ -3001,7 +3001,7 @@ UnmapSubwindows(WindowPtr pWin)
} }
_X_EXPORT void void
HandleSaveSet(ClientPtr client) HandleSaveSet(ClientPtr client)
{ {
WindowPtr pParent, pWin; WindowPtr pParent, pWin;
@ -3051,7 +3051,7 @@ HandleSaveSet(ClientPtr client)
* *
* \param x,y in root * \param x,y in root
*/ */
_X_EXPORT Bool Bool
PointInWindowIsVisible(WindowPtr pWin, int x, int y) PointInWindowIsVisible(WindowPtr pWin, int x, int y)
{ {
BoxRec box; BoxRec box;
@ -3070,7 +3070,7 @@ PointInWindowIsVisible(WindowPtr pWin, int x, int y)
} }
_X_EXPORT RegionPtr RegionPtr
NotClippedByChildren(WindowPtr pWin) NotClippedByChildren(WindowPtr pWin)
{ {
ScreenPtr pScreen; ScreenPtr pScreen;
@ -3087,7 +3087,7 @@ NotClippedByChildren(WindowPtr pWin)
return(pReg); return(pReg);
} }
_X_EXPORT void void
SendVisibilityNotify(WindowPtr pWin) SendVisibilityNotify(WindowPtr pWin)
{ {
xEvent event; xEvent event;
@ -3165,7 +3165,7 @@ static void DrawLogo(
); );
#endif #endif
_X_EXPORT int int
dixSaveScreens(ClientPtr client, int on, int mode) dixSaveScreens(ClientPtr client, int on, int mode)
{ {
int rc, i, what, type; int rc, i, what, type;
@ -3284,7 +3284,7 @@ dixSaveScreens(ClientPtr client, int on, int mode)
return Success; return Success;
} }
_X_EXPORT int int
SaveScreens(int on, int mode) SaveScreens(int on, int mode)
{ {
return dixSaveScreens(serverClient, on, mode); return dixSaveScreens(serverClient, on, mode);
@ -3409,7 +3409,7 @@ TileScreenSaver(int i, int kind)
* contain the structure. * contain the structure.
*/ */
_X_EXPORT WindowPtr WindowPtr
FindWindowWithOptional (WindowPtr w) FindWindowWithOptional (WindowPtr w)
{ {
do do
@ -3426,7 +3426,7 @@ FindWindowWithOptional (WindowPtr w)
* release the optional record * release the optional record
*/ */
_X_EXPORT void void
CheckWindowOptionalNeed (WindowPtr w) CheckWindowOptionalNeed (WindowPtr w)
{ {
WindowOptPtr optional; WindowOptPtr optional;
@ -3493,7 +3493,7 @@ CheckWindowOptionalNeed (WindowPtr w)
* values. * values.
*/ */
_X_EXPORT Bool Bool
MakeWindowOptional (WindowPtr pWin) MakeWindowOptional (WindowPtr pWin)
{ {
WindowOptPtr optional; WindowOptPtr optional;
@ -3565,7 +3565,7 @@ MakeWindowOptional (WindowPtr pWin)
* Assumption: If there is a node for a device in the list, the device has a * Assumption: If there is a node for a device in the list, the device has a
* cursor. If the cursor is set to None, it is inherited by the parent. * cursor. If the cursor is set to None, it is inherited by the parent.
*/ */
_X_EXPORT int int
ChangeWindowDeviceCursor(WindowPtr pWin, ChangeWindowDeviceCursor(WindowPtr pWin,
DeviceIntPtr pDev, DeviceIntPtr pDev,
CursorPtr pCursor) CursorPtr pCursor)
@ -3670,7 +3670,7 @@ ChangeWindowDeviceCursor(WindowPtr pWin,
} }
/* Get device cursor for given device or None if none is set */ /* Get device cursor for given device or None if none is set */
_X_EXPORT CursorPtr CursorPtr
WindowGetDeviceCursor(WindowPtr pWin, DeviceIntPtr pDev) WindowGetDeviceCursor(WindowPtr pWin, DeviceIntPtr pDev)
{ {
DevCursorList pList; DevCursorList pList;

20
exa/exa.c
View File

@ -67,7 +67,7 @@ ExaGetPixmapAddress(PixmapPtr p)
* support for having multiple card-accessible offscreen, such as an AGP memory * support for having multiple card-accessible offscreen, such as an AGP memory
* pool alongside the framebuffer pool. * pool alongside the framebuffer pool.
*/ */
_X_EXPORT unsigned long unsigned long
exaGetPixmapOffset(PixmapPtr pPix) exaGetPixmapOffset(PixmapPtr pPix)
{ {
ExaScreenPriv (pPix->drawable.pScreen); ExaScreenPriv (pPix->drawable.pScreen);
@ -76,7 +76,7 @@ exaGetPixmapOffset(PixmapPtr pPix)
(unsigned long)pExaScr->info->memoryBase); (unsigned long)pExaScr->info->memoryBase);
} }
_X_EXPORT void * void *
exaGetPixmapDriverPrivate(PixmapPtr pPix) exaGetPixmapDriverPrivate(PixmapPtr pPix)
{ {
ExaPixmapPriv(pPix); ExaPixmapPriv(pPix);
@ -90,7 +90,7 @@ exaGetPixmapDriverPrivate(PixmapPtr pPix)
* This is a helper to make driver code more obvious, due to the rather obscure * This is a helper to make driver code more obvious, due to the rather obscure
* naming of the pitch field in the pixmap. * naming of the pitch field in the pixmap.
*/ */
_X_EXPORT unsigned long unsigned long
exaGetPixmapPitch(PixmapPtr pPix) exaGetPixmapPitch(PixmapPtr pPix)
{ {
return pPix->devKind; return pPix->devKind;
@ -100,7 +100,7 @@ exaGetPixmapPitch(PixmapPtr pPix)
* exaGetPixmapSize() returns the size in bytes of the given pixmap in video * exaGetPixmapSize() returns the size in bytes of the given pixmap in video
* memory. Only valid when the pixmap is currently in framebuffer. * memory. Only valid when the pixmap is currently in framebuffer.
*/ */
_X_EXPORT unsigned long unsigned long
exaGetPixmapSize(PixmapPtr pPix) exaGetPixmapSize(PixmapPtr pPix)
{ {
ExaPixmapPrivPtr pExaPixmap; ExaPixmapPrivPtr pExaPixmap;
@ -463,7 +463,7 @@ exaPixmapIsOffscreen(PixmapPtr p)
/** /**
* exaDrawableIsOffscreen() is a convenience wrapper for exaPixmapIsOffscreen(). * exaDrawableIsOffscreen() is a convenience wrapper for exaPixmapIsOffscreen().
*/ */
_X_EXPORT Bool Bool
exaDrawableIsOffscreen (DrawablePtr pDrawable) exaDrawableIsOffscreen (DrawablePtr pDrawable)
{ {
return exaPixmapIsOffscreen (exaGetDrawablePixmap (pDrawable)); return exaPixmapIsOffscreen (exaGetDrawablePixmap (pDrawable));
@ -776,7 +776,7 @@ exaCloseScreen(int i, ScreenPtr pScreen)
* *
* @return a newly allocated, zero-filled driver structure * @return a newly allocated, zero-filled driver structure
*/ */
_X_EXPORT ExaDriverPtr ExaDriverPtr
exaDriverAlloc(void) exaDriverAlloc(void)
{ {
return xcalloc(1, sizeof(ExaDriverRec)); return xcalloc(1, sizeof(ExaDriverRec));
@ -792,7 +792,7 @@ exaDriverAlloc(void)
* *
* @return TRUE if EXA was successfully initialized. * @return TRUE if EXA was successfully initialized.
*/ */
_X_EXPORT Bool Bool
exaDriverInit (ScreenPtr pScreen, exaDriverInit (ScreenPtr pScreen,
ExaDriverPtr pScreenInfo) ExaDriverPtr pScreenInfo)
{ {
@ -1012,7 +1012,7 @@ exaDriverInit (ScreenPtr pScreen,
* *
* @param pScreen screen being torn down. * @param pScreen screen being torn down.
*/ */
_X_EXPORT void void
exaDriverFini (ScreenPtr pScreen) exaDriverFini (ScreenPtr pScreen)
{ {
/*right now does nothing*/ /*right now does nothing*/
@ -1029,7 +1029,7 @@ exaDriverFini (ScreenPtr pScreen)
* driver MarkSync() callback, the return value of which may be used to do partial * driver MarkSync() callback, the return value of which may be used to do partial
* synchronization with the hardware in the future. * synchronization with the hardware in the future.
*/ */
_X_EXPORT void exaMarkSync(ScreenPtr pScreen) void exaMarkSync(ScreenPtr pScreen)
{ {
ExaScreenPriv(pScreen); ExaScreenPriv(pScreen);
@ -1048,7 +1048,7 @@ _X_EXPORT void exaMarkSync(ScreenPtr pScreen)
* It should always be called before relying on the framebuffer contents * It should always be called before relying on the framebuffer contents
* reflecting previous drawing, from a CPU perspective. * reflecting previous drawing, from a CPU perspective.
*/ */
_X_EXPORT void exaWaitSync(ScreenPtr pScreen) void exaWaitSync(ScreenPtr pScreen)
{ {
ExaScreenPriv(pScreen); ExaScreenPriv(pScreen);

34
exa/exa.h
View File

@ -745,63 +745,63 @@ typedef struct _ExaDriver {
/** @} */ /** @} */
/* in exa.c */ /* in exa.c */
ExaDriverPtr extern _X_EXPORT ExaDriverPtr
exaDriverAlloc(void); exaDriverAlloc(void);
Bool extern _X_EXPORT Bool
exaDriverInit(ScreenPtr pScreen, exaDriverInit(ScreenPtr pScreen,
ExaDriverPtr pScreenInfo); ExaDriverPtr pScreenInfo);
void extern _X_EXPORT void
exaDriverFini(ScreenPtr pScreen); exaDriverFini(ScreenPtr pScreen);
void extern _X_EXPORT void
exaMarkSync(ScreenPtr pScreen); exaMarkSync(ScreenPtr pScreen);
void extern _X_EXPORT void
exaWaitSync(ScreenPtr pScreen); exaWaitSync(ScreenPtr pScreen);
unsigned long extern _X_EXPORT unsigned long
exaGetPixmapOffset(PixmapPtr pPix); exaGetPixmapOffset(PixmapPtr pPix);
unsigned long extern _X_EXPORT unsigned long
exaGetPixmapPitch(PixmapPtr pPix); exaGetPixmapPitch(PixmapPtr pPix);
unsigned long extern _X_EXPORT unsigned long
exaGetPixmapSize(PixmapPtr pPix); exaGetPixmapSize(PixmapPtr pPix);
void * extern _X_EXPORT void *
exaGetPixmapDriverPrivate(PixmapPtr p); exaGetPixmapDriverPrivate(PixmapPtr p);
/* in exa_offscreen.c */ /* in exa_offscreen.c */
ExaOffscreenArea * extern _X_EXPORT ExaOffscreenArea *
exaOffscreenAlloc(ScreenPtr pScreen, int size, int align, exaOffscreenAlloc(ScreenPtr pScreen, int size, int align,
Bool locked, Bool locked,
ExaOffscreenSaveProc save, ExaOffscreenSaveProc save,
pointer privData); pointer privData);
ExaOffscreenArea * extern _X_EXPORT ExaOffscreenArea *
exaOffscreenFree(ScreenPtr pScreen, ExaOffscreenArea *area); exaOffscreenFree(ScreenPtr pScreen, ExaOffscreenArea *area);
void extern _X_EXPORT void
ExaOffscreenMarkUsed (PixmapPtr pPixmap); ExaOffscreenMarkUsed (PixmapPtr pPixmap);
void extern _X_EXPORT void
exaEnableDisableFBAccess (int index, Bool enable); exaEnableDisableFBAccess (int index, Bool enable);
Bool extern _X_EXPORT Bool
exaDrawableIsOffscreen (DrawablePtr pDrawable); exaDrawableIsOffscreen (DrawablePtr pDrawable);
/* in exa_migration.c */ /* in exa_migration.c */
void extern _X_EXPORT void
exaMoveInPixmap (PixmapPtr pPixmap); exaMoveInPixmap (PixmapPtr pPixmap);
void extern _X_EXPORT void
exaMoveOutPixmap (PixmapPtr pPixmap); exaMoveOutPixmap (PixmapPtr pPixmap);
/* in exa_unaccel.c */ /* in exa_unaccel.c */
CARD32 extern _X_EXPORT CARD32
exaGetPixmapFirstPixel (PixmapPtr pPixmap); exaGetPixmapFirstPixel (PixmapPtr pPixmap);

4
exa/exa_migration.c
View File

@ -348,7 +348,7 @@ exaDoMoveInPixmap (ExaMigrationPtr migrate)
pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER; pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
} }
_X_EXPORT void void
exaMoveInPixmap (PixmapPtr pPixmap) exaMoveInPixmap (PixmapPtr pPixmap)
{ {
static ExaMigrationRec migrate = { .as_dst = FALSE, .as_src = TRUE, static ExaMigrationRec migrate = { .as_dst = FALSE, .as_src = TRUE,
@ -389,7 +389,7 @@ exaDoMoveOutPixmap (ExaMigrationPtr migrate)
} }
} }
_X_EXPORT void void
exaMoveOutPixmap (PixmapPtr pPixmap) exaMoveOutPixmap (PixmapPtr pPixmap)
{ {
static ExaMigrationRec migrate = { .as_dst = FALSE, .as_src = TRUE, static ExaMigrationRec migrate = { .as_dst = FALSE, .as_src = TRUE,

8
exa/exa_offscreen.c
View File

@ -164,7 +164,7 @@ exaFindAreaToEvict(ExaScreenPrivPtr pExaScr, int size, int align)
* requested version 2.1 or newer behavior. In that case, the save callback is * requested version 2.1 or newer behavior. In that case, the save callback is
* still called. * still called.
*/ */
_X_EXPORT ExaOffscreenArea * ExaOffscreenArea *
exaOffscreenAlloc (ScreenPtr pScreen, int size, int align, exaOffscreenAlloc (ScreenPtr pScreen, int size, int align,
Bool locked, Bool locked,
ExaOffscreenSaveProc save, ExaOffscreenSaveProc save,
@ -365,7 +365,7 @@ ExaOffscreenSwapIn (ScreenPtr pScreen)
* many drivers that could otherwise handle the lack of FB access while * many drivers that could otherwise handle the lack of FB access while
* swapped out. * swapped out.
*/ */
_X_EXPORT void void
exaEnableDisableFBAccess (int index, Bool enable) exaEnableDisableFBAccess (int index, Bool enable)
{ {
ScreenPtr pScreen = screenInfo.screens[index]; ScreenPtr pScreen = screenInfo.screens[index];
@ -412,7 +412,7 @@ ExaOffscreenMerge (ExaOffscreenArea *area)
* @return pointer to the newly freed area. This behavior should not be relied * @return pointer to the newly freed area. This behavior should not be relied
* on. * on.
*/ */
_X_EXPORT ExaOffscreenArea * ExaOffscreenArea *
exaOffscreenFree (ScreenPtr pScreen, ExaOffscreenArea *area) exaOffscreenFree (ScreenPtr pScreen, ExaOffscreenArea *area)
{ {
ExaScreenPriv(pScreen); ExaScreenPriv(pScreen);
@ -453,7 +453,7 @@ exaOffscreenFree (ScreenPtr pScreen, ExaOffscreenArea *area)
return area; return area;
} }
_X_EXPORT void void
ExaOffscreenMarkUsed (PixmapPtr pPixmap) ExaOffscreenMarkUsed (PixmapPtr pPixmap)
{ {
ExaPixmapPriv (pPixmap); ExaPixmapPriv (pPixmap);

2
exa/exa_unaccel.c
View File

@ -373,7 +373,7 @@ ExaCheckAddTraps (PicturePtr pPicture,
* *
* XXX This really belongs in fb, so it can be aware of tiling and etc. * XXX This really belongs in fb, so it can be aware of tiling and etc.
*/ */
_X_EXPORT CARD32 CARD32
exaGetPixmapFirstPixel (PixmapPtr pPixmap) exaGetPixmapFirstPixel (PixmapPtr pPixmap)
{ {
CARD32 pixel; CARD32 pixel;

2
fb/Makefile.am
View File

@ -7,7 +7,7 @@ INCLUDES = \
AM_CFLAGS = $(DIX_CFLAGS) AM_CFLAGS = $(DIX_CFLAGS)
if XORG if XORG
sdk_HEADERS = fb.h fbrop.h fboverlay.h wfbrename.h sdk_HEADERS = fb.h fbrop.h fboverlay.h wfbrename.h fbpict.h
endif endif
libfb_la_CFLAGS = $(AM_CFLAGS) libfb_la_CFLAGS = $(AM_CFLAGS)

287
fb/fb.h
View File

@ -167,9 +167,9 @@ typedef int FbStride;
#ifdef FB_DEBUG #ifdef FB_DEBUG
extern void fbValidateDrawable(DrawablePtr d); extern _X_EXPORT void fbValidateDrawable(DrawablePtr d);
extern void fbInitializeDrawable(DrawablePtr d); extern _X_EXPORT void fbInitializeDrawable(DrawablePtr d);
extern void fbSetBits (FbStip *bits, int stride, FbStip data); extern _X_EXPORT void fbSetBits (FbStip *bits, int stride, FbStip data);
#define FB_HEAD_BITS (FbStip) (0xbaadf00d) #define FB_HEAD_BITS (FbStip) (0xbaadf00d)
#define FB_TAIL_BITS (FbStip) (0xbaddf0ad) #define FB_TAIL_BITS (FbStip) (0xbaddf0ad)
#else #else
@ -595,10 +595,10 @@ extern void fbSetBits (FbStip *bits, int stride, FbStip data);
} \ } \
} }
extern DevPrivateKey fbGetGCPrivateKey(void); extern _X_EXPORT DevPrivateKey fbGetGCPrivateKey(void);
extern DevPrivateKey fbGetWinPrivateKey(void); extern _X_EXPORT DevPrivateKey fbGetWinPrivateKey(void);
extern const GCOps fbGCOps; extern _X_EXPORT const GCOps fbGCOps;
extern const GCFuncs fbGCFuncs; extern _X_EXPORT const GCFuncs fbGCFuncs;
#ifdef FB_24_32BIT #ifdef FB_24_32BIT
#define FB_SCREEN_PRIVATE #define FB_SCREEN_PRIVATE
@ -631,7 +631,7 @@ typedef void (*FinishWrapProcPtr)(DrawablePtr pDraw);
#ifdef FB_SCREEN_PRIVATE #ifdef FB_SCREEN_PRIVATE
extern DevPrivateKey fbGetScreenPrivateKey(void); extern _X_EXPORT DevPrivateKey fbGetScreenPrivateKey(void);
/* private field of a screen */ /* private field of a screen */
typedef struct { typedef struct {
@ -749,7 +749,7 @@ typedef struct {
/* /*
* fb24_32.c * fb24_32.c
*/ */
void extern _X_EXPORT void
fb24_32GetSpans(DrawablePtr pDrawable, fb24_32GetSpans(DrawablePtr pDrawable,
int wMax, int wMax,
DDXPointPtr ppt, DDXPointPtr ppt,
@ -757,7 +757,7 @@ fb24_32GetSpans(DrawablePtr pDrawable,
int nspans, int nspans,
char *pchardstStart); char *pchardstStart);
void extern _X_EXPORT void
fb24_32SetSpans (DrawablePtr pDrawable, fb24_32SetSpans (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
char *src, char *src,
@ -766,7 +766,7 @@ fb24_32SetSpans (DrawablePtr pDrawable,
int nspans, int nspans,
int fSorted); int fSorted);
void extern _X_EXPORT void
fb24_32PutZImage (DrawablePtr pDrawable, fb24_32PutZImage (DrawablePtr pDrawable,
RegionPtr pClip, RegionPtr pClip,
int alu, int alu,
@ -778,7 +778,7 @@ fb24_32PutZImage (DrawablePtr pDrawable,
CARD8 *src, CARD8 *src,
FbStride srcStride); FbStride srcStride);
void extern _X_EXPORT void
fb24_32GetImage (DrawablePtr pDrawable, fb24_32GetImage (DrawablePtr pDrawable,
int x, int x,
int y, int y,
@ -788,7 +788,7 @@ fb24_32GetImage (DrawablePtr pDrawable,
unsigned long planeMask, unsigned long planeMask,
char *d); char *d);
void extern _X_EXPORT void
fb24_32CopyMtoN (DrawablePtr pSrcDrawable, fb24_32CopyMtoN (DrawablePtr pSrcDrawable,
DrawablePtr pDstDrawable, DrawablePtr pDstDrawable,
GCPtr pGC, GCPtr pGC,
@ -801,13 +801,13 @@ fb24_32CopyMtoN (DrawablePtr pSrcDrawable,
Pixel bitplane, Pixel bitplane,
void *closure); void *closure);
PixmapPtr extern _X_EXPORT PixmapPtr
fb24_32ReformatTile(PixmapPtr pOldTile, int bitsPerPixel); fb24_32ReformatTile(PixmapPtr pOldTile, int bitsPerPixel);
Bool extern _X_EXPORT Bool
fb24_32CreateScreenResources(ScreenPtr pScreen); fb24_32CreateScreenResources(ScreenPtr pScreen);
Bool extern _X_EXPORT Bool
fb24_32ModifyPixmapHeader (PixmapPtr pPixmap, fb24_32ModifyPixmapHeader (PixmapPtr pPixmap,
int width, int width,
int height, int height,
@ -819,14 +819,14 @@ fb24_32ModifyPixmapHeader (PixmapPtr pPixmap,
/* /*
* fballpriv.c * fballpriv.c
*/ */
Bool extern _X_EXPORT Bool
fbAllocatePrivates(ScreenPtr pScreen, DevPrivateKey *pGCIndex); fbAllocatePrivates(ScreenPtr pScreen, DevPrivateKey *pGCIndex);
/* /*
* fbarc.c * fbarc.c
*/ */
void extern _X_EXPORT void
fbPolyArc (DrawablePtr pDrawable, fbPolyArc (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int narcs, int narcs,
@ -836,7 +836,7 @@ fbPolyArc (DrawablePtr pDrawable,
* fbbits.c * fbbits.c
*/ */
void extern _X_EXPORT void
fbBresSolid8(DrawablePtr pDrawable, fbBresSolid8(DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int dashOffset, int dashOffset,
@ -850,7 +850,7 @@ fbBresSolid8(DrawablePtr pDrawable,
int e3, int e3,
int len); int len);
void extern _X_EXPORT void
fbBresDash8 (DrawablePtr pDrawable, fbBresDash8 (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int dashOffset, int dashOffset,
@ -864,7 +864,7 @@ fbBresDash8 (DrawablePtr pDrawable,
int e3, int e3,
int len); int len);
void extern _X_EXPORT void
fbDots8 (FbBits *dst, fbDots8 (FbBits *dst,
FbStride dstStride, FbStride dstStride,
int dstBpp, int dstBpp,
@ -878,7 +878,7 @@ fbDots8 (FbBits *dst,
FbBits and, FbBits and,
FbBits xor); FbBits xor);
void extern _X_EXPORT void
fbArc8 (FbBits *dst, fbArc8 (FbBits *dst,
FbStride dstStride, FbStride dstStride,
int dstBpp, int dstBpp,
@ -888,7 +888,7 @@ fbArc8 (FbBits *dst,
FbBits and, FbBits and,
FbBits xor); FbBits xor);
void extern _X_EXPORT void
fbGlyph8 (FbBits *dstLine, fbGlyph8 (FbBits *dstLine,
FbStride dstStride, FbStride dstStride,
int dstBpp, int dstBpp,
@ -897,20 +897,20 @@ fbGlyph8 (FbBits *dstLine,
int height, int height,
int shift); int shift);
void extern _X_EXPORT void
fbPolyline8 (DrawablePtr pDrawable, fbPolyline8 (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int mode, int mode,
int npt, int npt,
DDXPointPtr ptsOrig); DDXPointPtr ptsOrig);
void extern _X_EXPORT void
fbPolySegment8 (DrawablePtr pDrawable, fbPolySegment8 (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int nseg, int nseg,
xSegment *pseg); xSegment *pseg);
void extern _X_EXPORT void
fbBresSolid16(DrawablePtr pDrawable, fbBresSolid16(DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int dashOffset, int dashOffset,
@ -924,7 +924,7 @@ fbBresSolid16(DrawablePtr pDrawable,
int e3, int e3,
int len); int len);
void extern _X_EXPORT void
fbBresDash16(DrawablePtr pDrawable, fbBresDash16(DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int dashOffset, int dashOffset,
@ -938,7 +938,7 @@ fbBresDash16(DrawablePtr pDrawable,
int e3, int e3,
int len); int len);
void extern _X_EXPORT void
fbDots16(FbBits *dst, fbDots16(FbBits *dst,
FbStride dstStride, FbStride dstStride,
int dstBpp, int dstBpp,
@ -952,7 +952,7 @@ fbDots16(FbBits *dst,
FbBits and, FbBits and,
FbBits xor); FbBits xor);
void extern _X_EXPORT void
fbArc16(FbBits *dst, fbArc16(FbBits *dst,
FbStride dstStride, FbStride dstStride,
int dstBpp, int dstBpp,
@ -962,7 +962,7 @@ fbArc16(FbBits *dst,
FbBits and, FbBits and,
FbBits xor); FbBits xor);
void extern _X_EXPORT void
fbGlyph16(FbBits *dstLine, fbGlyph16(FbBits *dstLine,
FbStride dstStride, FbStride dstStride,
int dstBpp, int dstBpp,
@ -971,21 +971,21 @@ fbGlyph16(FbBits *dstLine,
int height, int height,
int shift); int shift);
void extern _X_EXPORT void
fbPolyline16 (DrawablePtr pDrawable, fbPolyline16 (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int mode, int mode,
int npt, int npt,
DDXPointPtr ptsOrig); DDXPointPtr ptsOrig);
void extern _X_EXPORT void
fbPolySegment16 (DrawablePtr pDrawable, fbPolySegment16 (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int nseg, int nseg,
xSegment *pseg); xSegment *pseg);
void extern _X_EXPORT void
fbBresSolid24(DrawablePtr pDrawable, fbBresSolid24(DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int dashOffset, int dashOffset,
@ -999,7 +999,7 @@ fbBresSolid24(DrawablePtr pDrawable,
int e3, int e3,
int len); int len);
void extern _X_EXPORT void
fbBresDash24(DrawablePtr pDrawable, fbBresDash24(DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int dashOffset, int dashOffset,
@ -1013,7 +1013,7 @@ fbBresDash24(DrawablePtr pDrawable,
int e3, int e3,
int len); int len);
void extern _X_EXPORT void
fbDots24(FbBits *dst, fbDots24(FbBits *dst,
FbStride dstStride, FbStride dstStride,
int dstBpp, int dstBpp,
@ -1027,7 +1027,7 @@ fbDots24(FbBits *dst,
FbBits and, FbBits and,
FbBits xor); FbBits xor);
void extern _X_EXPORT void
fbArc24(FbBits *dst, fbArc24(FbBits *dst,
FbStride dstStride, FbStride dstStride,
int dstBpp, int dstBpp,
@ -1037,7 +1037,7 @@ fbArc24(FbBits *dst,
FbBits and, FbBits and,
FbBits xor); FbBits xor);
void extern _X_EXPORT void
fbGlyph24(FbBits *dstLine, fbGlyph24(FbBits *dstLine,
FbStride dstStride, FbStride dstStride,
int dstBpp, int dstBpp,
@ -1046,21 +1046,21 @@ fbGlyph24(FbBits *dstLine,
int height, int height,
int shift); int shift);
void extern _X_EXPORT void
fbPolyline24 (DrawablePtr pDrawable, fbPolyline24 (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int mode, int mode,
int npt, int npt,
DDXPointPtr ptsOrig); DDXPointPtr ptsOrig);
void extern _X_EXPORT void
fbPolySegment24 (DrawablePtr pDrawable, fbPolySegment24 (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int nseg, int nseg,
xSegment *pseg); xSegment *pseg);
void extern _X_EXPORT void
fbBresSolid32(DrawablePtr pDrawable, fbBresSolid32(DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int dashOffset, int dashOffset,
@ -1074,7 +1074,7 @@ fbBresSolid32(DrawablePtr pDrawable,
int e3, int e3,
int len); int len);
void extern _X_EXPORT void
fbBresDash32(DrawablePtr pDrawable, fbBresDash32(DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int dashOffset, int dashOffset,
@ -1088,7 +1088,7 @@ fbBresDash32(DrawablePtr pDrawable,
int e3, int e3,
int len); int len);
void extern _X_EXPORT void
fbDots32(FbBits *dst, fbDots32(FbBits *dst,
FbStride dstStride, FbStride dstStride,
int dstBpp, int dstBpp,
@ -1102,7 +1102,7 @@ fbDots32(FbBits *dst,
FbBits and, FbBits and,
FbBits xor); FbBits xor);
void extern _X_EXPORT void
fbArc32(FbBits *dst, fbArc32(FbBits *dst,
FbStride dstStride, FbStride dstStride,
int dstBpp, int dstBpp,
@ -1112,7 +1112,7 @@ fbArc32(FbBits *dst,
FbBits and, FbBits and,
FbBits xor); FbBits xor);
void extern _X_EXPORT void
fbGlyph32(FbBits *dstLine, fbGlyph32(FbBits *dstLine,
FbStride dstStride, FbStride dstStride,
int dstBpp, int dstBpp,
@ -1120,14 +1120,14 @@ fbGlyph32(FbBits *dstLine,
FbBits fg, FbBits fg,
int height, int height,
int shift); int shift);
void extern _X_EXPORT void
fbPolyline32 (DrawablePtr pDrawable, fbPolyline32 (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int mode, int mode,
int npt, int npt,
DDXPointPtr ptsOrig); DDXPointPtr ptsOrig);
void extern _X_EXPORT void
fbPolySegment32 (DrawablePtr pDrawable, fbPolySegment32 (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int nseg, int nseg,
@ -1136,7 +1136,7 @@ fbPolySegment32 (DrawablePtr pDrawable,
/* /*
* fbblt.c * fbblt.c
*/ */
void extern _X_EXPORT void
fbBlt (FbBits *src, fbBlt (FbBits *src,
FbStride srcStride, FbStride srcStride,
int srcX, int srcX,
@ -1155,7 +1155,7 @@ fbBlt (FbBits *src,
Bool reverse, Bool reverse,
Bool upsidedown); Bool upsidedown);
void extern _X_EXPORT void
fbBlt24 (FbBits *srcLine, fbBlt24 (FbBits *srcLine,
FbStride srcStride, FbStride srcStride,
int srcX, int srcX,
@ -1173,7 +1173,7 @@ fbBlt24 (FbBits *srcLine,
Bool reverse, Bool reverse,
Bool upsidedown); Bool upsidedown);
void extern _X_EXPORT void
fbBltStip (FbStip *src, fbBltStip (FbStip *src,
FbStride srcStride, /* in FbStip units, not FbBits units */ FbStride srcStride, /* in FbStip units, not FbBits units */
int srcX, int srcX,
@ -1192,7 +1192,7 @@ fbBltStip (FbStip *src,
/* /*
* fbbltone.c * fbbltone.c
*/ */
void extern _X_EXPORT void
fbBltOne (FbStip *src, fbBltOne (FbStip *src,
FbStride srcStride, FbStride srcStride,
int srcX, int srcX,
@ -1210,7 +1210,7 @@ fbBltOne (FbStip *src,
FbBits bgxor); FbBits bgxor);
#ifdef FB_24BIT #ifdef FB_24BIT
void extern _X_EXPORT void
fbBltOne24 (FbStip *src, fbBltOne24 (FbStip *src,
FbStride srcStride, /* FbStip units per scanline */ FbStride srcStride, /* FbStip units per scanline */
int srcX, /* bit position of source */ int srcX, /* bit position of source */
@ -1228,7 +1228,7 @@ fbBltOne24 (FbStip *src,
FbBits bgxor); FbBits bgxor);
#endif #endif
void extern _X_EXPORT void
fbBltPlane (FbBits *src, fbBltPlane (FbBits *src,
FbStride srcStride, FbStride srcStride,
int srcX, int srcX,
@ -1250,47 +1250,47 @@ fbBltPlane (FbBits *src,
/* /*
* fbcmap.c * fbcmap.c
*/ */
int extern _X_EXPORT int
fbListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps); fbListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps);
void extern _X_EXPORT void
fbInstallColormap(ColormapPtr pmap); fbInstallColormap(ColormapPtr pmap);
void extern _X_EXPORT void
fbUninstallColormap(ColormapPtr pmap); fbUninstallColormap(ColormapPtr pmap);
void extern _X_EXPORT void
fbResolveColor(unsigned short *pred, fbResolveColor(unsigned short *pred,
unsigned short *pgreen, unsigned short *pgreen,
unsigned short *pblue, unsigned short *pblue,
VisualPtr pVisual); VisualPtr pVisual);
Bool extern _X_EXPORT Bool
fbInitializeColormap(ColormapPtr pmap); fbInitializeColormap(ColormapPtr pmap);
int extern _X_EXPORT int
fbExpandDirectColors (ColormapPtr pmap, fbExpandDirectColors (ColormapPtr pmap,
int ndef, int ndef,
xColorItem *indefs, xColorItem *indefs,
xColorItem *outdefs); xColorItem *outdefs);
Bool extern _X_EXPORT Bool
fbCreateDefColormap(ScreenPtr pScreen); fbCreateDefColormap(ScreenPtr pScreen);
void extern _X_EXPORT void
fbClearVisualTypes(void); fbClearVisualTypes(void);
Bool extern _X_EXPORT Bool
fbHasVisualTypes (int depth); fbHasVisualTypes (int depth);
Bool extern _X_EXPORT Bool
fbSetVisualTypes (int depth, int visuals, int bitsPerRGB); fbSetVisualTypes (int depth, int visuals, int bitsPerRGB);
Bool extern _X_EXPORT Bool
fbSetVisualTypesAndMasks (int depth, int visuals, int bitsPerRGB, fbSetVisualTypesAndMasks (int depth, int visuals, int bitsPerRGB,
Pixel redMask, Pixel greenMask, Pixel blueMask); Pixel redMask, Pixel greenMask, Pixel blueMask);
Bool extern _X_EXPORT Bool
fbInitVisuals (VisualPtr *visualp, fbInitVisuals (VisualPtr *visualp,
DepthPtr *depthp, DepthPtr *depthp,
int *nvisualp, int *nvisualp,
@ -1316,7 +1316,7 @@ typedef void (*fbCopyProc) (DrawablePtr pSrcDrawable,
Pixel bitplane, Pixel bitplane,
void *closure); void *closure);
void extern _X_EXPORT void
fbCopyNtoN (DrawablePtr pSrcDrawable, fbCopyNtoN (DrawablePtr pSrcDrawable,
DrawablePtr pDstDrawable, DrawablePtr pDstDrawable,
GCPtr pGC, GCPtr pGC,
@ -1329,7 +1329,7 @@ fbCopyNtoN (DrawablePtr pSrcDrawable,
Pixel bitplane, Pixel bitplane,
void *closure); void *closure);
void extern _X_EXPORT void
fbCopy1toN (DrawablePtr pSrcDrawable, fbCopy1toN (DrawablePtr pSrcDrawable,
DrawablePtr pDstDrawable, DrawablePtr pDstDrawable,
GCPtr pGC, GCPtr pGC,
@ -1342,7 +1342,7 @@ fbCopy1toN (DrawablePtr pSrcDrawable,
Pixel bitplane, Pixel bitplane,
void *closure); void *closure);
void extern _X_EXPORT void
fbCopyNto1 (DrawablePtr pSrcDrawable, fbCopyNto1 (DrawablePtr pSrcDrawable,
DrawablePtr pDstDrawable, DrawablePtr pDstDrawable,
GCPtr pGC, GCPtr pGC,
@ -1355,7 +1355,7 @@ fbCopyNto1 (DrawablePtr pSrcDrawable,
Pixel bitplane, Pixel bitplane,
void *closure); void *closure);
void extern _X_EXPORT void
fbCopyRegion (DrawablePtr pSrcDrawable, fbCopyRegion (DrawablePtr pSrcDrawable,
DrawablePtr pDstDrawable, DrawablePtr pDstDrawable,
GCPtr pGC, GCPtr pGC,
@ -1366,7 +1366,7 @@ fbCopyRegion (DrawablePtr pSrcDrawable,
Pixel bitPlane, Pixel bitPlane,
void *closure); void *closure);
RegionPtr extern _X_EXPORT RegionPtr
fbDoCopy (DrawablePtr pSrcDrawable, fbDoCopy (DrawablePtr pSrcDrawable,
DrawablePtr pDstDrawable, DrawablePtr pDstDrawable,
GCPtr pGC, GCPtr pGC,
@ -1380,7 +1380,7 @@ fbDoCopy (DrawablePtr pSrcDrawable,
Pixel bitplane, Pixel bitplane,
void *closure); void *closure);
RegionPtr extern _X_EXPORT RegionPtr
fbCopyArea (DrawablePtr pSrcDrawable, fbCopyArea (DrawablePtr pSrcDrawable,
DrawablePtr pDstDrawable, DrawablePtr pDstDrawable,
GCPtr pGC, GCPtr pGC,
@ -1391,7 +1391,7 @@ fbCopyArea (DrawablePtr pSrcDrawable,
int xOut, int xOut,
int yOut); int yOut);
RegionPtr extern _X_EXPORT RegionPtr
fbCopyPlane (DrawablePtr pSrcDrawable, fbCopyPlane (DrawablePtr pSrcDrawable,
DrawablePtr pDstDrawable, DrawablePtr pDstDrawable,
GCPtr pGC, GCPtr pGC,
@ -1406,7 +1406,7 @@ fbCopyPlane (DrawablePtr pSrcDrawable,
/* /*
* fbfill.c * fbfill.c
*/ */
void extern _X_EXPORT void
fbFill (DrawablePtr pDrawable, fbFill (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int x, int x,
@ -1414,7 +1414,7 @@ fbFill (DrawablePtr pDrawable,
int width, int width,
int height); int height);
void extern _X_EXPORT void
fbSolidBoxClipped (DrawablePtr pDrawable, fbSolidBoxClipped (DrawablePtr pDrawable,
RegionPtr pClip, RegionPtr pClip,
int xa, int xa,
@ -1427,7 +1427,7 @@ fbSolidBoxClipped (DrawablePtr pDrawable,
/* /*
* fbfillrect.c * fbfillrect.c
*/ */
void extern _X_EXPORT void
fbPolyFillRect(DrawablePtr pDrawable, fbPolyFillRect(DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int nrectInit, int nrectInit,
@ -1440,7 +1440,7 @@ fbPolyFillRect(DrawablePtr pDrawable,
/* /*
* fbfillsp.c * fbfillsp.c
*/ */
void extern _X_EXPORT void
fbFillSpans (DrawablePtr pDrawable, fbFillSpans (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int nInit, int nInit,
@ -1453,19 +1453,19 @@ fbFillSpans (DrawablePtr pDrawable,
* fbgc.c * fbgc.c
*/ */
Bool extern _X_EXPORT Bool
fbCreateGC(GCPtr pGC); fbCreateGC(GCPtr pGC);
void extern _X_EXPORT void
fbPadPixmap (PixmapPtr pPixmap); fbPadPixmap (PixmapPtr pPixmap);
void extern _X_EXPORT void
fbValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable); fbValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable);
/* /*
* fbgetsp.c * fbgetsp.c
*/ */
void extern _X_EXPORT void
fbGetSpans(DrawablePtr pDrawable, fbGetSpans(DrawablePtr pDrawable,
int wMax, int wMax,
DDXPointPtr ppt, DDXPointPtr ppt,
@ -1477,14 +1477,14 @@ fbGetSpans(DrawablePtr pDrawable,
* fbglyph.c * fbglyph.c
*/ */
Bool extern _X_EXPORT Bool
fbGlyphIn (RegionPtr pRegion, fbGlyphIn (RegionPtr pRegion,
int x, int x,
int y, int y,
int width, int width,
int height); int height);
void extern _X_EXPORT void
fbPolyGlyphBlt (DrawablePtr pDrawable, fbPolyGlyphBlt (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int x, int x,
@ -1493,7 +1493,7 @@ fbPolyGlyphBlt (DrawablePtr pDrawable,
CharInfoPtr *ppci, CharInfoPtr *ppci,
pointer pglyphBase); pointer pglyphBase);
void extern _X_EXPORT void
fbImageGlyphBlt (DrawablePtr pDrawable, fbImageGlyphBlt (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int x, int x,
@ -1506,7 +1506,7 @@ fbImageGlyphBlt (DrawablePtr pDrawable,
* fbimage.c * fbimage.c
*/ */
void extern _X_EXPORT void
fbPutImage (DrawablePtr pDrawable, fbPutImage (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int depth, int depth,
@ -1518,7 +1518,7 @@ fbPutImage (DrawablePtr pDrawable,
int format, int format,
char *pImage); char *pImage);
void extern _X_EXPORT void
fbPutZImage (DrawablePtr pDrawable, fbPutZImage (DrawablePtr pDrawable,
RegionPtr pClip, RegionPtr pClip,
int alu, int alu,
@ -1530,7 +1530,7 @@ fbPutZImage (DrawablePtr pDrawable,
FbStip *src, FbStip *src,
FbStride srcStride); FbStride srcStride);
void extern _X_EXPORT void
fbPutXYImage (DrawablePtr pDrawable, fbPutXYImage (DrawablePtr pDrawable,
RegionPtr pClip, RegionPtr pClip,
FbBits fg, FbBits fg,
@ -1548,7 +1548,7 @@ fbPutXYImage (DrawablePtr pDrawable,
FbStride srcStride, FbStride srcStride,
int srcX); int srcX);
void extern _X_EXPORT void
fbGetImage (DrawablePtr pDrawable, fbGetImage (DrawablePtr pDrawable,
int x, int x,
int y, int y,
@ -1561,31 +1561,31 @@ fbGetImage (DrawablePtr pDrawable,
* fbline.c * fbline.c
*/ */
void extern _X_EXPORT void
fbZeroLine (DrawablePtr pDrawable, fbZeroLine (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int mode, int mode,
int npt, int npt,
DDXPointPtr ppt); DDXPointPtr ppt);
void extern _X_EXPORT void
fbZeroSegment (DrawablePtr pDrawable, fbZeroSegment (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int nseg, int nseg,
xSegment *pSegs); xSegment *pSegs);
void extern _X_EXPORT void
fbPolyLine (DrawablePtr pDrawable, fbPolyLine (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int mode, int mode,
int npt, int npt,
DDXPointPtr ppt); DDXPointPtr ppt);
void extern _X_EXPORT void
fbFixCoordModePrevious (int npt, fbFixCoordModePrevious (int npt,
DDXPointPtr ppt); DDXPointPtr ppt);
void extern _X_EXPORT void
fbPolySegment (DrawablePtr pDrawable, fbPolySegment (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int nseg, int nseg,
@ -1597,7 +1597,7 @@ fbPolySegment (DrawablePtr pDrawable,
* fbpict.c * fbpict.c
*/ */
Bool extern _X_EXPORT Bool
fbPictureInit (ScreenPtr pScreen, fbPictureInit (ScreenPtr pScreen,
PictFormatPtr formats, PictFormatPtr formats,
int nformats); int nformats);
@ -1606,25 +1606,25 @@ fbPictureInit (ScreenPtr pScreen,
* fbpixmap.c * fbpixmap.c
*/ */
PixmapPtr extern _X_EXPORT PixmapPtr
fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp, fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp,
unsigned usage_hint); unsigned usage_hint);
PixmapPtr extern _X_EXPORT PixmapPtr
fbCreatePixmap (ScreenPtr pScreen, int width, int height, int depth, fbCreatePixmap (ScreenPtr pScreen, int width, int height, int depth,
unsigned usage_hint); unsigned usage_hint);
Bool extern _X_EXPORT Bool
fbDestroyPixmap (PixmapPtr pPixmap); fbDestroyPixmap (PixmapPtr pPixmap);
RegionPtr extern _X_EXPORT RegionPtr
fbPixmapToRegion(PixmapPtr pPix); fbPixmapToRegion(PixmapPtr pPix);
/* /*
* fbpoint.c * fbpoint.c
*/ */
void extern _X_EXPORT void
fbDots (FbBits *dstOrig, fbDots (FbBits *dstOrig,
FbStride dstStride, FbStride dstStride,
int dstBpp, int dstBpp,
@ -1638,7 +1638,7 @@ fbDots (FbBits *dstOrig,
FbBits andOrig, FbBits andOrig,
FbBits xorOrig); FbBits xorOrig);
void extern _X_EXPORT void
fbPolyPoint (DrawablePtr pDrawable, fbPolyPoint (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int mode, int mode,
@ -1648,7 +1648,7 @@ fbPolyPoint (DrawablePtr pDrawable,
/* /*
* fbpush.c * fbpush.c
*/ */
void extern _X_EXPORT void
fbPushPattern (DrawablePtr pDrawable, fbPushPattern (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
@ -1662,7 +1662,7 @@ fbPushPattern (DrawablePtr pDrawable,
int width, int width,
int height); int height);
void extern _X_EXPORT void
fbPushFill (DrawablePtr pDrawable, fbPushFill (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
@ -1675,7 +1675,7 @@ fbPushFill (DrawablePtr pDrawable,
int width, int width,
int height); int height);
void extern _X_EXPORT void
fbPushImage (DrawablePtr pDrawable, fbPushImage (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
@ -1688,7 +1688,7 @@ fbPushImage (DrawablePtr pDrawable,
int width, int width,
int height); int height);
void extern _X_EXPORT void
fbPushPixels (GCPtr pGC, fbPushPixels (GCPtr pGC,
PixmapPtr pBitmap, PixmapPtr pBitmap,
DrawablePtr pDrawable, DrawablePtr pDrawable,
@ -1702,27 +1702,27 @@ fbPushPixels (GCPtr pGC,
* fbscreen.c * fbscreen.c
*/ */
Bool extern _X_EXPORT Bool
fbCloseScreen (int indx, ScreenPtr pScreen); fbCloseScreen (int indx, ScreenPtr pScreen);
Bool extern _X_EXPORT Bool
fbRealizeFont(ScreenPtr pScreen, FontPtr pFont); fbRealizeFont(ScreenPtr pScreen, FontPtr pFont);
Bool extern _X_EXPORT Bool
fbUnrealizeFont(ScreenPtr pScreen, FontPtr pFont); fbUnrealizeFont(ScreenPtr pScreen, FontPtr pFont);
void extern _X_EXPORT void
fbQueryBestSize (int class, fbQueryBestSize (int class,
unsigned short *width, unsigned short *height, unsigned short *width, unsigned short *height,
ScreenPtr pScreen); ScreenPtr pScreen);
PixmapPtr extern _X_EXPORT PixmapPtr
_fbGetWindowPixmap (WindowPtr pWindow); _fbGetWindowPixmap (WindowPtr pWindow);
void extern _X_EXPORT void
_fbSetWindowPixmap (WindowPtr pWindow, PixmapPtr pPixmap); _fbSetWindowPixmap (WindowPtr pWindow, PixmapPtr pPixmap);
Bool extern _X_EXPORT Bool
fbSetupScreen(ScreenPtr pScreen, fbSetupScreen(ScreenPtr pScreen,
pointer pbits, /* pointer to screen bitmap */ pointer pbits, /* pointer to screen bitmap */
int xsize, /* in pixels */ int xsize, /* in pixels */
@ -1732,7 +1732,7 @@ fbSetupScreen(ScreenPtr pScreen,
int width, /* pixel width of frame buffer */ int width, /* pixel width of frame buffer */
int bpp); /* bits per pixel of frame buffer */ int bpp); /* bits per pixel of frame buffer */
Bool extern _X_EXPORT Bool
wfbFinishScreenInit(ScreenPtr pScreen, wfbFinishScreenInit(ScreenPtr pScreen,
pointer pbits, pointer pbits,
int xsize, int xsize,
@ -1744,7 +1744,7 @@ wfbFinishScreenInit(ScreenPtr pScreen,
SetupWrapProcPtr setupWrap, SetupWrapProcPtr setupWrap,
FinishWrapProcPtr finishWrap); FinishWrapProcPtr finishWrap);
Bool extern _X_EXPORT Bool
wfbScreenInit(ScreenPtr pScreen, wfbScreenInit(ScreenPtr pScreen,
pointer pbits, pointer pbits,
int xsize, int xsize,
@ -1756,7 +1756,7 @@ wfbScreenInit(ScreenPtr pScreen,
SetupWrapProcPtr setupWrap, SetupWrapProcPtr setupWrap,
FinishWrapProcPtr finishWrap); FinishWrapProcPtr finishWrap);
Bool extern _X_EXPORT Bool
fbFinishScreenInit(ScreenPtr pScreen, fbFinishScreenInit(ScreenPtr pScreen,
pointer pbits, pointer pbits,
int xsize, int xsize,
@ -1766,7 +1766,7 @@ fbFinishScreenInit(ScreenPtr pScreen,
int width, int width,
int bpp); int bpp);
Bool extern _X_EXPORT Bool
fbScreenInit(ScreenPtr pScreen, fbScreenInit(ScreenPtr pScreen,
pointer pbits, pointer pbits,
int xsize, int xsize,
@ -1792,12 +1792,12 @@ typedef void FbBres (DrawablePtr pDrawable,
int e3, int e3,
int len); int len);
FbBres fbBresSolid, fbBresDash, fbBresFill, fbBresFillDash; extern _X_EXPORT FbBres fbBresSolid, fbBresDash, fbBresFill, fbBresFillDash;
/* /*
* fbsetsp.c * fbsetsp.c
*/ */
void extern _X_EXPORT void
fbSetSpans (DrawablePtr pDrawable, fbSetSpans (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
char *src, char *src,
@ -1806,11 +1806,11 @@ fbSetSpans (DrawablePtr pDrawable,
int nspans, int nspans,
int fSorted); int fSorted);
FbBres * extern _X_EXPORT FbBres *
fbSelectBres (DrawablePtr pDrawable, fbSelectBres (DrawablePtr pDrawable,
GCPtr pGC); GCPtr pGC);
void extern _X_EXPORT void
fbBres (DrawablePtr pDrawable, fbBres (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int dashOffset, int dashOffset,
@ -1824,7 +1824,7 @@ fbBres (DrawablePtr pDrawable,
int e3, int e3,
int len); int len);
void extern _X_EXPORT void
fbSegment (DrawablePtr pDrawable, fbSegment (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int xa, int xa,
@ -1839,7 +1839,7 @@ fbSegment (DrawablePtr pDrawable,
* fbsolid.c * fbsolid.c
*/ */
void extern _X_EXPORT void
fbSolid (FbBits *dst, fbSolid (FbBits *dst,
FbStride dstStride, FbStride dstStride,
int dstX, int dstX,
@ -1852,7 +1852,7 @@ fbSolid (FbBits *dst,
FbBits xor); FbBits xor);
#ifdef FB_24BIT #ifdef FB_24BIT
void extern _X_EXPORT void
fbSolid24 (FbBits *dst, fbSolid24 (FbBits *dst,
FbStride dstStride, FbStride dstStride,
int dstX, int dstX,
@ -1868,13 +1868,13 @@ fbSolid24 (FbBits *dst,
* fbstipple.c * fbstipple.c
*/ */
void extern _X_EXPORT void
fbTransparentSpan (FbBits *dst, fbTransparentSpan (FbBits *dst,
FbBits stip, FbBits stip,
FbBits fgxor, FbBits fgxor,
int n); int n);
void extern _X_EXPORT void
fbEvenStipple (FbBits *dst, fbEvenStipple (FbBits *dst,
FbStride dstStride, FbStride dstStride,
int dstX, int dstX,
@ -1895,7 +1895,7 @@ fbEvenStipple (FbBits *dst,
int xRot, int xRot,
int yRot); int yRot);
void extern _X_EXPORT void
fbOddStipple (FbBits *dst, fbOddStipple (FbBits *dst,
FbStride dstStride, FbStride dstStride,
int dstX, int dstX,
@ -1917,7 +1917,7 @@ fbOddStipple (FbBits *dst,
int xRot, int xRot,
int yRot); int yRot);
void extern _X_EXPORT void
fbStipple (FbBits *dst, fbStipple (FbBits *dst,
FbStride dstStride, FbStride dstStride,
int dstX, int dstX,
@ -1944,7 +1944,7 @@ fbStipple (FbBits *dst,
* fbtile.c * fbtile.c
*/ */
void extern _X_EXPORT void
fbEvenTile (FbBits *dst, fbEvenTile (FbBits *dst,
FbStride dstStride, FbStride dstStride,
int dstX, int dstX,
@ -1961,7 +1961,7 @@ fbEvenTile (FbBits *dst,
int xRot, int xRot,
int yRot); int yRot);
void extern _X_EXPORT void
fbOddTile (FbBits *dst, fbOddTile (FbBits *dst,
FbStride dstStride, FbStride dstStride,
int dstX, int dstX,
@ -1981,7 +1981,7 @@ fbOddTile (FbBits *dst,
int xRot, int xRot,
int yRot); int yRot);
void extern _X_EXPORT void
fbTile (FbBits *dst, fbTile (FbBits *dst,
FbStride dstStride, FbStride dstStride,
int dstX, int dstX,
@ -2004,37 +2004,37 @@ fbTile (FbBits *dst,
/* /*
* fbutil.c * fbutil.c
*/ */
FbBits extern _X_EXPORT FbBits
fbReplicatePixel (Pixel p, int bpp); fbReplicatePixel (Pixel p, int bpp);
void extern _X_EXPORT void
fbReduceRasterOp (int rop, FbBits fg, FbBits pm, FbBits *andp, FbBits *xorp); fbReduceRasterOp (int rop, FbBits fg, FbBits pm, FbBits *andp, FbBits *xorp);
#ifdef FB_ACCESS_WRAPPER #ifdef FB_ACCESS_WRAPPER
extern ReadMemoryProcPtr wfbReadMemory; extern _X_EXPORT ReadMemoryProcPtr wfbReadMemory;
extern WriteMemoryProcPtr wfbWriteMemory; extern _X_EXPORT WriteMemoryProcPtr wfbWriteMemory;
#endif #endif
/* /*
* fbwindow.c * fbwindow.c
*/ */
Bool extern _X_EXPORT Bool
fbCreateWindow(WindowPtr pWin); fbCreateWindow(WindowPtr pWin);
Bool extern _X_EXPORT Bool
fbDestroyWindow(WindowPtr pWin); fbDestroyWindow(WindowPtr pWin);
Bool extern _X_EXPORT Bool
fbMapWindow(WindowPtr pWindow); fbMapWindow(WindowPtr pWindow);
Bool extern _X_EXPORT Bool
fbPositionWindow(WindowPtr pWin, int x, int y); fbPositionWindow(WindowPtr pWin, int x, int y);
Bool extern _X_EXPORT Bool
fbUnmapWindow(WindowPtr pWindow); fbUnmapWindow(WindowPtr pWindow);
void extern _X_EXPORT void
fbCopyWindowProc (DrawablePtr pSrcDrawable, fbCopyWindowProc (DrawablePtr pSrcDrawable,
DrawablePtr pDstDrawable, DrawablePtr pDstDrawable,
GCPtr pGC, GCPtr pGC,
@ -2047,23 +2047,24 @@ fbCopyWindowProc (DrawablePtr pSrcDrawable,
Pixel bitplane, Pixel bitplane,
void *closure); void *closure);
void extern _X_EXPORT void
fbCopyWindow(WindowPtr pWin, fbCopyWindow(WindowPtr pWin,
DDXPointRec ptOldOrg, DDXPointRec ptOldOrg,
RegionPtr prgnSrc); RegionPtr prgnSrc);
Bool extern _X_EXPORT Bool
fbChangeWindowAttributes(WindowPtr pWin, unsigned long mask); fbChangeWindowAttributes(WindowPtr pWin, unsigned long mask);
void extern _X_EXPORT void
fbFillRegionSolid (DrawablePtr pDrawable, fbFillRegionSolid (DrawablePtr pDrawable,
RegionPtr pRegion, RegionPtr pRegion,
FbBits and, FbBits and,
FbBits xor); FbBits xor);
pixman_image_t *image_from_pict (PicturePtr pict, extern _X_EXPORT pixman_image_t *
Bool has_clip); image_from_pict (PicturePtr pict,
void free_pixman_pict (PicturePtr, pixman_image_t *); Bool has_clip);
extern _X_EXPORT void free_pixman_pict (PicturePtr, pixman_image_t *);
#endif /* _FB_H_ */ #endif /* _FB_H_ */

16
fb/fb24_32.c
View File

@ -265,7 +265,7 @@ fb24_32BltUp (CARD8 *srcLine,
/* /*
* Spans functions; probably unused. * Spans functions; probably unused.
*/ */
_X_EXPORT void void
fb24_32GetSpans(DrawablePtr pDrawable, fb24_32GetSpans(DrawablePtr pDrawable,
int wMax, int wMax,
DDXPointPtr ppt, DDXPointPtr ppt,
@ -308,7 +308,7 @@ fb24_32GetSpans(DrawablePtr pDrawable,
fbFinishAccess (pDrawable); fbFinishAccess (pDrawable);
} }
_X_EXPORT void void
fb24_32SetSpans (DrawablePtr pDrawable, fb24_32SetSpans (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
char *src, char *src,
@ -374,7 +374,7 @@ fb24_32SetSpans (DrawablePtr pDrawable,
/* /*
* Clip and put 32bpp Z-format images to a 24bpp drawable * Clip and put 32bpp Z-format images to a 24bpp drawable
*/ */
_X_EXPORT void void
fb24_32PutZImage (DrawablePtr pDrawable, fb24_32PutZImage (DrawablePtr pDrawable,
RegionPtr pClip, RegionPtr pClip,
int alu, int alu,
@ -436,7 +436,7 @@ fb24_32PutZImage (DrawablePtr pDrawable,
fbFinishAccess (pDrawable); fbFinishAccess (pDrawable);
} }
_X_EXPORT void void
fb24_32GetImage (DrawablePtr pDrawable, fb24_32GetImage (DrawablePtr pDrawable,
int x, int x,
int y, int y,
@ -472,7 +472,7 @@ fb24_32GetImage (DrawablePtr pDrawable,
fbFinishAccess (pDrawable); fbFinishAccess (pDrawable);
} }
_X_EXPORT void void
fb24_32CopyMtoN (DrawablePtr pSrcDrawable, fb24_32CopyMtoN (DrawablePtr pSrcDrawable,
DrawablePtr pDstDrawable, DrawablePtr pDstDrawable,
GCPtr pGC, GCPtr pGC,
@ -531,7 +531,7 @@ fb24_32CopyMtoN (DrawablePtr pSrcDrawable,
fbFinishAccess (pDstDrawable); fbFinishAccess (pDstDrawable);
} }
_X_EXPORT PixmapPtr PixmapPtr
fb24_32ReformatTile(PixmapPtr pOldTile, int bitsPerPixel) fb24_32ReformatTile(PixmapPtr pOldTile, int bitsPerPixel)
{ {
ScreenPtr pScreen = pOldTile->drawable.pScreen; ScreenPtr pScreen = pOldTile->drawable.pScreen;
@ -583,7 +583,7 @@ typedef struct {
int width; int width;
} miScreenInitParmsRec, *miScreenInitParmsPtr; } miScreenInitParmsRec, *miScreenInitParmsPtr;
_X_EXPORT Bool Bool
fb24_32CreateScreenResources(ScreenPtr pScreen) fb24_32CreateScreenResources(ScreenPtr pScreen)
{ {
miScreenInitParmsPtr pScrInitParms; miScreenInitParmsPtr pScrInitParms;
@ -604,7 +604,7 @@ fb24_32CreateScreenResources(ScreenPtr pScreen)
return retval; return retval;
} }
_X_EXPORT Bool Bool
fb24_32ModifyPixmapHeader (PixmapPtr pPixmap, fb24_32ModifyPixmapHeader (PixmapPtr pPixmap,
int width, int width,
int height, int height,

12
fb/fballpriv.c
View File

@ -29,7 +29,7 @@
#ifdef FB_SCREEN_PRIVATE #ifdef FB_SCREEN_PRIVATE
static int fbScreenPrivateKeyIndex; static int fbScreenPrivateKeyIndex;
static DevPrivateKey fbScreenPrivateKey = &fbScreenPrivateKeyIndex; static DevPrivateKey fbScreenPrivateKey = &fbScreenPrivateKeyIndex;
_X_EXPORT DevPrivateKey fbGetScreenPrivateKey(void) DevPrivateKey fbGetScreenPrivateKey(void)
{ {
return fbScreenPrivateKey; return fbScreenPrivateKey;
} }
@ -37,19 +37,19 @@ _X_EXPORT DevPrivateKey fbGetScreenPrivateKey(void)
static int fbGCPrivateKeyIndex; static int fbGCPrivateKeyIndex;
static DevPrivateKey fbGCPrivateKey = &fbGCPrivateKeyIndex; static DevPrivateKey fbGCPrivateKey = &fbGCPrivateKeyIndex;
_X_EXPORT DevPrivateKey fbGetGCPrivateKey(void) DevPrivateKey fbGetGCPrivateKey(void)
{ {
return fbGCPrivateKey; return fbGCPrivateKey;
} }
static int fbWinPrivateKeyIndex; static int fbWinPrivateKeyIndex;
static DevPrivateKey fbWinPrivateKey = &fbWinPrivateKeyIndex; static DevPrivateKey fbWinPrivateKey = &fbWinPrivateKeyIndex;
_X_EXPORT DevPrivateKey fbGetWinPrivateKey(void) DevPrivateKey fbGetWinPrivateKey(void)
{ {
return fbWinPrivateKey; return fbWinPrivateKey;
} }
_X_EXPORT Bool Bool
fbAllocatePrivates(ScreenPtr pScreen, DevPrivateKey *pGCKey) fbAllocatePrivates(ScreenPtr pScreen, DevPrivateKey *pGCKey)
{ {
if (pGCKey) if (pGCKey)
@ -71,6 +71,6 @@ fbAllocatePrivates(ScreenPtr pScreen, DevPrivateKey *pGCKey)
} }
#ifdef FB_ACCESS_WRAPPER #ifdef FB_ACCESS_WRAPPER
_X_EXPORT ReadMemoryProcPtr wfbReadMemory; ReadMemoryProcPtr wfbReadMemory;
_X_EXPORT WriteMemoryProcPtr wfbWriteMemory; WriteMemoryProcPtr wfbWriteMemory;
#endif #endif

2
fb/fbarc.c
View File

@ -37,7 +37,7 @@ typedef void (*FbArc) (FbBits *dst,
FbBits and, FbBits and,
FbBits xor); FbBits xor);
_X_EXPORT void void
fbPolyArc (DrawablePtr pDrawable, fbPolyArc (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int narcs, int narcs,

14
fb/fbbits.h
View File

@ -67,7 +67,7 @@
*/ */
#ifdef BRESSOLID #ifdef BRESSOLID
_X_EXPORT void void
BRESSOLID (DrawablePtr pDrawable, BRESSOLID (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int dashOffset, int dashOffset,
@ -123,7 +123,7 @@ BRESSOLID (DrawablePtr pDrawable,
#endif #endif
#ifdef BRESDASH #ifdef BRESDASH
_X_EXPORT void void
BRESDASH (DrawablePtr pDrawable, BRESDASH (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int dashOffset, int dashOffset,
@ -269,7 +269,7 @@ onOffOdd:
#endif #endif
#ifdef DOTS #ifdef DOTS
_X_EXPORT void void
DOTS (FbBits *dst, DOTS (FbBits *dst,
FbStride dstStride, FbStride dstStride,
int dstBpp, int dstBpp,
@ -329,7 +329,7 @@ DOTS (FbBits *dst,
#define ARCCOPY(d) STORE(d,xorBits) #define ARCCOPY(d) STORE(d,xorBits)
#define ARCRROP(d) RROP(d,andBits,xorBits) #define ARCRROP(d) RROP(d,andBits,xorBits)
_X_EXPORT void void
ARC (FbBits *dst, ARC (FbBits *dst,
FbStride dstStride, FbStride dstStride,
int dstBpp, int dstBpp,
@ -557,7 +557,7 @@ ARC (FbBits *dst,
# define WRITE4(d,n,fg) (WRITE2(d,n,fg), WRITE2(d,(n)+2,fg)) # define WRITE4(d,n,fg) (WRITE2(d,n,fg), WRITE2(d,(n)+2,fg))
#endif #endif
_X_EXPORT void void
GLYPH (FbBits *dstBits, GLYPH (FbBits *dstBits,
FbStride dstStride, FbStride dstStride,
int dstBpp, int dstBpp,
@ -659,7 +659,7 @@ GLYPH (FbBits *dstBits,
#endif #endif
#ifdef POLYLINE #ifdef POLYLINE
_X_EXPORT void void
POLYLINE (DrawablePtr pDrawable, POLYLINE (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int mode, int mode,
@ -797,7 +797,7 @@ POLYLINE (DrawablePtr pDrawable,
#endif #endif
#ifdef POLYSEGMENT #ifdef POLYSEGMENT
_X_EXPORT void void
POLYSEGMENT (DrawablePtr pDrawable, POLYSEGMENT (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int nseg, int nseg,

6
fb/fbblt.c
View File

@ -39,7 +39,7 @@
} \ } \
} }
_X_EXPORT void void
fbBlt (FbBits *srcLine, fbBlt (FbBits *srcLine,
FbStride srcStride, FbStride srcStride,
int srcX, int srcX,
@ -568,7 +568,7 @@ fbBlt24Line (FbBits *src,
#endif #endif
} }
_X_EXPORT void void
fbBlt24 (FbBits *srcLine, fbBlt24 (FbBits *srcLine,
FbStride srcStride, FbStride srcStride,
int srcX, int srcX,
@ -873,7 +873,7 @@ fbSetBltOdd (FbStip *stip,
} }
#endif #endif
_X_EXPORT void void
fbBltStip (FbStip *src, fbBltStip (FbStip *src,
FbStride srcStride, /* in FbStip units, not FbBits units */ FbStride srcStride, /* in FbStip units, not FbBits units */
int srcX, int srcX,

22
fb/fbbltone.c
View File

@ -78,7 +78,7 @@
#endif #endif
#if FB_SHIFT == 6 #if FB_SHIFT == 6
_X_EXPORT CARD8 fb8Lane[256] = { CARD8 fb8Lane[256] = {
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
@ -95,33 +95,33 @@ _X_EXPORT CARD8 fb8Lane[256] = {
242, 243, 244,245,246,247,248,249,250,251,252,253,254,255, 242, 243, 244,245,246,247,248,249,250,251,252,253,254,255,
}; };
_X_EXPORT CARD8 fb16Lane[256] = { CARD8 fb16Lane[256] = {
0x00, 0x03, 0x0c, 0x0f, 0x00, 0x03, 0x0c, 0x0f,
0x30, 0x33, 0x3c, 0x3f, 0x30, 0x33, 0x3c, 0x3f,
0xc0, 0xc3, 0xcc, 0xcf, 0xc0, 0xc3, 0xcc, 0xcf,
0xf0, 0xf3, 0xfc, 0xff, 0xf0, 0xf3, 0xfc, 0xff,
}; };
_X_EXPORT CARD8 fb32Lane[16] = { CARD8 fb32Lane[16] = {
0x00, 0x0f, 0xf0, 0xff, 0x00, 0x0f, 0xf0, 0xff,
}; };
#endif #endif
#if FB_SHIFT == 5 #if FB_SHIFT == 5
_X_EXPORT CARD8 fb8Lane[16] = { CARD8 fb8Lane[16] = {
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
}; };
_X_EXPORT CARD8 fb16Lane[16] = { CARD8 fb16Lane[16] = {
0, 3, 12, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 12, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
}; };
_X_EXPORT CARD8 fb32Lane[16] = { CARD8 fb32Lane[16] = {
0, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
}; };
#endif #endif
_X_EXPORT CARD8 *fbLaneTable[33] = { CARD8 *fbLaneTable[33] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
fb8Lane, 0, 0, 0, 0, 0, 0, 0, fb8Lane, 0, 0, 0, 0, 0, 0, 0,
fb16Lane, 0, 0, 0, 0, 0, 0, 0, fb16Lane, 0, 0, 0, 0, 0, 0, 0,
@ -130,7 +130,7 @@ _X_EXPORT CARD8 *fbLaneTable[33] = {
}; };
#endif #endif
_X_EXPORT void void
fbBltOne (FbStip *src, fbBltOne (FbStip *src,
FbStride srcStride, /* FbStip units per scanline */ FbStride srcStride, /* FbStip units per scanline */
int srcX, /* bit position of source */ int srcX, /* bit position of source */
@ -457,7 +457,7 @@ fbBltOne (FbStip *src,
#define FbStip24New(rot) (2 + (rot != 0)) #define FbStip24New(rot) (2 + (rot != 0))
#define FbStip24Len 4 #define FbStip24Len 4
_X_EXPORT const FbBits fbStipple24Bits[3][1 << FbStip24Len] = { const FbBits fbStipple24Bits[3][1 << FbStip24Len] = {
/* rotate 0 */ /* rotate 0 */
{ {
C4_24( 0, 0), C4_24( 1, 0), C4_24( 2, 0), C4_24( 3, 0), C4_24( 0, 0), C4_24( 1, 0), C4_24( 2, 0), C4_24( 3, 0),
@ -569,7 +569,7 @@ const FbBits fbStipple24Bits[3][1 << FbStip24Len] = {
* have no acceleration so this code is used for stipples, copyplane * have no acceleration so this code is used for stipples, copyplane
* and text * and text
*/ */
_X_EXPORT void void
fbBltOne24 (FbStip *srcLine, fbBltOne24 (FbStip *srcLine,
FbStride srcStride, /* FbStip units per scanline */ FbStride srcStride, /* FbStip units per scanline */
int srcX, /* bit position of source */ int srcX, /* bit position of source */
@ -754,7 +754,7 @@ fbBltOne24 (FbStip *srcLine,
* from an N bit image to a 1 bit image * from an N bit image to a 1 bit image
*/ */
_X_EXPORT void void
fbBltPlane (FbBits *src, fbBltPlane (FbBits *src,
FbStride srcStride, FbStride srcStride,
int srcX, int srcX,

22
fb/fbcmap.c
View File

@ -47,7 +47,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
ColormapPtr FbInstalledMaps[MAXSCREENS]; ColormapPtr FbInstalledMaps[MAXSCREENS];
_X_EXPORT int int
fbListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps) fbListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps)
{ {
/* By the time we are processing requests, we can guarantee that there /* By the time we are processing requests, we can guarantee that there
@ -57,7 +57,7 @@ fbListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps)
} }
_X_EXPORT void void
fbInstallColormap(ColormapPtr pmap) fbInstallColormap(ColormapPtr pmap)
{ {
int index = pmap->pScreen->myNum; int index = pmap->pScreen->myNum;
@ -75,7 +75,7 @@ fbInstallColormap(ColormapPtr pmap)
} }
} }
_X_EXPORT void void
fbUninstallColormap(ColormapPtr pmap) fbUninstallColormap(ColormapPtr pmap)
{ {
int index = pmap->pScreen->myNum; int index = pmap->pScreen->myNum;
@ -92,7 +92,7 @@ fbUninstallColormap(ColormapPtr pmap)
} }
} }
_X_EXPORT void void
fbResolveColor(unsigned short *pred, fbResolveColor(unsigned short *pred,
unsigned short *pgreen, unsigned short *pgreen,
unsigned short *pblue, unsigned short *pblue,
@ -116,7 +116,7 @@ fbResolveColor(unsigned short *pred,
} }
} }
_X_EXPORT Bool Bool
fbInitializeColormap(ColormapPtr pmap) fbInitializeColormap(ColormapPtr pmap)
{ {
register unsigned i; register unsigned i;
@ -216,7 +216,7 @@ fbInitializeColormap(ColormapPtr pmap)
outdefs[i].blue = pmap->blue[blue >> pVisual->offsetBlue].co.local.blue; \ outdefs[i].blue = pmap->blue[blue >> pVisual->offsetBlue].co.local.blue; \
} }
_X_EXPORT int int
fbExpandDirectColors (ColormapPtr pmap, fbExpandDirectColors (ColormapPtr pmap,
int ndef, int ndef,
xColorItem *indefs, xColorItem *indefs,
@ -278,7 +278,7 @@ fbExpandDirectColors (ColormapPtr pmap,
return nresult; return nresult;
} }
_X_EXPORT Bool Bool
fbCreateDefColormap(ScreenPtr pScreen) fbCreateDefColormap(ScreenPtr pScreen)
{ {
unsigned short zero = 0, ones = 0xFFFF; unsigned short zero = 0, ones = 0xFFFF;
@ -387,7 +387,7 @@ maskShift (Pixel p)
return s; return s;
} }
_X_EXPORT Bool Bool
fbSetVisualTypesAndMasks (int depth, int visuals, int bitsPerRGB, fbSetVisualTypesAndMasks (int depth, int visuals, int bitsPerRGB,
Pixel redMask, Pixel greenMask, Pixel blueMask) Pixel redMask, Pixel greenMask, Pixel blueMask)
{ {
@ -415,7 +415,7 @@ fbSetVisualTypesAndMasks (int depth, int visuals, int bitsPerRGB,
return TRUE; return TRUE;
} }
_X_EXPORT Bool Bool
fbHasVisualTypes (int depth) fbHasVisualTypes (int depth)
{ {
fbVisualsPtr v; fbVisualsPtr v;
@ -426,7 +426,7 @@ fbHasVisualTypes (int depth)
return FALSE; return FALSE;
} }
_X_EXPORT Bool Bool
fbSetVisualTypes (int depth, int visuals, int bitsPerRGB) fbSetVisualTypes (int depth, int visuals, int bitsPerRGB)
{ {
return fbSetVisualTypesAndMasks (depth, visuals, bitsPerRGB, return fbSetVisualTypesAndMasks (depth, visuals, bitsPerRGB,
@ -439,7 +439,7 @@ fbSetVisualTypes (int depth, int visuals, int bitsPerRGB)
* the set which can be used with this version of fb. * the set which can be used with this version of fb.
*/ */
_X_EXPORT Bool Bool
fbInitVisuals (VisualPtr *visualp, fbInitVisuals (VisualPtr *visualp,
DepthPtr *depthp, DepthPtr *depthp,
int *nvisualp, int *nvisualp,

18
fb/fbcmap_mi.c
View File

@ -49,19 +49,19 @@ fbListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps)
return miListInstalledColormaps(pScreen, pmaps); return miListInstalledColormaps(pScreen, pmaps);
} }
_X_EXPORT void void
fbInstallColormap(ColormapPtr pmap) fbInstallColormap(ColormapPtr pmap)
{ {
miInstallColormap(pmap); miInstallColormap(pmap);
} }
_X_EXPORT void void
fbUninstallColormap(ColormapPtr pmap) fbUninstallColormap(ColormapPtr pmap)
{ {
miUninstallColormap(pmap); miUninstallColormap(pmap);
} }
_X_EXPORT void void
fbResolveColor(unsigned short *pred, fbResolveColor(unsigned short *pred,
unsigned short *pgreen, unsigned short *pgreen,
unsigned short *pblue, unsigned short *pblue,
@ -70,7 +70,7 @@ fbResolveColor(unsigned short *pred,
miResolveColor(pred, pgreen, pblue, pVisual); miResolveColor(pred, pgreen, pblue, pVisual);
} }
_X_EXPORT Bool Bool
fbInitializeColormap(ColormapPtr pmap) fbInitializeColormap(ColormapPtr pmap)
{ {
return miInitializeColormap(pmap); return miInitializeColormap(pmap);
@ -85,25 +85,25 @@ fbExpandDirectColors (ColormapPtr pmap,
return miExpandDirectColors(pmap, ndef, indefs, outdefs); return miExpandDirectColors(pmap, ndef, indefs, outdefs);
} }
_X_EXPORT Bool Bool
fbCreateDefColormap(ScreenPtr pScreen) fbCreateDefColormap(ScreenPtr pScreen)
{ {
return miCreateDefColormap(pScreen); return miCreateDefColormap(pScreen);
} }
_X_EXPORT void void
fbClearVisualTypes(void) fbClearVisualTypes(void)
{ {
miClearVisualTypes(); miClearVisualTypes();
} }
_X_EXPORT Bool Bool
fbSetVisualTypes (int depth, int visuals, int bitsPerRGB) fbSetVisualTypes (int depth, int visuals, int bitsPerRGB)
{ {
return miSetVisualTypes(depth, visuals, bitsPerRGB, -1); return miSetVisualTypes(depth, visuals, bitsPerRGB, -1);
} }
_X_EXPORT Bool Bool
fbSetVisualTypesAndMasks (int depth, int visuals, int bitsPerRGB, fbSetVisualTypesAndMasks (int depth, int visuals, int bitsPerRGB,
Pixel redMask, Pixel greenMask, Pixel blueMask) Pixel redMask, Pixel greenMask, Pixel blueMask)
{ {
@ -116,7 +116,7 @@ fbSetVisualTypesAndMasks (int depth, int visuals, int bitsPerRGB,
* of visuals and depths for the screen which coorespond to * of visuals and depths for the screen which coorespond to
* the set which can be used with this version of fb. * the set which can be used with this version of fb.
*/ */
_X_EXPORT Bool Bool
fbInitVisuals (VisualPtr *visualp, fbInitVisuals (VisualPtr *visualp,
DepthPtr *depthp, DepthPtr *depthp,
int *nvisualp, int *nvisualp,

14
fb/fbcopy.c
View File

@ -28,7 +28,7 @@
#include "fb.h" #include "fb.h"
_X_EXPORT void void
fbCopyNtoN (DrawablePtr pSrcDrawable, fbCopyNtoN (DrawablePtr pSrcDrawable,
DrawablePtr pDstDrawable, DrawablePtr pDstDrawable,
GCPtr pGC, GCPtr pGC,
@ -100,7 +100,7 @@ fbCopyNtoN (DrawablePtr pSrcDrawable,
fbFinishAccess (pSrcDrawable); fbFinishAccess (pSrcDrawable);
} }
_X_EXPORT void void
fbCopy1toN (DrawablePtr pSrcDrawable, fbCopy1toN (DrawablePtr pSrcDrawable,
DrawablePtr pDstDrawable, DrawablePtr pDstDrawable,
GCPtr pGC, GCPtr pGC,
@ -173,7 +173,7 @@ fbCopy1toN (DrawablePtr pSrcDrawable,
fbFinishAccess (pSrcDrawable); fbFinishAccess (pSrcDrawable);
} }
_X_EXPORT void void
fbCopyNto1 (DrawablePtr pSrcDrawable, fbCopyNto1 (DrawablePtr pSrcDrawable,
DrawablePtr pDstDrawable, DrawablePtr pDstDrawable,
GCPtr pGC, GCPtr pGC,
@ -289,7 +289,7 @@ fbCopyNto1 (DrawablePtr pSrcDrawable,
} }
} }
_X_EXPORT void void
fbCopyRegion (DrawablePtr pSrcDrawable, fbCopyRegion (DrawablePtr pSrcDrawable,
DrawablePtr pDstDrawable, DrawablePtr pDstDrawable,
GCPtr pGC, GCPtr pGC,
@ -407,7 +407,7 @@ fbCopyRegion (DrawablePtr pSrcDrawable,
xfree (pboxNew2); xfree (pboxNew2);
} }
_X_EXPORT RegionPtr RegionPtr
fbDoCopy (DrawablePtr pSrcDrawable, fbDoCopy (DrawablePtr pSrcDrawable,
DrawablePtr pDstDrawable, DrawablePtr pDstDrawable,
GCPtr pGC, GCPtr pGC,
@ -612,7 +612,7 @@ fbDoCopy (DrawablePtr pSrcDrawable,
return prgnExposed; return prgnExposed;
} }
_X_EXPORT RegionPtr RegionPtr
fbCopyArea (DrawablePtr pSrcDrawable, fbCopyArea (DrawablePtr pSrcDrawable,
DrawablePtr pDstDrawable, DrawablePtr pDstDrawable,
GCPtr pGC, GCPtr pGC,
@ -635,7 +635,7 @@ fbCopyArea (DrawablePtr pSrcDrawable,
widthSrc, heightSrc, xOut, yOut, copy, 0, 0); widthSrc, heightSrc, xOut, yOut, copy, 0, 0);
} }
_X_EXPORT RegionPtr RegionPtr
fbCopyPlane (DrawablePtr pSrcDrawable, fbCopyPlane (DrawablePtr pSrcDrawable,
DrawablePtr pDstDrawable, DrawablePtr pDstDrawable,
GCPtr pGC, GCPtr pGC,

4
fb/fbfill.c
View File

@ -26,7 +26,7 @@
#include "fb.h" #include "fb.h"
_X_EXPORT void void
fbFill (DrawablePtr pDrawable, fbFill (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int x, int x,
@ -165,7 +165,7 @@ fbFill (DrawablePtr pDrawable,
fbFinishAccess (pDrawable); fbFinishAccess (pDrawable);
} }
_X_EXPORT void void
fbSolidBoxClipped (DrawablePtr pDrawable, fbSolidBoxClipped (DrawablePtr pDrawable,
RegionPtr pClip, RegionPtr pClip,
int x1, int x1,

2
fb/fbfillrect.c
View File

@ -26,7 +26,7 @@
#include "fb.h" #include "fb.h"
_X_EXPORT void void
fbPolyFillRect(DrawablePtr pDrawable, fbPolyFillRect(DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int nrect, int nrect,

2
fb/fbfillsp.c
View File

@ -26,7 +26,7 @@
#include "fb.h" #include "fb.h"
_X_EXPORT void void
fbFillSpans (DrawablePtr pDrawable, fbFillSpans (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int n, int n,

10
fb/fbgc.c
View File

@ -28,7 +28,7 @@
#include "fb.h" #include "fb.h"
_X_EXPORT const GCFuncs fbGCFuncs = { const GCFuncs fbGCFuncs = {
fbValidateGC, fbValidateGC,
miChangeGC, miChangeGC,
miCopyGC, miCopyGC,
@ -38,7 +38,7 @@ _X_EXPORT const GCFuncs fbGCFuncs = {
miCopyClip, miCopyClip,
}; };
_X_EXPORT const GCOps fbGCOps = { const GCOps fbGCOps = {
fbFillSpans, fbFillSpans,
fbSetSpans, fbSetSpans,
fbPutImage, fbPutImage,
@ -61,7 +61,7 @@ _X_EXPORT const GCOps fbGCOps = {
fbPushPixels fbPushPixels
}; };
_X_EXPORT Bool Bool
fbCreateGC(GCPtr pGC) fbCreateGC(GCPtr pGC)
{ {
pGC->clientClip = NULL; pGC->clientClip = NULL;
@ -84,7 +84,7 @@ fbCreateGC(GCPtr pGC)
/* /*
* Pad pixmap to FB_UNIT bits wide * Pad pixmap to FB_UNIT bits wide
*/ */
_X_EXPORT void void
fbPadPixmap (PixmapPtr pPixmap) fbPadPixmap (PixmapPtr pPixmap)
{ {
int width; int width;
@ -193,7 +193,7 @@ fbCanEvenStipple (PixmapPtr pStipple, int bpp)
return TRUE; return TRUE;
} }
_X_EXPORT void void
fbValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable) fbValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
{ {
FbGCPrivPtr pPriv = fbGetGCPrivate(pGC); FbGCPrivPtr pPriv = fbGetGCPrivate(pGC);

2
fb/fbgetsp.c
View File

@ -26,7 +26,7 @@
#include "fb.h" #include "fb.h"
_X_EXPORT void void
fbGetSpans(DrawablePtr pDrawable, fbGetSpans(DrawablePtr pDrawable,
int wMax, int wMax,
DDXPointPtr ppt, DDXPointPtr ppt,

8
fb/fbglyph.c
View File

@ -31,7 +31,7 @@
#define dummyScreen screenInfo.screens[0] #define dummyScreen screenInfo.screens[0]
_X_EXPORT Bool Bool
fbGlyphIn (RegionPtr pRegion, fbGlyphIn (RegionPtr pRegion,
int x, int x,
int y, int y,
@ -129,7 +129,7 @@ fbGlyphIn (RegionPtr pRegion,
#define CASE(a,b,c,d) (a | (b << 1) | (c << 2) | (d << 3)) #define CASE(a,b,c,d) (a | (b << 1) | (c << 2) | (d << 3))
#endif #endif
_X_EXPORT void void
fbGlyph24 (FbBits *dstBits, fbGlyph24 (FbBits *dstBits,
FbStride dstStride, FbStride dstStride,
int dstBpp, int dstBpp,
@ -253,7 +253,7 @@ fbGlyph24 (FbBits *dstBits,
#endif #endif
#endif #endif
_X_EXPORT void void
fbPolyGlyphBlt (DrawablePtr pDrawable, fbPolyGlyphBlt (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int x, int x,
@ -343,7 +343,7 @@ fbPolyGlyphBlt (DrawablePtr pDrawable,
} }
_X_EXPORT void void
fbImageGlyphBlt (DrawablePtr pDrawable, fbImageGlyphBlt (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int x, int x,

8
fb/fbimage.c
View File

@ -28,7 +28,7 @@
#include "fb.h" #include "fb.h"
_X_EXPORT void void
fbPutImage (DrawablePtr pDrawable, fbPutImage (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int depth, int depth,
@ -112,7 +112,7 @@ fbPutImage (DrawablePtr pDrawable,
} }
} }
_X_EXPORT void void
fbPutZImage (DrawablePtr pDrawable, fbPutZImage (DrawablePtr pDrawable,
RegionPtr pClip, RegionPtr pClip,
int alu, int alu,
@ -172,7 +172,7 @@ fbPutZImage (DrawablePtr pDrawable,
fbFinishAccess (pDrawable); fbFinishAccess (pDrawable);
} }
_X_EXPORT void void
fbPutXYImage (DrawablePtr pDrawable, fbPutXYImage (DrawablePtr pDrawable,
RegionPtr pClip, RegionPtr pClip,
FbBits fg, FbBits fg,
@ -281,7 +281,7 @@ fbPutXYImage (DrawablePtr pDrawable,
fbFinishAccess (pDrawable); fbFinishAccess (pDrawable);
} }
_X_EXPORT void void
fbGetImage (DrawablePtr pDrawable, fbGetImage (DrawablePtr pDrawable,
int x, int x,
int y, int y,

10
fb/fbline.c
View File

@ -26,7 +26,7 @@
#include "fb.h" #include "fb.h"
_X_EXPORT void void
fbZeroLine (DrawablePtr pDrawable, fbZeroLine (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int mode, int mode,
@ -61,7 +61,7 @@ fbZeroLine (DrawablePtr pDrawable,
} }
} }
_X_EXPORT void void
fbZeroSegment (DrawablePtr pDrawable, fbZeroSegment (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int nseg, int nseg,
@ -85,7 +85,7 @@ fbZeroSegment (DrawablePtr pDrawable,
} }
} }
_X_EXPORT void void
fbFixCoordModePrevious (int npt, fbFixCoordModePrevious (int npt,
DDXPointPtr ppt) DDXPointPtr ppt)
{ {
@ -102,7 +102,7 @@ fbFixCoordModePrevious (int npt,
} }
} }
_X_EXPORT void void
fbPolyLine (DrawablePtr pDrawable, fbPolyLine (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int mode, int mode,
@ -140,7 +140,7 @@ fbPolyLine (DrawablePtr pDrawable,
(*line) (pDrawable, pGC, mode, npt, ppt); (*line) (pDrawable, pGC, mode, npt, ppt);
} }
_X_EXPORT void void
fbPolySegment (DrawablePtr pDrawable, fbPolySegment (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int nseg, int nseg,

22
fb/fboverlay.c
View File

@ -36,7 +36,7 @@
static int fbOverlayScreenPrivateKeyIndex; static int fbOverlayScreenPrivateKeyIndex;
static DevPrivateKey fbOverlayScreenPrivateKey = &fbOverlayScreenPrivateKeyIndex; static DevPrivateKey fbOverlayScreenPrivateKey = &fbOverlayScreenPrivateKeyIndex;
_X_EXPORT DevPrivateKey fbOverlayGetScreenPrivateKey(void) DevPrivateKey fbOverlayGetScreenPrivateKey(void)
{ {
return fbOverlayScreenPrivateKey; return fbOverlayScreenPrivateKey;
} }
@ -45,7 +45,7 @@ _X_EXPORT DevPrivateKey fbOverlayGetScreenPrivateKey(void)
* Replace this if you want something supporting * Replace this if you want something supporting
* multiple overlays with the same depth * multiple overlays with the same depth
*/ */
_X_EXPORT Bool Bool
fbOverlayCreateWindow(WindowPtr pWin) fbOverlayCreateWindow(WindowPtr pWin)
{ {
FbOverlayScrPrivPtr pScrPriv = fbOverlayGetScrPriv(pWin->drawable.pScreen); FbOverlayScrPrivPtr pScrPriv = fbOverlayGetScrPriv(pWin->drawable.pScreen);
@ -84,7 +84,7 @@ fbOverlayCreateWindow(WindowPtr pWin)
return FALSE; return FALSE;
} }
_X_EXPORT Bool Bool
fbOverlayCloseScreen (int iScreen, ScreenPtr pScreen) fbOverlayCloseScreen (int iScreen, ScreenPtr pScreen)
{ {
FbOverlayScrPrivPtr pScrPriv = fbOverlayGetScrPriv(pScreen); FbOverlayScrPrivPtr pScrPriv = fbOverlayGetScrPriv(pScreen);
@ -101,7 +101,7 @@ fbOverlayCloseScreen (int iScreen, ScreenPtr pScreen)
/* /*
* Return layer containing this window * Return layer containing this window
*/ */
_X_EXPORT int int
fbOverlayWindowLayer(WindowPtr pWin) fbOverlayWindowLayer(WindowPtr pWin)
{ {
FbOverlayScrPrivPtr pScrPriv = fbOverlayGetScrPriv(pWin->drawable.pScreen); FbOverlayScrPrivPtr pScrPriv = fbOverlayGetScrPriv(pWin->drawable.pScreen);
@ -114,7 +114,7 @@ fbOverlayWindowLayer(WindowPtr pWin)
return 0; return 0;
} }
_X_EXPORT Bool Bool
fbOverlayCreateScreenResources(ScreenPtr pScreen) fbOverlayCreateScreenResources(ScreenPtr pScreen)
{ {
int i; int i;
@ -153,7 +153,7 @@ fbOverlayCreateScreenResources(ScreenPtr pScreen)
return TRUE; return TRUE;
} }
_X_EXPORT void void
fbOverlayPaintKey (DrawablePtr pDrawable, fbOverlayPaintKey (DrawablePtr pDrawable,
RegionPtr pRegion, RegionPtr pRegion,
CARD32 pixel, CARD32 pixel,
@ -166,7 +166,7 @@ fbOverlayPaintKey (DrawablePtr pDrawable,
/* /*
* Track visible region for each layer * Track visible region for each layer
*/ */
_X_EXPORT void void
fbOverlayUpdateLayerRegion (ScreenPtr pScreen, fbOverlayUpdateLayerRegion (ScreenPtr pScreen,
int layer, int layer,
RegionPtr prgn) RegionPtr prgn)
@ -213,7 +213,7 @@ fbOverlayUpdateLayerRegion (ScreenPtr pScreen,
/* /*
* Copy only areas in each layer containing real bits * Copy only areas in each layer containing real bits
*/ */
_X_EXPORT void void
fbOverlayCopyWindow(WindowPtr pWin, fbOverlayCopyWindow(WindowPtr pWin,
DDXPointRec ptOldOrg, DDXPointRec ptOldOrg,
RegionPtr prgnSrc) RegionPtr prgnSrc)
@ -267,7 +267,7 @@ fbOverlayCopyWindow(WindowPtr pWin,
REGION_UNINIT(pScreen, &rgnDst); REGION_UNINIT(pScreen, &rgnDst);
} }
_X_EXPORT void void
fbOverlayWindowExposures (WindowPtr pWin, fbOverlayWindowExposures (WindowPtr pWin,
RegionPtr prgn, RegionPtr prgn,
RegionPtr other_exposed) RegionPtr other_exposed)
@ -278,7 +278,7 @@ fbOverlayWindowExposures (WindowPtr pWin,
miWindowExposures(pWin, prgn, other_exposed); miWindowExposures(pWin, prgn, other_exposed);
} }
_X_EXPORT Bool Bool
fbOverlaySetupScreen(ScreenPtr pScreen, fbOverlaySetupScreen(ScreenPtr pScreen,
pointer pbits1, pointer pbits1,
pointer pbits2, pointer pbits2,
@ -325,7 +325,7 @@ fb24_32OverlayCreateScreenResources(ScreenPtr pScreen)
return retval; return retval;
} }
_X_EXPORT Bool Bool
fbOverlayFinishScreenInit(ScreenPtr pScreen, fbOverlayFinishScreenInit(ScreenPtr pScreen,
pointer pbits1, pointer pbits1,
pointer pbits2, pointer pbits2,

22
fb/fboverlay.h
View File

@ -27,7 +27,7 @@
#include "privates.h" #include "privates.h"
extern DevPrivateKey fbOverlayGetScreenPrivateKey(void); extern _X_EXPORT DevPrivateKey fbOverlayGetScreenPrivateKey(void);
#ifndef FB_OVERLAY_MAX #ifndef FB_OVERLAY_MAX
#define FB_OVERLAY_MAX 2 #define FB_OVERLAY_MAX 2
@ -59,40 +59,40 @@ typedef struct _fbOverlayScrPriv {
#define fbOverlayGetScrPriv(s) \ #define fbOverlayGetScrPriv(s) \
dixLookupPrivate(&(s)->devPrivates, fbOverlayGetScreenPrivateKey()) dixLookupPrivate(&(s)->devPrivates, fbOverlayGetScreenPrivateKey())
Bool extern _X_EXPORT Bool
fbOverlayCreateWindow(WindowPtr pWin); fbOverlayCreateWindow(WindowPtr pWin);
Bool extern _X_EXPORT Bool
fbOverlayCloseScreen (int iScreen, ScreenPtr pScreen); fbOverlayCloseScreen (int iScreen, ScreenPtr pScreen);
int extern _X_EXPORT int
fbOverlayWindowLayer(WindowPtr pWin); fbOverlayWindowLayer(WindowPtr pWin);
Bool extern _X_EXPORT Bool
fbOverlayCreateScreenResources(ScreenPtr pScreen); fbOverlayCreateScreenResources(ScreenPtr pScreen);
void extern _X_EXPORT void
fbOverlayPaintKey (DrawablePtr pDrawable, fbOverlayPaintKey (DrawablePtr pDrawable,
RegionPtr pRegion, RegionPtr pRegion,
CARD32 pixel, CARD32 pixel,
int layer); int layer);
void extern _X_EXPORT void
fbOverlayUpdateLayerRegion (ScreenPtr pScreen, fbOverlayUpdateLayerRegion (ScreenPtr pScreen,
int layer, int layer,
RegionPtr prgn); RegionPtr prgn);
void extern _X_EXPORT void
fbOverlayCopyWindow(WindowPtr pWin, fbOverlayCopyWindow(WindowPtr pWin,
DDXPointRec ptOldOrg, DDXPointRec ptOldOrg,
RegionPtr prgnSrc); RegionPtr prgnSrc);
void extern _X_EXPORT void
fbOverlayWindowExposures (WindowPtr pWin, fbOverlayWindowExposures (WindowPtr pWin,
RegionPtr prgn, RegionPtr prgn,
RegionPtr other_exposed); RegionPtr other_exposed);
Bool extern _X_EXPORT Bool
fbOverlaySetupScreen(ScreenPtr pScreen, fbOverlaySetupScreen(ScreenPtr pScreen,
pointer pbits1, pointer pbits1,
pointer pbits2, pointer pbits2,
@ -105,7 +105,7 @@ fbOverlaySetupScreen(ScreenPtr pScreen,
int bpp1, int bpp1,
int bpp2); int bpp2);
Bool extern _X_EXPORT Bool
fbOverlayFinishScreenInit(ScreenPtr pScreen, fbOverlayFinishScreenInit(ScreenPtr pScreen,
pointer pbits1, pointer pbits1,
pointer pbits2, pointer pbits2,

12
fb/fbpict.c
View File

@ -39,7 +39,7 @@
#define mod(a,b) ((b) == 1 ? 0 : (a) >= 0 ? (a) % (b) : (b) - (-a) % (b)) #define mod(a,b) ((b) == 1 ? 0 : (a) >= 0 ? (a) % (b) : (b) - (-a) % (b))
_X_EXPORT void void
fbWalkCompositeRegion (CARD8 op, fbWalkCompositeRegion (CARD8 op,
PicturePtr pSrc, PicturePtr pSrc,
PicturePtr pMask, PicturePtr pMask,
@ -143,7 +143,7 @@ fbWalkCompositeRegion (CARD8 op,
REGION_UNINIT (pDst->pDrawable->pScreen, &region); REGION_UNINIT (pDst->pDrawable->pScreen, &region);
} }
_X_EXPORT void void
fbComposite (CARD8 op, fbComposite (CARD8 op,
PicturePtr pSrc, PicturePtr pSrc,
PicturePtr pMask, PicturePtr pMask,
@ -192,7 +192,7 @@ fbComposite (CARD8 op,
free_pixman_pict (pDst, dest); free_pixman_pict (pDst, dest);
} }
_X_EXPORT void void
fbCompositeGeneral (CARD8 op, fbCompositeGeneral (CARD8 op,
PicturePtr pSrc, PicturePtr pSrc,
PicturePtr pMask, PicturePtr pMask,
@ -400,7 +400,7 @@ set_image_properties (pixman_image_t *image, PicturePtr pict)
pixman_image_set_source_clipping (image, TRUE); pixman_image_set_source_clipping (image, TRUE);
} }
_X_EXPORT pixman_image_t * pixman_image_t *
image_from_pict (PicturePtr pict, image_from_pict (PicturePtr pict,
Bool has_clip) Bool has_clip)
{ {
@ -440,14 +440,14 @@ image_from_pict (PicturePtr pict,
return image; return image;
} }
_X_EXPORT void void
free_pixman_pict (PicturePtr pict, pixman_image_t *image) free_pixman_pict (PicturePtr pict, pixman_image_t *image)
{ {
if (image && pixman_image_unref (image) && pict->pDrawable) if (image && pixman_image_unref (image) && pict->pDrawable)
fbFinishAccess (pict->pDrawable); fbFinishAccess (pict->pDrawable);
} }
_X_EXPORT Bool Bool
fbPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats) fbPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats)
{ {

14
fb/fbpict.h
View File

@ -383,7 +383,7 @@ typedef struct _FbComposeData {
CARD16 height; CARD16 height;
} FbComposeData; } FbComposeData;
void extern _X_EXPORT void
fbCompositeRect (const FbComposeData *data, CARD32 *scanline_buffer); fbCompositeRect (const FbComposeData *data, CARD32 *scanline_buffer);
typedef FASTCALL void (*CombineMaskU) (CARD32 *src, const CARD32 *mask, int width); typedef FASTCALL void (*CombineMaskU) (CARD32 *src, const CARD32 *mask, int width);
@ -398,7 +398,7 @@ typedef struct _FbComposeFunctions {
/* fbcompose.c */ /* fbcompose.c */
void extern _X_EXPORT void
fbCompositeGeneral (CARD8 op, fbCompositeGeneral (CARD8 op,
PicturePtr pSrc, PicturePtr pSrc,
PicturePtr pMask, PicturePtr pMask,
@ -413,7 +413,7 @@ fbCompositeGeneral (CARD8 op,
CARD16 height); CARD16 height);
/* fbpict.c */ /* fbpict.c */
void extern _X_EXPORT void
fbComposite (CARD8 op, fbComposite (CARD8 op,
PicturePtr pSrc, PicturePtr pSrc,
PicturePtr pMask, PicturePtr pMask,
@ -440,7 +440,7 @@ typedef void (*CompositeFunc) (CARD8 op,
CARD16 width, CARD16 width,
CARD16 height); CARD16 height);
void extern _X_EXPORT void
fbWalkCompositeRegion (CARD8 op, fbWalkCompositeRegion (CARD8 op,
PicturePtr pSrc, PicturePtr pSrc,
PicturePtr pMask, PicturePtr pMask,
@ -459,20 +459,20 @@ fbWalkCompositeRegion (CARD8 op,
/* fbtrap.c */ /* fbtrap.c */
void extern _X_EXPORT void
fbAddTraps (PicturePtr pPicture, fbAddTraps (PicturePtr pPicture,
INT16 xOff, INT16 xOff,
INT16 yOff, INT16 yOff,
int ntrap, int ntrap,
xTrap *traps); xTrap *traps);
void extern _X_EXPORT void
fbRasterizeTrapezoid (PicturePtr alpha, fbRasterizeTrapezoid (PicturePtr alpha,
xTrapezoid *trap, xTrapezoid *trap,
int x_off, int x_off,
int y_off); int y_off);
void extern _X_EXPORT void
fbAddTriangles (PicturePtr pPicture, fbAddTriangles (PicturePtr pPicture,
INT16 xOff, INT16 xOff,
INT16 yOff, INT16 yOff,

14
fb/fbpixmap.c
View File

@ -28,7 +28,7 @@
#include "fb.h" #include "fb.h"
_X_EXPORT PixmapPtr PixmapPtr
fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp, fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp,
unsigned usage_hint) unsigned usage_hint)
{ {
@ -82,7 +82,7 @@ fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp,
return pPixmap; return pPixmap;
} }
_X_EXPORT PixmapPtr PixmapPtr
fbCreatePixmap (ScreenPtr pScreen, int width, int height, int depth, fbCreatePixmap (ScreenPtr pScreen, int width, int height, int depth,
unsigned usage_hint) unsigned usage_hint)
{ {
@ -95,7 +95,7 @@ fbCreatePixmap (ScreenPtr pScreen, int width, int height, int depth,
return fbCreatePixmapBpp (pScreen, width, height, depth, bpp, usage_hint); return fbCreatePixmapBpp (pScreen, width, height, depth, bpp, usage_hint);
} }
_X_EXPORT Bool Bool
fbDestroyPixmap (PixmapPtr pPixmap) fbDestroyPixmap (PixmapPtr pPixmap)
{ {
if(--pPixmap->refcnt) if(--pPixmap->refcnt)
@ -137,7 +137,7 @@ if (((rx1) < (rx2)) && ((ry1) < (ry2)) && \
* Then it coalesces the current line with the previous if they have boxes * Then it coalesces the current line with the previous if they have boxes
* at the same X coordinates. * at the same X coordinates.
*/ */
_X_EXPORT RegionPtr RegionPtr
fbPixmapToRegion(PixmapPtr pPix) fbPixmapToRegion(PixmapPtr pPix)
{ {
register RegionPtr pReg; register RegionPtr pReg;
@ -348,7 +348,7 @@ fbValidateBits (FbStip *bits, int stride, FbStip data)
} }
} }
_X_EXPORT void void
fbValidateDrawable (DrawablePtr pDrawable) fbValidateDrawable (DrawablePtr pDrawable)
{ {
FbStip *bits, *first, *last; FbStip *bits, *first, *last;
@ -368,14 +368,14 @@ fbValidateDrawable (DrawablePtr pDrawable)
fbFinishAccess (pDrawable); fbFinishAccess (pDrawable);
} }
_X_EXPORT void void
fbSetBits (FbStip *bits, int stride, FbStip data) fbSetBits (FbStip *bits, int stride, FbStip data)
{ {
while (stride--) while (stride--)
*bits++ = data; *bits++ = data;
} }
_X_EXPORT void void
fbInitializeDrawable (DrawablePtr pDrawable) fbInitializeDrawable (DrawablePtr pDrawable)
{ {
FbStip *bits, *first, *last; FbStip *bits, *first, *last;

4
fb/fbpoint.c
View File

@ -39,7 +39,7 @@ typedef void (*FbDots) (FbBits *dst,
FbBits and, FbBits and,
FbBits xor); FbBits xor);
_X_EXPORT void void
fbDots (FbBits *dstOrig, fbDots (FbBits *dstOrig,
FbStride dstStride, FbStride dstStride,
int dstBpp, int dstBpp,
@ -107,7 +107,7 @@ fbDots (FbBits *dstOrig,
} }
} }
_X_EXPORT void void
fbPolyPoint (DrawablePtr pDrawable, fbPolyPoint (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int mode, int mode,

8
fb/fbpush.c
View File

@ -26,7 +26,7 @@
#include "fb.h" #include "fb.h"
_X_EXPORT void void
fbPushPattern (DrawablePtr pDrawable, fbPushPattern (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
@ -100,7 +100,7 @@ fbPushPattern (DrawablePtr pDrawable,
} }
} }
_X_EXPORT void void
fbPushFill (DrawablePtr pDrawable, fbPushFill (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
@ -172,7 +172,7 @@ fbPushFill (DrawablePtr pDrawable,
} }
} }
_X_EXPORT void void
fbPushImage (DrawablePtr pDrawable, fbPushImage (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
@ -223,7 +223,7 @@ fbPushImage (DrawablePtr pDrawable,
} }
} }
_X_EXPORT void void
fbPushPixels (GCPtr pGC, fbPushPixels (GCPtr pGC,
PixmapPtr pBitmap, PixmapPtr pBitmap,
DrawablePtr pDrawable, DrawablePtr pDrawable,

14
fb/fbrop.h
View File

@ -27,7 +27,7 @@ typedef struct _mergeRopBits {
FbBits ca1, cx1, ca2, cx2; FbBits ca1, cx1, ca2, cx2;
} FbMergeRopRec, *FbMergeRopPtr; } FbMergeRopRec, *FbMergeRopPtr;
extern const FbMergeRopRec FbMergeRopBits[16]; extern _X_EXPORT const FbMergeRopRec FbMergeRopBits[16];
#define FbDeclareMergeRop() FbBits _ca1, _cx1, _ca2, _cx2; #define FbDeclareMergeRop() FbBits _ca1, _cx1, _ca2, _cx2;
#define FbDeclarePrebuiltMergeRop() FbBits _cca, _ccx; #define FbDeclarePrebuiltMergeRop() FbBits _cca, _ccx;
@ -95,14 +95,14 @@ extern const FbMergeRopRec FbMergeRopBits[16];
* Stippling operations; * Stippling operations;
*/ */
extern const FbBits fbStipple16Bits[256]; /* half of table */ extern _X_EXPORT const FbBits fbStipple16Bits[256]; /* half of table */
#define FbStipple16Bits(b) \ #define FbStipple16Bits(b) \
(fbStipple16Bits[(b)&0xff] | fbStipple16Bits[(b) >> 8] << FB_HALFUNIT) (fbStipple16Bits[(b)&0xff] | fbStipple16Bits[(b) >> 8] << FB_HALFUNIT)
extern const FbBits fbStipple8Bits[256]; extern _X_EXPORT const FbBits fbStipple8Bits[256];
extern const FbBits fbStipple4Bits[16]; extern _X_EXPORT const FbBits fbStipple4Bits[16];
extern const FbBits fbStipple2Bits[4]; extern _X_EXPORT const FbBits fbStipple2Bits[4];
extern const FbBits fbStipple1Bits[2]; extern _X_EXPORT const FbBits fbStipple1Bits[2];
extern const FbBits *const fbStippleTable[]; extern _X_EXPORT const FbBits *const fbStippleTable[];
#define FbStippleRRop(dst, b, fa, fx, ba, bx) \ #define FbStippleRRop(dst, b, fa, fx, ba, bx) \
(FbDoRRop(dst, fa, fx) & b) | (FbDoRRop(dst, ba, bx) & ~b) (FbDoRRop(dst, fa, fx) & b) | (FbDoRRop(dst, ba, bx) & ~b)

18
fb/fbscreen.c
View File

@ -26,7 +26,7 @@
#include "fb.h" #include "fb.h"
_X_EXPORT Bool Bool
fbCloseScreen (int index, ScreenPtr pScreen) fbCloseScreen (int index, ScreenPtr pScreen)
{ {
int d; int d;
@ -43,19 +43,19 @@ fbCloseScreen (int index, ScreenPtr pScreen)
return TRUE; return TRUE;
} }
_X_EXPORT Bool Bool
fbRealizeFont(ScreenPtr pScreen, FontPtr pFont) fbRealizeFont(ScreenPtr pScreen, FontPtr pFont)
{ {
return (TRUE); return (TRUE);
} }
_X_EXPORT Bool Bool
fbUnrealizeFont(ScreenPtr pScreen, FontPtr pFont) fbUnrealizeFont(ScreenPtr pScreen, FontPtr pFont)
{ {
return (TRUE); return (TRUE);
} }
_X_EXPORT void void
fbQueryBestSize (int class, fbQueryBestSize (int class,
unsigned short *width, unsigned short *height, unsigned short *width, unsigned short *height,
ScreenPtr pScreen) ScreenPtr pScreen)
@ -81,7 +81,7 @@ fbQueryBestSize (int class,
} }
} }
_X_EXPORT PixmapPtr PixmapPtr
_fbGetWindowPixmap (WindowPtr pWindow) _fbGetWindowPixmap (WindowPtr pWindow)
{ {
return fbGetWindowPixmap (pWindow); return fbGetWindowPixmap (pWindow);
@ -93,7 +93,7 @@ _fbSetWindowPixmap (WindowPtr pWindow, PixmapPtr pPixmap)
dixSetPrivate(&pWindow->devPrivates, fbGetWinPrivateKey(), pPixmap); dixSetPrivate(&pWindow->devPrivates, fbGetWinPrivateKey(), pPixmap);
} }
_X_EXPORT Bool Bool
fbSetupScreen(ScreenPtr pScreen, fbSetupScreen(ScreenPtr pScreen,
pointer pbits, /* pointer to screen bitmap */ pointer pbits, /* pointer to screen bitmap */
int xsize, /* in pixels */ int xsize, /* in pixels */
@ -140,7 +140,7 @@ fbSetupScreen(ScreenPtr pScreen,
} }
#ifdef FB_ACCESS_WRAPPER #ifdef FB_ACCESS_WRAPPER
_X_EXPORT Bool Bool
wfbFinishScreenInit(ScreenPtr pScreen, wfbFinishScreenInit(ScreenPtr pScreen,
pointer pbits, pointer pbits,
int xsize, int xsize,
@ -247,7 +247,7 @@ fbFinishScreenInit(ScreenPtr pScreen,
/* dts * (inch/dot) * (25.4 mm / inch) = mm */ /* dts * (inch/dot) * (25.4 mm / inch) = mm */
#ifdef FB_ACCESS_WRAPPER #ifdef FB_ACCESS_WRAPPER
_X_EXPORT Bool Bool
wfbScreenInit(ScreenPtr pScreen, wfbScreenInit(ScreenPtr pScreen,
pointer pbits, pointer pbits,
int xsize, int xsize,
@ -267,7 +267,7 @@ wfbScreenInit(ScreenPtr pScreen,
return TRUE; return TRUE;
} }
#else #else
_X_EXPORT Bool Bool
fbScreenInit(ScreenPtr pScreen, fbScreenInit(ScreenPtr pScreen,
pointer pbits, pointer pbits,
int xsize, int xsize,

14
fb/fbseg.c
View File

@ -33,7 +33,7 @@
((dir < 0) ? FbStipLeft(mask,bpp) : \ ((dir < 0) ? FbStipLeft(mask,bpp) : \
FbStipRight(mask,bpp))) FbStipRight(mask,bpp)))
_X_EXPORT void void
fbBresSolid (DrawablePtr pDrawable, fbBresSolid (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int dashOffset, int dashOffset,
@ -117,7 +117,7 @@ fbBresSolid (DrawablePtr pDrawable,
fbFinishAccess (pDrawable); fbFinishAccess (pDrawable);
} }
_X_EXPORT void void
fbBresDash (DrawablePtr pDrawable, fbBresDash (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int dashOffset, int dashOffset,
@ -203,7 +203,7 @@ fbBresDash (DrawablePtr pDrawable,
fbFinishAccess (pDrawable); fbFinishAccess (pDrawable);
} }
_X_EXPORT void void
fbBresFill (DrawablePtr pDrawable, fbBresFill (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int dashOffset, int dashOffset,
@ -255,7 +255,7 @@ fbSetFg (DrawablePtr pDrawable,
} }
} }
_X_EXPORT void void
fbBresFillDash (DrawablePtr pDrawable, fbBresFillDash (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int dashOffset, int dashOffset,
@ -513,7 +513,7 @@ fbBresDash24RRop (DrawablePtr pDrawable,
* based on the contents of the specified GC. * based on the contents of the specified GC.
*/ */
_X_EXPORT FbBres * FbBres *
fbSelectBres (DrawablePtr pDrawable, fbSelectBres (DrawablePtr pDrawable,
GCPtr pGC) GCPtr pGC)
{ {
@ -575,7 +575,7 @@ fbSelectBres (DrawablePtr pDrawable,
return bres; return bres;
} }
_X_EXPORT void void
fbBres (DrawablePtr pDrawable, fbBres (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int dashOffset, int dashOffset,
@ -594,7 +594,7 @@ fbBres (DrawablePtr pDrawable,
e, e1, e3, len); e, e1, e3, len);
} }
_X_EXPORT void void
fbSegment (DrawablePtr pDrawable, fbSegment (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int x1, int x1,

2
fb/fbsetsp.c
View File

@ -26,7 +26,7 @@
#include "fb.h" #include "fb.h"
_X_EXPORT void void
fbSetSpans (DrawablePtr pDrawable, fbSetSpans (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
char *src, char *src,

4
fb/fbsolid.c
View File

@ -28,7 +28,7 @@
#include "fb.h" #include "fb.h"
_X_EXPORT void void
fbSolid (FbBits *dst, fbSolid (FbBits *dst,
FbStride dstStride, FbStride dstStride,
int dstX, int dstX,
@ -82,7 +82,7 @@ fbSolid (FbBits *dst,
} }
#ifdef FB_24BIT #ifdef FB_24BIT
_X_EXPORT void void
fbSolid24 (FbBits *dst, fbSolid24 (FbBits *dst,
FbStride dstStride, FbStride dstStride,
int dstX, int dstX,

8
fb/fbstipple.c
View File

@ -56,7 +56,7 @@
* Repeat a transparent stipple across a scanline n times * Repeat a transparent stipple across a scanline n times
*/ */
_X_EXPORT void void
fbTransparentSpan (FbBits *dst, fbTransparentSpan (FbBits *dst,
FbBits stip, FbBits stip,
FbBits fgxor, FbBits fgxor,
@ -80,7 +80,7 @@ fbTransparentSpan (FbBits *dst,
} }
#endif #endif
_X_EXPORT void void
fbEvenStipple (FbBits *dst, fbEvenStipple (FbBits *dst,
FbStride dstStride, FbStride dstStride,
int dstX, int dstX,
@ -213,7 +213,7 @@ fbEvenStipple (FbBits *dst,
} }
} }
_X_EXPORT void void
fbOddStipple (FbBits *dst, fbOddStipple (FbBits *dst,
FbStride dstStride, FbStride dstStride,
int dstX, int dstX,
@ -278,7 +278,7 @@ fbOddStipple (FbBits *dst,
} }
} }
_X_EXPORT void void
fbStipple (FbBits *dst, fbStipple (FbBits *dst,
FbStride dstStride, FbStride dstStride,
int dstX, int dstX,

6
fb/fbtile.c
View File

@ -31,7 +31,7 @@
* than FB_UNIT * than FB_UNIT
*/ */
_X_EXPORT void void
fbEvenTile (FbBits *dst, fbEvenTile (FbBits *dst,
FbStride dstStride, FbStride dstStride,
int dstX, int dstX,
@ -107,7 +107,7 @@ fbEvenTile (FbBits *dst,
} }
} }
_X_EXPORT void void
fbOddTile(FbBits *dst, fbOddTile(FbBits *dst,
FbStride dstStride, FbStride dstStride,
int dstX, int dstX,
@ -172,7 +172,7 @@ fbOddTile(FbBits *dst,
} }
} }
_X_EXPORT void void
fbTile (FbBits *dst, fbTile (FbBits *dst,
FbStride dstStride, FbStride dstStride,
int dstX, int dstX,

6
fb/fbtrap.c
View File

@ -33,7 +33,7 @@
#include "renderedge.h" #include "renderedge.h"
#include "fbpict.h" #include "fbpict.h"
_X_EXPORT void void
fbAddTraps (PicturePtr pPicture, fbAddTraps (PicturePtr pPicture,
INT16 x_off, INT16 x_off,
INT16 y_off, INT16 y_off,
@ -50,7 +50,7 @@ fbAddTraps (PicturePtr pPicture,
free_pixman_pict (pPicture, image); free_pixman_pict (pPicture, image);
} }
_X_EXPORT void void
fbRasterizeTrapezoid (PicturePtr pPicture, fbRasterizeTrapezoid (PicturePtr pPicture,
xTrapezoid *trap, xTrapezoid *trap,
int x_off, int x_off,
@ -92,7 +92,7 @@ _Clockwise (xPointFixed *ref, xPointFixed *a, xPointFixed *b)
} }
/* FIXME -- this could be made more efficient */ /* FIXME -- this could be made more efficient */
_X_EXPORT void void
fbAddTriangles (PicturePtr pPicture, fbAddTriangles (PicturePtr pPicture,
INT16 x_off, INT16 x_off,
INT16 y_off, INT16 y_off,

30
fb/fbutil.c
View File

@ -26,7 +26,7 @@
#include "fb.h" #include "fb.h"
_X_EXPORT FbBits FbBits
fbReplicatePixel (Pixel p, int bpp) fbReplicatePixel (Pixel p, int bpp)
{ {
FbBits b = p; FbBits b = p;
@ -40,7 +40,7 @@ fbReplicatePixel (Pixel p, int bpp)
return b; return b;
} }
_X_EXPORT void void
fbReduceRasterOp (int rop, FbBits fg, FbBits pm, FbBits *andp, FbBits *xorp) fbReduceRasterOp (int rop, FbBits fg, FbBits pm, FbBits *andp, FbBits *xorp)
{ {
FbBits and, xor; FbBits and, xor;
@ -122,7 +122,7 @@ fbReduceRasterOp (int rop, FbBits fg, FbBits pm, FbBits *andp, FbBits *xorp)
#define O 0 #define O 0
#define I FB_ALLONES #define I FB_ALLONES
_X_EXPORT const FbMergeRopRec FbMergeRopBits[16] = { const FbMergeRopRec FbMergeRopBits[16] = {
{ O,O,O,O }, /* clear 0x0 0 */ { O,O,O,O }, /* clear 0x0 0 */
{ I,O,O,O }, /* and 0x1 src AND dst */ { I,O,O,O }, /* and 0x1 src AND dst */
{ I,O,I,O }, /* andReverse 0x2 src AND NOT dst */ { I,O,I,O }, /* andReverse 0x2 src AND NOT dst */
@ -180,20 +180,20 @@ _X_EXPORT const FbMergeRopRec FbMergeRopBits[16] = {
#if FB_UNIT == 16 #if FB_UNIT == 16
#define fbStipple16Bits 0 #define fbStipple16Bits 0
#define fbStipple8Bits 0 #define fbStipple8Bits 0
_X_EXPORT const FbBits fbStipple4Bits[16] = { const FbBits fbStipple4Bits[16] = {
C4( 0,4), C4( 1,4), C4( 2,4), C4( 3,4), C4( 4,4), C4( 5,4), C4( 0,4), C4( 1,4), C4( 2,4), C4( 3,4), C4( 4,4), C4( 5,4),
C4( 6,4), C4( 7,4), C4( 8,4), C4( 9,4), C4( 10,4), C4( 11,4), C4( 6,4), C4( 7,4), C4( 8,4), C4( 9,4), C4( 10,4), C4( 11,4),
C4( 12,4), C4( 13,4), C4( 14,4), C4( 15,4),}; C4( 12,4), C4( 13,4), C4( 14,4), C4( 15,4),};
_X_EXPORT const FbBits fbStipple2Bits[4] = { const FbBits fbStipple2Bits[4] = {
C2( 0,8), C2( 1,8), C2( 2,8), C2( 3,8), C2( 0,8), C2( 1,8), C2( 2,8), C2( 3,8),
}; };
_X_EXPORT const FbBits fbStipple1Bits[2] = { const FbBits fbStipple1Bits[2] = {
C1( 0,16), C1( 1,16), C1( 0,16), C1( 1,16),
}; };
#endif #endif
#if FB_UNIT == 32 #if FB_UNIT == 32
#define fbStipple16Bits 0 #define fbStipple16Bits 0
_X_EXPORT const FbBits fbStipple8Bits[256] = { const FbBits fbStipple8Bits[256] = {
C8( 0,4), C8( 1,4), C8( 2,4), C8( 3,4), C8( 4,4), C8( 5,4), C8( 0,4), C8( 1,4), C8( 2,4), C8( 3,4), C8( 4,4), C8( 5,4),
C8( 6,4), C8( 7,4), C8( 8,4), C8( 9,4), C8( 10,4), C8( 11,4), C8( 6,4), C8( 7,4), C8( 8,4), C8( 9,4), C8( 10,4), C8( 11,4),
C8( 12,4), C8( 13,4), C8( 14,4), C8( 15,4), C8( 16,4), C8( 17,4), C8( 12,4), C8( 13,4), C8( 14,4), C8( 15,4), C8( 16,4), C8( 17,4),
@ -238,19 +238,19 @@ _X_EXPORT const FbBits fbStipple8Bits[256] = {
C8(246,4), C8(247,4), C8(248,4), C8(249,4), C8(250,4), C8(251,4), C8(246,4), C8(247,4), C8(248,4), C8(249,4), C8(250,4), C8(251,4),
C8(252,4), C8(253,4), C8(254,4), C8(255,4), C8(252,4), C8(253,4), C8(254,4), C8(255,4),
}; };
_X_EXPORT const FbBits fbStipple4Bits[16] = { const FbBits fbStipple4Bits[16] = {
C4( 0,8), C4( 1,8), C4( 2,8), C4( 3,8), C4( 4,8), C4( 5,8), C4( 0,8), C4( 1,8), C4( 2,8), C4( 3,8), C4( 4,8), C4( 5,8),
C4( 6,8), C4( 7,8), C4( 8,8), C4( 9,8), C4( 10,8), C4( 11,8), C4( 6,8), C4( 7,8), C4( 8,8), C4( 9,8), C4( 10,8), C4( 11,8),
C4( 12,8), C4( 13,8), C4( 14,8), C4( 15,8),}; C4( 12,8), C4( 13,8), C4( 14,8), C4( 15,8),};
_X_EXPORT const FbBits fbStipple2Bits[4] = { const FbBits fbStipple2Bits[4] = {
C2( 0,16), C2( 1,16), C2( 2,16), C2( 3,16), C2( 0,16), C2( 1,16), C2( 2,16), C2( 3,16),
}; };
_X_EXPORT const FbBits fbStipple1Bits[2] = { const FbBits fbStipple1Bits[2] = {
C1( 0,32), C1( 1,32), C1( 0,32), C1( 1,32),
}; };
#endif #endif
#if FB_UNIT == 64 #if FB_UNIT == 64
_X_EXPORT const FbBits fbStipple16Bits[256] = { const FbBits fbStipple16Bits[256] = {
C8( 0,4), C8( 1,4), C8( 2,4), C8( 3,4), C8( 4,4), C8( 5,4), C8( 0,4), C8( 1,4), C8( 2,4), C8( 3,4), C8( 4,4), C8( 5,4),
C8( 6,4), C8( 7,4), C8( 8,4), C8( 9,4), C8( 10,4), C8( 11,4), C8( 6,4), C8( 7,4), C8( 8,4), C8( 9,4), C8( 10,4), C8( 11,4),
C8( 12,4), C8( 13,4), C8( 14,4), C8( 15,4), C8( 16,4), C8( 17,4), C8( 12,4), C8( 13,4), C8( 14,4), C8( 15,4), C8( 16,4), C8( 17,4),
@ -295,7 +295,7 @@ _X_EXPORT const FbBits fbStipple16Bits[256] = {
C8(246,4), C8(247,4), C8(248,4), C8(249,4), C8(250,4), C8(251,4), C8(246,4), C8(247,4), C8(248,4), C8(249,4), C8(250,4), C8(251,4),
C8(252,4), C8(253,4), C8(254,4), C8(255,4), C8(252,4), C8(253,4), C8(254,4), C8(255,4),
}; };
_X_EXPORT const FbBits fbStipple8Bits[256] = { const FbBits fbStipple8Bits[256] = {
C8( 0,8), C8( 1,8), C8( 2,8), C8( 3,8), C8( 4,8), C8( 5,8), C8( 0,8), C8( 1,8), C8( 2,8), C8( 3,8), C8( 4,8), C8( 5,8),
C8( 6,8), C8( 7,8), C8( 8,8), C8( 9,8), C8( 10,8), C8( 11,8), C8( 6,8), C8( 7,8), C8( 8,8), C8( 9,8), C8( 10,8), C8( 11,8),
C8( 12,8), C8( 13,8), C8( 14,8), C8( 15,8), C8( 16,8), C8( 17,8), C8( 12,8), C8( 13,8), C8( 14,8), C8( 15,8), C8( 16,8), C8( 17,8),
@ -340,16 +340,16 @@ _X_EXPORT const FbBits fbStipple8Bits[256] = {
C8(246,8), C8(247,8), C8(248,8), C8(249,8), C8(250,8), C8(251,8), C8(246,8), C8(247,8), C8(248,8), C8(249,8), C8(250,8), C8(251,8),
C8(252,8), C8(253,8), C8(254,8), C8(255,8), C8(252,8), C8(253,8), C8(254,8), C8(255,8),
}; };
_X_EXPORT const FbBits fbStipple4Bits[16] = { const FbBits fbStipple4Bits[16] = {
C4( 0,16), C4( 1,16), C4( 2,16), C4( 3,16), C4( 4,16), C4( 5,16), C4( 0,16), C4( 1,16), C4( 2,16), C4( 3,16), C4( 4,16), C4( 5,16),
C4( 6,16), C4( 7,16), C4( 8,16), C4( 9,16), C4( 10,16), C4( 11,16), C4( 6,16), C4( 7,16), C4( 8,16), C4( 9,16), C4( 10,16), C4( 11,16),
C4( 12,16), C4( 13,16), C4( 14,16), C4( 15,16),}; C4( 12,16), C4( 13,16), C4( 14,16), C4( 15,16),};
_X_EXPORT const FbBits fbStipple2Bits[4] = { const FbBits fbStipple2Bits[4] = {
C2( 0,32), C2( 1,32), C2( 2,32), C2( 3,32), C2( 0,32), C2( 1,32), C2( 2,32), C2( 3,32),
}; };
#define fbStipple1Bits 0 #define fbStipple1Bits 0
#endif #endif
_X_EXPORT const FbBits * const fbStippleTable[] = { const FbBits * const fbStippleTable[] = {
0, 0,
fbStipple1Bits, fbStipple1Bits,
fbStipple2Bits, fbStipple2Bits,

18
fb/fbwindow.c
View File

@ -28,7 +28,7 @@
#include "fb.h" #include "fb.h"
_X_EXPORT Bool Bool
fbCreateWindow(WindowPtr pWin) fbCreateWindow(WindowPtr pWin)
{ {
dixSetPrivate(&pWin->devPrivates, fbGetWinPrivateKey(), dixSetPrivate(&pWin->devPrivates, fbGetWinPrivateKey(),
@ -40,31 +40,31 @@ fbCreateWindow(WindowPtr pWin)
return TRUE; return TRUE;
} }
_X_EXPORT Bool Bool
fbDestroyWindow(WindowPtr pWin) fbDestroyWindow(WindowPtr pWin)
{ {
return TRUE; return TRUE;
} }
_X_EXPORT Bool Bool
fbMapWindow(WindowPtr pWindow) fbMapWindow(WindowPtr pWindow)
{ {
return TRUE; return TRUE;
} }
_X_EXPORT Bool Bool
fbPositionWindow(WindowPtr pWin, int x, int y) fbPositionWindow(WindowPtr pWin, int x, int y)
{ {
return TRUE; return TRUE;
} }
_X_EXPORT Bool Bool
fbUnmapWindow(WindowPtr pWindow) fbUnmapWindow(WindowPtr pWindow)
{ {
return TRUE; return TRUE;
} }
_X_EXPORT void void
fbCopyWindowProc (DrawablePtr pSrcDrawable, fbCopyWindowProc (DrawablePtr pSrcDrawable,
DrawablePtr pDstDrawable, DrawablePtr pDstDrawable,
GCPtr pGC, GCPtr pGC,
@ -115,7 +115,7 @@ fbCopyWindowProc (DrawablePtr pSrcDrawable,
fbFinishAccess (pSrcDrawable); fbFinishAccess (pSrcDrawable);
} }
_X_EXPORT void void
fbCopyWindow(WindowPtr pWin, fbCopyWindow(WindowPtr pWin,
DDXPointRec ptOldOrg, DDXPointRec ptOldOrg,
RegionPtr prgnSrc) RegionPtr prgnSrc)
@ -148,7 +148,7 @@ fbCopyWindow(WindowPtr pWin,
fbValidateDrawable (&pWin->drawable); fbValidateDrawable (&pWin->drawable);
} }
_X_EXPORT Bool Bool
fbChangeWindowAttributes(WindowPtr pWin, unsigned long mask) fbChangeWindowAttributes(WindowPtr pWin, unsigned long mask)
{ {
PixmapPtr pPixmap; PixmapPtr pPixmap;
@ -201,7 +201,7 @@ fbChangeWindowAttributes(WindowPtr pWin, unsigned long mask)
return TRUE; return TRUE;
} }
_X_EXPORT void void
fbFillRegionSolid (DrawablePtr pDrawable, fbFillRegionSolid (DrawablePtr pDrawable,
RegionPtr pRegion, RegionPtr pRegion,
FbBits and, FbBits and,

7
hw/xfree86/common/Makefile.am
View File

@ -10,6 +10,10 @@ XVSOURCES = xf86xv.c xf86xvmc.c
XVSDKINCS = xf86xv.h xf86xvmc.h XVSDKINCS = xf86xv.h xf86xvmc.h
endif endif
if XF86VIDMODE
XF86VMODE_SDK = vidmodeproc.h
endif
XISOURCES = xf86Xinput.c xisb.c XISOURCES = xf86Xinput.c xisb.c
XISDKINCS = xf86Xinput.h xisb.h XISDKINCS = xf86Xinput.h xisb.h
RANDRSOURCES = xf86RandR.c RANDRSOURCES = xf86RandR.c
@ -46,7 +50,7 @@ INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
sdk_HEADERS = compiler.h fourcc.h xf86.h xf86Module.h xf86Opt.h \ sdk_HEADERS = compiler.h fourcc.h xf86.h xf86Module.h xf86Opt.h \
xf86PciInfo.h xf86Priv.h xf86Privstr.h xf86Resources.h \ xf86PciInfo.h xf86Priv.h xf86Privstr.h xf86Resources.h \
xf86cmap.h xf86fbman.h xf86str.h xf86RAC.h xf86Xinput.h xisb.h \ xf86cmap.h xf86fbman.h xf86str.h xf86RAC.h xf86Xinput.h xisb.h \
$(XVSDKINCS) xorgVersion.h \ $(XVSDKINCS) $(XF86VMODE_SDK) xorgVersion.h \
xf86sbusBus.h xf86xv.h xf86xvmc.h xf86xvpriv.h xf86sbusBus.h xf86xv.h xf86xvmc.h xf86xvpriv.h
DISTCLEANFILES = xf86Build.h DISTCLEANFILES = xf86Build.h
@ -56,6 +60,7 @@ EXTRA_DIST = \
compiler.h \ compiler.h \
fourcc.h \ fourcc.h \
scoasm.h \ scoasm.h \
vidmodeproc.h \
xf86.h \ xf86.h \
xf86Bus.h \ xf86Bus.h \
xf86Config.h \ xf86Config.h \

110
hw/xfree86/common/compiler.h
View File

@ -87,37 +87,37 @@
&& !(defined(__alpha__) && defined(linux)) \ && !(defined(__alpha__) && defined(linux)) \
&& !(defined(__ia64__) && defined(linux)) \ && !(defined(__ia64__) && defined(linux)) \
extern void outb(unsigned short, unsigned char); extern _X_EXPORT void outb(unsigned short, unsigned char);
extern void outw(unsigned short, unsigned short); extern _X_EXPORT void outw(unsigned short, unsigned short);
extern void outl(unsigned short, unsigned int); extern _X_EXPORT void outl(unsigned short, unsigned int);
extern unsigned int inb(unsigned short); extern _X_EXPORT unsigned int inb(unsigned short);
extern unsigned int inw(unsigned short); extern _X_EXPORT unsigned int inw(unsigned short);
extern unsigned int inl(unsigned short); extern _X_EXPORT unsigned int inl(unsigned short);
# else /* __sparc__, __arm32__, __alpha__*/ # else /* __sparc__, __arm32__, __alpha__*/
extern void outb(unsigned long, unsigned char); extern _X_EXPORT void outb(unsigned long, unsigned char);
extern void outw(unsigned long, unsigned short); extern _X_EXPORT void outw(unsigned long, unsigned short);
extern void outl(unsigned long, unsigned int); extern _X_EXPORT void outl(unsigned long, unsigned int);
extern unsigned int inb(unsigned long); extern _X_EXPORT unsigned int inb(unsigned long);
extern unsigned int inw(unsigned long); extern _X_EXPORT unsigned int inw(unsigned long);
extern unsigned int inl(unsigned long); extern _X_EXPORT unsigned int inl(unsigned long);
# endif /* __sparc__, __arm32__, __alpha__ */ # endif /* __sparc__, __arm32__, __alpha__ */
# endif /* __arm__ */ # endif /* __arm__ */
extern unsigned long ldq_u(unsigned long *); extern _X_EXPORT unsigned long ldq_u(unsigned long *);
extern unsigned long ldl_u(unsigned int *); extern _X_EXPORT unsigned long ldl_u(unsigned int *);
extern unsigned long ldw_u(unsigned short *); extern _X_EXPORT unsigned long ldw_u(unsigned short *);
extern void stq_u(unsigned long, unsigned long *); extern _X_EXPORT void stq_u(unsigned long, unsigned long *);
extern void stl_u(unsigned long, unsigned int *); extern _X_EXPORT void stl_u(unsigned long, unsigned int *);
extern void stw_u(unsigned long, unsigned short *); extern _X_EXPORT void stw_u(unsigned long, unsigned short *);
extern void mem_barrier(void); extern _X_EXPORT void mem_barrier(void);
extern void write_mem_barrier(void); extern _X_EXPORT void write_mem_barrier(void);
extern void stl_brx(unsigned long, volatile unsigned char *, int); extern _X_EXPORT void stl_brx(unsigned long, volatile unsigned char *, int);
extern void stw_brx(unsigned short, volatile unsigned char *, int); extern _X_EXPORT void stw_brx(unsigned short, volatile unsigned char *, int);
extern unsigned long ldl_brx(volatile unsigned char *, int); extern _X_EXPORT unsigned long ldl_brx(volatile unsigned char *, int);
extern unsigned short ldw_brx(volatile unsigned char *, int); extern _X_EXPORT unsigned short ldw_brx(volatile unsigned char *, int);
# endif # endif
@ -130,42 +130,42 @@ extern unsigned short ldw_brx(volatile unsigned char *, int);
/* note that the appropriate setup via "ioperm" needs to be done */ /* note that the appropriate setup via "ioperm" needs to be done */
/* *before* any inx/outx is done. */ /* *before* any inx/outx is done. */
extern void (*_alpha_outb)(char val, unsigned long port); extern _X_EXPORT void (*_alpha_outb)(char val, unsigned long port);
static __inline__ void static __inline__ void
outb(unsigned long port, unsigned char val) outb(unsigned long port, unsigned char val)
{ {
_alpha_outb(val, port); _alpha_outb(val, port);
} }
extern void (*_alpha_outw)(short val, unsigned long port); extern _X_EXPORT void (*_alpha_outw)(short val, unsigned long port);
static __inline__ void static __inline__ void
outw(unsigned long port, unsigned short val) outw(unsigned long port, unsigned short val)
{ {
_alpha_outw(val, port); _alpha_outw(val, port);
} }
extern void (*_alpha_outl)(int val, unsigned long port); extern _X_EXPORT void (*_alpha_outl)(int val, unsigned long port);
static __inline__ void static __inline__ void
outl(unsigned long port, unsigned int val) outl(unsigned long port, unsigned int val)
{ {
_alpha_outl(val, port); _alpha_outl(val, port);
} }
extern unsigned int (*_alpha_inb)(unsigned long port); extern _X_EXPORT unsigned int (*_alpha_inb)(unsigned long port);
static __inline__ unsigned int static __inline__ unsigned int
inb(unsigned long port) inb(unsigned long port)
{ {
return _alpha_inb(port); return _alpha_inb(port);
} }
extern unsigned int (*_alpha_inw)(unsigned long port); extern _X_EXPORT unsigned int (*_alpha_inw)(unsigned long port);
static __inline__ unsigned int static __inline__ unsigned int
inw(unsigned long port) inw(unsigned long port)
{ {
return _alpha_inw(port); return _alpha_inw(port);
} }
extern unsigned int (*_alpha_inl)(unsigned long port); extern _X_EXPORT unsigned int (*_alpha_inl)(unsigned long port);
static __inline__ unsigned int static __inline__ unsigned int
inl(unsigned long port) inl(unsigned long port)
{ {
@ -182,12 +182,12 @@ inl(unsigned long port)
/* note that the appropriate setup via "ioperm" needs to be done */ /* note that the appropriate setup via "ioperm" needs to be done */
/* *before* any inx/outx is done. */ /* *before* any inx/outx is done. */
extern void outb(unsigned int port, unsigned char val); extern _X_EXPORT void outb(unsigned int port, unsigned char val);
extern void outw(unsigned int port, unsigned short val); extern _X_EXPORT void outw(unsigned int port, unsigned short val);
extern void outl(unsigned int port, unsigned int val); extern _X_EXPORT void outl(unsigned int port, unsigned int val);
extern unsigned char inb(unsigned int port); extern _X_EXPORT unsigned char inb(unsigned int port);
extern unsigned short inw(unsigned int port); extern _X_EXPORT unsigned short inw(unsigned int port);
extern unsigned int inl(unsigned int port); extern _X_EXPORT unsigned int inl(unsigned int port);
# endif /* (__FreeBSD__ || __OpenBSD__ ) && !DO_PROTOTYPES */ # endif /* (__FreeBSD__ || __OpenBSD__ ) && !DO_PROTOTYPES */
@ -458,12 +458,12 @@ __ustw (unsigned long r5, unsigned short * r11)
# undef inb # undef inb
# undef inw # undef inw
# undef inl # undef inl
extern void outb(unsigned long port, unsigned char val); extern _X_EXPORT void outb(unsigned long port, unsigned char val);
extern void outw(unsigned long port, unsigned short val); extern _X_EXPORT void outw(unsigned long port, unsigned short val);
extern void outl(unsigned long port, unsigned int val); extern _X_EXPORT void outl(unsigned long port, unsigned int val);
extern unsigned int inb(unsigned long port); extern _X_EXPORT unsigned int inb(unsigned long port);
extern unsigned int inw(unsigned long port); extern _X_EXPORT unsigned int inw(unsigned long port);
extern unsigned int inl(unsigned long port); extern _X_EXPORT unsigned int inl(unsigned long port);
# elif defined(linux) && defined(__amd64__) # elif defined(linux) && defined(__amd64__)
@ -870,7 +870,7 @@ static __inline__ void stw_u(unsigned long val, unsigned short *p)
# define PORT_SIZE short # define PORT_SIZE short
# endif # endif
unsigned int IOPortBase; /* Memory mapped I/O port area */ _X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */
static __inline__ void static __inline__ void
outb(unsigned PORT_SIZE port, unsigned char val) outb(unsigned PORT_SIZE port, unsigned char val)
@ -1038,7 +1038,7 @@ xf86WriteMmio32Be(__volatile__ void *base, const unsigned long offset,
# define MAP_FAILED ((void *)-1) # define MAP_FAILED ((void *)-1)
# endif # endif
extern volatile unsigned char *ioBase; extern _X_EXPORT volatile unsigned char *ioBase;
#if defined(linux) && defined(__powerpc64__) #if defined(linux) && defined(__powerpc64__)
# include <linux/version.h> # include <linux/version.h>
@ -1522,10 +1522,10 @@ inl(unsigned short port)
# ifdef __alpha__ # ifdef __alpha__
/* entry points for Mmio memory access routines */ /* entry points for Mmio memory access routines */
extern int (*xf86ReadMmio8)(void *, unsigned long); extern _X_EXPORT int (*xf86ReadMmio8)(void *, unsigned long);
extern int (*xf86ReadMmio16)(void *, unsigned long); extern _X_EXPORT int (*xf86ReadMmio16)(void *, unsigned long);
# ifndef STANDALONE_MMIO # ifndef STANDALONE_MMIO
extern int (*xf86ReadMmio32)(void *, unsigned long); extern _X_EXPORT int (*xf86ReadMmio32)(void *, unsigned long);
# else # else
/* Some DRI 3D drivers need MMIO_IN32. */ /* Some DRI 3D drivers need MMIO_IN32. */
static __inline__ int static __inline__ int
@ -1535,14 +1535,14 @@ xf86ReadMmio32(void *Base, unsigned long Offset)
return *(volatile unsigned int*)((unsigned long)Base+(Offset)); return *(volatile unsigned int*)((unsigned long)Base+(Offset));
} }
# endif # endif
extern void (*xf86WriteMmio8)(int, void *, unsigned long); extern _X_EXPORT void (*xf86WriteMmio8)(int, void *, unsigned long);
extern void (*xf86WriteMmio16)(int, void *, unsigned long); extern _X_EXPORT void (*xf86WriteMmio16)(int, void *, unsigned long);
extern void (*xf86WriteMmio32)(int, void *, unsigned long); extern _X_EXPORT void (*xf86WriteMmio32)(int, void *, unsigned long);
extern void (*xf86WriteMmioNB8)(int, void *, unsigned long); extern _X_EXPORT void (*xf86WriteMmioNB8)(int, void *, unsigned long);
extern void (*xf86WriteMmioNB16)(int, void *, unsigned long); extern _X_EXPORT void (*xf86WriteMmioNB16)(int, void *, unsigned long);
extern void (*xf86WriteMmioNB32)(int, void *, unsigned long); extern _X_EXPORT void (*xf86WriteMmioNB32)(int, void *, unsigned long);
extern void xf86SlowBCopyFromBus(unsigned char *, unsigned char *, int); extern _X_EXPORT void xf86SlowBCopyFromBus(unsigned char *, unsigned char *, int);
extern void xf86SlowBCopyToBus(unsigned char *, unsigned char *, int); extern _X_EXPORT void xf86SlowBCopyToBus(unsigned char *, unsigned char *, int);
/* Some macros to hide the system dependencies for MMIO accesses */ /* Some macros to hide the system dependencies for MMIO accesses */
/* Changed to kill noise generated by gcc's -Wcast-align */ /* Changed to kill noise generated by gcc's -Wcast-align */

77
hw/xfree86/common/vidmodeproc.h Normal file
View File

@ -0,0 +1,77 @@
/* Prototypes for DGA functions that the DDX must provide */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#ifndef _VIDMODEPROC_H_
#define _VIDMODEPROC_H_
typedef enum {
VIDMODE_H_DISPLAY,
VIDMODE_H_SYNCSTART,
VIDMODE_H_SYNCEND,
VIDMODE_H_TOTAL,
VIDMODE_H_SKEW,
VIDMODE_V_DISPLAY,
VIDMODE_V_SYNCSTART,
VIDMODE_V_SYNCEND,
VIDMODE_V_TOTAL,
VIDMODE_FLAGS,
VIDMODE_CLOCK
} VidModeSelectMode;
typedef enum {
VIDMODE_MON_VENDOR,
VIDMODE_MON_MODEL,
VIDMODE_MON_NHSYNC,
VIDMODE_MON_NVREFRESH,
VIDMODE_MON_HSYNC_LO,
VIDMODE_MON_HSYNC_HI,
VIDMODE_MON_VREFRESH_LO,
VIDMODE_MON_VREFRESH_HI
} VidModeSelectMonitor;
typedef union {
pointer ptr;
int i;
float f;
} vidMonitorValue;
extern _X_EXPORT void XFree86VidModeExtensionInit(void);
extern _X_EXPORT Bool VidModeAvailable(int scrnIndex);
extern _X_EXPORT Bool VidModeGetCurrentModeline(int scrnIndex, pointer *mode, int *dotClock);
extern _X_EXPORT Bool VidModeGetFirstModeline(int scrnIndex, pointer *mode, int *dotClock);
extern _X_EXPORT Bool VidModeGetNextModeline(int scrnIndex, pointer *mode, int *dotClock);
extern _X_EXPORT Bool VidModeDeleteModeline(int scrnIndex, pointer mode);
extern _X_EXPORT Bool VidModeZoomViewport(int scrnIndex, int zoom);
extern _X_EXPORT Bool VidModeGetViewPort(int scrnIndex, int *x, int *y);
extern _X_EXPORT Bool VidModeSetViewPort(int scrnIndex, int x, int y);
extern _X_EXPORT Bool VidModeSwitchMode(int scrnIndex, pointer mode);
extern _X_EXPORT Bool VidModeLockZoom(int scrnIndex, Bool lock);
extern _X_EXPORT Bool VidModeGetMonitor(int scrnIndex, pointer *monitor);
extern _X_EXPORT int VidModeGetNumOfClocks(int scrnIndex, Bool *progClock);
extern _X_EXPORT Bool VidModeGetClocks(int scrnIndex, int *Clocks);
extern _X_EXPORT ModeStatus VidModeCheckModeForMonitor(int scrnIndex, pointer mode);
extern _X_EXPORT ModeStatus VidModeCheckModeForDriver(int scrnIndex, pointer mode);
extern _X_EXPORT void VidModeSetCrtcForMode(int scrnIndex, pointer mode);
extern _X_EXPORT Bool VidModeAddModeline(int scrnIndex, pointer mode);
extern _X_EXPORT int VidModeGetDotClock(int scrnIndex, int Clock);
extern _X_EXPORT int VidModeGetNumOfModes(int scrnIndex);
extern _X_EXPORT Bool VidModeSetGamma(int scrnIndex, float red, float green, float blue);
extern _X_EXPORT Bool VidModeGetGamma(int scrnIndex, float *red, float *green, float *blue);
extern _X_EXPORT pointer VidModeCreateMode(void);
extern _X_EXPORT void VidModeCopyMode(pointer modefrom, pointer modeto);
extern _X_EXPORT int VidModeGetModeValue(pointer mode, int valtyp);
extern _X_EXPORT void VidModeSetModeValue(pointer mode, int valtyp, int val);
extern _X_EXPORT vidMonitorValue VidModeGetMonitorValue(pointer monitor, int valtyp, int indx);
extern _X_EXPORT Bool VidModeSetGammaRamp(int, int, CARD16 *, CARD16 *, CARD16 *);
extern _X_EXPORT Bool VidModeGetGammaRamp(int, int, CARD16 *, CARD16 *, CARD16 *);
extern _X_EXPORT int VidModeGetGammaRampSize(int scrnIndex);
#endif

391
hw/xfree86/common/xf86.h
View File

@ -55,23 +55,25 @@
#include "propertyst.h" #include "propertyst.h"
/* General parameters */ /* General parameters */
extern int xf86DoConfigure; extern _X_EXPORT int xf86DoConfigure;
extern int xf86DoShowOptions; extern _X_EXPORT int xf86DoShowOptions;
extern Bool xf86DoModalias; extern _X_EXPORT Bool xf86DoModalias;
extern Bool xf86DoConfigurePass1; extern _X_EXPORT Bool xf86DoConfigurePass1;
extern DevPrivateKey xf86ScreenKey; extern _X_EXPORT DevPrivateKey xf86ScreenKey;
extern DevPrivateKey xf86CreateRootWindowKey; extern _X_EXPORT DevPrivateKey xf86CreateRootWindowKey;
extern DevPrivateKey xf86PixmapKey; extern _X_EXPORT DevPrivateKey xf86PixmapKey;
extern ScrnInfoPtr *xf86Screens; /* List of pointers to ScrnInfoRecs */ extern _X_EXPORT ScrnInfoPtr *xf86Screens; /* List of pointers to ScrnInfoRecs */
extern const unsigned char byte_reversed[256]; extern _X_EXPORT const unsigned char byte_reversed[256];
extern Bool pciSlotClaimed; extern _X_EXPORT Bool pciSlotClaimed;
extern Bool fbSlotClaimed; extern _X_EXPORT Bool fbSlotClaimed;
#if defined(__sparc__) || defined(__sparc) #if defined(__sparc__) || defined(__sparc)
extern Bool sbusSlotClaimed; extern _X_EXPORT Bool sbusSlotClaimed;
#endif #endif
extern confDRIRec xf86ConfigDRI; extern _X_EXPORT confDRIRec xf86ConfigDRI;
extern Bool xf86inSuspend; extern _X_EXPORT Bool xf86inSuspend;
extern Bool xf86DRI2Enabled(void); extern _X_EXPORT Bool xf86DRI2Enabled(void);
extern _X_EXPORT Bool VTSwitchEnabled; /* kbd driver */
#define XF86SCRNINFO(p) ((ScrnInfoPtr)dixLookupPrivate(&(p)->devPrivates, \ #define XF86SCRNINFO(p) ((ScrnInfoPtr)dixLookupPrivate(&(p)->devPrivates, \
xf86ScreenKey)) xf86ScreenKey))
@ -93,282 +95,285 @@ extern Bool xf86DRI2Enabled(void);
/* xf86Bus.c */ /* xf86Bus.c */
Bool xf86CheckPciSlot( const struct pci_device * ); extern _X_EXPORT Bool xf86CheckPciSlot( const struct pci_device * );
int xf86ClaimPciSlot( struct pci_device *, DriverPtr drvp, extern _X_EXPORT int xf86ClaimPciSlot( struct pci_device *, DriverPtr drvp,
int chipset, GDevPtr dev, Bool active); int chipset, GDevPtr dev, Bool active);
Bool xf86ParsePciBusString(const char *busID, int *bus, int *device, extern _X_EXPORT Bool xf86ParsePciBusString(const char *busID, int *bus, int *device,
int *func); int *func);
Bool xf86ComparePciBusString(const char *busID, int bus, int device, int func); extern _X_EXPORT Bool xf86ComparePciBusString(const char *busID, int bus, int device, int func);
void xf86FormatPciBusNumber(int busnum, char *buffer); extern _X_EXPORT void xf86FormatPciBusNumber(int busnum, char *buffer);
resPtr xf86AddRangesToList(resPtr list, resRange *pRange, int entityIndex); extern _X_EXPORT resPtr xf86AddRangesToList(resPtr list, resRange *pRange, int entityIndex);
int xf86GetFbInfoForScreen(int scrnIndex); extern _X_EXPORT int xf86GetFbInfoForScreen(int scrnIndex);
int xf86ClaimFbSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active); extern _X_EXPORT int xf86ClaimFbSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active);
int xf86ClaimNoSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active); extern _X_EXPORT int xf86ClaimNoSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active);
void xf86EnableAccess(ScrnInfoPtr pScrn); extern _X_EXPORT void xf86EnableAccess(ScrnInfoPtr pScrn);
void xf86SetCurrentAccess(Bool Enable, ScrnInfoPtr pScrn); extern _X_EXPORT void xf86SetCurrentAccess(Bool Enable, ScrnInfoPtr pScrn);
Bool xf86IsPrimaryPci(struct pci_device * pPci); extern _X_EXPORT Bool xf86IsPrimaryPci(struct pci_device * pPci);
/* new RAC */ /* new RAC */
resPtr xf86AddResToList(resPtr rlist, resRange *Range, int entityIndex); extern _X_EXPORT resPtr xf86AddResToList(resPtr rlist, resRange *Range, int entityIndex);
void xf86FreeResList(resPtr rlist); extern _X_EXPORT void xf86FreeResList(resPtr rlist);
void xf86ClaimFixedResources(resList list, int entityIndex); extern _X_EXPORT void xf86ClaimFixedResources(resList list, int entityIndex);
Bool xf86DriverHasEntities(DriverPtr drvp); extern _X_EXPORT Bool xf86DriverHasEntities(DriverPtr drvp);
void xf86AddEntityToScreen(ScrnInfoPtr pScrn, int entityIndex); extern _X_EXPORT void xf86AddEntityToScreen(ScrnInfoPtr pScrn, int entityIndex);
void xf86SetEntityInstanceForScreen(ScrnInfoPtr pScrn, int entityIndex, extern _X_EXPORT void xf86SetEntityInstanceForScreen(ScrnInfoPtr pScrn, int entityIndex,
int instance); int instance);
int xf86GetNumEntityInstances(int entityIndex); extern _X_EXPORT int xf86GetNumEntityInstances(int entityIndex);
GDevPtr xf86GetDevFromEntity(int entityIndex, int instance); extern _X_EXPORT GDevPtr xf86GetDevFromEntity(int entityIndex, int instance);
void xf86RemoveEntityFromScreen(ScrnInfoPtr pScrn, int entityIndex); extern _X_EXPORT void xf86RemoveEntityFromScreen(ScrnInfoPtr pScrn, int entityIndex);
EntityInfoPtr xf86GetEntityInfo(int entityIndex); extern _X_EXPORT EntityInfoPtr xf86GetEntityInfo(int entityIndex);
struct pci_device * xf86GetPciInfoForEntity(int entityIndex); extern _X_EXPORT struct pci_device * xf86GetPciInfoForEntity(int entityIndex);
Bool xf86SetEntityFuncs(int entityIndex, EntityProc init, extern _X_EXPORT Bool xf86SetEntityFuncs(int entityIndex, EntityProc init,
EntityProc enter, EntityProc leave, pointer); EntityProc enter, EntityProc leave, pointer);
void xf86DeallocateResourcesForEntity(int entityIndex, unsigned long type); extern _X_EXPORT void xf86DeallocateResourcesForEntity(int entityIndex, unsigned long type);
resPtr xf86RegisterResources(int entityIndex, resList list, extern _X_EXPORT resPtr xf86RegisterResources(int entityIndex, resList list,
unsigned long Access); unsigned long Access);
Bool xf86CheckPciMemBase(struct pci_device * pPci, memType base); extern _X_EXPORT Bool xf86CheckPciMemBase(struct pci_device * pPci, memType base);
void xf86SetAccessFuncs(EntityInfoPtr pEnt, xf86SetAccessFuncPtr funcs, extern _X_EXPORT void xf86SetAccessFuncs(EntityInfoPtr pEnt, xf86SetAccessFuncPtr funcs,
xf86SetAccessFuncPtr oldFuncs); xf86SetAccessFuncPtr oldFuncs);
Bool xf86IsEntityPrimary(int entityIndex); extern _X_EXPORT Bool xf86IsEntityPrimary(int entityIndex);
resPtr xf86SetOperatingState(resList list, int entityIndex, int mask); extern _X_EXPORT resPtr xf86SetOperatingState(resList list, int entityIndex, int mask);
void xf86EnterServerState(xf86State state); extern _X_EXPORT void xf86EnterServerState(xf86State state);
ScrnInfoPtr xf86FindScreenForEntity(int entityIndex); extern _X_EXPORT ScrnInfoPtr xf86FindScreenForEntity(int entityIndex);
Bool xf86NoSharedResources(int screenIndex, resType res); extern _X_EXPORT Bool xf86NoSharedResources(int screenIndex, resType res);
resPtr xf86FindIntersectOfLists(resPtr l1, resPtr l2); extern _X_EXPORT resPtr xf86FindIntersectOfLists(resPtr l1, resPtr l2);
void xf86RegisterStateChangeNotificationCallback(xf86StateChangeNotificationCallbackFunc func, pointer arg); extern _X_EXPORT void xf86RegisterStateChangeNotificationCallback(xf86StateChangeNotificationCallbackFunc func, pointer arg);
Bool xf86DeregisterStateChangeNotificationCallback(xf86StateChangeNotificationCallbackFunc func); extern _X_EXPORT Bool xf86DeregisterStateChangeNotificationCallback(xf86StateChangeNotificationCallbackFunc func);
int xf86GetLastScrnFlag(int entityIndex); extern _X_EXPORT int xf86GetLastScrnFlag(int entityIndex);
void xf86SetLastScrnFlag(int entityIndex, int scrnIndex); extern _X_EXPORT void xf86SetLastScrnFlag(int entityIndex, int scrnIndex);
Bool xf86IsEntityShared(int entityIndex); extern _X_EXPORT Bool xf86IsEntityShared(int entityIndex);
void xf86SetEntityShared(int entityIndex); extern _X_EXPORT void xf86SetEntityShared(int entityIndex);
Bool xf86IsEntitySharable(int entityIndex); extern _X_EXPORT Bool xf86IsEntitySharable(int entityIndex);
void xf86SetEntitySharable(int entityIndex); extern _X_EXPORT void xf86SetEntitySharable(int entityIndex);
Bool xf86IsPrimInitDone(int entityIndex); extern _X_EXPORT Bool xf86IsPrimInitDone(int entityIndex);
void xf86SetPrimInitDone(int entityIndex); extern _X_EXPORT void xf86SetPrimInitDone(int entityIndex);
void xf86ClearPrimInitDone(int entityIndex); extern _X_EXPORT void xf86ClearPrimInitDone(int entityIndex);
int xf86AllocateEntityPrivateIndex(void); extern _X_EXPORT int xf86AllocateEntityPrivateIndex(void);
DevUnion *xf86GetEntityPrivate(int entityIndex, int privIndex); extern _X_EXPORT DevUnion *xf86GetEntityPrivate(int entityIndex, int privIndex);
/* xf86Configure.c */ /* xf86Configure.c */
GDevPtr xf86AddBusDeviceToConfigure(const char *driver, BusType bus, extern _X_EXPORT GDevPtr xf86AddBusDeviceToConfigure(const char *driver, BusType bus,
void *busData, int chipset); void *busData, int chipset);
/* xf86Cursor.c */ /* xf86Cursor.c */
void xf86LockZoom(ScreenPtr pScreen, int lock); extern _X_EXPORT void xf86LockZoom(ScreenPtr pScreen, int lock);
void xf86InitViewport(ScrnInfoPtr pScr); extern _X_EXPORT void xf86InitViewport(ScrnInfoPtr pScr);
void xf86SetViewport(ScreenPtr pScreen, int x, int y); extern _X_EXPORT void xf86SetViewport(ScreenPtr pScreen, int x, int y);
void xf86ZoomViewport(ScreenPtr pScreen, int zoom); extern _X_EXPORT void xf86ZoomViewport(ScreenPtr pScreen, int zoom);
Bool xf86SwitchMode(ScreenPtr pScreen, DisplayModePtr mode); extern _X_EXPORT Bool xf86SwitchMode(ScreenPtr pScreen, DisplayModePtr mode);
void *xf86GetPointerScreenFuncs(void); extern _X_EXPORT void *xf86GetPointerScreenFuncs(void);
void xf86InitOrigins(void); extern _X_EXPORT void xf86InitOrigins(void);
void xf86ReconfigureLayout(void); extern _X_EXPORT void xf86ReconfigureLayout(void);
/* xf86cvt.c */ /* xf86cvt.c */
DisplayModePtr xf86CVTMode(int HDisplay, int VDisplay, float VRefresh, extern _X_EXPORT DisplayModePtr xf86CVTMode(int HDisplay, int VDisplay, float VRefresh,
Bool Reduced, Bool Interlaced); Bool Reduced, Bool Interlaced);
/* xf86DPMS.c */ /* xf86DPMS.c */
Bool xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags); extern _X_EXPORT Bool xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags);
extern _X_EXPORT int DPMSSet(ClientPtr client, int level); /* libextmod */
/* xf86DGA.c */ /* xf86DGA.c */
Bool DGAInit(ScreenPtr pScreen, DGAFunctionPtr funcs, DGAModePtr modes, extern _X_EXPORT Bool DGAInit(ScreenPtr pScreen, DGAFunctionPtr funcs, DGAModePtr modes,
int num); int num);
Bool DGAReInitModes(ScreenPtr pScreen, DGAModePtr modes, int num); extern _X_EXPORT Bool DGAReInitModes(ScreenPtr pScreen, DGAModePtr modes, int num);
xf86SetDGAModeProc xf86SetDGAMode; extern _X_EXPORT xf86SetDGAModeProc xf86SetDGAMode;
/* xf86Events.c */ /* xf86Events.c */
void SetTimeSinceLastInputEvent(void); extern _X_EXPORT void SetTimeSinceLastInputEvent(void);
pointer xf86AddInputHandler(int fd, InputHandlerProc proc, pointer data); extern _X_EXPORT pointer xf86AddInputHandler(int fd, InputHandlerProc proc, pointer data);
int xf86RemoveInputHandler(pointer handler); extern _X_EXPORT int xf86RemoveInputHandler(pointer handler);
void xf86DisableInputHandler(pointer handler); extern _X_EXPORT void xf86DisableInputHandler(pointer handler);
void xf86EnableInputHandler(pointer handler); extern _X_EXPORT void xf86EnableInputHandler(pointer handler);
pointer xf86AddGeneralHandler(int fd, InputHandlerProc proc, pointer data); extern _X_EXPORT pointer xf86AddGeneralHandler(int fd, InputHandlerProc proc, pointer data);
int xf86RemoveGeneralHandler(pointer handler); extern _X_EXPORT int xf86RemoveGeneralHandler(pointer handler);
void xf86DisableGeneralHandler(pointer handler); extern _X_EXPORT void xf86DisableGeneralHandler(pointer handler);
void xf86EnableGeneralHandler(pointer handler); extern _X_EXPORT void xf86EnableGeneralHandler(pointer handler);
void xf86InterceptSignals(int *signo); extern _X_EXPORT void xf86InterceptSignals(int *signo);
void xf86InterceptSigIll(void (*sigillhandler)(void)); extern _X_EXPORT void xf86InterceptSigIll(void (*sigillhandler)(void));
Bool xf86EnableVTSwitch(Bool new); extern _X_EXPORT Bool xf86EnableVTSwitch(Bool new);
void xf86ProcessActionEvent(ActionEvent action, void *arg); extern _X_EXPORT void xf86ProcessActionEvent(ActionEvent action, void *arg);
void xf86PrintBacktrace(void); extern _X_EXPORT void xf86PrintBacktrace(void);
/* xf86Helper.c */ /* xf86Helper.c */
void xf86AddDriver(DriverPtr driver, pointer module, int flags); extern _X_EXPORT void xf86AddDriver(DriverPtr driver, pointer module, int flags);
void xf86DeleteDriver(int drvIndex); extern _X_EXPORT void xf86DeleteDriver(int drvIndex);
ScrnInfoPtr xf86AllocateScreen(DriverPtr drv, int flags); extern _X_EXPORT ScrnInfoPtr xf86AllocateScreen(DriverPtr drv, int flags);
void xf86DeleteScreen(int scrnIndex, int flags); extern _X_EXPORT void xf86DeleteScreen(int scrnIndex, int flags);
int xf86AllocateScrnInfoPrivateIndex(void); extern _X_EXPORT int xf86AllocateScrnInfoPrivateIndex(void);
Bool xf86AddPixFormat(ScrnInfoPtr pScrn, int depth, int bpp, int pad); extern _X_EXPORT Bool xf86AddPixFormat(ScrnInfoPtr pScrn, int depth, int bpp, int pad);
Bool xf86SetDepthBpp(ScrnInfoPtr scrp, int depth, int bpp, int fbbpp, extern _X_EXPORT Bool xf86SetDepthBpp(ScrnInfoPtr scrp, int depth, int bpp, int fbbpp,
int depth24flags); int depth24flags);
void xf86PrintDepthBpp(ScrnInfoPtr scrp); extern _X_EXPORT void xf86PrintDepthBpp(ScrnInfoPtr scrp);
Bool xf86SetWeight(ScrnInfoPtr scrp, rgb weight, rgb mask); extern _X_EXPORT Bool xf86SetWeight(ScrnInfoPtr scrp, rgb weight, rgb mask);
Bool xf86SetDefaultVisual(ScrnInfoPtr scrp, int visual); extern _X_EXPORT Bool xf86SetDefaultVisual(ScrnInfoPtr scrp, int visual);
Bool xf86SetGamma(ScrnInfoPtr scrp, Gamma newGamma); extern _X_EXPORT Bool xf86SetGamma(ScrnInfoPtr scrp, Gamma newGamma);
void xf86SetDpi(ScrnInfoPtr pScrn, int x, int y); extern _X_EXPORT void xf86SetDpi(ScrnInfoPtr pScrn, int x, int y);
void xf86SetBlackWhitePixels(ScreenPtr pScreen); extern _X_EXPORT void xf86SetBlackWhitePixels(ScreenPtr pScreen);
void xf86EnableDisableFBAccess(int scrnIndex, Bool enable); extern _X_EXPORT void xf86EnableDisableFBAccess(int scrnIndex, Bool enable);
void xf86VDrvMsgVerb(int scrnIndex, MessageType type, int verb, extern _X_EXPORT void xf86VDrvMsgVerb(int scrnIndex, MessageType type, int verb,
const char *format, va_list args); const char *format, va_list args);
void xf86DrvMsgVerb(int scrnIndex, MessageType type, int verb, extern _X_EXPORT void xf86DrvMsgVerb(int scrnIndex, MessageType type, int verb,
const char *format, ...) _printf_attribute(4,5); const char *format, ...) _printf_attribute(4,5);
void xf86DrvMsg(int scrnIndex, MessageType type, const char *format, ...) extern _X_EXPORT void xf86DrvMsg(int scrnIndex, MessageType type, const char *format, ...)
_printf_attribute(3,4); _printf_attribute(3,4);
void xf86MsgVerb(MessageType type, int verb, const char *format, ...) extern _X_EXPORT void xf86MsgVerb(MessageType type, int verb, const char *format, ...)
_printf_attribute(3,4); _printf_attribute(3,4);
void xf86Msg(MessageType type, const char *format, ...) _printf_attribute(2,3); extern _X_EXPORT void xf86Msg(MessageType type, const char *format, ...) _printf_attribute(2,3);
void xf86ErrorFVerb(int verb, const char *format, ...) _printf_attribute(2,3); extern _X_EXPORT void xf86ErrorFVerb(int verb, const char *format, ...) _printf_attribute(2,3);
void xf86ErrorF(const char *format, ...) _printf_attribute(1,2); extern _X_EXPORT void xf86ErrorF(const char *format, ...) _printf_attribute(1,2);
const char *xf86TokenToString(SymTabPtr table, int token); extern _X_EXPORT const char *xf86TokenToString(SymTabPtr table, int token);
int xf86StringToToken(SymTabPtr table, const char *string); extern _X_EXPORT int xf86StringToToken(SymTabPtr table, const char *string);
void xf86ShowClocks(ScrnInfoPtr scrp, MessageType from); extern _X_EXPORT void xf86ShowClocks(ScrnInfoPtr scrp, MessageType from);
void xf86PrintChipsets(const char *drvname, const char *drvmsg, extern _X_EXPORT void xf86PrintChipsets(const char *drvname, const char *drvmsg,
SymTabPtr chips); SymTabPtr chips);
int xf86MatchDevice(const char *drivername, GDevPtr **driversectlist); extern _X_EXPORT int xf86MatchDevice(const char *drivername, GDevPtr **driversectlist);
int xf86MatchPciInstances(const char *driverName, int vendorID, extern _X_EXPORT int xf86MatchPciInstances(const char *driverName, int vendorID,
SymTabPtr chipsets, PciChipsets *PCIchipsets, SymTabPtr chipsets, PciChipsets *PCIchipsets,
GDevPtr *devList, int numDevs, DriverPtr drvp, GDevPtr *devList, int numDevs, DriverPtr drvp,
int **foundEntities); int **foundEntities);
void xf86GetClocks(ScrnInfoPtr pScrn, int num, extern _X_EXPORT void xf86GetClocks(ScrnInfoPtr pScrn, int num,
Bool (*ClockFunc)(ScrnInfoPtr, int), Bool (*ClockFunc)(ScrnInfoPtr, int),
void (*ProtectRegs)(ScrnInfoPtr, Bool), void (*ProtectRegs)(ScrnInfoPtr, Bool),
void (*BlankScreen)(ScrnInfoPtr, Bool), void (*BlankScreen)(ScrnInfoPtr, Bool),
IOADDRESS vertsyncreg, int maskval, IOADDRESS vertsyncreg, int maskval,
int knownclkindex, int knownclkvalue); int knownclkindex, int knownclkvalue);
void xf86SetPriority(Bool up); extern _X_EXPORT void xf86SetPriority(Bool up);
const char *xf86GetVisualName(int visual); extern _X_EXPORT const char *xf86GetVisualName(int visual);
int xf86GetVerbosity(void); extern _X_EXPORT int xf86GetVerbosity(void);
Pix24Flags xf86GetPix24(void); extern _X_EXPORT Pix24Flags xf86GetPix24(void);
int xf86GetDepth(void); extern _X_EXPORT int xf86GetDepth(void);
rgb xf86GetWeight(void); extern _X_EXPORT rgb xf86GetWeight(void);
Gamma xf86GetGamma(void); extern _X_EXPORT Gamma xf86GetGamma(void);
Bool xf86GetFlipPixels(void); extern _X_EXPORT Bool xf86GetFlipPixels(void);
const char *xf86GetServerName(void); extern _X_EXPORT const char *xf86GetServerName(void);
Bool xf86ServerIsExiting(void); extern _X_EXPORT Bool xf86ServerIsExiting(void);
Bool xf86ServerIsResetting(void); extern _X_EXPORT Bool xf86ServerIsResetting(void);
Bool xf86ServerIsInitialising(void); extern _X_EXPORT Bool xf86ServerIsInitialising(void);
Bool xf86ServerIsOnlyDetecting(void); extern _X_EXPORT Bool xf86ServerIsOnlyDetecting(void);
Bool xf86ServerIsOnlyProbing(void); extern _X_EXPORT Bool xf86ServerIsOnlyProbing(void);
Bool xf86CaughtSignal(void); extern _X_EXPORT Bool xf86CaughtSignal(void);
Bool xf86GetVidModeAllowNonLocal(void); extern _X_EXPORT Bool xf86GetVidModeAllowNonLocal(void);
Bool xf86GetVidModeEnabled(void); extern _X_EXPORT Bool xf86GetVidModeEnabled(void);
Bool xf86GetModInDevAllowNonLocal(void); extern _X_EXPORT Bool xf86GetModInDevAllowNonLocal(void);
Bool xf86GetModInDevEnabled(void); extern _X_EXPORT Bool xf86GetModInDevEnabled(void);
Bool xf86GetAllowMouseOpenFail(void); extern _X_EXPORT Bool xf86GetAllowMouseOpenFail(void);
Bool xf86IsPc98(void); extern _X_EXPORT Bool xf86IsPc98(void);
void xf86DisableRandR(void); extern _X_EXPORT void xf86DisableRandR(void);
CARD32 xorgGetVersion(void); extern _X_EXPORT CARD32 xorgGetVersion(void);
CARD32 xf86GetModuleVersion(pointer module); extern _X_EXPORT CARD32 xf86GetModuleVersion(pointer module);
pointer xf86LoadDrvSubModule(DriverPtr drv, const char *name); extern _X_EXPORT pointer xf86LoadDrvSubModule(DriverPtr drv, const char *name);
pointer xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name); extern _X_EXPORT pointer xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name);
pointer xf86LoadOneModule(char *name, pointer optlist); extern _X_EXPORT pointer xf86LoadOneModule(char *name, pointer optlist);
void xf86UnloadSubModule(pointer mod); extern _X_EXPORT void xf86UnloadSubModule(pointer mod);
Bool xf86LoaderCheckSymbol(const char *name); extern _X_EXPORT Bool xf86LoaderCheckSymbol(const char *name);
void xf86LoaderReqSymLists(const char **, ...); extern _X_EXPORT void xf86LoaderReqSymLists(const char **, ...);
void xf86LoaderReqSymbols(const char *, ...); extern _X_EXPORT void xf86LoaderReqSymbols(const char *, ...);
void xf86LoaderRefSymLists(const char **, ...); extern _X_EXPORT void xf86LoaderRefSymLists(const char **, ...);
void xf86LoaderRefSymbols(const char *, ...); extern _X_EXPORT void xf86LoaderRefSymbols(const char *, ...);
void xf86SetBackingStore(ScreenPtr pScreen); extern _X_EXPORT void xf86SetBackingStore(ScreenPtr pScreen);
void xf86SetSilkenMouse(ScreenPtr pScreen); extern _X_EXPORT void xf86SetSilkenMouse(ScreenPtr pScreen);
pointer xf86FindXvOptions(int scrnIndex, int adapt_index, char *port_name, extern _X_EXPORT pointer xf86FindXvOptions(int scrnIndex, int adapt_index, char *port_name,
char **adaptor_name, pointer *adaptor_options); char **adaptor_name, pointer *adaptor_options);
void xf86GetOS(const char **name, int *major, int *minor, int *teeny); extern _X_EXPORT void xf86GetOS(const char **name, int *major, int *minor, int *teeny);
ScrnInfoPtr xf86ConfigPciEntity(ScrnInfoPtr pScrn, int scrnFlag, extern _X_EXPORT ScrnInfoPtr xf86ConfigPciEntity(ScrnInfoPtr pScrn, int scrnFlag,
int entityIndex,PciChipsets *p_chip, int entityIndex,PciChipsets *p_chip,
resList res, EntityProc init, resList res, EntityProc init,
EntityProc enter, EntityProc leave, EntityProc enter, EntityProc leave,
pointer private); pointer private);
ScrnInfoPtr xf86ConfigFbEntity(ScrnInfoPtr pScrn, int scrnFlag, extern _X_EXPORT ScrnInfoPtr xf86ConfigFbEntity(ScrnInfoPtr pScrn, int scrnFlag,
int entityIndex, EntityProc init, int entityIndex, EntityProc init,
EntityProc enter, EntityProc leave, EntityProc enter, EntityProc leave,
pointer private); pointer private);
/* Obsolete! don't use */ /* Obsolete! don't use */
Bool xf86ConfigActivePciEntity(ScrnInfoPtr pScrn, extern _X_EXPORT Bool xf86ConfigActivePciEntity(ScrnInfoPtr pScrn,
int entityIndex,PciChipsets *p_chip, int entityIndex,PciChipsets *p_chip,
resList res, EntityProc init, resList res, EntityProc init,
EntityProc enter, EntityProc leave, EntityProc enter, EntityProc leave,
pointer private); pointer private);
/* Obsolete! don't use */ /* Obsolete! don't use */
void xf86ConfigPciEntityInactive(EntityInfoPtr pEnt, PciChipsets *p_chip, extern _X_EXPORT void xf86ConfigPciEntityInactive(EntityInfoPtr pEnt, PciChipsets *p_chip,
resList res, EntityProc init, resList res, EntityProc init,
EntityProc enter, EntityProc leave, EntityProc enter, EntityProc leave,
pointer private); pointer private);
void xf86ConfigFbEntityInactive(EntityInfoPtr pEnt, EntityProc init, extern _X_EXPORT void xf86ConfigFbEntityInactive(EntityInfoPtr pEnt, EntityProc init,
EntityProc enter, EntityProc leave, EntityProc enter, EntityProc leave,
pointer private); pointer private);
Bool xf86IsScreenPrimary(int scrnIndex); extern _X_EXPORT Bool xf86IsScreenPrimary(int scrnIndex);
int xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type, extern _X_EXPORT int xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type,
int format, unsigned long len, int format, unsigned long len,
pointer value); pointer value);
Bool xf86IsUnblank(int mode); extern _X_EXPORT Bool xf86IsUnblank(int mode);
_X_DEPRECATED void xf86AddModuleInfo(pointer info, pointer module); extern _X_EXPORT _X_DEPRECATED void xf86AddModuleInfo(pointer info, pointer module);
_X_DEPRECATED void xf86DeleteModuleInfo(int idx); extern _X_EXPORT _X_DEPRECATED void xf86DeleteModuleInfo(int idx);
/* xf86Init.c */ /* xf86Init.c */
PixmapFormatPtr xf86GetPixFormat(ScrnInfoPtr pScrn, int depth); extern _X_EXPORT PixmapFormatPtr xf86GetPixFormat(ScrnInfoPtr pScrn, int depth);
int xf86GetBppFromDepth(ScrnInfoPtr pScrn, int depth); extern _X_EXPORT int xf86GetBppFromDepth(ScrnInfoPtr pScrn, int depth);
/* xf86Mode.c */ /* xf86Mode.c */
int xf86GetNearestClock(ScrnInfoPtr scrp, int freq, Bool allowDiv2, extern _X_EXPORT int xf86GetNearestClock(ScrnInfoPtr scrp, int freq, Bool allowDiv2,
int DivFactor, int MulFactor, int *divider); int DivFactor, int MulFactor, int *divider);
const char *xf86ModeStatusToString(ModeStatus status); extern _X_EXPORT const char *xf86ModeStatusToString(ModeStatus status);
ModeStatus xf86LookupMode(ScrnInfoPtr scrp, DisplayModePtr modep, extern _X_EXPORT ModeStatus xf86LookupMode(ScrnInfoPtr scrp, DisplayModePtr modep,
ClockRangePtr clockRanges, LookupModeFlags strategy); ClockRangePtr clockRanges, LookupModeFlags strategy);
ModeStatus xf86CheckModeForMonitor(DisplayModePtr mode, MonPtr monitor); extern _X_EXPORT ModeStatus xf86CheckModeForMonitor(DisplayModePtr mode, MonPtr monitor);
ModeStatus xf86InitialCheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode, extern _X_EXPORT ModeStatus xf86InitialCheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode,
ClockRangePtr clockRanges, ClockRangePtr clockRanges,
LookupModeFlags strategy, LookupModeFlags strategy,
int maxPitch, int virtualX, int maxPitch, int virtualX,
int virtualY); int virtualY);
ModeStatus xf86CheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode, extern _X_EXPORT ModeStatus xf86CheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode,
int flags); int flags);
int xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes, extern _X_EXPORT int xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
char **modeNames, ClockRangePtr clockRanges, char **modeNames, ClockRangePtr clockRanges,
int *linePitches, int minPitch, int maxPitch, int *linePitches, int minPitch, int maxPitch,
int minHeight, int maxHeight, int pitchInc, int minHeight, int maxHeight, int pitchInc,
int virtualX, int virtualY, int apertureSize, int virtualX, int virtualY, int apertureSize,
LookupModeFlags strategy); LookupModeFlags strategy);
void xf86DeleteMode(DisplayModePtr *modeList, DisplayModePtr mode); extern _X_EXPORT void xf86DeleteMode(DisplayModePtr *modeList, DisplayModePtr mode);
void xf86PruneDriverModes(ScrnInfoPtr scrp); extern _X_EXPORT void xf86PruneDriverModes(ScrnInfoPtr scrp);
void xf86SetCrtcForModes(ScrnInfoPtr scrp, int adjustFlags); extern _X_EXPORT void xf86SetCrtcForModes(ScrnInfoPtr scrp, int adjustFlags);
void xf86PrintModes(ScrnInfoPtr scrp); extern _X_EXPORT void xf86PrintModes(ScrnInfoPtr scrp);
void xf86ShowClockRanges(ScrnInfoPtr scrp, ClockRangePtr clockRanges); extern _X_EXPORT void xf86ShowClockRanges(ScrnInfoPtr scrp, ClockRangePtr clockRanges);
double xf86ModeHSync(const DisplayModeRec *mode); extern _X_EXPORT double xf86ModeHSync(const DisplayModeRec *mode);
double xf86ModeVRefresh(const DisplayModeRec *mode); extern _X_EXPORT double xf86ModeVRefresh(const DisplayModeRec *mode);
void xf86SetModeDefaultName(DisplayModePtr mode); extern _X_EXPORT void xf86SetModeDefaultName(DisplayModePtr mode);
void xf86SetModeCrtc(DisplayModePtr p, int adjustFlags); extern _X_EXPORT void xf86SetModeCrtc(DisplayModePtr p, int adjustFlags);
DisplayModePtr xf86DuplicateMode(const DisplayModeRec *pMode); extern _X_EXPORT DisplayModePtr xf86DuplicateMode(const DisplayModeRec *pMode);
DisplayModePtr xf86DuplicateModes(ScrnInfoPtr pScrn, DisplayModePtr modeList); extern _X_EXPORT DisplayModePtr xf86DuplicateModes(ScrnInfoPtr pScrn, DisplayModePtr modeList);
Bool xf86ModesEqual(const DisplayModeRec *pMode1, extern _X_EXPORT Bool xf86ModesEqual(const DisplayModeRec *pMode1,
const DisplayModeRec *pMode2); const DisplayModeRec *pMode2);
void xf86PrintModeline(int scrnIndex,DisplayModePtr mode); extern _X_EXPORT void xf86PrintModeline(int scrnIndex,DisplayModePtr mode);
DisplayModePtr xf86ModesAdd(DisplayModePtr modes, DisplayModePtr new); extern _X_EXPORT DisplayModePtr xf86ModesAdd(DisplayModePtr modes, DisplayModePtr new);
/* xf86Option.c */ /* xf86Option.c */
void xf86CollectOptions(ScrnInfoPtr pScrn, pointer extraOpts); extern _X_EXPORT void xf86CollectOptions(ScrnInfoPtr pScrn, pointer extraOpts);
/* xf86RandR.c */ /* xf86RandR.c */
#ifdef RANDR #ifdef RANDR
Bool xf86RandRInit (ScreenPtr pScreen); extern _X_EXPORT Bool xf86RandRInit (ScreenPtr pScreen);
Rotation xf86GetRotation(ScreenPtr pScreen); extern _X_EXPORT Rotation xf86GetRotation(ScreenPtr pScreen);
Bool xf86RandRSetNewVirtualAndDimensions(ScreenPtr pScreen, extern _X_EXPORT Bool xf86RandRSetNewVirtualAndDimensions(ScreenPtr pScreen,
int newvirtX, int newvirtY, int newvirtX, int newvirtY,
int newmmWidth, int newmmHeight, Bool resetMode); int newmmWidth, int newmmHeight, Bool resetMode);
#endif #endif
/* xf86VidModeExtentionInit.c */ /* xf86VidModeExtentionInit.c */
Bool VidModeExtensionInit(ScreenPtr pScreen); extern _X_EXPORT Bool VidModeExtensionInit(ScreenPtr pScreen);
#endif /* _NO_XF86_PROTOTYPES */ #endif /* _NO_XF86_PROTOTYPES */

120
hw/xfree86/common/xf86Bus.c
View File

@ -64,7 +64,7 @@ noopEnableDisable(void *arg) { }
xf86AccessRec AccessNULL = { noopEnableDisable, noopEnableDisable, NULL }; xf86AccessRec AccessNULL = { noopEnableDisable, noopEnableDisable, NULL };
_X_EXPORT xf86CurrentAccessRec xf86CurrentAccess = {NULL,NULL}; xf86CurrentAccessRec xf86CurrentAccess = {NULL,NULL};
BusRec primaryBus = { BUS_NONE, {{0}}}; BusRec primaryBus = { BUS_NONE, {{0}}};
@ -75,16 +75,16 @@ static Bool xf86ResAccessEnter = FALSE;
resPtr Acc = NULL; resPtr Acc = NULL;
/* predefined special resources */ /* predefined special resources */
_X_EXPORT resRange resVgaExclusive[] = {_VGA_EXCLUSIVE, _END}; resRange resVgaExclusive[] = {_VGA_EXCLUSIVE, _END};
_X_EXPORT resRange resVgaShared[] = {_VGA_SHARED, _END}; resRange resVgaShared[] = {_VGA_SHARED, _END};
_X_EXPORT resRange resVgaMemShared[] = {_VGA_SHARED_MEM,_END}; resRange resVgaMemShared[] = {_VGA_SHARED_MEM,_END};
_X_EXPORT resRange resVgaIoShared[] = {_VGA_SHARED_IO,_END}; resRange resVgaIoShared[] = {_VGA_SHARED_IO,_END};
_X_EXPORT resRange resVgaUnusedExclusive[] = {_VGA_EXCLUSIVE_UNUSED, _END}; resRange resVgaUnusedExclusive[] = {_VGA_EXCLUSIVE_UNUSED, _END};
_X_EXPORT resRange resVgaUnusedShared[] = {_VGA_SHARED_UNUSED, _END}; resRange resVgaUnusedShared[] = {_VGA_SHARED_UNUSED, _END};
_X_EXPORT resRange resVgaSparseExclusive[] = {_VGA_EXCLUSIVE_SPARSE, _END}; resRange resVgaSparseExclusive[] = {_VGA_EXCLUSIVE_SPARSE, _END};
_X_EXPORT resRange resVgaSparseShared[] = {_VGA_SHARED_SPARSE, _END}; resRange resVgaSparseShared[] = {_VGA_SHARED_SPARSE, _END};
_X_EXPORT resRange res8514Exclusive[] = {_8514_EXCLUSIVE, _END}; resRange res8514Exclusive[] = {_8514_EXCLUSIVE, _END};
_X_EXPORT resRange res8514Shared[] = {_8514_SHARED, _END}; resRange res8514Shared[] = {_8514_SHARED, _END};
/* Flag: do we need RAC ? */ /* Flag: do we need RAC ? */
static Bool needRAC = FALSE; static Bool needRAC = FALSE;
@ -100,7 +100,7 @@ static void notifyStateChange(xf86NotifyState state);
* The only one available so far is for PCI and SBUS. * The only one available so far is for PCI and SBUS.
*/ */
_X_EXPORT void void
xf86BusProbe(void) xf86BusProbe(void)
{ {
xf86PciProbe(); xf86PciProbe();
@ -148,7 +148,7 @@ StringToBusType(const char* busID, const char **retID)
* Entity related code. * Entity related code.
*/ */
_X_EXPORT void void
xf86EntityInit(void) xf86EntityInit(void)
{ {
int i; int i;
@ -214,7 +214,7 @@ EntityLeave(void)
} }
} }
_X_EXPORT Bool Bool
xf86IsEntityPrimary(int entityIndex) xf86IsEntityPrimary(int entityIndex)
{ {
EntityPtr pEnt = xf86Entities[entityIndex]; EntityPtr pEnt = xf86Entities[entityIndex];
@ -231,7 +231,7 @@ xf86IsEntityPrimary(int entityIndex)
} }
} }
_X_EXPORT Bool Bool
xf86SetEntityFuncs(int entityIndex, EntityProc init, EntityProc enter, xf86SetEntityFuncs(int entityIndex, EntityProc init, EntityProc enter,
EntityProc leave, pointer private) EntityProc leave, pointer private)
{ {
@ -244,7 +244,7 @@ xf86SetEntityFuncs(int entityIndex, EntityProc init, EntityProc enter,
return TRUE; return TRUE;
} }
_X_EXPORT Bool Bool
xf86DriverHasEntities(DriverPtr drvp) xf86DriverHasEntities(DriverPtr drvp)
{ {
int i; int i;
@ -255,7 +255,7 @@ xf86DriverHasEntities(DriverPtr drvp)
return FALSE; return FALSE;
} }
_X_EXPORT void void
xf86AddEntityToScreen(ScrnInfoPtr pScrn, int entityIndex) xf86AddEntityToScreen(ScrnInfoPtr pScrn, int entityIndex)
{ {
if (entityIndex == -1) if (entityIndex == -1)
@ -279,7 +279,7 @@ xf86AddEntityToScreen(ScrnInfoPtr pScrn, int entityIndex)
pScrn->domainIOBase = xf86Entities[entityIndex]->domainIO; pScrn->domainIOBase = xf86Entities[entityIndex]->domainIO;
} }
_X_EXPORT void void
xf86SetEntityInstanceForScreen(ScrnInfoPtr pScrn, int entityIndex, int instance) xf86SetEntityInstanceForScreen(ScrnInfoPtr pScrn, int entityIndex, int instance)
{ {
int i; int i;
@ -299,7 +299,7 @@ xf86SetEntityInstanceForScreen(ScrnInfoPtr pScrn, int entityIndex, int instance)
* XXX This needs to be updated for the case where a single entity may have * XXX This needs to be updated for the case where a single entity may have
* instances associated with more than one screen. * instances associated with more than one screen.
*/ */
_X_EXPORT ScrnInfoPtr ScrnInfoPtr
xf86FindScreenForEntity(int entityIndex) xf86FindScreenForEntity(int entityIndex)
{ {
int i,j; int i,j;
@ -317,7 +317,7 @@ xf86FindScreenForEntity(int entityIndex)
return NULL; return NULL;
} }
_X_EXPORT void void
xf86RemoveEntityFromScreen(ScrnInfoPtr pScrn, int entityIndex) xf86RemoveEntityFromScreen(ScrnInfoPtr pScrn, int entityIndex)
{ {
int i; int i;
@ -348,7 +348,7 @@ xf86RemoveEntityFromScreen(ScrnInfoPtr pScrn, int entityIndex)
* xf86ClearEntitiesForScreen() - called when a screen is deleted * xf86ClearEntitiesForScreen() - called when a screen is deleted
* to mark it's entities unused. Called by xf86DeleteScreen(). * to mark it's entities unused. Called by xf86DeleteScreen().
*/ */
_X_EXPORT void void
xf86ClearEntityListForScreen(int scrnIndex) xf86ClearEntityListForScreen(int scrnIndex)
{ {
ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
@ -380,7 +380,7 @@ xf86ClearEntityListForScreen(int scrnIndex)
pScrn->entityInstanceList = NULL; pScrn->entityInstanceList = NULL;
} }
_X_EXPORT void void
xf86DeallocateResourcesForEntity(int entityIndex, unsigned long type) xf86DeallocateResourcesForEntity(int entityIndex, unsigned long type)
{ {
resPtr *pprev_next = &Acc; resPtr *pprev_next = &Acc;
@ -402,7 +402,7 @@ xf86DeallocateResourcesForEntity(int entityIndex, unsigned long type)
* Add an extra device section (GDevPtr) to an entity. * Add an extra device section (GDevPtr) to an entity.
*/ */
_X_EXPORT void void
xf86AddDevToEntity(int entityIndex, GDevPtr dev) xf86AddDevToEntity(int entityIndex, GDevPtr dev)
{ {
EntityPtr pEnt; EntityPtr pEnt;
@ -423,7 +423,7 @@ xf86AddDevToEntity(int entityIndex, GDevPtr dev)
* EntityRec struct to the drivers. The EntityRec structure itself * EntityRec struct to the drivers. The EntityRec structure itself
* remains invisible to the driver. * remains invisible to the driver.
*/ */
_X_EXPORT EntityInfoPtr EntityInfoPtr
xf86GetEntityInfo(int entityIndex) xf86GetEntityInfo(int entityIndex)
{ {
EntityInfoPtr pEnt; EntityInfoPtr pEnt;
@ -451,7 +451,7 @@ xf86GetEntityInfo(int entityIndex)
return pEnt; return pEnt;
} }
_X_EXPORT int int
xf86GetNumEntityInstances(int entityIndex) xf86GetNumEntityInstances(int entityIndex)
{ {
if (entityIndex >= xf86NumEntities) if (entityIndex >= xf86NumEntities)
@ -460,7 +460,7 @@ xf86GetNumEntityInstances(int entityIndex)
return xf86Entities[entityIndex]->numInstances; return xf86Entities[entityIndex]->numInstances;
} }
_X_EXPORT GDevPtr GDevPtr
xf86GetDevFromEntity(int entityIndex, int instance) xf86GetDevFromEntity(int entityIndex, int instance)
{ {
int i; int i;
@ -539,7 +539,7 @@ clearAccess(void)
* xf86AccessInit() - set up everything needed for access control * xf86AccessInit() - set up everything needed for access control
* called only once on first server generation. * called only once on first server generation.
*/ */
_X_EXPORT void void
xf86AccessInit(void) xf86AccessInit(void)
{ {
initPciState(); initPciState();
@ -554,7 +554,7 @@ xf86AccessInit(void)
* xf86AccessEnter() -- gets called to save the text mode VGA IO * xf86AccessEnter() -- gets called to save the text mode VGA IO
* resources when reentering the server after a VT switch. * resources when reentering the server after a VT switch.
*/ */
_X_EXPORT void void
xf86AccessEnter(void) xf86AccessEnter(void)
{ {
if (xf86ResAccessEnter) if (xf86ResAccessEnter)
@ -583,7 +583,7 @@ xf86AccessEnter(void)
* This was split to call xf86AccessLeaveState() from * This was split to call xf86AccessLeaveState() from
* ddxGiveUp(). * ddxGiveUp().
*/ */
_X_EXPORT void void
xf86AccessLeave(void) xf86AccessLeave(void)
{ {
if (!xf86ResAccessEnter) if (!xf86ResAccessEnter)
@ -594,7 +594,7 @@ xf86AccessLeave(void)
EntityLeave(); EntityLeave();
} }
_X_EXPORT void void
xf86AccessLeaveState(void) xf86AccessLeaveState(void)
{ {
if (!xf86ResAccessEnter) if (!xf86ResAccessEnter)
@ -632,7 +632,7 @@ xf86AccessRestoreState(void)
* by other resources! * by other resources!
*/ */
_X_EXPORT void void
xf86EnableAccess(ScrnInfoPtr pScrn) xf86EnableAccess(ScrnInfoPtr pScrn)
{ {
register EntityAccessPtr peAcc = (EntityAccessPtr) pScrn->access; register EntityAccessPtr peAcc = (EntityAccessPtr) pScrn->access;
@ -753,7 +753,7 @@ xf86EnableAccess(ScrnInfoPtr pScrn)
} }
} }
_X_EXPORT void void
xf86SetCurrentAccess(Bool Enable, ScrnInfoPtr pScrn) xf86SetCurrentAccess(Bool Enable, ScrnInfoPtr pScrn)
{ {
EntityAccessPtr pceAcc2 = NULL; EntityAccessPtr pceAcc2 = NULL;
@ -793,7 +793,7 @@ xf86SetCurrentAccess(Bool Enable, ScrnInfoPtr pScrn)
} }
} }
_X_EXPORT void void
xf86SetAccessFuncs(EntityInfoPtr pEnt, xf86SetAccessFuncPtr funcs, xf86SetAccessFuncs(EntityInfoPtr pEnt, xf86SetAccessFuncPtr funcs,
xf86SetAccessFuncPtr oldFuncs) xf86SetAccessFuncPtr oldFuncs)
{ {
@ -1098,7 +1098,7 @@ xf86JoinResLists(resPtr rlist1, resPtr rlist2)
return rlist1; return rlist1;
} }
_X_EXPORT resPtr resPtr
xf86AddResToList(resPtr rlist, resRange *range, int entityIndex) xf86AddResToList(resPtr rlist, resRange *range, int entityIndex)
{ {
resPtr new; resPtr new;
@ -1135,7 +1135,7 @@ xf86AddResToList(resPtr rlist, resRange *range, int entityIndex)
return new; return new;
} }
_X_EXPORT void void
xf86FreeResList(resPtr rlist) xf86FreeResList(resPtr rlist)
{ {
resPtr pRes; resPtr pRes;
@ -1267,7 +1267,7 @@ xf86PrintResList(int verb, resPtr list)
} }
} }
_X_EXPORT resPtr resPtr
xf86AddRangesToList(resPtr list, resRange *pRange, int entityIndex) xf86AddRangesToList(resPtr list, resRange *pRange, int entityIndex)
{ {
while(pRange && pRange->type != ResEnd) { while(pRange && pRange->type != ResEnd) {
@ -1277,7 +1277,7 @@ xf86AddRangesToList(resPtr list, resRange *pRange, int entityIndex)
return list; return list;
} }
_X_EXPORT void void
xf86ResourceBrokerInit(void) xf86ResourceBrokerInit(void)
{ {
Acc = NULL; Acc = NULL;
@ -1323,7 +1323,7 @@ xf86ConvertListToHost(int entityIndex, resPtr list)
* which we mean, NULL. * which we mean, NULL.
*/ */
_X_EXPORT resPtr resPtr
xf86RegisterResources(int entityIndex, resList list, unsigned long access) xf86RegisterResources(int entityIndex, resList list, unsigned long access)
{ {
resRange range; resRange range;
@ -1543,7 +1543,7 @@ SetSIGIOForState(xf86State state)
} }
} }
_X_EXPORT void void
xf86EnterServerState(xf86State state) xf86EnterServerState(xf86State state)
{ {
EntityPtr pEnt; EntityPtr pEnt;
@ -1649,7 +1649,7 @@ xf86EnterServerState(xf86State state)
/* /*
* xf86SetOperatingState() -- Set ResOperMask for resources listed. * xf86SetOperatingState() -- Set ResOperMask for resources listed.
*/ */
_X_EXPORT resPtr resPtr
xf86SetOperatingState(resList list, int entityIndex, int mask) xf86SetOperatingState(resList list, int entityIndex, int mask)
{ {
resPtr acc; resPtr acc;
@ -1690,7 +1690,7 @@ xf86SetOperatingState(resList list, int entityIndex, int mask)
* xf86ClaimFixedResources() is used to allocate non-relocatable resources. * xf86ClaimFixedResources() is used to allocate non-relocatable resources.
* This should only be done by a driver's Probe() function. * This should only be done by a driver's Probe() function.
*/ */
_X_EXPORT void void
xf86ClaimFixedResources(resList list, int entityIndex) xf86ClaimFixedResources(resList list, int entityIndex)
{ {
resPtr ptr = NULL; resPtr ptr = NULL;
@ -1820,7 +1820,7 @@ checkRoutingForScreens(xf86State state)
* xf86PostProbe() -- Allocate all non conflicting resources * xf86PostProbe() -- Allocate all non conflicting resources
* This function gets called by xf86Init(). * This function gets called by xf86Init().
*/ */
_X_EXPORT void void
xf86PostProbe(void) xf86PostProbe(void)
{ {
memType val; memType val;
@ -1935,7 +1935,7 @@ checkRequiredResources(int entityIndex)
pEnt->entityProp &= ~(unsigned long)NEED_IO_SHARED; pEnt->entityProp &= ~(unsigned long)NEED_IO_SHARED;
} }
_X_EXPORT void void
xf86PostPreInit() xf86PostPreInit()
{ {
if (doFramebufferMode) return; if (doFramebufferMode) return;
@ -1955,7 +1955,7 @@ xf86PostPreInit()
xf86PrintResList(3, Acc); xf86PrintResList(3, Acc);
} }
_X_EXPORT void void
xf86PostScreenInit(void) xf86PostScreenInit(void)
{ {
int i,j; int i,j;
@ -2304,7 +2304,7 @@ findIntersect(resRange Range, resPtr list)
return new; return new;
} }
_X_EXPORT resPtr resPtr
xf86FindIntersectOfLists(resPtr l1, resPtr l2) xf86FindIntersectOfLists(resPtr l1, resPtr l2)
{ {
resPtr ret = NULL; resPtr ret = NULL;
@ -2369,7 +2369,7 @@ xf86ExtractTypeFromList(resPtr list, unsigned long type)
* xf86FindPrimaryDevice() - Find the display device which * xf86FindPrimaryDevice() - Find the display device which
* was active when the server was started. * was active when the server was started.
*/ */
_X_EXPORT void void
xf86FindPrimaryDevice() xf86FindPrimaryDevice()
{ {
if (primaryBus.type != BUS_NONE) { if (primaryBus.type != BUS_NONE) {
@ -2398,7 +2398,7 @@ xf86FindPrimaryDevice()
} }
} }
_X_EXPORT Bool Bool
xf86NoSharedResources(int screenIndex,resType res) xf86NoSharedResources(int screenIndex,resType res)
{ {
int j; int j;
@ -2430,7 +2430,7 @@ xf86NoSharedResources(int screenIndex,resType res)
return TRUE; return TRUE;
} }
_X_EXPORT void void
xf86RegisterStateChangeNotificationCallback(xf86StateChangeNotificationCallbackFunc func, pointer arg) xf86RegisterStateChangeNotificationCallback(xf86StateChangeNotificationCallbackFunc func, pointer arg)
{ {
StateChangeNotificationPtr ptr = StateChangeNotificationPtr ptr =
@ -2442,7 +2442,7 @@ xf86RegisterStateChangeNotificationCallback(xf86StateChangeNotificationCallbackF
StateChangeNotificationList = ptr; StateChangeNotificationList = ptr;
} }
_X_EXPORT Bool Bool
xf86DeregisterStateChangeNotificationCallback(xf86StateChangeNotificationCallbackFunc func) xf86DeregisterStateChangeNotificationCallback(xf86StateChangeNotificationCallbackFunc func)
{ {
StateChangeNotificationPtr *ptr = &StateChangeNotificationList; StateChangeNotificationPtr *ptr = &StateChangeNotificationList;
@ -2472,7 +2472,7 @@ notifyStateChange(xf86NotifyState state)
/* Multihead accel sharing accessor functions and entity Private handling */ /* Multihead accel sharing accessor functions and entity Private handling */
_X_EXPORT int int
xf86GetLastScrnFlag(int entityIndex) xf86GetLastScrnFlag(int entityIndex)
{ {
if(entityIndex < xf86NumEntities) { if(entityIndex < xf86NumEntities) {
@ -2482,7 +2482,7 @@ xf86GetLastScrnFlag(int entityIndex)
} }
} }
_X_EXPORT void void
xf86SetLastScrnFlag(int entityIndex, int scrnIndex) xf86SetLastScrnFlag(int entityIndex, int scrnIndex)
{ {
if(entityIndex < xf86NumEntities) { if(entityIndex < xf86NumEntities) {
@ -2490,7 +2490,7 @@ xf86SetLastScrnFlag(int entityIndex, int scrnIndex)
} }
} }
_X_EXPORT Bool Bool
xf86IsEntityShared(int entityIndex) xf86IsEntityShared(int entityIndex)
{ {
if(entityIndex < xf86NumEntities) { if(entityIndex < xf86NumEntities) {
@ -2501,7 +2501,7 @@ xf86IsEntityShared(int entityIndex)
return FALSE; return FALSE;
} }
_X_EXPORT void void
xf86SetEntityShared(int entityIndex) xf86SetEntityShared(int entityIndex)
{ {
if(entityIndex < xf86NumEntities) { if(entityIndex < xf86NumEntities) {
@ -2509,7 +2509,7 @@ xf86SetEntityShared(int entityIndex)
} }
} }
_X_EXPORT Bool Bool
xf86IsEntitySharable(int entityIndex) xf86IsEntitySharable(int entityIndex)
{ {
if(entityIndex < xf86NumEntities) { if(entityIndex < xf86NumEntities) {
@ -2520,7 +2520,7 @@ xf86IsEntitySharable(int entityIndex)
return FALSE; return FALSE;
} }
_X_EXPORT void void
xf86SetEntitySharable(int entityIndex) xf86SetEntitySharable(int entityIndex)
{ {
if(entityIndex < xf86NumEntities) { if(entityIndex < xf86NumEntities) {
@ -2528,7 +2528,7 @@ xf86SetEntitySharable(int entityIndex)
} }
} }
_X_EXPORT Bool Bool
xf86IsPrimInitDone(int entityIndex) xf86IsPrimInitDone(int entityIndex)
{ {
if(entityIndex < xf86NumEntities) { if(entityIndex < xf86NumEntities) {
@ -2539,7 +2539,7 @@ xf86IsPrimInitDone(int entityIndex)
return FALSE; return FALSE;
} }
_X_EXPORT void void
xf86SetPrimInitDone(int entityIndex) xf86SetPrimInitDone(int entityIndex)
{ {
if(entityIndex < xf86NumEntities) { if(entityIndex < xf86NumEntities) {
@ -2547,7 +2547,7 @@ xf86SetPrimInitDone(int entityIndex)
} }
} }
_X_EXPORT void void
xf86ClearPrimInitDone(int entityIndex) xf86ClearPrimInitDone(int entityIndex)
{ {
if(entityIndex < xf86NumEntities) { if(entityIndex < xf86NumEntities) {
@ -2560,7 +2560,7 @@ xf86ClearPrimInitDone(int entityIndex)
* Allocate a private in the entities. * Allocate a private in the entities.
*/ */
_X_EXPORT int int
xf86AllocateEntityPrivateIndex(void) xf86AllocateEntityPrivateIndex(void)
{ {
int idx, i; int idx, i;
@ -2579,7 +2579,7 @@ xf86AllocateEntityPrivateIndex(void)
return idx; return idx;
} }
_X_EXPORT DevUnion * DevUnion *
xf86GetEntityPrivate(int entityIndex, int privIndex) xf86GetEntityPrivate(int entityIndex, int privIndex)
{ {
if (entityIndex >= xf86NumEntities || privIndex >= xf86EntityPrivateCount) if (entityIndex >= xf86NumEntities || privIndex >= xf86EntityPrivateCount)

Some files were not shown because too many files have changed in this diff Show More