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

Export symbols defined in the sdk. 

This is the biggest "visibility" patch. Instead of doing a "export"
symbol on demand, export everything in the sdk, so that if some module
fails due to an unresolved symbol, it is because it is using a symbol
not in the sdk.

  Most exported symbols shouldn't really be made visible, neither
advertised in the sdk, as they are only used by a single shared object.

  Symbols in the sdk (or referenced in sdk macros), but not defined
anywhere include:
XkbBuildCoreState()
XkbInitialMap
XkbXIUnsupported
XkbCheckActionVMods()
XkbSendCompatNotify()
XkbDDXFakePointerButton()
XkbDDXApplyConfig()
_XkbStrCaseCmp()
_XkbErrMessages[]
_XkbErrCode
_XkbErrLocation
_XkbErrData
XkbAccessXDetailText()
XkbNKNDetailMaskText()
XkbLookupGroupAndLevel()
XkbInitAtoms()
XkbGetOrderedDrawables()
XkbFreeOrderedDrawables()
XkbConvertXkbComponents()
XkbWriteXKBSemantics()
XkbWriteXKBLayout()
XkbWriteXKBKeymap()
XkbWriteXKBFile()
XkbWriteCFile()
XkbWriteXKMFile()
XkbWriteToServer()
XkbMergeFile()
XkmFindTOCEntry()
XkmReadFileSection()
XkmReadFileSectionName()
InitExtInput()
xf86CheckButton()
xf86SwitchCoreDevice()
RamDacSetGamma()
RamDacRestoreDACValues()
xf86Bpp
xf86ConfigPix24
xf86MouseCflags[]
xf86SupportedMouseTypes[]
xf86NumMouseTypes
xf86ChangeBusIndex()
xf86EntityEnter()
xf86EntityLeave()
xf86WrapperInit()
xf86RingBell()
xf86findOptionBoolean()
xf86debugListOptions()
LoadSubModuleLocal()
LoaderSymbolLocal()
getInt10Rec()
xf86CurrentScreen
xf86ReallocatePciResources()
xf86NewSerialNumber()
xf86RandRSetInitialMode()
fbCompositeSolidMask_nx1xn
fbCompositeSolidMask_nx8888x0565C
fbCompositeSolidMask_nx8888x8888C
fbCompositeSolidMask_nx8x0565
fbCompositeSolidMask_nx8x0888
fbCompositeSolidMask_nx8x8888
fbCompositeSrc_0565x0565
fbCompositeSrc_8888x0565
fbCompositeSrc_8888x0888
fbCompositeSrc_8888x8888
fbCompositeSrcAdd_1000x1000
fbCompositeSrcAdd_8000x8000
fbCompositeSrcAdd_8888x8888
fbGeneration
fbIn
fbOver
fbOver24
fbOverlayGeneration
fbRasterizeEdges
fbRestoreAreas
fbSaveAreas
composeFunctions
VBEBuildVbeModeList()
VBECalcVbeModeIndex()
TIramdac3030CalculateMNPForClock()
shadowBufPtr
shadowFindBuf()
miRRGetScreenInfo()
RRSetScreenConfig()
RRModePruneUnused()
PixmanImageFromPicture()
extern int miPointerGetMotionEvents()
miClipPicture()
miRasterizeTriangle()
fbPush1toN()
fbInitializeBackingStore()
ddxBeforeReset()
SetupSprite()
InitSprite()
DGADeliverEvent()

  SPECIAL CASES
o defined as _X_INTERNAL
	xf86NewInputDevice()
o defined as static
	fbGCPrivateKey
	fbOverlayScreenPrivateKey
	fbScreenPrivateKey
	fbWinPrivateKey
o defined in libXfont.so, but declared in xorg/dixfont.h
	GetGlyphs()
	QueryGlyphExtents()
	QueryTextExtents()
	ParseGlyphCachingMode()
	InitGlyphCaching()
	SetGlyphCachingMode()
This commit is contained in:
Paulo Cesar Pereira de Andrade 2008-11-29 23:56:06 -02:00
parent ffb484f7ef
commit d6cbd4511e
281 changed files with 1681 additions and 1673 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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)])
int GEEventBase; _X_EXPORT int GEEventBase;
int GEErrorBase; _X_EXPORT int GEErrorBase;
static int GEClientPrivateKeyIndex; static int GEClientPrivateKeyIndex;
DevPrivateKey GEClientPrivateKey = &GEClientPrivateKeyIndex; _X_EXPORT DevPrivateKey GEClientPrivateKey = &GEClientPrivateKeyIndex;
int GEEventType; /* The opcode for all GenericEvents will have. */ _X_EXPORT int GEEventType; /* The opcode for all GenericEvents will have. */
int RT_GECLIENT = 0; int RT_GECLIENT = 0;
GEExtension GEExtensions[MAXEXTENSIONS]; _X_EXPORT 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);
} }
int (*ProcGEVector[GENumberRequests])(ClientPtr) = { _X_EXPORT 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);
} }
int (*SProcGEVector[GENumberRequests])(ClientPtr) = { _X_EXPORT 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.
*/ */
void _X_EXPORT 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.
*/ */
void _X_EXPORT 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.
*/ */
void _X_EXPORT 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. */
void _X_EXPORT 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
*/ */
BOOL _X_EXPORT BOOL
GEDeviceMaskIsSet(WindowPtr pWin, DeviceIntPtr pDev, GEDeviceMaskIsSet(WindowPtr pWin, DeviceIntPtr pDev,
int extension, Mask mask) int extension, Mask mask)
{ {

8
Xext/shape.c
View File

@ -136,7 +136,7 @@ typedef struct _ShapeEvent {
* *
****************/ ****************/
void _X_EXPORT 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;
} }
RegionPtr _X_EXPORT 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);
} }
RegionPtr _X_EXPORT RegionPtr
CreateClipShape (pWin) CreateClipShape (pWin)
WindowPtr pWin; WindowPtr pWin;
{ {
@ -895,7 +895,7 @@ ProcShapeSelectInput (client)
* deliver the event * deliver the event
*/ */
void _X_EXPORT void
SendShapeNotify (pWin, which) SendShapeNotify (pWin, which)
WindowPtr pWin; WindowPtr pWin;
int which; int which;

4
Xext/xvdisp.c
View File

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

58
Xext/xvmain.c
View File

@ -107,20 +107,20 @@ SOFTWARE.
static int XvScreenKeyIndex; static int XvScreenKeyIndex;
static DevPrivateKey XvScreenKey = &XvScreenKeyIndex; static DevPrivateKey XvScreenKey = &XvScreenKeyIndex;
unsigned long XvExtensionGeneration = 0; _X_EXPORT unsigned long XvExtensionGeneration = 0;
unsigned long XvScreenGeneration = 0; _X_EXPORT unsigned long XvScreenGeneration = 0;
unsigned long XvResourceGeneration = 0; _X_EXPORT unsigned long XvResourceGeneration = 0;
int XvReqCode; _X_EXPORT int XvReqCode;
int XvEventBase; _X_EXPORT int XvEventBase;
int XvErrorBase; _X_EXPORT int XvErrorBase;
unsigned long XvRTPort; _X_EXPORT unsigned long XvRTPort;
unsigned long XvRTEncoding; _X_EXPORT unsigned long XvRTEncoding;
unsigned long XvRTGrab; _X_EXPORT unsigned long XvRTGrab;
unsigned long XvRTVideoNotify; _X_EXPORT unsigned long XvRTVideoNotify;
unsigned long XvRTVideoNotifyList; _X_EXPORT unsigned long XvRTVideoNotifyList;
unsigned long XvRTPortNotify; _X_EXPORT unsigned long XvRTPortNotify;
@ -153,7 +153,7 @@ static int XvdiSendVideoNotify(XvPortPtr, DrawablePtr, int);
** **
*/ */
void _X_EXPORT void
XvExtensionInit(void) XvExtensionInit(void)
{ {
ExtensionEntry *extEntry; ExtensionEntry *extEntry;
@ -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 */
int _X_EXPORT int
XvdiVideoStopped(XvPortPtr pPort, int reason) XvdiVideoStopped(XvPortPtr pPort, int reason)
{ {
@ -553,7 +553,7 @@ int reason;
} }
int _X_EXPORT int
XvdiSendPortNotify( XvdiSendPortNotify(
XvPortPtr pPort, XvPortPtr pPort,
Atom attribute, Atom attribute,
@ -593,7 +593,7 @@ XvdiSendPortNotify(
} }
int _X_EXPORT int
XvdiPutVideo( XvdiPutVideo(
ClientPtr client, ClientPtr client,
DrawablePtr pDraw, DrawablePtr pDraw,
@ -646,7 +646,7 @@ XvdiPutVideo(
} }
int _X_EXPORT int
XvdiPutStill( XvdiPutStill(
ClientPtr client, ClientPtr client,
DrawablePtr pDraw, DrawablePtr pDraw,
@ -684,7 +684,7 @@ XvdiPutStill(
} }
int _X_EXPORT int
XvdiPutImage( XvdiPutImage(
ClientPtr client, ClientPtr client,
DrawablePtr pDraw, DrawablePtr pDraw,
@ -723,7 +723,7 @@ XvdiPutImage(
} }
int _X_EXPORT int
XvdiGetVideo( XvdiGetVideo(
ClientPtr client, ClientPtr client,
DrawablePtr pDraw, DrawablePtr pDraw,
@ -776,7 +776,7 @@ XvdiGetVideo(
} }
int _X_EXPORT int
XvdiGetStill( XvdiGetStill(
ClientPtr client, ClientPtr client,
DrawablePtr pDraw, DrawablePtr pDraw,
@ -814,7 +814,7 @@ XvdiGetStill(
} }
int _X_EXPORT int
XvdiGrabPort( XvdiGrabPort(
ClientPtr client, ClientPtr client,
XvPortPtr pPort, XvPortPtr pPort,
@ -871,7 +871,7 @@ XvdiGrabPort(
} }
int _X_EXPORT int
XvdiUngrabPort( XvdiUngrabPort(
ClientPtr client, ClientPtr client,
XvPortPtr pPort, XvPortPtr pPort,
@ -905,7 +905,7 @@ XvdiUngrabPort(
} }
int _X_EXPORT int
XvdiSelectVideoNotify( XvdiSelectVideoNotify(
ClientPtr client, ClientPtr client,
DrawablePtr pDraw, DrawablePtr pDraw,
@ -983,7 +983,7 @@ XvdiSelectVideoNotify(
} }
int _X_EXPORT int
XvdiSelectPortNotify( XvdiSelectPortNotify(
ClientPtr client, ClientPtr client,
XvPortPtr pPort, XvPortPtr pPort,
@ -1036,7 +1036,7 @@ XvdiSelectPortNotify(
} }
int _X_EXPORT int
XvdiStopVideo( XvdiStopVideo(
ClientPtr client, ClientPtr client,
XvPortPtr pPort, XvPortPtr pPort,
@ -1073,7 +1073,7 @@ XvdiStopVideo(
} }
int _X_EXPORT int
XvdiPreemptVideo( XvdiPreemptVideo(
ClientPtr client, ClientPtr client,
XvPortPtr pPort, XvPortPtr pPort,
@ -1097,7 +1097,7 @@ XvdiPreemptVideo(
} }
int _X_EXPORT int
XvdiMatchPort( XvdiMatchPort(
XvPortPtr pPort, XvPortPtr pPort,
DrawablePtr pDraw DrawablePtr pDraw
@ -1130,7 +1130,7 @@ XvdiMatchPort(
} }
int _X_EXPORT int
XvdiSetPortAttribute( XvdiSetPortAttribute(
ClientPtr client, ClientPtr client,
XvPortPtr pPort, XvPortPtr pPort,
@ -1145,7 +1145,7 @@ XvdiSetPortAttribute(
} }
int _X_EXPORT 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;
} }
void _X_EXPORT void
XvMCExtensionInit(void) XvMCExtensionInit(void)
{ {
ExtensionEntry *extEntry; ExtensionEntry *extEntry;
@ -705,7 +705,7 @@ XvMCCloseScreen (int i, ScreenPtr pScreen)
} }
int _X_EXPORT 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;
} }
XvImagePtr XvMCFindXvImage(XvPortPtr pPort, CARD32 id) _X_EXPORT 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 @@ XvImagePtr XvMCFindXvImage(XvPortPtr pPort, CARD32 id)
return pImage; return pImage;
} }
int _X_EXPORT 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)

48
Xi/exevents.c
View File

@ -100,14 +100,14 @@ static Bool MakeInputMasks(WindowPtr /* pWin */
extern DevPrivateKey UnusedClassesPrivateKey; extern DevPrivateKey UnusedClassesPrivateKey;
void _X_EXPORT void
RegisterOtherDevice(DeviceIntPtr device) RegisterOtherDevice(DeviceIntPtr device)
{ {
device->public.processInputProc = ProcessOtherEvent; device->public.processInputProc = ProcessOtherEvent;
device->public.realInputProc = ProcessOtherEvent; device->public.realInputProc = ProcessOtherEvent;
} }
Bool _X_EXPORT 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.
*/ */
DeviceIntPtr _X_EXPORT 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.
*/ */
void _X_EXPORT 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
int _X_EXPORT 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.
* *
*/ */
void _X_EXPORT void
ProcessOtherEvent(xEventPtr xE, DeviceIntPtr device, int count) ProcessOtherEvent(xEventPtr xE, DeviceIntPtr device, int count)
{ {
int i; int i;
@ -1233,7 +1233,7 @@ FixDeviceValuator(DeviceIntPtr dev, deviceValuator * ev, ValuatorClassPtr v,
first += ev->num_valuators; first += ev->num_valuators;
} }
void _X_EXPORT void
DeviceFocusEvent(DeviceIntPtr dev, int type, int mode, int detail, DeviceFocusEvent(DeviceIntPtr dev, int type, int mode, int detail,
WindowPtr pWin) WindowPtr pWin)
{ {
@ -1355,7 +1355,7 @@ DeviceFocusEvent(DeviceIntPtr dev, int type, int mode, int detail,
} }
} }
int _X_EXPORT 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,
@ -1422,7 +1422,7 @@ GrabButton(ClientPtr client, DeviceIntPtr dev, BYTE this_device_mode,
return AddPassiveGrabToList(client, grab); return AddPassiveGrabToList(client, grab);
} }
int _X_EXPORT 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,
@ -1477,7 +1477,7 @@ GrabKey(ClientPtr client, DeviceIntPtr dev, BYTE this_device_mode,
return AddPassiveGrabToList(client, grab); return AddPassiveGrabToList(client, grab);
} }
int _X_EXPORT 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)
{ {
@ -1538,7 +1538,7 @@ SelectForWindow(DeviceIntPtr dev, WindowPtr pWin, ClientPtr client,
return Success; return Success;
} }
int _X_EXPORT int
AddExtensionClient(WindowPtr pWin, ClientPtr client, Mask mask, int mskidx) AddExtensionClient(WindowPtr pWin, ClientPtr client, Mask mask, int mskidx)
{ {
InputClientsPtr others; InputClientsPtr others;
@ -1571,7 +1571,7 @@ MakeInputMasks(WindowPtr pWin)
return TRUE; return TRUE;
} }
void _X_EXPORT void
RecalculateDeviceDeliverableEvents(WindowPtr pWin) RecalculateDeviceDeliverableEvents(WindowPtr pWin)
{ {
InputClientsPtr others; InputClientsPtr others;
@ -1609,7 +1609,7 @@ RecalculateDeviceDeliverableEvents(WindowPtr pWin)
} }
} }
int _X_EXPORT int
InputClientGone(WindowPtr pWin, XID id) InputClientGone(WindowPtr pWin, XID id)
{ {
InputClientsPtr other, prev; InputClientsPtr other, prev;
@ -1648,7 +1648,7 @@ InputClientGone(WindowPtr pWin, XID id)
FatalError("client not on device event list"); FatalError("client not on device event list");
} }
int _X_EXPORT 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)
{ {
@ -1707,7 +1707,7 @@ SendEvent(ClientPtr client, DeviceIntPtr d, Window dest, Bool propagate,
return Success; return Success;
} }
int _X_EXPORT int
SetButtonMapping(ClientPtr client, DeviceIntPtr dev, int nElts, BYTE * map) SetButtonMapping(ClientPtr client, DeviceIntPtr dev, int nElts, BYTE * map)
{ {
int i; int i;
@ -1730,7 +1730,7 @@ SetButtonMapping(ClientPtr client, DeviceIntPtr dev, int nElts, BYTE * map)
return Success; return Success;
} }
int _X_EXPORT 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)
{ {
@ -1810,7 +1810,7 @@ SetModifierMapping(ClientPtr client, DeviceIntPtr dev, int len, int rlen,
return (MappingSuccess); return (MappingSuccess);
} }
void _X_EXPORT void
SendDeviceMappingNotify(ClientPtr client, CARD8 request, SendDeviceMappingNotify(ClientPtr client, CARD8 request,
KeyCode firstKeyCode, CARD8 count, DeviceIntPtr dev) KeyCode firstKeyCode, CARD8 count, DeviceIntPtr dev)
{ {
@ -1834,7 +1834,7 @@ SendDeviceMappingNotify(ClientPtr client, CARD8 request,
SendEventToAllWindows(dev, DeviceMappingNotifyMask, (xEvent *) ev, 1); SendEventToAllWindows(dev, DeviceMappingNotifyMask, (xEvent *) ev, 1);
} }
int _X_EXPORT int
ChangeKeyMapping(ClientPtr client, ChangeKeyMapping(ClientPtr client,
DeviceIntPtr dev, DeviceIntPtr dev,
unsigned len, unsigned len,
@ -1935,7 +1935,7 @@ DeleteDeviceFromAnyExtEvents(WindowPtr pWin, DeviceIntPtr dev)
dev->valuator->motionHintWindow = NullWindow; dev->valuator->motionHintWindow = NullWindow;
} }
void _X_EXPORT void
DeleteWindowFromAnyExtEvents(WindowPtr pWin, Bool freeResources) DeleteWindowFromAnyExtEvents(WindowPtr pWin, Bool freeResources)
{ {
int i; int i;
@ -1961,7 +1961,7 @@ DeleteWindowFromAnyExtEvents(WindowPtr pWin, Bool freeResources)
} }
} }
int _X_EXPORT int
MaybeSendDeviceMotionNotifyHint(deviceKeyButtonPointer * pEvents, Mask mask) MaybeSendDeviceMotionNotifyHint(deviceKeyButtonPointer * pEvents, Mask mask)
{ {
DeviceIntPtr dev; DeviceIntPtr dev;
@ -1984,7 +1984,7 @@ MaybeSendDeviceMotionNotifyHint(deviceKeyButtonPointer * pEvents, Mask mask)
return (0); return (0);
} }
void _X_EXPORT 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)
@ -2033,7 +2033,7 @@ DeviceEventMaskForClient(DeviceIntPtr dev, WindowPtr pWin, ClientPtr client)
return 0; return 0;
} }
void _X_EXPORT void
MaybeStopDeviceHint(DeviceIntPtr dev, ClientPtr client) MaybeStopDeviceHint(DeviceIntPtr dev, ClientPtr client)
{ {
WindowPtr pWin; WindowPtr pWin;
@ -2052,7 +2052,7 @@ MaybeStopDeviceHint(DeviceIntPtr dev, ClientPtr client)
dev->valuator->motionHintWindow = NullWindow; dev->valuator->motionHintWindow = NullWindow;
} }
int _X_EXPORT int
DeviceEventSuppressForWindow(WindowPtr pWin, ClientPtr client, Mask mask, DeviceEventSuppressForWindow(WindowPtr pWin, ClientPtr client, Mask mask,
int maskndx) int maskndx)
{ {
@ -2123,7 +2123,7 @@ FindInterestedChildren(DeviceIntPtr dev, WindowPtr p1, Mask mask,
* *
*/ */
void _X_EXPORT 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;
int DeviceKeyPress; _X_EXPORT int DeviceKeyPress;
int DeviceKeyRelease; _X_EXPORT int DeviceKeyRelease;
int DeviceButtonPress; _X_EXPORT int DeviceButtonPress;
int DeviceButtonRelease; _X_EXPORT int DeviceButtonRelease;
int DeviceMotionNotify; _X_EXPORT 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;
int DeviceEnterNotify; _X_EXPORT int DeviceEnterNotify;
int DeviceLeaveNotify; _X_EXPORT int DeviceLeaveNotify;
int RT_INPUTCLIENT; int RT_INPUTCLIENT;
@ -982,7 +982,7 @@ IResetProc(ExtensionEntry * unused)
* *
*/ */
Bool _X_EXPORT 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)
* *
*/ */
void _X_EXPORT 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.
*/ */
void _X_EXPORT void
XInputExtensionInit(void) XInputExtensionInit(void)
{ {
ExtensionEntry *extEntry; ExtensionEntry *extEntry;

16
Xi/stubs.c
View File

@ -80,7 +80,7 @@ SOFTWARE.
* *
*/ */
void _X_EXPORT void
CloseInputDevice(DeviceIntPtr d, ClientPtr client) CloseInputDevice(DeviceIntPtr d, ClientPtr client)
{ {
} }
@ -111,7 +111,7 @@ CloseInputDevice(DeviceIntPtr d, ClientPtr client)
* *
*/ */
void _X_EXPORT void
AddOtherInputDevices(void) AddOtherInputDevices(void)
{ {
/********************************************************************** /**********************************************************************
@ -151,7 +151,7 @@ AddOtherInputDevices(void)
* *
*/ */
void _X_EXPORT 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)
* *
*/ */
int _X_EXPORT 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)
* *
*/ */
int _X_EXPORT 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,
* *
*/ */
int _X_EXPORT 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.
* *
*/ */
int _X_EXPORT 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.
* *
*/ */
void _X_EXPORT void
DeleteInputDeviceRequest(DeviceIntPtr dev) DeleteInputDeviceRequest(DeviceIntPtr dev)
{ {
} }

14
Xi/xiproperty.c
View File

@ -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.
*/ */
long _X_EXPORT 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;
} }
void _X_EXPORT 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.
*/ */
void _X_EXPORT void
XIDeleteAllDeviceProperties (DeviceIntPtr device) XIDeleteAllDeviceProperties (DeviceIntPtr device)
{ {
XIPropertyPtr prop, next; XIPropertyPtr prop, next;
@ -219,7 +219,7 @@ XIDeleteAllDeviceProperties (DeviceIntPtr device)
} }
int _X_EXPORT 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;
} }
int _X_EXPORT 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);
} }
int _X_EXPORT 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;
} }
int _X_EXPORT 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);

4
config/config.c
View File

@ -31,7 +31,7 @@
#include "hotplug.h" #include "hotplug.h"
#include "config-backends.h" #include "config-backends.h"
void _X_EXPORT 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
} }
void _X_EXPORT 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)
* *
*****************************************************************************/ *****************************************************************************/
void _X_EXPORT void
DbeExtensionInit(void) DbeExtensionInit(void)
{ {
ExtensionEntry *extEntry; ExtensionEntry *extEntry;

6
dix/atom.c
View File

@ -166,7 +166,7 @@ NameForAtom(Atom atom)
return node->string; return node->string;
} }
void _X_EXPORT void
AtomError(void) AtomError(void)
{ {
FatalError("initializing atoms"); FatalError("initializing atoms");
@ -184,7 +184,7 @@ FreeAtom(NodePtr patom)
xfree(patom); xfree(patom);
} }
void _X_EXPORT void
FreeAllAtoms(void) FreeAllAtoms(void)
{ {
if(atomRoot == (NodePtr)NULL) if(atomRoot == (NodePtr)NULL)
@ -196,7 +196,7 @@ FreeAllAtoms(void)
lastAtom = None; lastAtom = None;
} }
void _X_EXPORT void
InitAtoms(void) InitAtoms(void)
{ {
FreeAllAtoms(); FreeAllAtoms();

14
dix/colormap.c
View File

@ -420,7 +420,7 @@ CreateColormap (Colormap mid, ScreenPtr pScreen, VisualPtr pVisual,
* *
* \param value must conform to DeleteType * \param value must conform to DeleteType
*/ */
int _X_EXPORT int
FreeColormap (pointer value, XID mid) FreeColormap (pointer value, XID mid)
{ {
int i; int i;
@ -552,7 +552,7 @@ TellGainedMap (WindowPtr pwin, pointer value)
} }
int _X_EXPORT int
CopyColormapAndFree (Colormap mid, ColormapPtr pSrc, int client) CopyColormapAndFree (Colormap mid, ColormapPtr pSrc, int client)
{ {
ColormapPtr pmap = (ColormapPtr) NULL; ColormapPtr pmap = (ColormapPtr) NULL;
@ -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
*/ */
int _X_EXPORT 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)
@ -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
*/ */
int _X_EXPORT 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;
} }
int _X_EXPORT 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,
} }
int _X_EXPORT 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)
@ -2667,7 +2667,7 @@ StoreColors (ColormapPtr pmap, int count, xColorItem *defs)
return (errVal); return (errVal);
} }
int _X_EXPORT int
IsMapInstalled(Colormap map, WindowPtr pWin) IsMapInstalled(Colormap map, WindowPtr pWin)
{ {
Colormap *pmaps; Colormap *pmaps;

6
dix/cursor.c
View File

@ -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
*/ */
int _X_EXPORT 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;
} }
int _X_EXPORT 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
*************************************************************/ *************************************************************/
CursorPtr _X_EXPORT CursorPtr
CreateRootCursor(char *unused1, unsigned int unused2) CreateRootCursor(char *unused1, unsigned int unused2)
{ {
CursorPtr curs; CursorPtr curs;

44
dix/devices.c
View File

@ -94,7 +94,7 @@ SOFTWARE.
*/ */
static int CoreDevicePrivateKeyIndex; static int CoreDevicePrivateKeyIndex;
DevPrivateKey CoreDevicePrivateKey = &CoreDevicePrivateKeyIndex; _X_EXPORT 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.
*/ */
DeviceIntPtr _X_EXPORT 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.
*/ */
Bool _X_EXPORT 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.
*/ */
Bool _X_EXPORT 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.
*/ */
int _X_EXPORT int
ActivateDevice(DeviceIntPtr dev) ActivateDevice(DeviceIntPtr dev)
{ {
int ret = Success; int ret = Success;
@ -598,7 +598,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.
*/ */
void _X_EXPORT void
InitCoreDevices(void) InitCoreDevices(void)
{ {
if (AllocMasterDevice(serverClient, "Virtual core", if (AllocMasterDevice(serverClient, "Virtual core",
@ -625,7 +625,7 @@ InitCoreDevices(void)
* *
* @return Success or error code on failure. * @return Success or error code on failure.
*/ */
int _X_EXPORT int
InitAndStartDevices() InitAndStartDevices()
{ {
DeviceIntPtr dev, next; DeviceIntPtr dev, next;
@ -890,7 +890,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!
*/ */
void _X_EXPORT void
CloseDownDevices(void) CloseDownDevices(void)
{ {
DeviceIntPtr dev, next; DeviceIntPtr dev, next;
@ -930,7 +930,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.
*/ */
void _X_EXPORT void
UndisplayDevices() UndisplayDevices()
{ {
DeviceIntPtr dev; DeviceIntPtr dev;
@ -951,7 +951,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.
*/ */
int _X_EXPORT int
RemoveDevice(DeviceIntPtr dev) RemoveDevice(DeviceIntPtr dev)
{ {
DeviceIntPtr prev,tmp,next; DeviceIntPtr prev,tmp,next;
@ -1018,7 +1018,7 @@ RemoveDevice(DeviceIntPtr dev)
return ret; return ret;
} }
int _X_EXPORT int
NumMotionEvents(void) NumMotionEvents(void)
{ {
/* only called to fill data in initial connection reply. /* only called to fill data in initial connection reply.
@ -1026,19 +1026,19 @@ NumMotionEvents(void)
return inputInfo.pointer->valuator->numMotionEvents; return inputInfo.pointer->valuator->numMotionEvents;
} }
void _X_EXPORT void
RegisterPointerDevice(DeviceIntPtr device) RegisterPointerDevice(DeviceIntPtr device)
{ {
RegisterOtherDevice(device); RegisterOtherDevice(device);
} }
void _X_EXPORT void
RegisterKeyboardDevice(DeviceIntPtr device) RegisterKeyboardDevice(DeviceIntPtr device)
{ {
RegisterOtherDevice(device); RegisterOtherDevice(device);
} }
int _X_EXPORT 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;
@ -1062,7 +1062,7 @@ found:
return rc; return rc;
} }
void _X_EXPORT void
QueryMinMaxKeyCodes(KeyCode *minCode, KeyCode *maxCode) QueryMinMaxKeyCodes(KeyCode *minCode, KeyCode *maxCode)
{ {
if (inputInfo.keyboard) { if (inputInfo.keyboard) {
@ -1071,7 +1071,7 @@ QueryMinMaxKeyCodes(KeyCode *minCode, KeyCode *maxCode)
} }
} }
Bool _X_EXPORT Bool
SetKeySymsMap(KeySymsPtr dst, KeySymsPtr src) SetKeySymsMap(KeySymsPtr dst, KeySymsPtr src)
{ {
int i, j; int i, j;
@ -1600,7 +1600,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.
*/ */
Bool _X_EXPORT 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;
@ -1617,7 +1617,7 @@ BadDeviceMap(BYTE *buff, int length, unsigned low, unsigned high, XID *errval)
return FALSE; return FALSE;
} }
Bool _X_EXPORT Bool
AllModifierKeysAreUp(dev, map1, per1, map2, per2) AllModifierKeysAreUp(dev, map1, per1, map2, per2)
DeviceIntPtr dev; DeviceIntPtr dev;
CARD8 *map1, *map2; CARD8 *map1, *map2;
@ -1987,7 +1987,7 @@ ProcGetPointerMapping(ClientPtr client)
return Success; return Success;
} }
void _X_EXPORT 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;
@ -2392,7 +2392,7 @@ ProcGetPointerControl(ClientPtr client)
return Success; return Success;
} }
void _X_EXPORT void
MaybeStopHint(DeviceIntPtr dev, ClientPtr client) MaybeStopHint(DeviceIntPtr dev, ClientPtr client)
{ {
GrabPtr grab = dev->deviceGrab.grab; GrabPtr grab = dev->deviceGrab.grab;
@ -2509,7 +2509,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.
*/ */
int _X_EXPORT int
AttachDevice(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr master) AttachDevice(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr master)
{ {
ScreenPtr screen; ScreenPtr screen;
@ -2613,7 +2613,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.
*/ */
int _X_EXPORT int
AllocMasterDevice(ClientPtr client, char* name, DeviceIntPtr* ptr, DeviceIntPtr* keybd) AllocMasterDevice(ClientPtr client, char* name, DeviceIntPtr* ptr, DeviceIntPtr* keybd)
{ {
DeviceIntPtr pointer; DeviceIntPtr pointer;

26
dix/dispatch.c
View File

@ -168,7 +168,7 @@ static ClientPtr grabClient;
static int grabState = GrabNone; static int grabState = GrabNone;
static long grabWaiters[mskcnt]; static long grabWaiters[mskcnt];
_X_EXPORT CallbackListPtr ServerGrabCallback = NULL; _X_EXPORT CallbackListPtr ServerGrabCallback = NULL;
HWEventQueuePtr checkForInput[2]; _X_EXPORT HWEventQueuePtr checkForInput[2];
extern int connBlockScreenStart; extern int connBlockScreenStart;
static void KillAllClients(void); static void KillAllClients(void);
@ -197,7 +197,7 @@ 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))
void _X_EXPORT void
SetInputCheck(HWEventQueuePtr c0, HWEventQueuePtr c1) SetInputCheck(HWEventQueuePtr c0, HWEventQueuePtr c1)
{ {
checkForInput[0] = c0; checkForInput[0] = c0;
@ -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 */
Bool SmartScheduleDisable = FALSE; _X_EXPORT Bool SmartScheduleDisable = FALSE;
long SmartScheduleSlice = SMART_SCHEDULE_DEFAULT_INTERVAL; _X_EXPORT long SmartScheduleSlice = SMART_SCHEDULE_DEFAULT_INTERVAL;
long SmartScheduleInterval = SMART_SCHEDULE_DEFAULT_INTERVAL; _X_EXPORT long SmartScheduleInterval = SMART_SCHEDULE_DEFAULT_INTERVAL;
long SmartScheduleMaxSlice = SMART_SCHEDULE_MAX_SLICE; _X_EXPORT long SmartScheduleMaxSlice = SMART_SCHEDULE_MAX_SLICE;
long SmartScheduleTime; _X_EXPORT 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];
@ -1239,7 +1239,7 @@ ProcListFontsWithInfo(ClientPtr client)
* *
* \param value must conform to DeleteType * \param value must conform to DeleteType
*/ */
int _X_EXPORT 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.
*********************/ *********************/
char dispatchExceptionAtReset = DE_RESET; _X_EXPORT char dispatchExceptionAtReset = DE_RESET;
void _X_EXPORT 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)
} }
} }
void InitClient(ClientPtr client, int i, pointer ospriv) _X_EXPORT void InitClient(ClientPtr client, int i, pointer ospriv)
{ {
client->index = i; client->index = i;
client->sequence = 0; client->sequence = 0;
@ -3504,7 +3504,7 @@ void InitClient(ClientPtr client, int i, pointer ospriv)
* Returns NULL if there are no free clients. * Returns NULL if there are no free clients.
*************************/ *************************/
ClientPtr NextAvailableClient(pointer ospriv) _X_EXPORT ClientPtr NextAvailableClient(pointer ospriv)
{ {
int i; int i;
ClientPtr client; ClientPtr client;
@ -3720,7 +3720,7 @@ SendErrorToClient(ClientPtr client, unsigned majorCode, unsigned minorCode,
WriteEventsToClient (client, 1, (xEvent *)&rep); WriteEventsToClient (client, 1, (xEvent *)&rep);
} }
void _X_EXPORT void
MarkClientException(ClientPtr client) MarkClientException(ClientPtr client)
{ {
client->noClientException = -1; client->noClientException = -1;

38
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
*/ */
Bool _X_EXPORT 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.
*/ */
void _X_EXPORT void
QueueFontWakeup(FontPathElementPtr fpe) QueueFontWakeup(FontPathElementPtr fpe)
{ {
int i; int i;
@ -182,7 +182,7 @@ QueueFontWakeup(FontPathElementPtr fpe)
num_slept_fpes++; num_slept_fpes++;
} }
void _X_EXPORT void
RemoveFontWakeup(FontPathElementPtr fpe) RemoveFontWakeup(FontPathElementPtr fpe)
{ {
int i, int i,
@ -199,7 +199,7 @@ RemoveFontWakeup(FontPathElementPtr fpe)
} }
} }
void _X_EXPORT 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;
} }
int _X_EXPORT 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
*/ */
int _X_EXPORT 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
*/ */
void _X_EXPORT 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;
} }
int _X_EXPORT 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;
} }
int _X_EXPORT 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)
int _X_EXPORT 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;
} }
int _X_EXPORT 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
int _X_EXPORT 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;
} }
int _X_EXPORT 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? */
int _X_EXPORT 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;
} }
int _X_EXPORT int
SetDefaultFontPath(char *path) SetDefaultFontPath(char *path)
{ {
unsigned char *cp, unsigned char *cp,
@ -1853,7 +1853,7 @@ SetDefaultFontPath(char *path)
return err; return err;
} }
int _X_EXPORT 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;
} }
void _X_EXPORT void
DeleteClientFontStuff(ClientPtr client) DeleteClientFontStuff(ClientPtr client)
{ {
int i; int i;
@ -1902,7 +1902,7 @@ DeleteClientFontStuff(ClientPtr client)
} }
} }
void _X_EXPORT void
InitFonts (void) InitFonts (void)
{ {
patternCache = MakeFontPatternCache(); patternCache = MakeFontPatternCache();
@ -2003,7 +2003,7 @@ RegisterFPEFunctions(NameCheckFunc name_func,
return num_fpe_types++; return num_fpe_types++;
} }
void _X_EXPORT void
FreeFonts(void) FreeFonts(void)
{ {
if (patternCache) { if (patternCache) {

24
dix/dixutils.c
View File

@ -175,7 +175,7 @@ CopyISOLatin1Lowered(unsigned char *dest, unsigned char *source, int length)
*dest = '\0'; *dest = '\0';
} }
int _X_EXPORT int
CompareISOLatin1Lowered(unsigned char *s1, int s1len, CompareISOLatin1Lowered(unsigned char *s1, int s1len,
unsigned char *s2, int s2len) unsigned char *s2, int s2len)
{ {
@ -276,7 +276,7 @@ bad:
return rc; return rc;
} }
int _X_EXPORT 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);
} }
void _X_EXPORT void
DeleteWindowFromAnySaveSet(WindowPtr pWin) DeleteWindowFromAnySaveSet(WindowPtr pWin)
{ {
int i; int i;
@ -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
*/ */
void _X_EXPORT 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
*/ */
void _X_EXPORT void
WakeupHandler(int result, pointer pReadmask) WakeupHandler(int result, pointer pReadmask)
{ {
int i, j; int i, j;
@ -492,7 +492,7 @@ RemoveBlockAndWakeupHandlers (BlockHandlerProcPtr blockHandler,
} }
} }
void _X_EXPORT 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;
void _X_EXPORT void
ProcessWorkQueue(void) ProcessWorkQueue(void)
{ {
WorkQueuePtr q, *p; WorkQueuePtr q, *p;
@ -537,7 +537,7 @@ ProcessWorkQueue(void)
workQueueLast = p; workQueueLast = p;
} }
void _X_EXPORT void
ProcessWorkQueueZombies(void) ProcessWorkQueueZombies(void)
{ {
WorkQueuePtr q, *p; WorkQueuePtr q, *p;
@ -653,7 +653,7 @@ ClientWakeup (ClientPtr client)
} }
} }
Bool _X_EXPORT Bool
ClientIsAsleep (ClientPtr client) ClientIsAsleep (ClientPtr client)
{ {
SleepQueuePtr q; SleepQueuePtr q;
@ -869,21 +869,21 @@ DeleteCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, pointer data)
return _DeleteCallback(pcbl, callback, data); return _DeleteCallback(pcbl, callback, data);
} }
void _X_EXPORT 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);
} }
void _X_EXPORT void
DeleteCallbackList(CallbackListPtr *pcbl) DeleteCallbackList(CallbackListPtr *pcbl)
{ {
if (!pcbl || !*pcbl) return; if (!pcbl || !*pcbl) return;
_DeleteCallbackList(pcbl); _DeleteCallbackList(pcbl);
} }
void _X_EXPORT void
InitCallbackManager(void) InitCallbackManager(void)
{ {
int i; int i;

114
dix/events.c
View File

@ -215,7 +215,7 @@ _X_EXPORT CallbackListPtr DeviceEventCallback;
#define DNPMCOUNT 8 #define DNPMCOUNT 8
Mask DontPropagateMasks[DNPMCOUNT]; _X_EXPORT Mask DontPropagateMasks[DNPMCOUNT];
static int DontPropagateRefCnts[DNPMCOUNT]; static int DontPropagateRefCnts[DNPMCOUNT];
@ -757,7 +757,7 @@ XineramaChangeToCursor(DeviceIntPtr pDev, CursorPtr cursor)
#endif /* PANORAMIX */ #endif /* PANORAMIX */
void _X_EXPORT void
SetMaskForEvent(int deviceid, Mask mask, int event) SetMaskForEvent(int deviceid, Mask mask, int event)
{ {
int coretype; int coretype;
@ -781,7 +781,7 @@ SetCriticalEvent(int event)
criticalEvents[event >> 3] |= 1 << (event & 7); criticalEvents[event >> 3] |= 1 << (event & 7);
} }
void _X_EXPORT void
ConfineToShape(DeviceIntPtr pDev, RegionPtr shape, int *px, int *py) ConfineToShape(DeviceIntPtr pDev, RegionPtr shape, int *px, int *py)
{ {
BoxRec box; BoxRec box;
@ -988,7 +988,7 @@ ChangeToCursor(DeviceIntPtr pDev, CursorPtr cursor)
/** /**
* @returns true if b is a descendent of a * @returns true if b is a descendent of a
*/ */
Bool _X_EXPORT 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)
@ -1114,7 +1114,7 @@ MonthChangedOrBadTime(xEvent *xE)
currentTime.milliseconds = (xE)->u.keyButtonPointer.time; \ currentTime.milliseconds = (xE)->u.keyButtonPointer.time; \
lastDeviceEventTime = currentTime; } lastDeviceEventTime = currentTime; }
void _X_EXPORT void
NoticeEventTime(xEvent *xE) NoticeEventTime(xEvent *xE)
{ {
if (!syncEvents.playingEvents) if (!syncEvents.playingEvents)
@ -1130,7 +1130,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.
*/ */
void _X_EXPORT void
EnqueueEvent(xEvent *xE, DeviceIntPtr device, int count) EnqueueEvent(xEvent *xE, DeviceIntPtr device, int count)
{ {
QdEventPtr tail = *syncEvents.pendtail; QdEventPtr tail = *syncEvents.pendtail;
@ -1400,7 +1400,7 @@ playmore:
} }
#ifdef RANDR #ifdef RANDR
void _X_EXPORT void
ScreenRestructured (ScreenPtr pScreen) ScreenRestructured (ScreenPtr pScreen)
{ {
GrabPtr grab; GrabPtr grab;
@ -1526,7 +1526,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.
*/ */
void _X_EXPORT void
ActivatePointerGrab(DeviceIntPtr mouse, GrabPtr grab, ActivatePointerGrab(DeviceIntPtr mouse, GrabPtr grab,
TimeStamp time, Bool autoGrab) TimeStamp time, Bool autoGrab)
{ {
@ -1572,7 +1572,7 @@ ActivatePointerGrab(DeviceIntPtr mouse, GrabPtr grab,
* *
* Extension devices are set up for ActivateKeyboardGrab(). * Extension devices are set up for ActivateKeyboardGrab().
*/ */
void _X_EXPORT void
DeactivatePointerGrab(DeviceIntPtr mouse) DeactivatePointerGrab(DeviceIntPtr mouse)
{ {
GrabPtr grab = mouse->deviceGrab.grab; GrabPtr grab = mouse->deviceGrab.grab;
@ -1615,7 +1615,7 @@ DeactivatePointerGrab(DeviceIntPtr mouse)
* *
* Extension devices have ActivateKeyboardGrab() set as their grabbing proc. * Extension devices have ActivateKeyboardGrab() set as their grabbing proc.
*/ */
void _X_EXPORT 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;
@ -1652,7 +1652,7 @@ ActivateKeyboardGrab(DeviceIntPtr keybd, GrabPtr grab, TimeStamp time, Bool pass
/** /**
* Delete keyboard grab for the given device. * Delete keyboard grab for the given device.
*/ */
void _X_EXPORT void
DeactivateKeyboardGrab(DeviceIntPtr keybd) DeactivateKeyboardGrab(DeviceIntPtr keybd)
{ {
GrabPtr grab = keybd->deviceGrab.grab; GrabPtr grab = keybd->deviceGrab.grab;
@ -1687,7 +1687,7 @@ DeactivateKeyboardGrab(DeviceIntPtr keybd)
ComputeFreezes(); ComputeFreezes();
} }
void _X_EXPORT void
AllowSome(ClientPtr client, AllowSome(ClientPtr client,
TimeStamp time, TimeStamp time,
DeviceIntPtr thisDev, DeviceIntPtr thisDev,
@ -1817,7 +1817,7 @@ AllowSome(ClientPtr client,
* *
* Release some events from a frozen device. * Release some events from a frozen device.
*/ */
int _X_EXPORT int
ProcAllowEvents(ClientPtr client) ProcAllowEvents(ClientPtr client)
{ {
TimeStamp time; TimeStamp time;
@ -1867,7 +1867,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.
*/ */
void _X_EXPORT void
ReleaseActiveGrabs(ClientPtr client) ReleaseActiveGrabs(ClientPtr client)
{ {
DeviceIntPtr dev; DeviceIntPtr dev;
@ -2013,7 +2013,7 @@ TryClientEvents (ClientPtr client, DeviceIntPtr dev, xEvent *pEvents,
* *
* @return Number of events delivered to various clients. * @return Number of events delivered to various clients.
*/ */
int _X_EXPORT 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)
{ {
@ -2225,7 +2225,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.
*/ */
int _X_EXPORT int
MaybeDeliverEventsToClient(WindowPtr pWin, xEvent *pEvents, MaybeDeliverEventsToClient(WindowPtr pWin, xEvent *pEvents,
int count, Mask filter, ClientPtr dontClient) int count, Mask filter, ClientPtr dontClient)
{ {
@ -2355,7 +2355,7 @@ FixUpEventFromWindow(
* @see DeliverGrabbedEvent * @see DeliverGrabbedEvent
* @see DeliverFocusedEvent * @see DeliverFocusedEvent
*/ */
int _X_EXPORT 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)
{ {
@ -2613,7 +2613,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.
*/ */
Bool _X_EXPORT Bool
CheckMotion(xEvent *xE, DeviceIntPtr pDev) CheckMotion(xEvent *xE, DeviceIntPtr pDev)
{ {
INT16 *rootX, *rootY; INT16 *rootX, *rootY;
@ -2710,7 +2710,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.
*/ */
void _X_EXPORT void
WindowsRestructured(void) WindowsRestructured(void)
{ {
DeviceIntPtr pDev = inputInfo.devices; DeviceIntPtr pDev = inputInfo.devices;
@ -2728,7 +2728,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. */
void ReinitializeRootWindow(WindowPtr win, int xoff, int yoff) _X_EXPORT void ReinitializeRootWindow(WindowPtr win, int xoff, int yoff)
{ {
GrabPtr grab; GrabPtr grab;
DeviceIntPtr pDev; DeviceIntPtr pDev;
@ -2782,7 +2782,7 @@ void ReinitializeRootWindow(WindowPtr win, int xoff, int yoff)
* *
* Should delete this now? -ds * Should delete this now? -ds
*/ */
void _X_EXPORT void
DefineInitialRootWindow(WindowPtr win) DefineInitialRootWindow(WindowPtr win)
{ {
} }
@ -2802,7 +2802,7 @@ DefineInitialRootWindow(WindowPtr win)
* @param pWin The window where to generate the sprite in. * @param pWin The window where to generate the sprite in.
* *
*/ */
void _X_EXPORT void
InitializeSprite(DeviceIntPtr pDev, WindowPtr pWin) InitializeSprite(DeviceIntPtr pDev, WindowPtr pWin)
{ {
SpritePtr pSprite; SpritePtr pSprite;
@ -2918,7 +2918,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.
*/ */
void _X_EXPORT void
UpdateSpriteForScreen(DeviceIntPtr pDev, ScreenPtr pScreen) UpdateSpriteForScreen(DeviceIntPtr pDev, ScreenPtr pScreen)
{ {
SpritePtr pSprite = NULL; SpritePtr pSprite = NULL;
@ -2970,7 +2970,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.
*/ */
void _X_EXPORT void
WindowHasNewCursor(WindowPtr pWin) WindowHasNewCursor(WindowPtr pWin)
{ {
DeviceIntPtr pDev; DeviceIntPtr pDev;
@ -3139,7 +3139,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.
*/ */
int _X_EXPORT int
ProcWarpPointer(ClientPtr client) ProcWarpPointer(ClientPtr client)
{ {
WindowPtr dest = NULL; WindowPtr dest = NULL;
@ -3438,7 +3438,7 @@ CheckPassiveGrabsOnWindow(
* @return TRUE if a grab has been activated or false otherwise. * @return TRUE if a grab has been activated or false otherwise.
*/ */
Bool _X_EXPORT Bool
CheckDeviceGrabs(DeviceIntPtr device, xEvent *xE, CheckDeviceGrabs(DeviceIntPtr device, xEvent *xE,
int checkFirst, int count) int checkFirst, int count)
{ {
@ -3512,7 +3512,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.
*/ */
void _X_EXPORT void
DeliverFocusedEvent(DeviceIntPtr keybd, xEvent *xE, WindowPtr window, int count) DeliverFocusedEvent(DeviceIntPtr keybd, xEvent *xE, WindowPtr window, int count)
{ {
DeviceIntPtr pointer; DeviceIntPtr pointer;
@ -3570,7 +3570,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.
*/ */
void _X_EXPORT void
DeliverGrabbedEvent(xEvent *xE, DeviceIntPtr thisDev, DeliverGrabbedEvent(xEvent *xE, DeviceIntPtr thisDev,
Bool deactivateGrab, int count) Bool deactivateGrab, int count)
{ {
@ -3742,7 +3742,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.
*/ */
void _X_EXPORT void
#ifdef XKB #ifdef XKB
CoreProcessKeyboardEvent (xEvent *xE, DeviceIntPtr keybd, int count) CoreProcessKeyboardEvent (xEvent *xE, DeviceIntPtr keybd, int count)
#else #else
@ -3823,7 +3823,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.
*/ */
void _X_EXPORT void
FixKeyState (xEvent *xE, DeviceIntPtr keybd) FixKeyState (xEvent *xE, DeviceIntPtr keybd)
{ {
int key, bit; int key, bit;
@ -3862,7 +3862,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.
*/ */
void _X_EXPORT void
#ifdef XKB #ifdef XKB
CoreProcessPointerEvent (xEvent *xE, DeviceIntPtr mouse, int count) CoreProcessPointerEvent (xEvent *xE, DeviceIntPtr mouse, int count)
#else #else
@ -3969,7 +3969,7 @@ ProcessPointerEvent (xEvent *xE, DeviceIntPtr mouse, int count)
* *
* Traverses to siblings and parents of the window. * Traverses to siblings and parents of the window.
*/ */
void _X_EXPORT void
RecalculateDeliverableEvents(pWin) RecalculateDeliverableEvents(pWin)
WindowPtr pWin; WindowPtr pWin;
{ {
@ -4010,7 +4010,7 @@ RecalculateDeliverableEvents(pWin)
* *
* \param value must conform to DeleteType * \param value must conform to DeleteType
*/ */
int _X_EXPORT int
OtherClientGone(pointer value, XID id) OtherClientGone(pointer value, XID id)
{ {
OtherClientsPtr other, prev; OtherClientsPtr other, prev;
@ -4039,7 +4039,7 @@ OtherClientGone(pointer value, XID id)
return -1; /* make compiler happy */ return -1; /* make compiler happy */
} }
int _X_EXPORT int
EventSelectForWindow(WindowPtr pWin, ClientPtr client, Mask mask) EventSelectForWindow(WindowPtr pWin, ClientPtr client, Mask mask)
{ {
Mask check; Mask check;
@ -4123,7 +4123,7 @@ maskSet:
return Success; return Success;
} }
int _X_EXPORT int
EventSuppressForWindow(WindowPtr pWin, ClientPtr client, EventSuppressForWindow(WindowPtr pWin, ClientPtr client,
Mask mask, Bool *checkOptional) Mask mask, Bool *checkOptional)
{ {
@ -4478,7 +4478,7 @@ FocusOutEvents(
FocusEvent(dev, FocusOut, mode, detail, ancestor); FocusEvent(dev, FocusOut, mode, detail, ancestor);
} }
void _X_EXPORT 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
@ -4622,7 +4622,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.
*/ */
int _X_EXPORT int
SetInputFocus( SetInputFocus(
ClientPtr client, ClientPtr client,
DeviceIntPtr dev, DeviceIntPtr dev,
@ -4714,7 +4714,7 @@ SetInputFocus(
* *
* Sets the input focus for the virtual core keyboard. * Sets the input focus for the virtual core keyboard.
*/ */
int _X_EXPORT int
ProcSetInputFocus(client) ProcSetInputFocus(client)
ClientPtr client; ClientPtr client;
{ {
@ -4733,7 +4733,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.
*/ */
int _X_EXPORT int
ProcGetInputFocus(ClientPtr client) ProcGetInputFocus(ClientPtr client)
{ {
DeviceIntPtr kbd = PickKeyboard(client); DeviceIntPtr kbd = PickKeyboard(client);
@ -4766,7 +4766,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.
*/ */
int _X_EXPORT int
ProcGrabPointer(ClientPtr client) ProcGrabPointer(ClientPtr client)
{ {
xGrabPointerReply rep; xGrabPointerReply rep;
@ -4900,7 +4900,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.
*/ */
int _X_EXPORT int
ProcChangeActivePointerGrab(ClientPtr client) ProcChangeActivePointerGrab(ClientPtr client)
{ {
DeviceIntPtr device; DeviceIntPtr device;
@ -4955,7 +4955,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.
*/ */
int _X_EXPORT int
ProcUngrabPointer(ClientPtr client) ProcUngrabPointer(ClientPtr client)
{ {
DeviceIntPtr device = PickPointer(client); DeviceIntPtr device = PickPointer(client);
@ -4993,7 +4993,7 @@ ProcUngrabPointer(ClientPtr client)
* *
* @returns Success or BadValue. * @returns Success or BadValue.
*/ */
int _X_EXPORT 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,
@ -5074,7 +5074,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.
*/ */
int _X_EXPORT int
ProcGrabKeyboard(ClientPtr client) ProcGrabKeyboard(ClientPtr client)
{ {
xGrabKeyboardReply rep; xGrabKeyboardReply rep;
@ -5103,7 +5103,7 @@ ProcGrabKeyboard(ClientPtr client)
* *
* Deletes a possible grab on the client's keyboard. * Deletes a possible grab on the client's keyboard.
*/ */
int _X_EXPORT int
ProcUngrabKeyboard(ClientPtr client) ProcUngrabKeyboard(ClientPtr client)
{ {
DeviceIntPtr device = PickKeyboard(client); DeviceIntPtr device = PickKeyboard(client);
@ -5130,7 +5130,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.
*/ */
int _X_EXPORT int
ProcQueryPointer(ClientPtr client) ProcQueryPointer(ClientPtr client)
{ {
xQueryPointerReply rep; xQueryPointerReply rep;
@ -5198,7 +5198,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.
*/ */
void _X_EXPORT void
InitEvents(void) InitEvents(void)
{ {
int i; int i;
@ -5242,7 +5242,7 @@ InitEvents(void)
FatalError("[dix] Failed to allocate input event list.\n"); FatalError("[dix] Failed to allocate input event list.\n");
} }
void _X_EXPORT void
CloseDownEvents(void) CloseDownEvents(void)
{ {
int len; int len;
@ -5258,7 +5258,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.
*/ */
int _X_EXPORT int
ProcSendEvent(ClientPtr client) ProcSendEvent(ClientPtr client)
{ {
WindowPtr pWin; WindowPtr pWin;
@ -5355,7 +5355,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.
*/ */
int _X_EXPORT int
ProcUngrabKey(ClientPtr client) ProcUngrabKey(ClientPtr client)
{ {
REQUEST(xUngrabKeyReq); REQUEST(xUngrabKeyReq);
@ -5404,7 +5404,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.
*/ */
int _X_EXPORT int
ProcGrabKey(ClientPtr client) ProcGrabKey(ClientPtr client)
{ {
WindowPtr pWin; WindowPtr pWin;
@ -5465,7 +5465,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.
*/ */
int _X_EXPORT int
ProcGrabButton(ClientPtr client) ProcGrabButton(ClientPtr client)
{ {
WindowPtr pWin, confineTo; WindowPtr pWin, confineTo;
@ -5600,7 +5600,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.
*/ */
void _X_EXPORT void
DeleteWindowFromAnyEvents(WindowPtr pWin, Bool freeResources) DeleteWindowFromAnyEvents(WindowPtr pWin, Bool freeResources)
{ {
WindowPtr parent; WindowPtr parent;
@ -5741,7 +5741,7 @@ CheckCursorConfinement(WindowPtr pWin)
} }
} }
Mask _X_EXPORT Mask
EventMaskForClient(WindowPtr pWin, ClientPtr client) EventMaskForClient(WindowPtr pWin, ClientPtr client)
{ {
OtherClientsPtr other; OtherClientsPtr other;
@ -5759,7 +5759,7 @@ EventMaskForClient(WindowPtr pWin, ClientPtr client)
/** /**
* Server-side protocol handling for RecolorCursor request. * Server-side protocol handling for RecolorCursor request.
*/ */
int _X_EXPORT int
ProcRecolorCursor(ClientPtr client) ProcRecolorCursor(ClientPtr client)
{ {
CursorPtr pCursor; CursorPtr pCursor;
@ -6026,7 +6026,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.
*/ */
Bool _X_EXPORT Bool
IsInterferingGrab(ClientPtr client, DeviceIntPtr dev, xEvent* event) IsInterferingGrab(ClientPtr client, DeviceIntPtr dev, xEvent* event)
{ {
DeviceIntPtr it = inputInfo.devices; DeviceIntPtr it = inputInfo.devices;
@ -6152,7 +6152,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.
*/ */
int _X_EXPORT int
FocusSemaphoresIsset(WindowPtr win) FocusSemaphoresIsset(WindowPtr win)
{ {
int set = 0; int set = 0;

4
dix/extension.c
View File

@ -207,7 +207,7 @@ CheckExtension(const char *extname)
/* /*
* Added as part of Xace. * Added as part of Xace.
*/ */
ExtensionEntry * _X_EXPORT ExtensionEntry *
GetExtensionEntry(int major) GetExtensionEntry(int major)
{ {
if (major < EXTENSION_BASE) if (major < EXTENSION_BASE)
@ -238,7 +238,7 @@ MinorOpcodeOfRequest(ClientPtr client)
return (*extensions[major]->MinorOpcode)(client); return (*extensions[major]->MinorOpcode)(client);
} }
void _X_EXPORT 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"
int _X_EXPORT int
ffs(int i) ffs(int i)
{ {
int j; int j;

12
dix/gc.c
View File

@ -956,7 +956,7 @@ CreateScratchGC(ScreenPtr pScreen, unsigned depth)
return pGC; return pGC;
} }
void _X_EXPORT void
FreeGCperDepth(int screenNum) FreeGCperDepth(int screenNum)
{ {
int i; int i;
@ -972,7 +972,7 @@ FreeGCperDepth(int screenNum)
} }
Bool _X_EXPORT Bool
CreateGCperDepth(int screenNum) CreateGCperDepth(int screenNum)
{ {
int i; int i;
@ -1005,7 +1005,7 @@ CreateGCperDepth(int screenNum)
return TRUE; return TRUE;
} }
Bool _X_EXPORT Bool
CreateDefaultStipple(int screenNum) CreateDefaultStipple(int screenNum)
{ {
ScreenPtr pScreen; ScreenPtr pScreen;
@ -1042,14 +1042,14 @@ CreateDefaultStipple(int screenNum)
return TRUE; return TRUE;
} }
void _X_EXPORT 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]);
} }
int _X_EXPORT 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;
@ -1155,7 +1155,7 @@ VerifyRectOrder(int nrects, xRectangle *prects, int ordering)
return -1; return -1;
} }
int _X_EXPORT 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)
{ {

10
dix/getevents.c
View File

@ -73,8 +73,8 @@
* 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.
*/ */
EventListPtr InputEventList = NULL; _X_EXPORT EventListPtr InputEventList = NULL;
int InputEventListLen = 0; _X_EXPORT int InputEventListLen = 0;
_X_EXPORT int _X_EXPORT int
GetEventList(EventListPtr* list) GetEventList(EventListPtr* list)
@ -117,7 +117,7 @@ key_autorepeats(DeviceIntPtr pDev, int key_code)
(1 << (key_code & 7))); (1 << (key_code & 7)));
} }
void _X_EXPORT void
CreateClassesChangedEvent(EventList* event, CreateClassesChangedEvent(EventList* event,
DeviceIntPtr master, DeviceIntPtr master,
DeviceIntPtr slave) DeviceIntPtr slave)
@ -903,7 +903,7 @@ GetKeyboardValuatorEvents(EventList *events, DeviceIntPtr pDev, int type,
* *
* @param num_events Number of elements in list. * @param num_events Number of elements in list.
*/ */
EventListPtr _X_EXPORT EventListPtr
InitEventList(int num_events) InitEventList(int num_events)
{ {
EventListPtr events; EventListPtr events;
@ -1135,7 +1135,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.
*/ */
void _X_EXPORT void
PostSyntheticMotion(DeviceIntPtr pDev, PostSyntheticMotion(DeviceIntPtr pDev,
int x, int x,
int y, int y,

48
dix/globals.c
View File

@ -62,7 +62,7 @@ SOFTWARE.
#include "os.h" #include "os.h"
_X_EXPORT ScreenInfo screenInfo; _X_EXPORT ScreenInfo screenInfo;
KeybdCtrl defaultKeyboardControl = { _X_EXPORT KeybdCtrl defaultKeyboardControl = {
DEFAULT_KEYBOARD_CLICK, DEFAULT_KEYBOARD_CLICK,
DEFAULT_BELL, DEFAULT_BELL,
DEFAULT_BELL_PITCH, DEFAULT_BELL_PITCH,
@ -72,7 +72,7 @@ KeybdCtrl defaultKeyboardControl = {
DEFAULT_LEDS, DEFAULT_LEDS,
0}; 0};
PtrCtrl defaultPointerControl = { _X_EXPORT PtrCtrl defaultPointerControl = {
DEFAULT_PTR_NUMERATOR, DEFAULT_PTR_NUMERATOR,
DEFAULT_PTR_DENOMINATOR, DEFAULT_PTR_DENOMINATOR,
DEFAULT_PTR_THRESHOLD, DEFAULT_PTR_THRESHOLD,
@ -90,9 +90,9 @@ _X_EXPORT unsigned long serverGeneration = 0;
/* these next four are initialized in main.c */ /* these next four are initialized in main.c */
_X_EXPORT CARD32 ScreenSaverTime; _X_EXPORT CARD32 ScreenSaverTime;
CARD32 ScreenSaverInterval; _X_EXPORT CARD32 ScreenSaverInterval;
_X_EXPORT int ScreenSaverBlanking; _X_EXPORT int ScreenSaverBlanking;
int ScreenSaverAllowExposures; _X_EXPORT int ScreenSaverAllowExposures;
#ifdef DPMSExtension #ifdef DPMSExtension
# ifndef DEFAULT_STANDBY_TIME # ifndef DEFAULT_STANDBY_TIME
@ -107,11 +107,11 @@ int ScreenSaverAllowExposures;
# ifndef DEFAULT_DPMS_ENABLED # ifndef DEFAULT_DPMS_ENABLED
# define DEFAULT_DPMS_ENABLED TRUE # define DEFAULT_DPMS_ENABLED TRUE
# endif # endif
CARD32 defaultDPMSStandbyTime = DEFAULT_STANDBY_TIME; _X_EXPORT CARD32 defaultDPMSStandbyTime = DEFAULT_STANDBY_TIME;
CARD32 defaultDPMSSuspendTime = DEFAULT_SUSPEND_TIME; _X_EXPORT CARD32 defaultDPMSSuspendTime = DEFAULT_SUSPEND_TIME;
CARD32 defaultDPMSOffTime = DEFAULT_OFF_TIME; _X_EXPORT CARD32 defaultDPMSOffTime = DEFAULT_OFF_TIME;
_X_EXPORT CARD16 DPMSPowerLevel = 0; _X_EXPORT CARD16 DPMSPowerLevel = 0;
Bool defaultDPMSEnabled = DEFAULT_DPMS_ENABLED; _X_EXPORT Bool defaultDPMSEnabled = DEFAULT_DPMS_ENABLED;
_X_EXPORT Bool DPMSEnabledSwitch = FALSE; /* these denote the DPMS command */ _X_EXPORT Bool DPMSEnabledSwitch = FALSE; /* these denote the DPMS command */
_X_EXPORT Bool DPMSDisabledSwitch = FALSE; /* lind switch states */ _X_EXPORT Bool DPMSDisabledSwitch = FALSE; /* lind switch states */
_X_EXPORT Bool DPMSCapableFlag = FALSE; _X_EXPORT Bool DPMSCapableFlag = FALSE;
@ -121,28 +121,28 @@ _X_EXPORT CARD32 DPMSOffTime;
_X_EXPORT Bool DPMSEnabled; _X_EXPORT Bool DPMSEnabled;
#endif #endif
CARD32 defaultScreenSaverTime = DEFAULT_SCREEN_SAVER_TIME; _X_EXPORT CARD32 defaultScreenSaverTime = DEFAULT_SCREEN_SAVER_TIME;
CARD32 defaultScreenSaverInterval = DEFAULT_SCREEN_SAVER_INTERVAL; _X_EXPORT CARD32 defaultScreenSaverInterval = DEFAULT_SCREEN_SAVER_INTERVAL;
int defaultScreenSaverBlanking = DEFAULT_SCREEN_SAVER_BLANKING; _X_EXPORT int defaultScreenSaverBlanking = DEFAULT_SCREEN_SAVER_BLANKING;
int defaultScreenSaverAllowExposures = DEFAULT_SCREEN_SAVER_EXPOSURES; _X_EXPORT int defaultScreenSaverAllowExposures = DEFAULT_SCREEN_SAVER_EXPOSURES;
#ifndef NOLOGOHACK #ifndef NOLOGOHACK
int logoScreenSaver = DEFAULT_LOGO_SCREEN_SAVER; _X_EXPORT int logoScreenSaver = DEFAULT_LOGO_SCREEN_SAVER;
#endif #endif
#ifdef SCREENSAVER #ifdef SCREENSAVER
Bool screenSaverSuspended = FALSE; _X_EXPORT Bool screenSaverSuspended = FALSE;
#endif #endif
char *defaultFontPath = COMPILEDDEFAULTFONTPATH; _X_EXPORT char *defaultFontPath = COMPILEDDEFAULTFONTPATH;
char *defaultTextFont = COMPILEDDEFAULTFONT; _X_EXPORT char *defaultTextFont = COMPILEDDEFAULTFONT;
char *defaultCursorFont = COMPILEDCURSORFONT; _X_EXPORT 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 */
CursorPtr rootCursor; _X_EXPORT CursorPtr rootCursor;
Bool party_like_its_1989 = FALSE; _X_EXPORT Bool party_like_its_1989 = FALSE;
Bool whiteRoot = FALSE; _X_EXPORT Bool whiteRoot = FALSE;
int cursorScreenDevPriv[MAXSCREENS]; _X_EXPORT int cursorScreenDevPriv[MAXSCREENS];
_X_EXPORT TimeStamp currentTime; _X_EXPORT TimeStamp currentTime;
_X_EXPORT TimeStamp lastDeviceEventTime; _X_EXPORT TimeStamp lastDeviceEventTime;
@ -151,8 +151,8 @@ _X_EXPORT int defaultColorVisualClass = -1;
_X_EXPORT int monitorResolution = 0; _X_EXPORT int monitorResolution = 0;
_X_EXPORT char *display; _X_EXPORT char *display;
char *ConnectionInfo; _X_EXPORT char *ConnectionInfo;
CARD32 TimeOutValue = DEFAULT_TIMEOUT * MILLI_PER_SECOND; _X_EXPORT CARD32 TimeOutValue = DEFAULT_TIMEOUT * MILLI_PER_SECOND;
DDXPointRec dixScreenOrigins[MAXSCREENS]; _X_EXPORT DDXPointRec dixScreenOrigins[MAXSCREENS];

4
dix/glyphcurs.c
View File

@ -73,7 +73,7 @@ the first one we find.
cursor metrics. cursor metrics.
*/ */
int _X_EXPORT 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
} }
Bool _X_EXPORT 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))
GrabPtr _X_EXPORT GrabPtr
CreateGrab( CreateGrab(
int client, int client,
DeviceIntPtr device, DeviceIntPtr device,
@ -128,7 +128,7 @@ FreeGrab(GrabPtr pGrab)
xfree(pGrab); xfree(pGrab);
} }
int _X_EXPORT 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.
*/ */
Bool _X_EXPORT 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.
*/ */
int _X_EXPORT 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
*/ */
Bool _X_EXPORT 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"
void MakePredeclaredAtoms(void) _X_EXPORT 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();

8
dix/main.c
View File

@ -144,7 +144,7 @@ NotImplemented(xEvent *from, xEvent *to)
* Dummy entry for ReplySwapVector[] * Dummy entry for ReplySwapVector[]
*/ */
void _X_EXPORT 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;
void _X_EXPORT void
SetVendorRelease(int release) SetVendorRelease(int release)
{ {
VendorRelease = release; VendorRelease = release;
} }
void _X_EXPORT 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.
*/ */
int _X_EXPORT int
AddScreen( AddScreen(
Bool (* pfnInit)( Bool (* pfnInit)(
int /*index*/, int /*index*/,

4
dix/pixmap.c
View File

@ -88,7 +88,7 @@ FreeScratchPixmapHeader(PixmapPtr pPixmap)
} }
Bool _X_EXPORT 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)
} }
void _X_EXPORT void
FreeScratchPixmapsForScreen(int scrnum) FreeScratchPixmapsForScreen(int scrnum)
{ {
FreeScratchPixmapHeader(screenInfo.screens[scrnum]->pScratchPixmap); FreeScratchPixmapHeader(screenInfo.screens[scrnum]->pScratchPixmap);

2
dix/privates.c
View File

@ -295,7 +295,7 @@ dixLookupPrivateOffset(RESTYPE type)
return offsets[type]; return offsets[type];
} }
int _X_EXPORT int
dixResetPrivates(void) dixResetPrivates(void)
{ {
int i; int i;

4
dix/property.c
View File

@ -370,7 +370,7 @@ ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format,
mode, len, value, sendevent); mode, len, value, sendevent);
} }
int _X_EXPORT 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;
} }
void _X_EXPORT void
DeleteAllWindowProperties(WindowPtr pWin) DeleteAllWindowProperties(WindowPtr pWin)
{ {
PropertyPtr pProp, pNextProp; PropertyPtr pProp, pNextProp;

10
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
*/ */
void _X_EXPORT 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
*/ */
void _X_EXPORT 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.
*/ */
void _X_EXPORT 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;
@ -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.
*/ */
void _X_EXPORT 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.
*/ */
void _X_EXPORT 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;
} }
void _X_EXPORT 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
*/ */
void _X_EXPORT 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
*/ */
const char * _X_EXPORT 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;
} }
const char * _X_EXPORT const char *
LookupMajorName(int major) LookupMajorName(int major)
{ {
if (major < 128) { if (major < 128) {
@ -244,7 +244,7 @@ LookupMajorName(int major)
} }
} }
const char * _X_EXPORT 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;
} }
const char * _X_EXPORT 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;
} }
const char * _X_EXPORT 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
*/ */
void _X_EXPORT void
dixResetRegistry(void) dixResetRegistry(void)
{ {
ExtensionEntry extEntry; ExtensionEntry extEntry;

14
dix/resource.c
View File

@ -244,7 +244,7 @@ static ClientResourceRec clientTable[MAXCLIENTS];
* in resource table * in resource table
*****************/ *****************/
Bool _X_EXPORT Bool
InitClientResources(ClientPtr client) InitClientResources(ClientPtr client)
{ {
int i, j; int i, j;
@ -339,7 +339,7 @@ AvailableID(
return 0; return 0;
} }
void _X_EXPORT 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.
*/ */
unsigned int _X_EXPORT unsigned int
GetXIDList(ClientPtr pClient, unsigned count, XID *pids) GetXIDList(ClientPtr pClient, unsigned count, XID *pids)
{ {
unsigned int found = 0; unsigned int found = 0;
@ -698,7 +698,7 @@ FindAllClientResources(
} }
pointer _X_EXPORT pointer
LookupClientResourceComplex( LookupClientResourceComplex(
ClientPtr client, ClientPtr client,
RESTYPE type, RESTYPE type,
@ -725,7 +725,7 @@ LookupClientResourceComplex(
} }
void _X_EXPORT void
FreeClientNeverRetainResources(ClientPtr client) FreeClientNeverRetainResources(ClientPtr client)
{ {
ResourcePtr *resources; ResourcePtr *resources;
@ -762,7 +762,7 @@ FreeClientNeverRetainResources(ClientPtr client)
} }
} }
void _X_EXPORT 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;
} }
void _X_EXPORT void
FreeAllResources(void) FreeAllResources(void)
{ {
int i; int i;

8
dix/selection.c
View File

@ -66,7 +66,7 @@ SOFTWARE.
*****************************************************************/ *****************************************************************/
_X_EXPORT Selection *CurrentSelections; _X_EXPORT Selection *CurrentSelections;
CallbackListPtr SelectionCallback; _X_EXPORT CallbackListPtr SelectionCallback;
_X_EXPORT int _X_EXPORT int
dixLookupSelection(Selection **result, Atom selectionName, dixLookupSelection(Selection **result, Atom selectionName,
@ -86,7 +86,7 @@ dixLookupSelection(Selection **result, Atom selectionName,
return rc; return rc;
} }
void _X_EXPORT 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);
} }
void _X_EXPORT void
DeleteWindowFromAnySelections(WindowPtr pWin) DeleteWindowFromAnySelections(WindowPtr pWin)
{ {
Selection *pSel; Selection *pSel;
@ -125,7 +125,7 @@ DeleteWindowFromAnySelections(WindowPtr pWin)
} }
} }
void _X_EXPORT void
DeleteClientFromAnySelections(ClientPtr client) DeleteClientFromAnySelections(ClientPtr client)
{ {
Selection *pSel; Selection *pSel;

138
dix/swaprep.c
View File

@ -140,7 +140,7 @@ CopySwap32Write(ClientPtr pClient, int size, CARD32 *pbuf)
* *
* \param size size in bytes * \param size size in bytes
*/ */
void _X_EXPORT 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 */
void _X_EXPORT 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 */
void _X_EXPORT 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);
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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)
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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);
} }
void _X_EXPORT void
SGetSelectionOwnerReply(ClientPtr pClient, int size, SGetSelectionOwnerReply(ClientPtr pClient, int size,
xGetSelectionOwnerReply *pRep) xGetSelectionOwnerReply *pRep)
{ {
@ -301,7 +301,7 @@ SGetSelectionOwnerReply(ClientPtr pClient, int size,
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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 */
void _X_EXPORT 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)
} }
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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 */
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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)
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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)
void _X_EXPORT 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;
} }
void _X_EXPORT 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;
} }
void _X_EXPORT 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;
} }
void _X_EXPORT 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;
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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;
} }
void _X_EXPORT 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;
} }
void _X_EXPORT 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;
} }
void _X_EXPORT 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;
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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;
} }
void _X_EXPORT 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;
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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;
} }
void _X_EXPORT 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;
} }
void _X_EXPORT 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)
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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;
} }
void _X_EXPORT 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;
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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;
} }
void _X_EXPORT 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;
} }
void _X_EXPORT 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)
} }
} }
void _X_EXPORT 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
@ -1262,7 +1262,7 @@ SwapConnSetupInfo(
} }
} }
void _X_EXPORT void
WriteSConnectionInfo(ClientPtr pClient, unsigned long size, char *pInfo) WriteSConnectionInfo(ClientPtr pClient, unsigned long size, char *pInfo)
{ {
char *pInfoTBase; char *pInfoTBase;
@ -1288,7 +1288,7 @@ SwapConnSetupPrefix(xConnSetupPrefix *pcspFrom, xConnSetupPrefix *pcspTo)
cpswaps(pcspFrom->length, pcspTo->length); cpswaps(pcspFrom->length, pcspTo->length);
} }
void _X_EXPORT void
WriteSConnSetupPrefix(ClientPtr pClient, xConnSetupPrefix *pcsp) WriteSConnSetupPrefix(ClientPtr pClient, xConnSetupPrefix *pcsp)
{ {
xConnSetupPrefix cspT; xConnSetupPrefix cspT;

134
dix/swapreq.c
View File

@ -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") */
int _X_EXPORT 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 */
int _X_EXPORT 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);
} }
int _X_EXPORT 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));
} }
int _X_EXPORT 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));
} }
int _X_EXPORT 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));
} }
int _X_EXPORT int
SProcConfigureWindow(ClientPtr client) SProcConfigureWindow(ClientPtr client)
{ {
char n; char n;
@ -213,7 +213,7 @@ SProcConfigureWindow(ClientPtr client)
} }
int _X_EXPORT 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));
} }
int _X_EXPORT 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));
} }
int _X_EXPORT int
SProcDeleteProperty(ClientPtr client) SProcDeleteProperty(ClientPtr client)
{ {
char n; char n;
@ -261,7 +261,7 @@ SProcDeleteProperty(ClientPtr client)
} }
int _X_EXPORT 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));
} }
int _X_EXPORT 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));
} }
int _X_EXPORT 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));
} }
int _X_EXPORT 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));
} }
int _X_EXPORT 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));
} }
int _X_EXPORT 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));
} }
int _X_EXPORT 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));
} }
int _X_EXPORT 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));
} }
int _X_EXPORT 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));
} }
int _X_EXPORT 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));
} }
int _X_EXPORT 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));
} }
int _X_EXPORT 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));
} }
int _X_EXPORT 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));
} }
int _X_EXPORT 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));
} }
int _X_EXPORT 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));
} }
int _X_EXPORT 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));
} }
int _X_EXPORT 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));
} }
int _X_EXPORT 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));
} }
int _X_EXPORT 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));
} }
int _X_EXPORT 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));
} }
int _X_EXPORT 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));
} }
int _X_EXPORT 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));
} }
int _X_EXPORT 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));
} }
int _X_EXPORT int
SProcSetDashes(ClientPtr client) SProcSetDashes(ClientPtr client)
{ {
char n; char n;
@ -590,7 +590,7 @@ SProcSetDashes(ClientPtr client)
} }
int _X_EXPORT 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));
} }
int _X_EXPORT 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));
} }
int _X_EXPORT 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));
} }
int _X_EXPORT 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) */
int _X_EXPORT 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! */
int _X_EXPORT 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));
} }
int _X_EXPORT int
SProcPutImage(ClientPtr client) SProcPutImage(ClientPtr client)
{ {
char n; char n;
@ -709,7 +709,7 @@ SProcPutImage(ClientPtr client)
} }
int _X_EXPORT 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 */
int _X_EXPORT 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 */
int _X_EXPORT 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));
} }
int _X_EXPORT int
SProcCreateColormap(ClientPtr client) SProcCreateColormap(ClientPtr client)
{ {
char n; char n;
@ -771,7 +771,7 @@ SProcCreateColormap(ClientPtr client)
} }
int _X_EXPORT int
SProcCopyColormapAndFree(ClientPtr client) SProcCopyColormapAndFree(ClientPtr client)
{ {
char n; char n;
@ -784,7 +784,7 @@ SProcCopyColormapAndFree(ClientPtr client)
} }
int _X_EXPORT 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));
} }
int _X_EXPORT 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));
} }
int _X_EXPORT 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));
} }
int _X_EXPORT 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));
} }
int _X_EXPORT int
SProcFreeColors(ClientPtr client) SProcFreeColors(ClientPtr client)
{ {
char n; char n;
@ -864,7 +864,7 @@ SwapColorItem(xColorItem *pItem)
swaps(&pItem->blue, n); swaps(&pItem->blue, n);
} }
int _X_EXPORT 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));
} }
int _X_EXPORT 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));
} }
int _X_EXPORT 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));
} }
int _X_EXPORT 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));
} }
int _X_EXPORT 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));
} }
int _X_EXPORT int
SProcCreateGlyphCursor (ClientPtr client) SProcCreateGlyphCursor (ClientPtr client)
{ {
char n; char n;
@ -961,7 +961,7 @@ SProcCreateGlyphCursor (ClientPtr client)
} }
int _X_EXPORT 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));
} }
int _X_EXPORT int
SProcQueryBestSize (ClientPtr client) SProcQueryBestSize (ClientPtr client)
{ {
char n; char n;
@ -992,7 +992,7 @@ SProcQueryBestSize (ClientPtr client)
} }
int _X_EXPORT 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));
} }
int _X_EXPORT int
SProcChangeKeyboardMapping (ClientPtr client) SProcChangeKeyboardMapping (ClientPtr client)
{ {
char n; char n;
@ -1015,7 +1015,7 @@ SProcChangeKeyboardMapping (ClientPtr client)
} }
int _X_EXPORT 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));
} }
int _X_EXPORT int
SProcChangePointerControl (ClientPtr client) SProcChangePointerControl (ClientPtr client)
{ {
char n; char n;
@ -1041,7 +1041,7 @@ SProcChangePointerControl (ClientPtr client)
} }
int _X_EXPORT 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));
} }
int _X_EXPORT int
SProcChangeHosts (ClientPtr client) SProcChangeHosts (ClientPtr client)
{ {
char n; char n;
@ -1066,7 +1066,7 @@ SProcChangeHosts (ClientPtr client)
} }
int SProcRotateProperties (ClientPtr client) _X_EXPORT int SProcRotateProperties (ClientPtr client)
{ {
char n; char n;
REQUEST(xRotatePropertiesReq); REQUEST(xRotatePropertiesReq);
@ -1079,7 +1079,7 @@ int SProcRotateProperties (ClientPtr client)
return ((* ProcVector[X_RotateProperties])(client)); return ((* ProcVector[X_RotateProperties])(client));
} }
int _X_EXPORT 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));
} }
void _X_EXPORT void
SwapConnClientPrefix(xConnClientPrefix *pCCP) SwapConnClientPrefix(xConnClientPrefix *pCCP)
{ {
char n; char n;

8
dix/tables.c
View File

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

48
dix/window.c
View File

@ -263,10 +263,10 @@ WalkTree(ScreenPtr pScreen, VisitWindowProcPtr func, pointer data)
} }
/* hack for forcing backing store on all windows */ /* hack for forcing backing store on all windows */
int defaultBackingStore = NotUseful; _X_EXPORT int defaultBackingStore = NotUseful;
/* hack to force no backing store */ /* hack to force no backing store */
Bool disableBackingStore = FALSE; _X_EXPORT Bool disableBackingStore = FALSE;
Bool enableBackingStore = FALSE; _X_EXPORT 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
*****/ *****/
Bool _X_EXPORT Bool
CreateRootWindow(ScreenPtr pScreen) CreateRootWindow(ScreenPtr pScreen)
{ {
WindowPtr pWin; WindowPtr pWin;
@ -469,7 +469,7 @@ CreateRootWindow(ScreenPtr pScreen)
return TRUE; return TRUE;
} }
void _X_EXPORT 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;
void _X_EXPORT void
RegisterRealChildHeadProc (RealChildHeadProc proc) RegisterRealChildHeadProc (RealChildHeadProc proc)
{ {
realChildHeadProc = proc; realChildHeadProc = proc;
} }
WindowPtr _X_EXPORT WindowPtr
RealChildHead(WindowPtr pWin) RealChildHead(WindowPtr pWin)
{ {
if (realChildHeadProc) { if (realChildHeadProc) {
@ -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
*****/ *****/
int _X_EXPORT 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;
} }
int _X_EXPORT int
DestroySubwindows(WindowPtr pWin, ClientPtr client) DestroySubwindows(WindowPtr pWin, ClientPtr client)
{ {
/* XXX /* XXX
@ -1480,7 +1480,7 @@ PatchUp:
* Notice that this is different than ChangeWindowAttributes * Notice that this is different than ChangeWindowAttributes
*****/ *****/
void _X_EXPORT 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
} }
WindowPtr _X_EXPORT WindowPtr
MoveWindowInStack(WindowPtr pWin, WindowPtr pNextSib) MoveWindowInStack(WindowPtr pWin, WindowPtr pNextSib)
{ {
WindowPtr pParent = pWin->parent; WindowPtr pParent = pWin->parent;
@ -1626,7 +1626,7 @@ CreateUnclippedWinSize (WindowPtr pWin)
return pRgn; return pRgn;
} }
void _X_EXPORT void
SetWinSize (WindowPtr pWin) SetWinSize (WindowPtr pWin)
{ {
#ifdef COMPOSITE #ifdef COMPOSITE
@ -1667,7 +1667,7 @@ SetWinSize (WindowPtr pWin)
} }
} }
void _X_EXPORT void
SetBorderSize (WindowPtr pWin) SetBorderSize (WindowPtr pWin)
{ {
int bw; int bw;
@ -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 */
void _X_EXPORT 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
*****/ *****/
int _X_EXPORT 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:
* *
******/ ******/
int _X_EXPORT 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
*****/ *****/
int _X_EXPORT 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;
void _X_EXPORT void
DisableMapUnmapEvents(WindowPtr pWin) DisableMapUnmapEvents(WindowPtr pWin)
{ {
assert (windowDisableMapUnmapEvents == NULL); assert (windowDisableMapUnmapEvents == NULL);
@ -2630,7 +2630,7 @@ DisableMapUnmapEvents(WindowPtr pWin)
windowDisableMapUnmapEvents = pWin; windowDisableMapUnmapEvents = pWin;
} }
void _X_EXPORT void
EnableMapUnmapEvents(WindowPtr pWin) EnableMapUnmapEvents(WindowPtr pWin)
{ {
assert (windowDisableMapUnmapEvents != NULL); assert (windowDisableMapUnmapEvents != NULL);
@ -2742,7 +2742,7 @@ MapWindow(WindowPtr pWin, ClientPtr client)
* to bottom stacking order. * to bottom stacking order.
*****/ *****/
void _X_EXPORT void
MapSubwindows(WindowPtr pParent, ClientPtr client) MapSubwindows(WindowPtr pParent, ClientPtr client)
{ {
WindowPtr pWin; WindowPtr pWin;
@ -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.
*****/ *****/
void _X_EXPORT void
UnmapSubwindows(WindowPtr pWin) UnmapSubwindows(WindowPtr pWin)
{ {
WindowPtr pChild, pHead; WindowPtr pChild, pHead;
@ -3001,7 +3001,7 @@ UnmapSubwindows(WindowPtr pWin)
} }
void _X_EXPORT 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
*/ */
Bool _X_EXPORT Bool
PointInWindowIsVisible(WindowPtr pWin, int x, int y) PointInWindowIsVisible(WindowPtr pWin, int x, int y)
{ {
BoxRec box; BoxRec box;
@ -3087,7 +3087,7 @@ NotClippedByChildren(WindowPtr pWin)
return(pReg); return(pReg);
} }
void _X_EXPORT void
SendVisibilityNotify(WindowPtr pWin) SendVisibilityNotify(WindowPtr pWin)
{ {
xEvent event; xEvent event;

6
exa/exa.c
View File

@ -76,7 +76,7 @@ exaGetPixmapOffset(PixmapPtr pPix)
(unsigned long)pExaScr->info->memoryBase); (unsigned long)pExaScr->info->memoryBase);
} }
void * _X_EXPORT void *
exaGetPixmapDriverPrivate(PixmapPtr pPix) exaGetPixmapDriverPrivate(PixmapPtr pPix)
{ {
ExaPixmapPriv(pPix); ExaPixmapPriv(pPix);
@ -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.
*/ */
unsigned long _X_EXPORT 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().
*/ */
Bool _X_EXPORT Bool
exaDrawableIsOffscreen (DrawablePtr pDrawable) exaDrawableIsOffscreen (DrawablePtr pDrawable)
{ {
return exaPixmapIsOffscreen (exaGetDrawablePixmap (pDrawable)); return exaPixmapIsOffscreen (exaGetDrawablePixmap (pDrawable));

2
exa/exa_migration.c
View File

@ -389,7 +389,7 @@ exaDoMoveOutPixmap (ExaMigrationPtr migrate)
} }
} }
void _X_EXPORT 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,

16
fb/fb24_32.c
View File

@ -265,7 +265,7 @@ fb24_32BltUp (CARD8 *srcLine,
/* /*
* Spans functions; probably unused. * Spans functions; probably unused.
*/ */
void _X_EXPORT 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);
} }
void _X_EXPORT 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
*/ */
void _X_EXPORT 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);
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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);
} }
PixmapPtr _X_EXPORT 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;
Bool _X_EXPORT 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;
} }
Bool _X_EXPORT 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;
DevPrivateKey fbGetScreenPrivateKey(void) _X_EXPORT DevPrivateKey fbGetScreenPrivateKey(void)
{ {
return fbScreenPrivateKey; return fbScreenPrivateKey;
} }
@ -37,19 +37,19 @@ DevPrivateKey fbGetScreenPrivateKey(void)
static int fbGCPrivateKeyIndex; static int fbGCPrivateKeyIndex;
static DevPrivateKey fbGCPrivateKey = &fbGCPrivateKeyIndex; static DevPrivateKey fbGCPrivateKey = &fbGCPrivateKeyIndex;
DevPrivateKey fbGetGCPrivateKey(void) _X_EXPORT DevPrivateKey fbGetGCPrivateKey(void)
{ {
return fbGCPrivateKey; return fbGCPrivateKey;
} }
static int fbWinPrivateKeyIndex; static int fbWinPrivateKeyIndex;
static DevPrivateKey fbWinPrivateKey = &fbWinPrivateKeyIndex; static DevPrivateKey fbWinPrivateKey = &fbWinPrivateKeyIndex;
DevPrivateKey fbGetWinPrivateKey(void) _X_EXPORT DevPrivateKey fbGetWinPrivateKey(void)
{ {
return fbWinPrivateKey; return fbWinPrivateKey;
} }
Bool _X_EXPORT 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
ReadMemoryProcPtr wfbReadMemory; _X_EXPORT ReadMemoryProcPtr wfbReadMemory;
WriteMemoryProcPtr wfbWriteMemory; _X_EXPORT 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);
void _X_EXPORT void
fbPolyArc (DrawablePtr pDrawable, fbPolyArc (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int narcs, int narcs,

6
fb/fbblt.c
View File

@ -39,7 +39,7 @@
} \ } \
} }
void _X_EXPORT void
fbBlt (FbBits *srcLine, fbBlt (FbBits *srcLine,
FbStride srcStride, FbStride srcStride,
int srcX, int srcX,
@ -568,7 +568,7 @@ fbBlt24Line (FbBits *src,
#endif #endif
} }
void _X_EXPORT void
fbBlt24 (FbBits *srcLine, fbBlt24 (FbBits *srcLine,
FbStride srcStride, FbStride srcStride,
int srcX, int srcX,
@ -873,7 +873,7 @@ fbSetBltOdd (FbStip *stip,
} }
#endif #endif
void _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,

22
fb/fbbltone.c
View File

@ -78,7 +78,7 @@
#endif #endif
#if FB_SHIFT == 6 #if FB_SHIFT == 6
CARD8 fb8Lane[256] = { _X_EXPORT 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 @@ 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,
}; };
CARD8 fb16Lane[256] = { _X_EXPORT 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,
}; };
CARD8 fb32Lane[16] = { _X_EXPORT CARD8 fb32Lane[16] = {
0x00, 0x0f, 0xf0, 0xff, 0x00, 0x0f, 0xf0, 0xff,
}; };
#endif #endif
#if FB_SHIFT == 5 #if FB_SHIFT == 5
CARD8 fb8Lane[16] = { _X_EXPORT 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
}; };
CARD8 fb16Lane[16] = { _X_EXPORT 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,
}; };
CARD8 fb32Lane[16] = { _X_EXPORT 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
CARD8 *fbLaneTable[33] = { _X_EXPORT 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 @@ CARD8 *fbLaneTable[33] = {
}; };
#endif #endif
void _X_EXPORT 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
const FbBits fbStipple24Bits[3][1 << FbStip24Len] = { _X_EXPORT 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
*/ */
void _X_EXPORT 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
*/ */
void _X_EXPORT void
fbBltPlane (FbBits *src, fbBltPlane (FbBits *src,
FbStride srcStride, FbStride srcStride,
int srcX, int srcX,

20
fb/fbcmap.c
View File

@ -47,7 +47,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
ColormapPtr FbInstalledMaps[MAXSCREENS]; ColormapPtr FbInstalledMaps[MAXSCREENS];
int _X_EXPORT 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)
} }
void _X_EXPORT void
fbInstallColormap(ColormapPtr pmap) fbInstallColormap(ColormapPtr pmap)
{ {
int index = pmap->pScreen->myNum; int index = pmap->pScreen->myNum;
@ -75,7 +75,7 @@ fbInstallColormap(ColormapPtr pmap)
} }
} }
void _X_EXPORT void
fbUninstallColormap(ColormapPtr pmap) fbUninstallColormap(ColormapPtr pmap)
{ {
int index = pmap->pScreen->myNum; int index = pmap->pScreen->myNum;
@ -92,7 +92,7 @@ fbUninstallColormap(ColormapPtr pmap)
} }
} }
void _X_EXPORT 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,
} }
} }
Bool _X_EXPORT 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; \
} }
int _X_EXPORT int
fbExpandDirectColors (ColormapPtr pmap, fbExpandDirectColors (ColormapPtr pmap,
int ndef, int ndef,
xColorItem *indefs, xColorItem *indefs,
@ -387,7 +387,7 @@ maskShift (Pixel p)
return s; return s;
} }
Bool _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)
{ {
@ -415,7 +415,7 @@ fbSetVisualTypesAndMasks (int depth, int visuals, int bitsPerRGB,
return TRUE; return TRUE;
} }
Bool _X_EXPORT Bool
fbHasVisualTypes (int depth) fbHasVisualTypes (int depth)
{ {
fbVisualsPtr v; fbVisualsPtr v;
@ -426,7 +426,7 @@ fbHasVisualTypes (int depth)
return FALSE; return FALSE;
} }
Bool _X_EXPORT 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.
*/ */
Bool _X_EXPORT Bool
fbInitVisuals (VisualPtr *visualp, fbInitVisuals (VisualPtr *visualp,
DepthPtr *depthp, DepthPtr *depthp,
int *nvisualp, int *nvisualp,

16
fb/fbcmap_mi.c
View File

@ -49,19 +49,19 @@ fbListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps)
return miListInstalledColormaps(pScreen, pmaps); return miListInstalledColormaps(pScreen, pmaps);
} }
void _X_EXPORT void
fbInstallColormap(ColormapPtr pmap) fbInstallColormap(ColormapPtr pmap)
{ {
miInstallColormap(pmap); miInstallColormap(pmap);
} }
void _X_EXPORT void
fbUninstallColormap(ColormapPtr pmap) fbUninstallColormap(ColormapPtr pmap)
{ {
miUninstallColormap(pmap); miUninstallColormap(pmap);
} }
void _X_EXPORT 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);
} }
Bool _X_EXPORT Bool
fbInitializeColormap(ColormapPtr pmap) fbInitializeColormap(ColormapPtr pmap)
{ {
return miInitializeColormap(pmap); return miInitializeColormap(pmap);
@ -91,19 +91,19 @@ fbCreateDefColormap(ScreenPtr pScreen)
return miCreateDefColormap(pScreen); return miCreateDefColormap(pScreen);
} }
void _X_EXPORT void
fbClearVisualTypes(void) fbClearVisualTypes(void)
{ {
miClearVisualTypes(); miClearVisualTypes();
} }
Bool _X_EXPORT 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);
} }
Bool _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)
{ {
@ -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.
*/ */
Bool _X_EXPORT 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"
void _X_EXPORT 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);
} }
void _X_EXPORT 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);
} }
void _X_EXPORT void
fbCopyNto1 (DrawablePtr pSrcDrawable, fbCopyNto1 (DrawablePtr pSrcDrawable,
DrawablePtr pDstDrawable, DrawablePtr pDstDrawable,
GCPtr pGC, GCPtr pGC,
@ -289,7 +289,7 @@ fbCopyNto1 (DrawablePtr pSrcDrawable,
} }
} }
void _X_EXPORT 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);
} }
RegionPtr _X_EXPORT 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;
} }
RegionPtr _X_EXPORT 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);
} }
RegionPtr _X_EXPORT 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"
void _X_EXPORT 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);
} }
void _X_EXPORT 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"
void _X_EXPORT 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"
void _X_EXPORT 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"
const GCFuncs fbGCFuncs = { _X_EXPORT const GCFuncs fbGCFuncs = {
fbValidateGC, fbValidateGC,
miChangeGC, miChangeGC,
miCopyGC, miCopyGC,
@ -38,7 +38,7 @@ const GCFuncs fbGCFuncs = {
miCopyClip, miCopyClip,
}; };
const GCOps fbGCOps = { _X_EXPORT const GCOps fbGCOps = {
fbFillSpans, fbFillSpans,
fbSetSpans, fbSetSpans,
fbPutImage, fbPutImage,
@ -61,7 +61,7 @@ const GCOps fbGCOps = {
fbPushPixels fbPushPixels
}; };
Bool _X_EXPORT 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
*/ */
void _X_EXPORT void
fbPadPixmap (PixmapPtr pPixmap) fbPadPixmap (PixmapPtr pPixmap)
{ {
int width; int width;
@ -193,7 +193,7 @@ fbCanEvenStipple (PixmapPtr pStipple, int bpp)
return TRUE; return TRUE;
} }
void _X_EXPORT 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"
void _X_EXPORT void
fbGetSpans(DrawablePtr pDrawable, fbGetSpans(DrawablePtr pDrawable,
int wMax, int wMax,
DDXPointPtr ppt, DDXPointPtr ppt,

6
fb/fbglyph.c
View File

@ -31,7 +31,7 @@
#define dummyScreen screenInfo.screens[0] #define dummyScreen screenInfo.screens[0]
Bool _X_EXPORT Bool
fbGlyphIn (RegionPtr pRegion, fbGlyphIn (RegionPtr pRegion,
int x, int x,
int y, int y,
@ -253,7 +253,7 @@ fbGlyph24 (FbBits *dstBits,
#endif #endif
#endif #endif
void _X_EXPORT void
fbPolyGlyphBlt (DrawablePtr pDrawable, fbPolyGlyphBlt (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int x, int x,
@ -343,7 +343,7 @@ fbPolyGlyphBlt (DrawablePtr pDrawable,
} }
void _X_EXPORT 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"
void _X_EXPORT void
fbPutImage (DrawablePtr pDrawable, fbPutImage (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int depth, int depth,
@ -112,7 +112,7 @@ fbPutImage (DrawablePtr pDrawable,
} }
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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"
void _X_EXPORT void
fbZeroLine (DrawablePtr pDrawable, fbZeroLine (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int mode, int mode,
@ -61,7 +61,7 @@ fbZeroLine (DrawablePtr pDrawable,
} }
} }
void _X_EXPORT void
fbZeroSegment (DrawablePtr pDrawable, fbZeroSegment (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int nseg, int nseg,
@ -85,7 +85,7 @@ fbZeroSegment (DrawablePtr pDrawable,
} }
} }
void _X_EXPORT void
fbFixCoordModePrevious (int npt, fbFixCoordModePrevious (int npt,
DDXPointPtr ppt) DDXPointPtr ppt)
{ {
@ -102,7 +102,7 @@ fbFixCoordModePrevious (int npt,
} }
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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;
DevPrivateKey fbOverlayGetScreenPrivateKey(void) _X_EXPORT DevPrivateKey fbOverlayGetScreenPrivateKey(void)
{ {
return fbOverlayScreenPrivateKey; return fbOverlayScreenPrivateKey;
} }
@ -45,7 +45,7 @@ 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
*/ */
Bool _X_EXPORT 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;
} }
Bool _X_EXPORT 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
*/ */
int _X_EXPORT 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;
} }
Bool _X_EXPORT Bool
fbOverlayCreateScreenResources(ScreenPtr pScreen) fbOverlayCreateScreenResources(ScreenPtr pScreen)
{ {
int i; int i;
@ -153,7 +153,7 @@ fbOverlayCreateScreenResources(ScreenPtr pScreen)
return TRUE; return TRUE;
} }
void _X_EXPORT 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
*/ */
void _X_EXPORT 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
*/ */
void _X_EXPORT 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);
} }
void _X_EXPORT 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);
} }
Bool _X_EXPORT 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;
} }
Bool _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))
void _X_EXPORT 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);
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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);
} }
pixman_image_t * _X_EXPORT 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;
} }
void _X_EXPORT 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);
} }
Bool _X_EXPORT Bool
fbPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats) fbPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats)
{ {

14
fb/fbpixmap.c
View File

@ -28,7 +28,7 @@
#include "fb.h" #include "fb.h"
PixmapPtr _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)
{ {
@ -82,7 +82,7 @@ fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp,
return pPixmap; return pPixmap;
} }
PixmapPtr _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)
{ {
@ -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);
} }
Bool _X_EXPORT 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.
*/ */
RegionPtr _X_EXPORT RegionPtr
fbPixmapToRegion(PixmapPtr pPix) fbPixmapToRegion(PixmapPtr pPix)
{ {
register RegionPtr pReg; register RegionPtr pReg;
@ -348,7 +348,7 @@ fbValidateBits (FbStip *bits, int stride, FbStip data)
} }
} }
void _X_EXPORT 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);
} }
void _X_EXPORT void
fbSetBits (FbStip *bits, int stride, FbStip data) fbSetBits (FbStip *bits, int stride, FbStip data)
{ {
while (stride--) while (stride--)
*bits++ = data; *bits++ = data;
} }
void _X_EXPORT 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);
void _X_EXPORT void
fbDots (FbBits *dstOrig, fbDots (FbBits *dstOrig,
FbStride dstStride, FbStride dstStride,
int dstBpp, int dstBpp,
@ -107,7 +107,7 @@ fbDots (FbBits *dstOrig,
} }
} }
void _X_EXPORT 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"
void _X_EXPORT void
fbPushPattern (DrawablePtr pDrawable, fbPushPattern (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
@ -100,7 +100,7 @@ fbPushPattern (DrawablePtr pDrawable,
} }
} }
void _X_EXPORT void
fbPushFill (DrawablePtr pDrawable, fbPushFill (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
@ -172,7 +172,7 @@ fbPushFill (DrawablePtr pDrawable,
} }
} }
void _X_EXPORT void
fbPushImage (DrawablePtr pDrawable, fbPushImage (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
@ -223,7 +223,7 @@ fbPushImage (DrawablePtr pDrawable,
} }
} }
void _X_EXPORT void
fbPushPixels (GCPtr pGC, fbPushPixels (GCPtr pGC,
PixmapPtr pBitmap, PixmapPtr pBitmap,
DrawablePtr pDrawable, DrawablePtr pDrawable,

18
fb/fbscreen.c
View File

@ -26,7 +26,7 @@
#include "fb.h" #include "fb.h"
Bool _X_EXPORT 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;
} }
Bool _X_EXPORT Bool
fbRealizeFont(ScreenPtr pScreen, FontPtr pFont) fbRealizeFont(ScreenPtr pScreen, FontPtr pFont)
{ {
return (TRUE); return (TRUE);
} }
Bool _X_EXPORT Bool
fbUnrealizeFont(ScreenPtr pScreen, FontPtr pFont) fbUnrealizeFont(ScreenPtr pScreen, FontPtr pFont)
{ {
return (TRUE); return (TRUE);
} }
void _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)
@ -81,7 +81,7 @@ fbQueryBestSize (int class,
} }
} }
PixmapPtr _X_EXPORT 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);
} }
Bool _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 */
@ -140,7 +140,7 @@ fbSetupScreen(ScreenPtr pScreen,
} }
#ifdef FB_ACCESS_WRAPPER #ifdef FB_ACCESS_WRAPPER
Bool _X_EXPORT Bool
wfbFinishScreenInit(ScreenPtr pScreen, wfbFinishScreenInit(ScreenPtr pScreen,
pointer pbits, pointer pbits,
int xsize, int xsize,
@ -255,7 +255,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
Bool _X_EXPORT Bool
wfbScreenInit(ScreenPtr pScreen, wfbScreenInit(ScreenPtr pScreen,
pointer pbits, pointer pbits,
int xsize, int xsize,
@ -275,7 +275,7 @@ wfbScreenInit(ScreenPtr pScreen,
return TRUE; return TRUE;
} }
#else #else
Bool _X_EXPORT 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)))
void _X_EXPORT 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);
} }
void _X_EXPORT 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);
} }
void _X_EXPORT void
fbBresFill (DrawablePtr pDrawable, fbBresFill (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int dashOffset, int dashOffset,
@ -255,7 +255,7 @@ fbSetFg (DrawablePtr pDrawable,
} }
} }
void _X_EXPORT 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.
*/ */
FbBres * _X_EXPORT FbBres *
fbSelectBres (DrawablePtr pDrawable, fbSelectBres (DrawablePtr pDrawable,
GCPtr pGC) GCPtr pGC)
{ {
@ -575,7 +575,7 @@ fbSelectBres (DrawablePtr pDrawable,
return bres; return bres;
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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"
void _X_EXPORT 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"
void _X_EXPORT 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
void _X_EXPORT 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
*/ */
void _X_EXPORT void
fbTransparentSpan (FbBits *dst, fbTransparentSpan (FbBits *dst,
FbBits stip, FbBits stip,
FbBits fgxor, FbBits fgxor,
@ -80,7 +80,7 @@ fbTransparentSpan (FbBits *dst,
} }
#endif #endif
void _X_EXPORT void
fbEvenStipple (FbBits *dst, fbEvenStipple (FbBits *dst,
FbStride dstStride, FbStride dstStride,
int dstX, int dstX,
@ -213,7 +213,7 @@ fbEvenStipple (FbBits *dst,
} }
} }
void _X_EXPORT void
fbOddStipple (FbBits *dst, fbOddStipple (FbBits *dst,
FbStride dstStride, FbStride dstStride,
int dstX, int dstX,
@ -278,7 +278,7 @@ fbOddStipple (FbBits *dst,
} }
} }
void _X_EXPORT 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
*/ */
void _X_EXPORT void
fbEvenTile (FbBits *dst, fbEvenTile (FbBits *dst,
FbStride dstStride, FbStride dstStride,
int dstX, int dstX,
@ -107,7 +107,7 @@ fbEvenTile (FbBits *dst,
} }
} }
void _X_EXPORT void
fbOddTile(FbBits *dst, fbOddTile(FbBits *dst,
FbStride dstStride, FbStride dstStride,
int dstX, int dstX,
@ -172,7 +172,7 @@ fbOddTile(FbBits *dst,
} }
} }
void _X_EXPORT 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"
void _X_EXPORT 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);
} }
void _X_EXPORT 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 */
void _X_EXPORT 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"
FbBits _X_EXPORT 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;
} }
void _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)
{ {
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
const FbMergeRopRec FbMergeRopBits[16] = { _X_EXPORT 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 @@ const FbMergeRopRec FbMergeRopBits[16] = {
#if FB_UNIT == 16 #if FB_UNIT == 16
#define fbStipple16Bits 0 #define fbStipple16Bits 0
#define fbStipple8Bits 0 #define fbStipple8Bits 0
const FbBits fbStipple4Bits[16] = { _X_EXPORT 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),};
const FbBits fbStipple2Bits[4] = { _X_EXPORT 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),
}; };
const FbBits fbStipple1Bits[2] = { _X_EXPORT 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
const FbBits fbStipple8Bits[256] = { _X_EXPORT 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 @@ 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),
}; };
const FbBits fbStipple4Bits[16] = { _X_EXPORT 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),};
const FbBits fbStipple2Bits[4] = { _X_EXPORT 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),
}; };
const FbBits fbStipple1Bits[2] = { _X_EXPORT 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
const FbBits fbStipple16Bits[256] = { _X_EXPORT 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 @@ 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),
}; };
const FbBits fbStipple8Bits[256] = { _X_EXPORT 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 @@ 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),
}; };
const FbBits fbStipple4Bits[16] = { _X_EXPORT 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),};
const FbBits fbStipple2Bits[4] = { _X_EXPORT 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
const FbBits * const fbStippleTable[] = { _X_EXPORT 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"
Bool _X_EXPORT 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;
} }
Bool _X_EXPORT Bool
fbDestroyWindow(WindowPtr pWin) fbDestroyWindow(WindowPtr pWin)
{ {
return TRUE; return TRUE;
} }
Bool _X_EXPORT Bool
fbMapWindow(WindowPtr pWindow) fbMapWindow(WindowPtr pWindow)
{ {
return TRUE; return TRUE;
} }
Bool _X_EXPORT Bool
fbPositionWindow(WindowPtr pWin, int x, int y) fbPositionWindow(WindowPtr pWin, int x, int y)
{ {
return TRUE; return TRUE;
} }
Bool _X_EXPORT Bool
fbUnmapWindow(WindowPtr pWindow) fbUnmapWindow(WindowPtr pWindow)
{ {
return TRUE; return TRUE;
} }
void _X_EXPORT 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);
} }
void _X_EXPORT 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);
} }
Bool _X_EXPORT 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;
} }
void _X_EXPORT void
fbFillRegionSolid (DrawablePtr pDrawable, fbFillRegionSolid (DrawablePtr pDrawable,
RegionPtr pRegion, RegionPtr pRegion,
FbBits and, FbBits and,

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

@ -64,7 +64,7 @@ noopEnableDisable(void *arg) { }
xf86AccessRec AccessNULL = { noopEnableDisable, noopEnableDisable, NULL }; xf86AccessRec AccessNULL = { noopEnableDisable, noopEnableDisable, NULL };
xf86CurrentAccessRec xf86CurrentAccess = {NULL,NULL}; _X_EXPORT xf86CurrentAccessRec xf86CurrentAccess = {NULL,NULL};
BusRec primaryBus = { BUS_NONE, {{0}}}; BusRec primaryBus = { BUS_NONE, {{0}}};
@ -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.
*/ */
void _X_EXPORT void
xf86BusProbe(void) xf86BusProbe(void)
{ {
xf86PciProbe(); xf86PciProbe();
@ -148,7 +148,7 @@ StringToBusType(const char* busID, const char **retID)
* Entity related code. * Entity related code.
*/ */
void _X_EXPORT void
xf86EntityInit(void) xf86EntityInit(void)
{ {
int i; int i;
@ -231,7 +231,7 @@ xf86IsEntityPrimary(int entityIndex)
} }
} }
Bool _X_EXPORT 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;
} }
Bool _X_EXPORT Bool
xf86DriverHasEntities(DriverPtr drvp) xf86DriverHasEntities(DriverPtr drvp)
{ {
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().
*/ */
void _X_EXPORT 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;
} }
void _X_EXPORT 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.
*/ */
void _X_EXPORT void
xf86AddDevToEntity(int entityIndex, GDevPtr dev) xf86AddDevToEntity(int entityIndex, GDevPtr dev)
{ {
EntityPtr pEnt; EntityPtr pEnt;
@ -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.
*/ */
void _X_EXPORT 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.
*/ */
void _X_EXPORT 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().
*/ */
void _X_EXPORT void
xf86AccessLeave(void) xf86AccessLeave(void)
{ {
if (!xf86ResAccessEnter) if (!xf86ResAccessEnter)
@ -594,7 +594,7 @@ xf86AccessLeave(void)
EntityLeave(); EntityLeave();
} }
void _X_EXPORT void
xf86AccessLeaveState(void) xf86AccessLeaveState(void)
{ {
if (!xf86ResAccessEnter) if (!xf86ResAccessEnter)
@ -1098,7 +1098,7 @@ xf86JoinResLists(resPtr rlist1, resPtr rlist2)
return rlist1; return rlist1;
} }
resPtr _X_EXPORT resPtr
xf86AddResToList(resPtr rlist, resRange *range, int entityIndex) xf86AddResToList(resPtr rlist, resRange *range, int entityIndex)
{ {
resPtr new; resPtr new;
@ -1264,7 +1264,7 @@ xf86PrintResList(int verb, resPtr list)
} }
} }
resPtr _X_EXPORT 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) {
@ -1274,7 +1274,7 @@ xf86AddRangesToList(resPtr list, resRange *pRange, int entityIndex)
return list; return list;
} }
void _X_EXPORT void
xf86ResourceBrokerInit(void) xf86ResourceBrokerInit(void)
{ {
Acc = NULL; Acc = NULL;
@ -1540,7 +1540,7 @@ SetSIGIOForState(xf86State state)
} }
} }
void _X_EXPORT void
xf86EnterServerState(xf86State state) xf86EnterServerState(xf86State state)
{ {
EntityPtr pEnt; EntityPtr pEnt;
@ -1817,7 +1817,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().
*/ */
void _X_EXPORT void
xf86PostProbe(void) xf86PostProbe(void)
{ {
memType val; memType val;
@ -1931,7 +1931,7 @@ checkRequiredResources(int entityIndex)
pEnt->entityProp &= ~(unsigned long)NEED_IO_SHARED; pEnt->entityProp &= ~(unsigned long)NEED_IO_SHARED;
} }
void _X_EXPORT void
xf86PostPreInit() xf86PostPreInit()
{ {
if (doFramebufferMode) return; if (doFramebufferMode) return;
@ -1951,7 +1951,7 @@ xf86PostPreInit()
xf86PrintResList(3, Acc); xf86PrintResList(3, Acc);
} }
void _X_EXPORT void
xf86PostScreenInit(void) xf86PostScreenInit(void)
{ {
int i,j; int i,j;
@ -2300,7 +2300,7 @@ findIntersect(resRange Range, resPtr list)
return new; return new;
} }
resPtr _X_EXPORT resPtr
xf86FindIntersectOfLists(resPtr l1, resPtr l2) xf86FindIntersectOfLists(resPtr l1, resPtr l2)
{ {
resPtr ret = NULL; resPtr ret = NULL;
@ -2365,7 +2365,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.
*/ */
void _X_EXPORT void
xf86FindPrimaryDevice() xf86FindPrimaryDevice()
{ {
if (primaryBus.type != BUS_NONE) { if (primaryBus.type != BUS_NONE) {
@ -2394,7 +2394,7 @@ xf86FindPrimaryDevice()
} }
} }
Bool _X_EXPORT Bool
xf86NoSharedResources(int screenIndex,resType res) xf86NoSharedResources(int screenIndex,resType res)
{ {
int j; int j;

4
hw/xfree86/common/xf86Config.c
View File

@ -1136,7 +1136,7 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
return TRUE; return TRUE;
} }
Bool xf86DRI2Enabled(void) _X_EXPORT Bool xf86DRI2Enabled(void)
{ {
return xf86Info.dri2; return xf86Info.dri2;
} }
@ -2626,7 +2626,7 @@ xf86HandleConfigFile(Bool autoconfig)
return CONFIG_OK; return CONFIG_OK;
} }
Bool _X_EXPORT Bool
xf86PathIsSafe(const char *path) xf86PathIsSafe(const char *path)
{ {
return (xf86pathIsSafe(path) != 0); return (xf86pathIsSafe(path) != 0);

6
hw/xfree86/common/xf86Configure.c
View File

@ -68,7 +68,7 @@ static DevToConfigPtr DevToConfig = NULL;
static int nDevToConfig = 0, CurrentDriver; static int nDevToConfig = 0, CurrentDriver;
_X_EXPORT xf86MonPtr ConfiguredMonitor; _X_EXPORT xf86MonPtr ConfiguredMonitor;
Bool xf86DoConfigurePass1 = TRUE; _X_EXPORT Bool xf86DoConfigurePass1 = TRUE;
static Bool foundMouse = FALSE; static Bool foundMouse = FALSE;
#if defined(__SCO__) #if defined(__SCO__)
@ -92,7 +92,7 @@ static char *DFLT_MOUSE_PROTO = "auto";
* directly. We allocate a GDevRec and fill it in as much as we can, letting * directly. We allocate a GDevRec and fill it in as much as we can, letting
* the caller fill in the rest and/or change it as it sees fit. * the caller fill in the rest and/or change it as it sees fit.
*/ */
GDevPtr _X_EXPORT GDevPtr
xf86AddBusDeviceToConfigure(const char *driver, BusType bus, void *busData, int chipset) xf86AddBusDeviceToConfigure(const char *driver, BusType bus, void *busData, int chipset)
{ {
int i, j; int i, j;
@ -639,7 +639,7 @@ configureDDCMonitorSection (int screennum)
# define PATH_MAX 1024 # define PATH_MAX 1024
#endif #endif
void _X_EXPORT void
DoConfigure(void) DoConfigure(void)
{ {
int i,j, screennum = -1; int i,j, screennum = -1;

8
hw/xfree86/common/xf86Cursor.c
View File

@ -89,7 +89,7 @@ static Bool HardEdges;
* is valid if specified. * is valid if specified.
*/ */
void _X_EXPORT void
xf86InitViewport(ScrnInfoPtr pScr) xf86InitViewport(ScrnInfoPtr pScr)
{ {
@ -185,7 +185,7 @@ xf86PointerMoved(int scrnIndex, int x, int y)
* Enable/disable ZoomViewport * Enable/disable ZoomViewport
*/ */
void _X_EXPORT void
xf86LockZoom(ScreenPtr pScreen, Bool lock) xf86LockZoom(ScreenPtr pScreen, Bool lock)
{ {
XF86SCRNINFO(pScreen)->zoomLocked = lock; XF86SCRNINFO(pScreen)->zoomLocked = lock;
@ -322,7 +322,7 @@ xf86SwitchMode(ScreenPtr pScreen, DisplayModePtr mode)
* Reinitialize the visual part of the screen for another mode. * Reinitialize the visual part of the screen for another mode.
*/ */
void _X_EXPORT void
xf86ZoomViewport(ScreenPtr pScreen, int zoom) xf86ZoomViewport(ScreenPtr pScreen, int zoom)
{ {
ScrnInfoPtr pScr = XF86SCRNINFO(pScreen); ScrnInfoPtr pScr = XF86SCRNINFO(pScreen);
@ -579,7 +579,7 @@ FillOutEdge(xf86EdgePtr pEdge, int limit)
* on 32 bit architectures, 64 on 64 bit architectures. * on 32 bit architectures, 64 on 64 bit architectures.
*/ */
void _X_EXPORT void
xf86InitOrigins(void) xf86InitOrigins(void)
{ {
unsigned long screensLeft, prevScreensLeft, mask; unsigned long screensLeft, prevScreensLeft, mask;

14
hw/xfree86/common/xf86DGA.c
View File

@ -334,7 +334,7 @@ DGAUninstallColormap(ColormapPtr pmap)
pScreen->UninstallColormap = DGAUninstallColormap; pScreen->UninstallColormap = DGAUninstallColormap;
} }
int _X_EXPORT int
xf86SetDGAMode( xf86SetDGAMode(
int index, int index,
int num, int num,
@ -567,7 +567,7 @@ DGAActive(int index)
/* Called by the event code in case the server is abruptly terminated */ /* Called by the event code in case the server is abruptly terminated */
void _X_EXPORT void
DGAShutdown() DGAShutdown()
{ {
ScrnInfoPtr pScrn; ScrnInfoPtr pScrn;
@ -892,7 +892,7 @@ DGACopyModeInfo(
} }
Bool _X_EXPORT Bool
DGAVTSwitch(void) DGAVTSwitch(void)
{ {
ScreenPtr pScreen; ScreenPtr pScreen;
@ -914,7 +914,7 @@ DGAVTSwitch(void)
return TRUE; return TRUE;
} }
Bool _X_EXPORT Bool
DGAStealKeyEvent(DeviceIntPtr dev, int index, int key_code, int is_down) DGAStealKeyEvent(DeviceIntPtr dev, int index, int key_code, int is_down)
{ {
DGAScreenPtr pScreenPriv; DGAScreenPtr pScreenPriv;
@ -941,7 +941,7 @@ DGAStealKeyEvent(DeviceIntPtr dev, int index, int key_code, int is_down)
static int DGAMouseX, DGAMouseY; static int DGAMouseX, DGAMouseY;
Bool _X_EXPORT Bool
DGAStealMotionEvent(DeviceIntPtr dev, int index, int dx, int dy) DGAStealMotionEvent(DeviceIntPtr dev, int index, int dx, int dy)
{ {
DGAScreenPtr pScreenPriv; DGAScreenPtr pScreenPriv;
@ -976,7 +976,7 @@ DGAStealMotionEvent(DeviceIntPtr dev, int index, int dx, int dy)
return TRUE; return TRUE;
} }
Bool _X_EXPORT Bool
DGAStealButtonEvent(DeviceIntPtr dev, int index, int button, int is_down) DGAStealButtonEvent(DeviceIntPtr dev, int index, int button, int is_down)
{ {
DGAScreenPtr pScreenPriv; DGAScreenPtr pScreenPriv;
@ -1004,7 +1004,7 @@ DGAStealButtonEvent(DeviceIntPtr dev, int index, int button, int is_down)
/* We have the power to steal or modify events that are about to get queued */ /* We have the power to steal or modify events that are about to get queued */
Bool _X_EXPORT Bool
DGAIsDgaEvent (xEvent *e) DGAIsDgaEvent (xEvent *e)
{ {
int coreEquiv; int coreEquiv;

12
hw/xfree86/common/xf86Events.c
View File

@ -130,7 +130,7 @@ typedef struct x_IHRec {
static IHPtr InputHandlers = NULL; static IHPtr InputHandlers = NULL;
Bool _X_EXPORT Bool
LegalModifier(unsigned int key, DeviceIntPtr pDev) LegalModifier(unsigned int key, DeviceIntPtr pDev)
{ {
return TRUE; return TRUE;
@ -141,7 +141,7 @@ LegalModifier(unsigned int key, DeviceIntPtr pDev)
* Function used for screensaver purposes by the os module. Returns the * Function used for screensaver purposes by the os module. Returns the
* time in milliseconds since there last was any input. * time in milliseconds since there last was any input.
*/ */
int _X_EXPORT int
TimeSinceLastInputEvent() TimeSinceLastInputEvent()
{ {
if (xf86Info.lastEventTime == 0) { if (xf86Info.lastEventTime == 0) {
@ -166,7 +166,7 @@ SetTimeSinceLastInputEvent()
* correct chronological order. Only reads from the system pointer * correct chronological order. Only reads from the system pointer
* and keyboard. * and keyboard.
*/ */
void _X_EXPORT void
ProcessInputEvents () ProcessInputEvents ()
{ {
int x, y; int x, y;
@ -251,7 +251,7 @@ xf86ProcessActionEvent(ActionEvent action, void *arg)
*/ */
/* ARGSUSED */ /* ARGSUSED */
void _X_EXPORT void
xf86Wakeup(pointer blockData, int err, pointer pReadmask) xf86Wakeup(pointer blockData, int err, pointer pReadmask)
{ {
fd_set* LastSelectMask = (fd_set*)pReadmask; fd_set* LastSelectMask = (fd_set*)pReadmask;
@ -359,7 +359,7 @@ xf86InterceptSigIll(void (*sigillhandler)(void))
* xf86SigHandler -- * xf86SigHandler --
* Catch unexpected signals and exit or continue cleanly. * Catch unexpected signals and exit or continue cleanly.
*/ */
void _X_EXPORT void
xf86SigHandler(int signo) xf86SigHandler(int signo)
{ {
if ((signo == SIGILL) && xf86SigIllHandler) { if ((signo == SIGILL) && xf86SigIllHandler) {
@ -802,7 +802,7 @@ xf86EnableVTSwitch(Bool new)
return old; return old;
} }
void _X_EXPORT void
xf86ReloadInputDevs(int sig) xf86ReloadInputDevs(int sig)
{ {
InputInfoPtr pInfo; InputInfoPtr pInfo;

88
hw/xfree86/common/xf86Globals.c
View File

@ -48,7 +48,7 @@
/* Index into pScreen.devPrivates */ /* Index into pScreen.devPrivates */
static int xf86CreateRootWindowKeyIndex; static int xf86CreateRootWindowKeyIndex;
DevPrivateKey xf86CreateRootWindowKey = &xf86CreateRootWindowKeyIndex; _X_EXPORT DevPrivateKey xf86CreateRootWindowKey = &xf86CreateRootWindowKeyIndex;
/* Index of ScrnInfo in pScreen.devPrivates */ /* Index of ScrnInfo in pScreen.devPrivates */
static int xf86ScreenKeyIndex; static int xf86ScreenKeyIndex;
_X_EXPORT DevPrivateKey xf86ScreenKey = &xf86ScreenKeyIndex; _X_EXPORT DevPrivateKey xf86ScreenKey = &xf86ScreenKeyIndex;
@ -92,7 +92,7 @@ _X_EXPORT const unsigned char byte_reversed[256] =
}; };
/* Globals that input drivers may access */ /* Globals that input drivers may access */
InputInfoPtr xf86InputDevs = NULL; _X_EXPORT InputInfoPtr xf86InputDevs = NULL;
/* Globals that video drivers may not access */ /* Globals that video drivers may not access */
@ -139,29 +139,29 @@ _X_EXPORT xf86InfoRec xf86Info = {
.autoEnableDevices = FALSE .autoEnableDevices = FALSE
#endif #endif
}; };
const char *xf86ConfigFile = NULL; _X_EXPORT const char *xf86ConfigFile = NULL;
const char *xf86InputDeviceList = NULL; _X_EXPORT const char *xf86InputDeviceList = NULL;
const char *xf86ModulePath = DEFAULT_MODULE_PATH; _X_EXPORT const char *xf86ModulePath = DEFAULT_MODULE_PATH;
MessageType xf86ModPathFrom = X_DEFAULT; _X_EXPORT MessageType xf86ModPathFrom = X_DEFAULT;
const char *xf86LogFile = DEFAULT_LOGPREFIX; _X_EXPORT const char *xf86LogFile = DEFAULT_LOGPREFIX;
MessageType xf86LogFileFrom = X_DEFAULT; _X_EXPORT MessageType xf86LogFileFrom = X_DEFAULT;
Bool xf86LogFileWasOpened = FALSE; _X_EXPORT Bool xf86LogFileWasOpened = FALSE;
serverLayoutRec xf86ConfigLayout = {NULL, }; _X_EXPORT serverLayoutRec xf86ConfigLayout = {NULL, };
_X_EXPORT confDRIRec xf86ConfigDRI = {0, }; _X_EXPORT confDRIRec xf86ConfigDRI = {0, };
XF86ConfigPtr xf86configptr = NULL; XF86ConfigPtr xf86configptr = NULL;
Bool xf86Resetting = FALSE; _X_EXPORT Bool xf86Resetting = FALSE;
Bool xf86Initialising = FALSE; _X_EXPORT Bool xf86Initialising = FALSE;
Bool xf86DoProbe = FALSE; _X_EXPORT Bool xf86DoProbe = FALSE;
Bool xf86DoConfigure = FALSE; _X_EXPORT Bool xf86DoConfigure = FALSE;
Bool xf86DoShowOptions = FALSE; _X_EXPORT Bool xf86DoShowOptions = FALSE;
Bool xf86DoModalias = FALSE; _X_EXPORT Bool xf86DoModalias = FALSE;
DriverPtr *xf86DriverList = NULL; _X_EXPORT DriverPtr *xf86DriverList = NULL;
int xf86NumDrivers = 0; _X_EXPORT int xf86NumDrivers = 0;
InputDriverPtr *xf86InputDriverList = NULL; InputDriverPtr *xf86InputDriverList = NULL;
int xf86NumInputDrivers = 0; int xf86NumInputDrivers = 0;
int xf86NumScreens = 0; _X_EXPORT int xf86NumScreens = 0;
const char *xf86VisualNames[] = { _X_EXPORT const char *xf86VisualNames[] = {
"StaticGray", "StaticGray",
"GrayScale", "GrayScale",
"StaticColor", "StaticColor",
@ -172,36 +172,36 @@ const char *xf86VisualNames[] = {
/* Parameters set only from the command line */ /* Parameters set only from the command line */
char *xf86ServerName = "no-name"; char *xf86ServerName = "no-name";
Bool xf86fpFlag = FALSE; _X_EXPORT Bool xf86fpFlag = FALSE;
Bool xf86sFlag = FALSE; _X_EXPORT Bool xf86sFlag = FALSE;
Bool xf86bsEnableFlag = FALSE; _X_EXPORT Bool xf86bsEnableFlag = FALSE;
Bool xf86bsDisableFlag = FALSE; _X_EXPORT Bool xf86bsDisableFlag = FALSE;
Bool xf86silkenMouseDisableFlag = FALSE; _X_EXPORT Bool xf86silkenMouseDisableFlag = FALSE;
#ifdef HAVE_ACPI #ifdef HAVE_ACPI
Bool xf86acpiDisableFlag = FALSE; _X_EXPORT Bool xf86acpiDisableFlag = FALSE;
#endif #endif
char *xf86LayoutName = NULL; _X_EXPORT char *xf86LayoutName = NULL;
char *xf86ScreenName = NULL; _X_EXPORT char *xf86ScreenName = NULL;
char *xf86PointerName = NULL; _X_EXPORT char *xf86PointerName = NULL;
char *xf86KeyboardName = NULL; _X_EXPORT char *xf86KeyboardName = NULL;
Bool xf86ProbeOnly = FALSE; _X_EXPORT Bool xf86ProbeOnly = FALSE;
int xf86Verbose = DEFAULT_VERBOSE; _X_EXPORT int xf86Verbose = DEFAULT_VERBOSE;
int xf86LogVerbose = DEFAULT_LOG_VERBOSE; _X_EXPORT int xf86LogVerbose = DEFAULT_LOG_VERBOSE;
int xf86FbBpp = -1; _X_EXPORT int xf86FbBpp = -1;
Pix24Flags xf86Pix24 = Pix24DontCare; _X_EXPORT Pix24Flags xf86Pix24 = Pix24DontCare;
int xf86Depth = -1; _X_EXPORT int xf86Depth = -1;
rgb xf86Weight = {0, 0, 0}; _X_EXPORT rgb xf86Weight = {0, 0, 0};
Bool xf86FlipPixels = FALSE; _X_EXPORT Bool xf86FlipPixels = FALSE;
Gamma xf86Gamma = {0.0, 0.0, 0.0}; _X_EXPORT Gamma xf86Gamma = {0.0, 0.0, 0.0};
Bool xf86AllowMouseOpenFail = FALSE; _X_EXPORT Bool xf86AllowMouseOpenFail = FALSE;
#ifdef XF86VIDMODE #ifdef XF86VIDMODE
Bool xf86VidModeDisabled = FALSE; _X_EXPORT Bool xf86VidModeDisabled = FALSE;
Bool xf86VidModeAllowNonLocal = FALSE; _X_EXPORT Bool xf86VidModeAllowNonLocal = FALSE;
#endif #endif
RootWinPropPtr *xf86RegisteredPropertiesTable = NULL; _X_EXPORT RootWinPropPtr *xf86RegisteredPropertiesTable = NULL;
_X_EXPORT Bool xf86inSuspend = FALSE; _X_EXPORT Bool xf86inSuspend = FALSE;
_X_EXPORT Bool xorgHWAccess = FALSE; _X_EXPORT Bool xorgHWAccess = FALSE;
struct pci_slot_match xf86IsolateDevice = { _X_EXPORT struct pci_slot_match xf86IsolateDevice = {
PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, 0 PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, 0
}; };

14
hw/xfree86/common/xf86Helper.c
View File

@ -133,7 +133,7 @@ xf86AddInputDriver(InputDriverPtr driver, pointer module, int flags)
xf86InputDriverList[xf86NumInputDrivers - 1]->refCount = 0; xf86InputDriverList[xf86NumInputDrivers - 1]->refCount = 0;
} }
void _X_EXPORT void
xf86DeleteInputDriver(int drvIndex) xf86DeleteInputDriver(int drvIndex)
{ {
if (xf86InputDriverList[drvIndex] && xf86InputDriverList[drvIndex]->module) if (xf86InputDriverList[drvIndex] && xf86InputDriverList[drvIndex]->module)
@ -142,7 +142,7 @@ xf86DeleteInputDriver(int drvIndex)
xf86InputDriverList[drvIndex] = NULL; xf86InputDriverList[drvIndex] = NULL;
} }
InputDriverPtr _X_EXPORT InputDriverPtr
xf86LookupInputDriver(const char *name) xf86LookupInputDriver(const char *name)
{ {
int i; int i;
@ -155,7 +155,7 @@ xf86LookupInputDriver(const char *name)
return NULL; return NULL;
} }
InputInfoPtr _X_EXPORT InputInfoPtr
xf86LookupInput(const char *name) xf86LookupInput(const char *name)
{ {
InputInfoPtr p; InputInfoPtr p;
@ -1334,7 +1334,7 @@ xf86ErrorF(const char *format, ...)
} }
void _X_EXPORT void
xf86LogInit() xf86LogInit()
{ {
char *lf = NULL; char *lf = NULL;
@ -1365,7 +1365,7 @@ xf86LogInit()
free(lf); free(lf);
} }
void _X_EXPORT void
xf86CloseLog() xf86CloseLog()
{ {
LogClose(); LogClose();
@ -2143,7 +2143,7 @@ xf86ServerIsResetting()
} }
Bool _X_EXPORT Bool
xf86ServerIsInitialising() xf86ServerIsInitialising()
{ {
return xf86Initialising; return xf86Initialising;
@ -2583,7 +2583,7 @@ xf86ConfigPciEntityInactive(EntityInfoPtr pEnt, PciChipsets *p_chip,
xf86SetEntityFuncs(pEnt->index,init,enter,leave,private); xf86SetEntityFuncs(pEnt->index,init,enter,leave,private);
} }
void _X_EXPORT void
xf86ConfigFbEntityInactive(EntityInfoPtr pEnt, EntityProc init, xf86ConfigFbEntityInactive(EntityInfoPtr pEnt, EntityProc init,
EntityProc enter, EntityProc leave, pointer private) EntityProc enter, EntityProc leave, pointer private)
{ {

24
hw/xfree86/common/xf86Init.c
View File

@ -613,7 +613,7 @@ check_for_matching_devices(DriverPtr drvp)
* If a device can be successfully probed by the driver, \c TRUE is * If a device can be successfully probed by the driver, \c TRUE is
* returned. Otherwise, \c FALSE is returned. * returned. Otherwise, \c FALSE is returned.
*/ */
Bool _X_EXPORT Bool
xf86CallDriverProbe( DriverPtr drv, Bool detect_only ) xf86CallDriverProbe( DriverPtr drv, Bool detect_only )
{ {
Bool foundScreen = FALSE; Bool foundScreen = FALSE;
@ -719,7 +719,7 @@ DoProbe(void)
* That includes vt-manager setup, querying all possible devices and * That includes vt-manager setup, querying all possible devices and
* collecting the pixmap formats. * collecting the pixmap formats.
*/ */
void _X_EXPORT void
InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
{ {
int i, j, k, scr_index; int i, j, k, scr_index;
@ -1305,7 +1305,7 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
* Initialize all supported input devices. * Initialize all supported input devices.
*/ */
void _X_EXPORT void
InitInput(argc, argv) InitInput(argc, argv)
int argc; int argc;
char **argv; char **argv;
@ -1334,7 +1334,7 @@ InitInput(argc, argv)
* is called by dix before establishing the well known sockets. * is called by dix before establishing the well known sockets.
*/ */
void _X_EXPORT void
OsVendorInit() OsVendorInit()
{ {
static Bool beenHere = FALSE; static Bool beenHere = FALSE;
@ -1379,7 +1379,7 @@ OsVendorInit()
* checking here, since there should be restored as much as possible. * checking here, since there should be restored as much as possible.
*/ */
void _X_EXPORT void
ddxGiveUp() ddxGiveUp()
{ {
int i; int i;
@ -1424,7 +1424,7 @@ ddxGiveUp()
* are closed. * are closed.
*/ */
void _X_EXPORT void
AbortDDX() AbortDDX()
{ {
int i; int i;
@ -1460,7 +1460,7 @@ AbortDDX()
ddxGiveUp(); ddxGiveUp();
} }
void _X_EXPORT void
OsVendorFatalError() OsVendorFatalError()
{ {
#ifdef VENDORSUPPORT #ifdef VENDORSUPPORT
@ -1476,7 +1476,7 @@ OsVendorFatalError()
ErrorF("\n"); ErrorF("\n");
} }
int _X_EXPORT int
xf86SetVerbosity(int verb) xf86SetVerbosity(int verb)
{ {
int save = xf86Verbose; int save = xf86Verbose;
@ -1486,7 +1486,7 @@ xf86SetVerbosity(int verb)
return save; return save;
} }
int _X_EXPORT int
xf86SetLogVerbosity(int verb) xf86SetLogVerbosity(int verb)
{ {
int save = xf86LogVerbose; int save = xf86LogVerbose;
@ -1517,7 +1517,7 @@ xf86PrintDefaultLibraryPath(void)
*/ */
/* ARGSUSED */ /* ARGSUSED */
int _X_EXPORT int
ddxProcessArgument(int argc, char **argv, int i) ddxProcessArgument(int argc, char **argv, int i)
{ {
/* /*
@ -1852,7 +1852,7 @@ ddxProcessArgument(int argc, char **argv, int i)
* Maybe the user now knows what really to do ... * Maybe the user now knows what really to do ...
*/ */
void _X_EXPORT void
ddxUseMsg() ddxUseMsg()
{ {
ErrorF("\n"); ErrorF("\n");
@ -1906,7 +1906,7 @@ ddxUseMsg()
/* /*
* xf86LoadModules iterates over a list that is being passed in. * xf86LoadModules iterates over a list that is being passed in.
*/ */
Bool _X_EXPORT Bool
xf86LoadModules(char **list, pointer *optlist) xf86LoadModules(char **list, pointer *optlist)
{ {
int errmaj, errmin; int errmaj, errmin;

2
hw/xfree86/common/xf86Option.c
View File

@ -855,7 +855,7 @@ xf86NameCmp(const char *s1, const char *s2)
return xf86nameCompare(s1, s2); return xf86nameCompare(s1, s2);
} }
char * _X_EXPORT char *
xf86NormalizeName(const char *s) xf86NormalizeName(const char *s)
{ {
char *ret, *q; char *ret, *q;

6
hw/xfree86/common/xf86PM.c
View File

@ -34,8 +34,8 @@
#include "xf86Priv.h" #include "xf86Priv.h"
#include "xf86Xinput.h" #include "xf86Xinput.h"
int (*xf86PMGetEventFromOs)(int fd,pmEvent *events,int num) = NULL; _X_EXPORT int (*xf86PMGetEventFromOs)(int fd,pmEvent *events,int num) = NULL;
pmWait (*xf86PMConfirmEventToOs)(int fd,pmEvent event) = NULL; _X_EXPORT pmWait (*xf86PMConfirmEventToOs)(int fd,pmEvent event) = NULL;
static Bool suspended = FALSE; static Bool suspended = FALSE;
@ -178,7 +178,7 @@ DoApmEvent(pmEvent event, Bool undo)
#define MAX_NO_EVENTS 8 #define MAX_NO_EVENTS 8
void _X_EXPORT void
xf86HandlePMEvents(int fd, pointer data) xf86HandlePMEvents(int fd, pointer data)
{ {
pmEvent events[MAX_NO_EVENTS]; pmEvent events[MAX_NO_EVENTS];

2
hw/xfree86/common/xf86RAC.c
View File

@ -262,7 +262,7 @@ static int RACGCKeyIndex;
static DevPrivateKey RACGCKey = &RACGCKeyIndex; static DevPrivateKey RACGCKey = &RACGCKeyIndex;
Bool _X_EXPORT Bool
xf86RACInit(ScreenPtr pScreen, unsigned int flag) xf86RACInit(ScreenPtr pScreen, unsigned int flag)
{ {
ScrnInfoPtr pScrn; ScrnInfoPtr pScrn;

2
hw/xfree86/common/xf86RandR.c
View File

@ -411,7 +411,7 @@ xf86RandRSetNewVirtualAndDimensions(ScreenPtr pScreen,
return TRUE; return TRUE;
} }
Bool _X_EXPORT Bool
xf86RandRInit (ScreenPtr pScreen) xf86RandRInit (ScreenPtr pScreen)
{ {
rrScrPrivPtr rp; rrScrPrivPtr rp;

2
hw/xfree86/common/xf86ShowOpts.c
View File

@ -76,7 +76,7 @@ optionTypeToSting(OptionValueType type)
} }
} }
void DoShowOptions (void) { _X_EXPORT void DoShowOptions (void) {
int i = 0; int i = 0;
char **vlist = 0; char **vlist = 0;
char *pSymbol = 0; char *pSymbol = 0;

14
hw/xfree86/common/xf86Xinput.c
View File

@ -96,7 +96,7 @@
#include "os.h" #include "os.h"
EventListPtr xf86Events = NULL; _X_EXPORT EventListPtr xf86Events = NULL;
/** /**
* Eval config and modify DeviceVelocityRec accordingly * Eval config and modify DeviceVelocityRec accordingly
@ -360,7 +360,7 @@ xf86ActivateDevice(LocalDevicePtr local)
*********************************************************************** ***********************************************************************
*/ */
void _X_EXPORT void
OpenInputDevice(DeviceIntPtr dev, OpenInputDevice(DeviceIntPtr dev,
ClientPtr client, ClientPtr client,
int *status) int *status)
@ -371,7 +371,7 @@ OpenInputDevice(DeviceIntPtr dev,
*status = Success; *status = Success;
} }
void _X_EXPORT void
CloseInputDevice(DeviceIntPtr dev, CloseInputDevice(DeviceIntPtr dev,
ClientPtr client) ClientPtr client)
{ {
@ -390,7 +390,7 @@ CloseInputDevice(DeviceIntPtr dev,
*********************************************************************** ***********************************************************************
*/ */
int _X_EXPORT int
SetDeviceMode (ClientPtr client, DeviceIntPtr dev, int mode) SetDeviceMode (ClientPtr client, DeviceIntPtr dev, int mode)
{ {
LocalDevicePtr local = (LocalDevicePtr)dev->public.devicePrivate; LocalDevicePtr local = (LocalDevicePtr)dev->public.devicePrivate;
@ -416,7 +416,7 @@ SetDeviceMode (ClientPtr client, DeviceIntPtr dev, int mode)
*********************************************************************** ***********************************************************************
*/ */
int _X_EXPORT int
SetDeviceValuators (ClientPtr client, DeviceIntPtr dev, int *valuators, SetDeviceValuators (ClientPtr client, DeviceIntPtr dev, int *valuators,
int first_valuator, int num_valuators) int first_valuator, int num_valuators)
{ {
@ -439,7 +439,7 @@ SetDeviceValuators (ClientPtr client, DeviceIntPtr dev, int *valuators,
*********************************************************************** ***********************************************************************
*/ */
int _X_EXPORT int
ChangeDeviceControl (ClientPtr client, DeviceIntPtr dev, xDeviceCtl *control) ChangeDeviceControl (ClientPtr client, DeviceIntPtr dev, xDeviceCtl *control)
{ {
LocalDevicePtr local = (LocalDevicePtr)dev->public.devicePrivate; LocalDevicePtr local = (LocalDevicePtr)dev->public.devicePrivate;
@ -462,7 +462,7 @@ ChangeDeviceControl (ClientPtr client, DeviceIntPtr dev, xDeviceCtl *control)
} }
} }
void _X_EXPORT void
AddOtherInputDevices() AddOtherInputDevices()
{ {
} }

2
hw/xfree86/common/xf86cmap.c
View File

@ -1098,7 +1098,7 @@ xf86GetGammaRamp(
return Success; return Success;
} }
int _X_EXPORT int
xf86ChangeGamma( xf86ChangeGamma(
ScreenPtr pScreen, ScreenPtr pScreen,
Gamma gamma Gamma gamma

4
hw/xfree86/common/xf86fbBus.c
View File

@ -51,7 +51,7 @@
#include "xf86RAC.h" #include "xf86RAC.h"
Bool fbSlotClaimed = FALSE; _X_EXPORT Bool fbSlotClaimed = FALSE;
_X_EXPORT int _X_EXPORT int
xf86ClaimFbSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active) xf86ClaimFbSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active)
@ -79,7 +79,7 @@ xf86ClaimFbSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active)
/* /*
* Get the list of FB "slots" claimed by a screen * Get the list of FB "slots" claimed by a screen
*/ */
int _X_EXPORT int
xf86GetFbInfoForScreen(int scrnIndex) xf86GetFbInfoForScreen(int scrnIndex)
{ {
int num = 0; int num = 0;

2
hw/xfree86/common/xf86pciBus.c
View File

@ -53,7 +53,7 @@
#include "xf86RAC.h" #include "xf86RAC.h"
/* Bus-specific globals */ /* Bus-specific globals */
Bool pciSlotClaimed = FALSE; _X_EXPORT Bool pciSlotClaimed = FALSE;
static struct pci_device ** xf86PciVideoInfo = NULL; /* PCI probe for video hw */ static struct pci_device ** xf86PciVideoInfo = NULL; /* PCI probe for video hw */

4
hw/xfree86/common/xf86sbusBus.c
View File

@ -41,7 +41,7 @@
#include "xf86sbusBus.h" #include "xf86sbusBus.h"
#include "xf86Sbus.h" #include "xf86Sbus.h"
Bool sbusSlotClaimed = FALSE; _X_EXPORT Bool sbusSlotClaimed = FALSE;
static int xf86nSbusInfo; static int xf86nSbusInfo;
@ -79,7 +79,7 @@ CheckSbusDevice(const char *device, int fbNum)
psdp->fd = -1; psdp->fd = -1;
} }
void _X_EXPORT void
xf86SbusProbe(void) xf86SbusProbe(void)
{ {
int i, useProm = 0; int i, useProm = 0;

2
hw/xfree86/common/xf86xv.c
View File

@ -113,7 +113,7 @@ static Bool xf86XVInitAdaptors(ScreenPtr, XF86VideoAdaptorPtr*, int);
static int XF86XVWindowKeyIndex; static int XF86XVWindowKeyIndex;
static DevPrivateKey XF86XVWindowKey = &XF86XVWindowKeyIndex; static DevPrivateKey XF86XVWindowKey = &XF86XVWindowKeyIndex;
static int XF86XvScreenKeyIndex; static int XF86XvScreenKeyIndex;
DevPrivateKey XF86XvScreenKey = &XF86XvScreenKeyIndex; _X_EXPORT DevPrivateKey XF86XvScreenKey = &XF86XvScreenKeyIndex;
static unsigned long PortResource = 0; static unsigned long PortResource = 0;
_X_EXPORT DevPrivateKey (*XvGetScreenKeyProc)(void) = NULL; _X_EXPORT DevPrivateKey (*XvGetScreenKeyProc)(void) = NULL;

2
hw/xfree86/common/xorgHelper.c
View File

@ -16,7 +16,7 @@
#include "xorgVersion.h" #include "xorgVersion.h"
CARD32 _X_EXPORT CARD32
xorgGetVersion() xorgGetVersion()
{ {
return XORG_VERSION_CURRENT; return XORG_VERSION_CURRENT;

2
hw/xfree86/ddc/interpret_edid.c
View File

@ -163,7 +163,7 @@ xf86InterpretEDID(int scrnIndex, Uchar *block)
return NULL; return NULL;
} }
xf86MonPtr _X_EXPORT xf86MonPtr
xf86InterpretEEDID(int scrnIndex, Uchar *block) xf86InterpretEEDID(int scrnIndex, Uchar *block)
{ {
xf86MonPtr m; xf86MonPtr m;

6
hw/xfree86/dixmods/extmod/xf86dga2.c
View File

@ -62,9 +62,9 @@ static void DGAClientStateChange (CallbackListPtr*, pointer, pointer);
static ClientPtr DGAClients[MAXSCREENS]; static ClientPtr DGAClients[MAXSCREENS];
unsigned char DGAReqCode = 0; _X_EXPORT unsigned char DGAReqCode = 0;
int DGAErrorBase; _X_EXPORT int DGAErrorBase;
int DGAEventBase; _X_EXPORT int DGAEventBase;
static int DGAClientPrivateKeyIndex; static int DGAClientPrivateKeyIndex;
static DevPrivateKey DGAClientPrivateKey = &DGAClientPrivateKeyIndex; static DevPrivateKey DGAClientPrivateKey = &DGAClientPrivateKeyIndex;

2
hw/xfree86/dixmods/xkbKillSrv.c
View File

@ -45,7 +45,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "xf86.h" #include "xf86.h"
int _X_EXPORT int
XkbDDXTerminateServer(DeviceIntPtr dev,KeyCode key,XkbAction *act) XkbDDXTerminateServer(DeviceIntPtr dev,KeyCode key,XkbAction *act)
{ {
if (dev != inputInfo.keyboard) if (dev != inputInfo.keyboard)

2
hw/xfree86/dixmods/xkbPrivate.c
View File

@ -17,7 +17,7 @@
#include "os.h" #include "os.h"
#include "xf86.h" #include "xf86.h"
int _X_EXPORT int
XkbDDXPrivate(DeviceIntPtr dev,KeyCode key,XkbAction *act) XkbDDXPrivate(DeviceIntPtr dev,KeyCode key,XkbAction *act)
{ {
XkbAnyAction *xf86act = &(act->any); XkbAnyAction *xf86act = &(act->any);

2
hw/xfree86/dixmods/xkbVT.c
View File

@ -45,7 +45,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "xf86.h" #include "xf86.h"
int _X_EXPORT int
XkbDDXSwitchScreen(DeviceIntPtr dev,KeyCode key,XkbAction *act) XkbDDXSwitchScreen(DeviceIntPtr dev,KeyCode key,XkbAction *act)
{ {
int scrnnum = XkbSAScreen(&act->screen); int scrnnum = XkbSAScreen(&act->screen);

54
hw/xfree86/dri/dri.c
View File

@ -132,26 +132,26 @@ DRIOpenDRMCleanup(DRIEntPrivPtr pDRIEntPriv)
} }
} }
int _X_EXPORT int
DRIMasterFD(ScrnInfoPtr pScrn) DRIMasterFD(ScrnInfoPtr pScrn)
{ {
return DRI_ENT_PRIV(pScrn)->drmFD; return DRI_ENT_PRIV(pScrn)->drmFD;
} }
void * _X_EXPORT void *
DRIMasterSareaPointer(ScrnInfoPtr pScrn) DRIMasterSareaPointer(ScrnInfoPtr pScrn)
{ {
return DRI_ENT_PRIV(pScrn)->pLSAREA; return DRI_ENT_PRIV(pScrn)->pLSAREA;
} }
drm_handle_t _X_EXPORT drm_handle_t
DRIMasterSareaHandle(ScrnInfoPtr pScrn) DRIMasterSareaHandle(ScrnInfoPtr pScrn)
{ {
return DRI_ENT_PRIV(pScrn)->hLSAREA; return DRI_ENT_PRIV(pScrn)->hLSAREA;
} }
Bool _X_EXPORT Bool
DRIOpenDRMMaster(ScrnInfoPtr pScrn, DRIOpenDRMMaster(ScrnInfoPtr pScrn,
unsigned long sAreaSize, unsigned long sAreaSize,
const char *busID, const char *busID,
@ -785,7 +785,7 @@ drmServerInfo DRIDRMServerInfo = {
dri_drm_get_perms, dri_drm_get_perms,
}; };
Bool _X_EXPORT Bool
DRIExtensionInit(void) DRIExtensionInit(void)
{ {
if (!DRIScreenPrivKey || DRIGeneration != serverGeneration) { if (!DRIScreenPrivKey || DRIGeneration != serverGeneration) {
@ -800,7 +800,7 @@ DRIExtensionInit(void)
return TRUE; return TRUE;
} }
void _X_EXPORT void
DRIReset(void) DRIReset(void)
{ {
/* /*
@ -880,7 +880,7 @@ DRIGetClientDriverName(ScreenPtr pScreen,
DRICreateContextPriv returns a pointer to newly allocated DRICreateContextPriv returns a pointer to newly allocated
DRIContextPriv, and returns the kernel drm_context_t in pHWContext. */ DRIContextPriv, and returns the kernel drm_context_t in pHWContext. */
DRIContextPrivPtr _X_EXPORT DRIContextPrivPtr
DRICreateContextPriv(ScreenPtr pScreen, DRICreateContextPriv(ScreenPtr pScreen,
drm_context_t * pHWContext, drm_context_t * pHWContext,
DRIContextFlags flags) DRIContextFlags flags)
@ -894,7 +894,7 @@ DRICreateContextPriv(ScreenPtr pScreen,
return DRICreateContextPrivFromHandle(pScreen, *pHWContext, flags); return DRICreateContextPrivFromHandle(pScreen, *pHWContext, flags);
} }
DRIContextPrivPtr _X_EXPORT DRIContextPrivPtr
DRICreateContextPrivFromHandle(ScreenPtr pScreen, DRICreateContextPrivFromHandle(ScreenPtr pScreen,
drm_context_t hHWContext, drm_context_t hHWContext,
DRIContextFlags flags) DRIContextFlags flags)
@ -940,7 +940,7 @@ DRICreateContextPrivFromHandle(ScreenPtr pScreen,
return pDRIContextPriv; return pDRIContextPriv;
} }
Bool _X_EXPORT Bool
DRIDestroyContextPriv(DRIContextPrivPtr pDRIContextPriv) DRIDestroyContextPriv(DRIContextPrivPtr pDRIContextPriv)
{ {
DRIScreenPrivPtr pDRIPriv; DRIScreenPrivPtr pDRIPriv;
@ -1059,7 +1059,7 @@ DRIDestroyContext(ScreenPtr pScreen, XID context)
} }
/* DRIContextPrivDelete is called by the resource manager. */ /* DRIContextPrivDelete is called by the resource manager. */
Bool _X_EXPORT Bool
DRIContextPrivDelete(pointer pResource, XID id) DRIContextPrivDelete(pointer pResource, XID id)
{ {
DRIContextPrivPtr pDRIContextPriv = (DRIContextPrivPtr)pResource; DRIContextPrivPtr pDRIContextPriv = (DRIContextPrivPtr)pResource;
@ -1361,7 +1361,7 @@ DRIDestroyDrawable(ScreenPtr pScreen, ClientPtr client, DrawablePtr pDrawable)
return TRUE; return TRUE;
} }
Bool _X_EXPORT Bool
DRIDrawablePrivDelete(pointer pResource, XID id) DRIDrawablePrivDelete(pointer pResource, XID id)
{ {
WindowPtr pWin; WindowPtr pWin;
@ -1645,7 +1645,7 @@ DRIBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadmask)
} }
} }
void _X_EXPORT void
DRIDoWakeupHandler(int screenNum, pointer wakeupData, DRIDoWakeupHandler(int screenNum, pointer wakeupData,
unsigned long result, pointer pReadmask) unsigned long result, pointer pReadmask)
{ {
@ -1664,7 +1664,7 @@ DRIDoWakeupHandler(int screenNum, pointer wakeupData,
} }
} }
void _X_EXPORT void
DRIDoBlockHandler(int screenNum, pointer blockData, DRIDoBlockHandler(int screenNum, pointer blockData,
pointer pTimeout, pointer pReadmask) pointer pTimeout, pointer pReadmask)
{ {
@ -1688,7 +1688,7 @@ DRIDoBlockHandler(int screenNum, pointer blockData,
DRIUnlock(pScreen); DRIUnlock(pScreen);
} }
void _X_EXPORT void
DRISwapContext(int drmFD, void *oldctx, void *newctx) DRISwapContext(int drmFD, void *oldctx, void *newctx)
{ {
DRIContextPrivPtr oldContext = (DRIContextPrivPtr)oldctx; DRIContextPrivPtr oldContext = (DRIContextPrivPtr)oldctx;
@ -1835,13 +1835,13 @@ DRISwapContext(int drmFD, void *oldctx, void *newctx)
newContextStore); newContextStore);
} }
void* _X_EXPORT void*
DRIGetContextStore(DRIContextPrivPtr context) DRIGetContextStore(DRIContextPrivPtr context)
{ {
return((void *)context->pContextStore); return((void *)context->pContextStore);
} }
void _X_EXPORT void
DRIWindowExposures(WindowPtr pWin, RegionPtr prgn, RegionPtr bsreg) DRIWindowExposures(WindowPtr pWin, RegionPtr prgn, RegionPtr bsreg)
{ {
ScreenPtr pScreen = pWin->drawable.pScreen; ScreenPtr pScreen = pWin->drawable.pScreen;
@ -1891,7 +1891,7 @@ DRITreeTraversal(WindowPtr pWin, pointer data)
return WT_WALKCHILDREN; return WT_WALKCHILDREN;
} }
Bool _X_EXPORT Bool
DRIDestroyWindow(WindowPtr pWin) DRIDestroyWindow(WindowPtr pWin)
{ {
ScreenPtr pScreen = pWin->drawable.pScreen; ScreenPtr pScreen = pWin->drawable.pScreen;
@ -1916,7 +1916,7 @@ DRIDestroyWindow(WindowPtr pWin)
return retval; return retval;
} }
void _X_EXPORT void
DRICopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc) DRICopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
{ {
ScreenPtr pScreen = pWin->drawable.pScreen; ScreenPtr pScreen = pWin->drawable.pScreen;
@ -2055,7 +2055,7 @@ DRILockTree(ScreenPtr pScreen)
} }
} }
int _X_EXPORT int
DRIValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind) DRIValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind)
{ {
ScreenPtr pScreen = pParent->drawable.pScreen; ScreenPtr pScreen = pParent->drawable.pScreen;
@ -2081,7 +2081,7 @@ DRIValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind)
return returnValue; return returnValue;
} }
void _X_EXPORT void
DRIPostValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind) DRIPostValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind)
{ {
ScreenPtr pScreen; ScreenPtr pScreen;
@ -2107,7 +2107,7 @@ DRIPostValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind)
} }
} }
void _X_EXPORT void
DRIClipNotify(WindowPtr pWin, int dx, int dy) DRIClipNotify(WindowPtr pWin, int dx, int dy)
{ {
ScreenPtr pScreen = pWin->drawable.pScreen; ScreenPtr pScreen = pWin->drawable.pScreen;
@ -2174,7 +2174,7 @@ DRIGetDrawableIndex(WindowPtr pWin)
return index; return index;
} }
unsigned int _X_EXPORT unsigned int
DRIGetDrawableStamp(ScreenPtr pScreen, CARD32 drawable_index) DRIGetDrawableStamp(ScreenPtr pScreen, CARD32 drawable_index)
{ {
DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen); DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
@ -2182,7 +2182,7 @@ DRIGetDrawableStamp(ScreenPtr pScreen, CARD32 drawable_index)
} }
void _X_EXPORT void
DRIPrintDrawableLock(ScreenPtr pScreen, char *msg) DRIPrintDrawableLock(ScreenPtr pScreen, char *msg)
{ {
DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen); DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
@ -2271,7 +2271,7 @@ DRIGetTexOffsetFuncs(ScreenPtr pScreen,
* call the lowerlevel functions, and choose whether they will be * call the lowerlevel functions, and choose whether they will be
* called at every level of recursion (eg in validatetree). * called at every level of recursion (eg in validatetree).
*/ */
DRIWrappedFuncsRec * _X_EXPORT DRIWrappedFuncsRec *
DRIGetWrappedFuncs(ScreenPtr pScreen) DRIGetWrappedFuncs(ScreenPtr pScreen)
{ {
return &(DRI_SCREEN_PRIV(pScreen)->wrap); return &(DRI_SCREEN_PRIV(pScreen)->wrap);
@ -2297,7 +2297,7 @@ _DRIAdjustFrame(ScrnInfoPtr pScrn, DRIScreenPrivPtr pDRIPriv, int x, int y)
pDRIPriv->pSAREA->frame.height = pScrn->frameY1 - y + 1; pDRIPriv->pSAREA->frame.height = pScrn->frameY1 - y + 1;
} }
void _X_EXPORT void
DRIAdjustFrame(int scrnIndex, int x, int y, int flags) DRIAdjustFrame(int scrnIndex, int x, int y, int flags)
{ {
ScreenPtr pScreen = screenInfo.screens[scrnIndex]; ScreenPtr pScreen = screenInfo.screens[scrnIndex];
@ -2479,7 +2479,7 @@ static void drmSIGIOHandler(int interrupt, void *closure)
} }
int drmInstallSIGIOHandler(int fd, void (*f)(int, void *, void *)) _X_EXPORT int drmInstallSIGIOHandler(int fd, void (*f)(int, void *, void *))
{ {
drmHashEntry *entry; drmHashEntry *entry;
@ -2489,7 +2489,7 @@ int drmInstallSIGIOHandler(int fd, void (*f)(int, void *, void *))
return xf86InstallSIGIOHandler(fd, drmSIGIOHandler, 0); return xf86InstallSIGIOHandler(fd, drmSIGIOHandler, 0);
} }
int drmRemoveSIGIOHandler(int fd) _X_EXPORT int drmRemoveSIGIOHandler(int fd)
{ {
drmHashEntry *entry = drmGetEntry(fd); drmHashEntry *entry = drmGetEntry(fd);

6
hw/xfree86/dri2/dri2.c
View File

@ -240,7 +240,7 @@ DRI2Connect(ScreenPtr pScreen, unsigned int driverType, int *fd,
return TRUE; return TRUE;
} }
Bool _X_EXPORT Bool
DRI2Authenticate(ScreenPtr pScreen, drm_magic_t magic) DRI2Authenticate(ScreenPtr pScreen, drm_magic_t magic)
{ {
DRI2ScreenPtr ds = DRI2GetScreen(pScreen); DRI2ScreenPtr ds = DRI2GetScreen(pScreen);
@ -268,7 +268,7 @@ DRI2ClipNotify(WindowPtr pWin, int dx, int dy)
} }
} }
Bool _X_EXPORT Bool
DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info) DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info)
{ {
DRI2ScreenPtr ds; DRI2ScreenPtr ds;
@ -295,7 +295,7 @@ DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info)
return TRUE; return TRUE;
} }
void _X_EXPORT void
DRI2CloseScreen(ScreenPtr pScreen) DRI2CloseScreen(ScreenPtr pScreen)
{ {
DRI2ScreenPtr ds = DRI2GetScreen(pScreen); DRI2ScreenPtr ds = DRI2GetScreen(pScreen);

2
hw/xfree86/dummylib/xalloc.c
View File

@ -94,7 +94,7 @@ Xstrdup(const char *s)
return sd; return sd;
} }
char * _X_EXPORT char *
XNFstrdup(const char *s) XNFstrdup(const char *s)
{ {
char *sd; char *sd;

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