diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-12-03 05:43:34 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-12-03 05:43:34 -0200 |
| commit | 49f77fff1495c0a2050fb18f9b1fc627839bbfc2 (patch) | |
| tree | eebaec908150abfc0159d9ee941404918f553113 /include | |
| parent | 0b8f8b24f718820a72ebdc52423c2e6a44e848c5 (diff) | |
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
Diffstat (limited to 'include')
38 files changed, 963 insertions, 918 deletions
diff --git a/include/XIstubs.h b/include/XIstubs.h index 6797e0732..ba2f861cd 100644 --- a/include/XIstubs.h +++ b/include/XIstubs.h @@ -26,27 +26,27 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef XI_STUBS_H #define XI_STUBS_H 1 -void +extern _X_EXPORT void CloseInputDevice ( DeviceIntPtr /* d */, ClientPtr /* client */); -void +extern _X_EXPORT void AddOtherInputDevices (void); -void +extern _X_EXPORT void OpenInputDevice ( DeviceIntPtr /* dev */, ClientPtr /* client */, int * /* status */); -int +extern _X_EXPORT int SetDeviceMode ( ClientPtr /* client */, DeviceIntPtr /* dev */, int /* mode */); -int +extern _X_EXPORT int SetDeviceValuators ( ClientPtr /* client */, DeviceIntPtr /* dev */, @@ -54,7 +54,7 @@ SetDeviceValuators ( int /* first_valuator */, int /* num_valuators */); -int +extern _X_EXPORT int ChangeDeviceControl ( ClientPtr /* client */, DeviceIntPtr /* dev */, diff --git a/include/colormap.h b/include/colormap.h index 8513c0a09..a3467c93f 100644 --- a/include/colormap.h +++ b/include/colormap.h @@ -76,7 +76,7 @@ typedef struct _CMEntry *EntryPtr; /* moved to screenint.h: typedef struct _ColormapRec *ColormapPtr */ typedef struct _colorResource *colorResourcePtr; -extern int CreateColormap( +extern _X_EXPORT int CreateColormap( Colormap /*mid*/, ScreenPtr /*pScreen*/, VisualPtr /*pVisual*/, @@ -84,24 +84,24 @@ extern int CreateColormap( int /*alloc*/, int /*client*/); -extern int FreeColormap( +extern _X_EXPORT int FreeColormap( pointer /*pmap*/, XID /*mid*/); -extern int TellLostMap( +extern _X_EXPORT int TellLostMap( WindowPtr /*pwin*/, pointer /* Colormap *pmid */); -extern int TellGainedMap( +extern _X_EXPORT int TellGainedMap( WindowPtr /*pwin*/, pointer /* Colormap *pmid */); -extern int CopyColormapAndFree( +extern _X_EXPORT int CopyColormapAndFree( Colormap /*mid*/, ColormapPtr /*pSrc*/, int /*client*/); -extern int AllocColor( +extern _X_EXPORT int AllocColor( ColormapPtr /*pmap*/, unsigned short* /*pred*/, unsigned short* /*pgreen*/, @@ -109,11 +109,11 @@ extern int AllocColor( Pixel* /*pPix*/, int /*client*/); -extern void FakeAllocColor( +extern _X_EXPORT void FakeAllocColor( ColormapPtr /*pmap*/, xColorItem * /*item*/); -extern void FakeFreeColor( +extern _X_EXPORT void FakeFreeColor( ColormapPtr /*pmap*/, Pixel /*pixel*/); @@ -121,7 +121,7 @@ typedef int (*ColorCompareProcPtr)( EntryPtr /*pent*/, xrgb * /*prgb*/); -extern int FindColor( +extern _X_EXPORT int FindColor( ColormapPtr /*pmap*/, EntryPtr /*pentFirst*/, int /*size*/, @@ -131,17 +131,17 @@ extern int FindColor( int /*client*/, ColorCompareProcPtr /*comp*/); -extern int QueryColors( +extern _X_EXPORT int QueryColors( ColormapPtr /*pmap*/, int /*count*/, Pixel* /*ppixIn*/, xrgb* /*prgbList*/); -extern int FreeClientPixels( +extern _X_EXPORT int FreeClientPixels( pointer /*pcr*/, XID /*fakeid*/); -extern int AllocColorCells( +extern _X_EXPORT int AllocColorCells( int /*client*/, ColormapPtr /*pmap*/, int /*colors*/, @@ -150,7 +150,7 @@ extern int AllocColorCells( Pixel* /*ppix*/, Pixel* /*masks*/); -extern int AllocColorPlanes( +extern _X_EXPORT int AllocColorPlanes( int /*client*/, ColormapPtr /*pmap*/, int /*colors*/, @@ -163,19 +163,19 @@ extern int AllocColorPlanes( Pixel* /*pgmask*/, Pixel* /*pbmask*/); -extern int FreeColors( +extern _X_EXPORT int FreeColors( ColormapPtr /*pmap*/, int /*client*/, int /*count*/, Pixel* /*pixels*/, Pixel /*mask*/); -extern int StoreColors( +extern _X_EXPORT int StoreColors( ColormapPtr /*pmap*/, int /*count*/, xColorItem* /*defs*/); -extern int IsMapInstalled( +extern _X_EXPORT int IsMapInstalled( Colormap /*map*/, WindowPtr /*pWin*/); diff --git a/include/cursor.h b/include/cursor.h index f7c16e3f9..acc95c3b3 100644 --- a/include/cursor.h +++ b/include/cursor.h @@ -64,16 +64,16 @@ struct _DeviceIntRec; typedef struct _Cursor *CursorPtr; typedef struct _CursorMetric *CursorMetricPtr; -extern int cursorScreenDevPriv[MAXSCREENS]; +extern _X_EXPORT int cursorScreenDevPriv[MAXSCREENS]; #define CursorScreenKey(pScreen) (cursorScreenDevPriv + (pScreen)->myNum) -extern CursorPtr rootCursor; +extern _X_EXPORT CursorPtr rootCursor; -extern int FreeCursor( +extern _X_EXPORT int FreeCursor( pointer /*pCurs*/, XID /*cid*/); -extern int AllocARGBCursor( +extern _X_EXPORT int AllocARGBCursor( unsigned char* /*psrcbits*/, unsigned char* /*pmaskbits*/, CARD32* /*argb*/, @@ -88,7 +88,7 @@ extern int AllocARGBCursor( ClientPtr /*client*/, XID /*cid*/); -extern int AllocGlyphCursor( +extern _X_EXPORT int AllocGlyphCursor( Font /*source*/, unsigned int /*sourceChar*/, Font /*mask*/, @@ -103,39 +103,39 @@ extern int AllocGlyphCursor( ClientPtr /*client*/, XID /*cid*/); -extern CursorPtr CreateRootCursor( +extern _X_EXPORT CursorPtr CreateRootCursor( char* /*pfilename*/, unsigned int /*glyph*/); -extern int ServerBitsFromGlyph( +extern _X_EXPORT int ServerBitsFromGlyph( FontPtr /*pfont*/, unsigned int /*ch*/, CursorMetricPtr /*cm*/, unsigned char ** /*ppbits*/); -extern Bool CursorMetricsFromGlyph( +extern _X_EXPORT Bool CursorMetricsFromGlyph( FontPtr /*pfont*/, unsigned /*ch*/, CursorMetricPtr /*cm*/); -extern void CheckCursorConfinement( +extern _X_EXPORT void CheckCursorConfinement( WindowPtr /*pWin*/); -extern void NewCurrentScreen( +extern _X_EXPORT void NewCurrentScreen( struct _DeviceIntRec* /*pDev*/, ScreenPtr /*newScreen*/, int /*x*/, int /*y*/); -extern Bool PointerConfinedToScreen(struct _DeviceIntRec* /* pDev */); +extern _X_EXPORT Bool PointerConfinedToScreen(struct _DeviceIntRec* /* pDev */); -extern void GetSpritePosition( +extern _X_EXPORT void GetSpritePosition( struct _DeviceIntRec* /* pDev */, int * /*px*/, int * /*py*/); #ifdef PANORAMIX -extern int XineramaGetCursorScreen(struct _DeviceIntRec* pDev); +extern _X_EXPORT int XineramaGetCursorScreen(struct _DeviceIntRec* pDev); #endif /* PANORAMIX */ #endif /* CURSOR_H */ diff --git a/include/dix.h b/include/dix.h index 1e3e78db1..4aa03c2f5 100644 --- a/include/dix.h +++ b/include/dix.h @@ -119,15 +119,15 @@ typedef struct _Client *ClientPtr; /* also in misc.h */ typedef struct _WorkQueue *WorkQueuePtr; -extern ClientPtr clients[MAXCLIENTS]; -extern ClientPtr serverClient; -extern int currentMaxClients; -extern char dispatchExceptionAtReset; +extern _X_EXPORT ClientPtr clients[MAXCLIENTS]; +extern _X_EXPORT ClientPtr serverClient; +extern _X_EXPORT int currentMaxClients; +extern _X_EXPORT char dispatchExceptionAtReset; typedef int HWEventQueueType; typedef HWEventQueueType* HWEventQueuePtr; -extern HWEventQueuePtr checkForInput[2]; +extern _X_EXPORT HWEventQueuePtr checkForInput[2]; typedef struct _TimeStamp { CARD32 months; /* really ~49.7 days */ @@ -136,94 +136,94 @@ typedef struct _TimeStamp { /* dispatch.c */ -extern void SetInputCheck( +extern _X_EXPORT void SetInputCheck( HWEventQueuePtr /*c0*/, HWEventQueuePtr /*c1*/); -extern void CloseDownClient( +extern _X_EXPORT void CloseDownClient( ClientPtr /*client*/); -extern void UpdateCurrentTime(void); +extern _X_EXPORT void UpdateCurrentTime(void); -extern void UpdateCurrentTimeIf(void); +extern _X_EXPORT void UpdateCurrentTimeIf(void); -extern int dixDestroyPixmap( +extern _X_EXPORT int dixDestroyPixmap( pointer /*value*/, XID /*pid*/); -extern void InitClient( +extern _X_EXPORT void InitClient( ClientPtr /*client*/, int /*i*/, pointer /*ospriv*/); -extern ClientPtr NextAvailableClient( +extern _X_EXPORT ClientPtr NextAvailableClient( pointer /*ospriv*/); -extern void SendErrorToClient( +extern _X_EXPORT void SendErrorToClient( ClientPtr /*client*/, unsigned int /*majorCode*/, unsigned int /*minorCode*/, XID /*resId*/, int /*errorCode*/); -extern void MarkClientException( +extern _X_EXPORT void MarkClientException( ClientPtr /*client*/); /* dixutils.c */ -extern void CopyISOLatin1Lowered( +extern _X_EXPORT void CopyISOLatin1Lowered( unsigned char * /*dest*/, unsigned char * /*source*/, int /*length*/); -extern int CompareISOLatin1Lowered( +extern _X_EXPORT int CompareISOLatin1Lowered( unsigned char * /*a*/, int alen, unsigned char * /*b*/, int blen); -extern int dixLookupWindow( +extern _X_EXPORT int dixLookupWindow( WindowPtr *result, XID id, ClientPtr client, Mask access_mode); -extern int dixLookupDrawable( +extern _X_EXPORT int dixLookupDrawable( DrawablePtr *result, XID id, ClientPtr client, Mask type_mask, Mask access_mode); -extern int dixLookupGC( +extern _X_EXPORT int dixLookupGC( GCPtr *result, XID id, ClientPtr client, Mask access_mode); -extern int dixLookupClient( +extern _X_EXPORT int dixLookupClient( ClientPtr *result, XID id, ClientPtr client, Mask access_mode); -extern void NoopDDA(void); +extern _X_EXPORT void NoopDDA(void); -extern int AlterSaveSetForClient( +extern _X_EXPORT int AlterSaveSetForClient( ClientPtr /*client*/, WindowPtr /*pWin*/, unsigned /*mode*/, Bool /*toRoot*/, Bool /*map*/); -extern void DeleteWindowFromAnySaveSet( +extern _X_EXPORT void DeleteWindowFromAnySaveSet( WindowPtr /*pWin*/); -extern void BlockHandler( +extern _X_EXPORT void BlockHandler( pointer /*pTimeout*/, pointer /*pReadmask*/); -extern void WakeupHandler( +extern _X_EXPORT void WakeupHandler( int /*result*/, pointer /*pReadmask*/); @@ -232,23 +232,23 @@ typedef void (* WakeupHandlerProcPtr)( int /* result */, pointer /* pReadmask */); -extern Bool RegisterBlockAndWakeupHandlers( +extern _X_EXPORT Bool RegisterBlockAndWakeupHandlers( BlockHandlerProcPtr /*blockHandler*/, WakeupHandlerProcPtr /*wakeupHandler*/, pointer /*blockData*/); -extern void RemoveBlockAndWakeupHandlers( +extern _X_EXPORT void RemoveBlockAndWakeupHandlers( BlockHandlerProcPtr /*blockHandler*/, WakeupHandlerProcPtr /*wakeupHandler*/, pointer /*blockData*/); -extern void InitBlockAndWakeupHandlers(void); +extern _X_EXPORT void InitBlockAndWakeupHandlers(void); -extern void ProcessWorkQueue(void); +extern _X_EXPORT void ProcessWorkQueue(void); -extern void ProcessWorkQueueZombies(void); +extern _X_EXPORT void ProcessWorkQueueZombies(void); -extern Bool QueueWorkProc( +extern _X_EXPORT Bool QueueWorkProc( Bool (* /*function*/)( ClientPtr /*clientUnused*/, pointer /*closure*/), @@ -260,106 +260,106 @@ typedef Bool (* ClientSleepProcPtr)( ClientPtr /*client*/, pointer /*closure*/); -extern Bool ClientSleep( +extern _X_EXPORT Bool ClientSleep( ClientPtr /*client*/, ClientSleepProcPtr /* function */, pointer /*closure*/); #ifndef ___CLIENTSIGNAL_DEFINED___ #define ___CLIENTSIGNAL_DEFINED___ -extern Bool ClientSignal( +extern _X_EXPORT Bool ClientSignal( ClientPtr /*client*/); #endif /* ___CLIENTSIGNAL_DEFINED___ */ -extern void ClientWakeup( +extern _X_EXPORT void ClientWakeup( ClientPtr /*client*/); -extern Bool ClientIsAsleep( +extern _X_EXPORT Bool ClientIsAsleep( ClientPtr /*client*/); /* atom.c */ -extern Atom MakeAtom( +extern _X_EXPORT Atom MakeAtom( char * /*string*/, unsigned /*len*/, Bool /*makeit*/); -extern Bool ValidAtom( +extern _X_EXPORT Bool ValidAtom( Atom /*atom*/); -extern char *NameForAtom( +extern _X_EXPORT char *NameForAtom( Atom /*atom*/); -extern void AtomError(void); +extern _X_EXPORT void AtomError(void); -extern void FreeAllAtoms(void); +extern _X_EXPORT void FreeAllAtoms(void); -extern void InitAtoms(void); +extern _X_EXPORT void InitAtoms(void); /* main.c */ -extern void SetVendorRelease(int release); +extern _X_EXPORT void SetVendorRelease(int release); -extern void SetVendorString(char *string); +extern _X_EXPORT void SetVendorString(char *string); /* events.c */ -extern void SetMaskForEvent( +extern _X_EXPORT void SetMaskForEvent( int /* deviceid */, Mask /* mask */, int /* event */); -extern void ConfineToShape( +extern _X_EXPORT void ConfineToShape( DeviceIntPtr /* pDev */, RegionPtr /* shape */, int* /* px */, int* /* py */); -extern Bool IsParent( +extern _X_EXPORT Bool IsParent( WindowPtr /* maybeparent */, WindowPtr /* child */); -extern WindowPtr GetCurrentRootWindow(DeviceIntPtr pDev); +extern _X_EXPORT WindowPtr GetCurrentRootWindow(DeviceIntPtr pDev); -extern WindowPtr GetSpriteWindow(DeviceIntPtr pDev); +extern _X_EXPORT WindowPtr GetSpriteWindow(DeviceIntPtr pDev); -extern void NoticeEventTime(xEventPtr /* xE */); +extern _X_EXPORT void NoticeEventTime(xEventPtr /* xE */); -extern void EnqueueEvent( +extern _X_EXPORT void EnqueueEvent( xEventPtr /* xE */, DeviceIntPtr /* device */, int /* count */); -extern void ActivatePointerGrab( +extern _X_EXPORT void ActivatePointerGrab( DeviceIntPtr /* mouse */, GrabPtr /* grab */, TimeStamp /* time */, Bool /* autoGrab */); -extern void DeactivatePointerGrab( +extern _X_EXPORT void DeactivatePointerGrab( DeviceIntPtr /* mouse */); -extern void ActivateKeyboardGrab( +extern _X_EXPORT void ActivateKeyboardGrab( DeviceIntPtr /* keybd */, GrabPtr /* grab */, TimeStamp /* time */, Bool /* passive */); -extern void DeactivateKeyboardGrab( +extern _X_EXPORT void DeactivateKeyboardGrab( DeviceIntPtr /* keybd */); -extern void AllowSome( +extern _X_EXPORT void AllowSome( ClientPtr /* client */, TimeStamp /* time */, DeviceIntPtr /* thisDev */, int /* newState */, Bool /* core */); -extern void ReleaseActiveGrabs( +extern _X_EXPORT void ReleaseActiveGrabs( ClientPtr client); -extern int DeliverEventsToWindow( +extern _X_EXPORT int DeliverEventsToWindow( DeviceIntPtr /* pWin */, WindowPtr /* pWin */, xEventPtr /* pEvents */, @@ -368,7 +368,7 @@ extern int DeliverEventsToWindow( GrabPtr /* grab */, int /* mskidx */); -extern int DeliverDeviceEvents( +extern _X_EXPORT int DeliverDeviceEvents( WindowPtr /* pWin */, xEventPtr /* xE */, GrabPtr /* grab */, @@ -376,58 +376,58 @@ extern int DeliverDeviceEvents( DeviceIntPtr /* dev */, int /* count */); -extern void DefineInitialRootWindow( +extern _X_EXPORT void DefineInitialRootWindow( WindowPtr /* win */); -extern void InitializeSprite( +extern _X_EXPORT void InitializeSprite( DeviceIntPtr /* pDev */, WindowPtr /* pWin */); -extern void UpdateSpriteForScreen( +extern _X_EXPORT void UpdateSpriteForScreen( DeviceIntPtr /* pDev */, ScreenPtr /* pScreen */); -extern void WindowHasNewCursor( +extern _X_EXPORT void WindowHasNewCursor( WindowPtr /* pWin */); -extern Bool CheckDeviceGrabs( +extern _X_EXPORT Bool CheckDeviceGrabs( DeviceIntPtr /* device */, xEventPtr /* xE */, int /* checkFirst */, int /* count */); -extern void DeliverFocusedEvent( +extern _X_EXPORT void DeliverFocusedEvent( DeviceIntPtr /* keybd */, xEventPtr /* xE */, WindowPtr /* window */, int /* count */); -extern void DeliverGrabbedEvent( +extern _X_EXPORT void DeliverGrabbedEvent( xEventPtr /* xE */, DeviceIntPtr /* thisDev */, Bool /* deactivateGrab */, int /* count */); #ifdef XKB -extern void FixKeyState( +extern _X_EXPORT void FixKeyState( xEvent * /* xE */, DeviceIntPtr /* keybd */); #endif /* XKB */ -extern void RecalculateDeliverableEvents( +extern _X_EXPORT void RecalculateDeliverableEvents( WindowPtr /* pWin */); -extern int OtherClientGone( +extern _X_EXPORT int OtherClientGone( pointer /* value */, XID /* id */); -extern void DoFocusEvents( +extern _X_EXPORT void DoFocusEvents( DeviceIntPtr /* dev */, WindowPtr /* fromWin */, WindowPtr /* toWin */, int /* mode */); -extern int SetInputFocus( +extern _X_EXPORT int SetInputFocus( ClientPtr /* client */, DeviceIntPtr /* dev */, Window /* focusID */, @@ -435,7 +435,7 @@ extern int SetInputFocus( Time /* ctime */, Bool /* followOK */); -extern int GrabDevice( +extern _X_EXPORT int GrabDevice( ClientPtr /* client */, DeviceIntPtr /* dev */, unsigned /* this_mode */, @@ -447,38 +447,38 @@ extern int GrabDevice( CARD8 * /* status */, Bool /* coreGrab */); -extern void InitEvents(void); +extern _X_EXPORT void InitEvents(void); -extern void CloseDownEvents(void); +extern _X_EXPORT void CloseDownEvents(void); -extern void DeleteWindowFromAnyEvents( +extern _X_EXPORT void DeleteWindowFromAnyEvents( WindowPtr /* pWin */, Bool /* freeResources */); -extern Mask EventMaskForClient( +extern _X_EXPORT Mask EventMaskForClient( WindowPtr /* pWin */, ClientPtr /* client */); -extern int DeliverEvents( +extern _X_EXPORT int DeliverEvents( WindowPtr /*pWin*/, xEventPtr /*xE*/, int /*count*/, WindowPtr /*otherParent*/); -extern Bool +extern _X_EXPORT Bool CheckMotion( xEvent* /* xE */, DeviceIntPtr /* pDev */); -extern void WriteEventsToClient( +extern _X_EXPORT void WriteEventsToClient( ClientPtr /*pClient*/, int /*count*/, xEventPtr /*events*/); -extern int TryClientEvents( +extern _X_EXPORT int TryClientEvents( ClientPtr /*client*/, DeviceIntPtr /* device */, xEventPtr /*pEvents*/, @@ -487,34 +487,34 @@ extern int TryClientEvents( Mask /*filter*/, GrabPtr /*grab*/); -extern void WindowsRestructured(void); +extern _X_EXPORT void WindowsRestructured(void); -extern Bool SetClientPointer( +extern _X_EXPORT Bool SetClientPointer( ClientPtr /* client */, ClientPtr /* setter */, DeviceIntPtr /* device */); -extern DeviceIntPtr PickPointer( +extern _X_EXPORT DeviceIntPtr PickPointer( ClientPtr /* client */); -extern DeviceIntPtr PickKeyboard( +extern _X_EXPORT DeviceIntPtr PickKeyboard( ClientPtr /* client */); -extern Bool IsInterferingGrab( +extern _X_EXPORT Bool IsInterferingGrab( ClientPtr /* client */, DeviceIntPtr /* dev */, xEvent* /* events */); #ifdef PANORAMIX -extern void ReinitializeRootWindow(WindowPtr win, int xoff, int yoff); +extern _X_EXPORT void ReinitializeRootWindow(WindowPtr win, int xoff, int yoff); #endif #ifdef RANDR -void +extern _X_EXPORT void ScreenRestructured (ScreenPtr pScreen); #endif -extern int ffs(int i); +extern _X_EXPORT int ffs(int i); /* * callback manager stuff @@ -528,30 +528,30 @@ typedef struct _CallbackList *CallbackListPtr; /* also in misc.h */ typedef void (*CallbackProcPtr) ( CallbackListPtr *, pointer, pointer); -extern Bool AddCallback( +extern _X_EXPORT Bool AddCallback( CallbackListPtr * /*pcbl*/, CallbackProcPtr /*callback*/, pointer /*data*/); -extern Bool DeleteCallback( +extern _X_EXPORT Bool DeleteCallback( CallbackListPtr * /*pcbl*/, CallbackProcPtr /*callback*/, pointer /*data*/); -extern void CallCallbacks( +extern _X_EXPORT void CallCallbacks( CallbackListPtr * /*pcbl*/, pointer /*call_data*/); -extern void DeleteCallbackList( +extern _X_EXPORT void DeleteCallbackList( CallbackListPtr * /*pcbl*/); -extern void InitCallbackManager(void); +extern _X_EXPORT void InitCallbackManager(void); /* * ServerGrabCallback stuff */ -extern CallbackListPtr ServerGrabCallback; +extern _X_EXPORT CallbackListPtr ServerGrabCallback; typedef enum {SERVER_GRABBED, SERVER_UNGRABBED, CLIENT_PERVIOUS, CLIENT_IMPERVIOUS } ServerGrabState; @@ -565,7 +565,7 @@ typedef struct { * EventCallback stuff */ -extern CallbackListPtr EventCallback; +extern _X_EXPORT CallbackListPtr EventCallback; typedef struct { ClientPtr client; @@ -577,52 +577,52 @@ typedef struct { * DeviceEventCallback stuff */ -extern CallbackListPtr DeviceEventCallback; +extern _X_EXPORT CallbackListPtr DeviceEventCallback; typedef struct { xEventPtr events; int count; } DeviceEventInfoRec; -extern int XItoCoreType(int xi_type); -extern Bool DevHasCursor(DeviceIntPtr pDev); -extern Bool IsPointerDevice( DeviceIntPtr dev); -extern Bool IsKeyboardDevice(DeviceIntPtr dev); -extern Bool IsPointerEvent(xEvent* xE); +extern _X_EXPORT int XItoCoreType(int xi_type); +extern _X_EXPORT Bool DevHasCursor(DeviceIntPtr pDev); +extern _X_EXPORT Bool IsPointerDevice( DeviceIntPtr dev); +extern _X_EXPORT Bool IsKeyboardDevice(DeviceIntPtr dev); +extern _X_EXPORT Bool IsPointerEvent(xEvent* xE); /* * These are deprecated compatibility functions and will be removed soon! * Please use the noted replacements instead. */ /* replaced by dixLookupWindow */ -extern WindowPtr SecurityLookupWindow( +extern _X_EXPORT WindowPtr SecurityLookupWindow( XID id, ClientPtr client, Mask access_mode); /* replaced by dixLookupWindow */ -extern WindowPtr LookupWindow( +extern _X_EXPORT WindowPtr LookupWindow( XID id, ClientPtr client); /* replaced by dixLookupDrawable */ -extern pointer SecurityLookupDrawable( +extern _X_EXPORT pointer SecurityLookupDrawable( XID id, ClientPtr client, Mask access_mode); /* replaced by dixLookupDrawable */ -extern pointer LookupDrawable( +extern _X_EXPORT pointer LookupDrawable( XID id, ClientPtr client); /* replaced by dixLookupClient */ -extern ClientPtr LookupClient( +extern _X_EXPORT ClientPtr LookupClient( XID id, ClientPtr client); /* GE stuff */ -extern void SetGenericFilter(int extension, Mask* filters); -extern int ExtGrabDevice(ClientPtr client, +extern _X_EXPORT void SetGenericFilter(int extension, Mask* filters); +extern _X_EXPORT int ExtGrabDevice(ClientPtr client, DeviceIntPtr dev, int device_mode, WindowPtr grabWindow, diff --git a/include/dixevents.h b/include/dixevents.h index 1ce2ad0c1..b9153456f 100644 --- a/include/dixevents.h +++ b/include/dixevents.h @@ -26,62 +26,62 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef DIXEVENTS_H #define DIXEVENTS_H -extern void SetCriticalEvent(int /* event */); +extern _X_EXPORT void SetCriticalEvent(int /* event */); -extern CursorPtr GetSpriteCursor(DeviceIntPtr /*pDev*/); +extern _X_EXPORT CursorPtr GetSpriteCursor(DeviceIntPtr /*pDev*/); -extern int ProcAllowEvents(ClientPtr /* client */); +extern _X_EXPORT int ProcAllowEvents(ClientPtr /* client */); -extern int MaybeDeliverEventsToClient( +extern _X_EXPORT int MaybeDeliverEventsToClient( WindowPtr /* pWin */, xEvent * /* pEvents */, int /* count */, Mask /* filter */, ClientPtr /* dontClient */); -extern int ProcWarpPointer(ClientPtr /* client */); +extern _X_EXPORT int ProcWarpPointer(ClientPtr /* client */); -extern int EventSelectForWindow( +extern _X_EXPORT int EventSelectForWindow( WindowPtr /* pWin */, ClientPtr /* client */, Mask /* mask */); -extern int EventSuppressForWindow( +extern _X_EXPORT int EventSuppressForWindow( WindowPtr /* pWin */, ClientPtr /* client */, Mask /* mask */, Bool * /* checkOptional */); -extern int ProcSetInputFocus(ClientPtr /* client */); +extern _X_EXPORT int ProcSetInputFocus(ClientPtr /* client */); -extern int ProcGetInputFocus(ClientPtr /* client */); +extern _X_EXPORT int ProcGetInputFocus(ClientPtr /* client */); -extern int ProcGrabPointer(ClientPtr /* client */); +extern _X_EXPORT int ProcGrabPointer(ClientPtr /* client */); -extern int ProcChangeActivePointerGrab(ClientPtr /* client */); +extern _X_EXPORT int ProcChangeActivePointerGrab(ClientPtr /* client */); -extern int ProcUngrabPointer(ClientPtr /* client */); +extern _X_EXPORT int ProcUngrabPointer(ClientPtr /* client */); -extern int ProcGrabKeyboard(ClientPtr /* client */); +extern _X_EXPORT int ProcGrabKeyboard(ClientPtr /* client */); -extern int ProcUngrabKeyboard(ClientPtr /* client */); +extern _X_EXPORT int ProcUngrabKeyboard(ClientPtr /* client */); -extern int ProcQueryPointer(ClientPtr /* client */); +extern _X_EXPORT int ProcQueryPointer(ClientPtr /* client */); -extern int ProcSendEvent(ClientPtr /* client */); +extern _X_EXPORT int ProcSendEvent(ClientPtr /* client */); -extern int ProcUngrabKey(ClientPtr /* client */); +extern _X_EXPORT int ProcUngrabKey(ClientPtr /* client */); -extern int ProcGrabKey(ClientPtr /* client */); +extern _X_EXPORT int ProcGrabKey(ClientPtr /* client */); -extern int ProcGrabButton(ClientPtr /* client */); +extern _X_EXPORT int ProcGrabButton(ClientPtr /* client */); -extern int ProcUngrabButton(ClientPtr /* client */); +extern _X_EXPORT int ProcUngrabButton(ClientPtr /* client */); -extern int ProcRecolorCursor(ClientPtr /* client */); +extern _X_EXPORT int ProcRecolorCursor(ClientPtr /* client */); #ifdef PANORAMIX -extern void PostSyntheticMotion(DeviceIntPtr pDev, +extern _X_EXPORT void PostSyntheticMotion(DeviceIntPtr pDev, int x, int y, int screen, diff --git a/include/dixfont.h b/include/dixfont.h index d61dd7e9e..97bd712ce 100644 --- a/include/dixfont.h +++ b/include/dixfont.h @@ -33,45 +33,45 @@ SOFTWARE. typedef struct _DIXFontProp *DIXFontPropPtr; -extern Bool SetDefaultFont(char * /*defaultfontname*/); +extern _X_EXPORT Bool SetDefaultFont(char * /*defaultfontname*/); -extern void QueueFontWakeup(FontPathElementPtr /*fpe*/); +extern _X_EXPORT void QueueFontWakeup(FontPathElementPtr /*fpe*/); -extern void RemoveFontWakeup(FontPathElementPtr /*fpe*/); +extern _X_EXPORT void RemoveFontWakeup(FontPathElementPtr /*fpe*/); -extern void FontWakeup(pointer /*data*/, +extern _X_EXPORT void FontWakeup(pointer /*data*/, int /*count*/, pointer /*LastSelectMask*/); -extern int OpenFont(ClientPtr /*client*/, +extern _X_EXPORT int OpenFont(ClientPtr /*client*/, XID /*fid*/, Mask /*flags*/, unsigned /*lenfname*/, char * /*pfontname*/); -extern int CloseFont(pointer /*pfont*/, +extern _X_EXPORT int CloseFont(pointer /*pfont*/, XID /*fid*/); typedef struct _xQueryFontReply *xQueryFontReplyPtr; -extern void QueryFont(FontPtr /*pFont*/, +extern _X_EXPORT void QueryFont(FontPtr /*pFont*/, xQueryFontReplyPtr /*pReply*/, int /*nProtoCCIStructs*/); -extern int ListFonts(ClientPtr /*client*/, +extern _X_EXPORT int ListFonts(ClientPtr /*client*/, unsigned char * /*pattern*/, unsigned int /*length*/, unsigned int /*max_names*/); -int +extern _X_EXPORT int doListFontsWithInfo(ClientPtr /*client*/, LFWIclosurePtr /*c*/); -extern int doPolyText(ClientPtr /*client*/, +extern _X_EXPORT int doPolyText(ClientPtr /*client*/, PTclosurePtr /*c*/ ); -extern int PolyText(ClientPtr /*client*/, +extern _X_EXPORT int PolyText(ClientPtr /*client*/, DrawablePtr /*pDraw*/, GCPtr /*pGC*/, unsigned char * /*pElt*/, @@ -81,10 +81,10 @@ extern int PolyText(ClientPtr /*client*/, int /*reqType*/, XID /*did*/); -extern int doImageText(ClientPtr /*client*/, +extern _X_EXPORT int doImageText(ClientPtr /*client*/, ITclosurePtr /*c*/); -extern int ImageText(ClientPtr /*client*/, +extern _X_EXPORT int ImageText(ClientPtr /*client*/, DrawablePtr /*pDraw*/, GCPtr /*pGC*/, int /*nChars*/, @@ -94,52 +94,90 @@ extern int ImageText(ClientPtr /*client*/, int /*reqType*/, XID /*did*/); -extern int SetFontPath(ClientPtr /*client*/, +extern _X_EXPORT int SetFontPath(ClientPtr /*client*/, int /*npaths*/, unsigned char * /*paths*/, int * /*error*/); -extern int SetDefaultFontPath(char * /*path*/); +extern _X_EXPORT int SetDefaultFontPath(char * /*path*/); -extern int GetFontPath(ClientPtr client, +extern _X_EXPORT int GetFontPath(ClientPtr client, int *count, int *length, unsigned char **result); -extern void DeleteClientFontStuff(ClientPtr /*client*/); +extern _X_EXPORT void DeleteClientFontStuff(ClientPtr /*client*/); /* Quartz support on Mac OS X pulls in the QuickDraw framework whose InitFonts function conflicts here. */ #ifdef __APPLE__ #define InitFonts Darwin_X_InitFonts #endif -extern void InitFonts(void); +extern _X_EXPORT void InitFonts(void); -extern void FreeFonts(void); +extern _X_EXPORT void FreeFonts(void); -extern FontPtr find_old_font(XID /*id*/); +extern _X_EXPORT FontPtr find_old_font(XID /*id*/); -extern void GetGlyphs(FontPtr /*font*/, +extern _X_EXPORT void GetGlyphs(FontPtr /*font*/, unsigned long /*count*/, unsigned char * /*chars*/, FontEncoding /*fontEncoding*/, unsigned long * /*glyphcount*/, CharInfoPtr * /*glyphs*/); -extern void QueryGlyphExtents(FontPtr /*pFont*/, +extern _X_EXPORT void QueryGlyphExtents(FontPtr /*pFont*/, CharInfoPtr * /*charinfo*/, unsigned long /*count*/, ExtentInfoPtr /*info*/); -extern Bool QueryTextExtents(FontPtr /*pFont*/, +extern _X_EXPORT Bool QueryTextExtents(FontPtr /*pFont*/, unsigned long /*count*/, unsigned char * /*chars*/, ExtentInfoPtr /*info*/); -extern Bool ParseGlyphCachingMode(char * /*str*/); +extern _X_EXPORT Bool ParseGlyphCachingMode(char * /*str*/); -extern void InitGlyphCaching(void); +extern _X_EXPORT void InitGlyphCaching(void); -extern void SetGlyphCachingMode(int /*newmode*/); +extern _X_EXPORT void SetGlyphCachingMode(int /*newmode*/); + +/* + * libXfont stubs. + */ +extern _X_EXPORT int client_auth_generation(ClientPtr client); + +extern _X_EXPORT void DeleteFontClientID(Font id); + +extern _X_EXPORT FontResolutionPtr GetClientResolutions(int *num); + +extern _X_EXPORT int GetDefaultPointSize(void); + +extern _X_EXPORT Font GetNewFontClientID(void); + +extern _X_EXPORT int init_fs_handlers(FontPathElementPtr fpe, + BlockHandlerProcPtr block_handler); + +extern _X_EXPORT int RegisterFPEFunctions(NameCheckFunc name_func, + InitFpeFunc init_func, + FreeFpeFunc free_func, + ResetFpeFunc reset_func, + OpenFontFunc open_func, + CloseFontFunc close_func, + ListFontsFunc list_func, + StartLfwiFunc start_lfwi_func, + NextLfwiFunc next_lfwi_func, + WakeupFpeFunc wakeup_func, + ClientDiedFunc client_died, + LoadGlyphsFunc load_glyphs, + StartLaFunc start_list_alias_func, + NextLaFunc next_list_alias_func, + SetPathFunc set_path_func); + +extern _X_EXPORT void remove_fs_handlers(FontPathElementPtr fpe, + BlockHandlerProcPtr blockHandler, + Bool all); + +extern _X_EXPORT int StoreFontClientFont(FontPtr pfont, Font id); #endif /* DIXFONT_H */ diff --git a/include/dixgrabs.h b/include/dixgrabs.h index 29aa82857..36ab2b9d7 100644 --- a/include/dixgrabs.h +++ b/include/dixgrabs.h @@ -26,7 +26,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef DIXGRABS_H #define DIXGRABS_H 1 -extern GrabPtr CreateGrab( +extern _X_EXPORT GrabPtr CreateGrab( int /* client */, DeviceIntPtr /* device */, WindowPtr /* window */, @@ -41,20 +41,20 @@ extern GrabPtr CreateGrab( WindowPtr /* confineTo */, CursorPtr /* cursor */); -extern int DeletePassiveGrab( +extern _X_EXPORT int DeletePassiveGrab( pointer /* value */, XID /* id */); -extern Bool GrabMatchesSecond( +extern _X_EXPORT Bool GrabMatchesSecond( GrabPtr /* pFirstGrab */, GrabPtr /* pSecondGrab */, Bool /*ignoreDevice*/); -extern int AddPassiveGrabToList( +extern _X_EXPORT int AddPassiveGrabToList( ClientPtr /* client */, GrabPtr /* pGrab */); -extern Bool DeletePassiveGrabFromList( +extern _X_EXPORT Bool DeletePassiveGrabFromList( GrabPtr /* pMinuendGrab */); #endif /* DIXGRABS_H */ diff --git a/include/dixstruct.h b/include/dixstruct.h index 4bfe3713c..4ca061b09 100644 --- a/include/dixstruct.h +++ b/include/dixstruct.h @@ -41,7 +41,7 @@ SOFTWARE. #define MAX_REQUEST_LOG 100 #endif -extern CallbackListPtr ClientStateCallback; +extern _X_EXPORT CallbackListPtr ClientStateCallback; typedef struct { ClientPtr client; @@ -54,7 +54,7 @@ typedef void (*ReplySwapPtr) ( int /* size */, void * /* pbuf */); -extern void ReplyNotSwappd ( +extern _X_EXPORT void ReplyNotSwappd ( ClientPtr /* pClient */, int /* size */, void * /* pbuf */); @@ -140,17 +140,17 @@ typedef struct _Client { /* * Scheduling interface */ -extern long SmartScheduleTime; -extern long SmartScheduleInterval; -extern long SmartScheduleSlice; -extern long SmartScheduleMaxSlice; -extern Bool SmartScheduleDisable; -extern void SmartScheduleStartTimer(void); -extern void SmartScheduleStopTimer(void); +extern _X_EXPORT long SmartScheduleTime; +extern _X_EXPORT long SmartScheduleInterval; +extern _X_EXPORT long SmartScheduleSlice; +extern _X_EXPORT long SmartScheduleMaxSlice; +extern _X_EXPORT Bool SmartScheduleDisable; +extern _X_EXPORT void SmartScheduleStartTimer(void); +extern _X_EXPORT void SmartScheduleStopTimer(void); #define SMART_MAX_PRIORITY (20) #define SMART_MIN_PRIORITY (-20) -extern Bool SmartScheduleInit(void); +extern _X_EXPORT Bool SmartScheduleInit(void); /* This prototype is used pervasively in Xext, dix */ @@ -166,14 +166,14 @@ typedef struct _WorkQueue { pointer closure; } WorkQueueRec; -extern TimeStamp currentTime; -extern TimeStamp lastDeviceEventTime; +extern _X_EXPORT TimeStamp currentTime; +extern _X_EXPORT TimeStamp lastDeviceEventTime; -extern int CompareTimeStamps( +extern _X_EXPORT int CompareTimeStamps( TimeStamp /*a*/, TimeStamp /*b*/); -extern TimeStamp ClientTimeToServerTime(CARD32 /*c*/); +extern _X_EXPORT TimeStamp ClientTimeToServerTime(CARD32 /*c*/); typedef struct _CallbackRec { CallbackProcPtr proc; @@ -191,14 +191,14 @@ typedef struct _CallbackList { /* proc vectors */ -extern int (* InitialVector[3]) (ClientPtr /*client*/); +extern _X_EXPORT int (* InitialVector[3]) (ClientPtr /*client*/); -extern int (* ProcVector[256]) (ClientPtr /*client*/); +extern _X_EXPORT int (* ProcVector[256]) (ClientPtr /*client*/); -extern int (* SwappedProcVector[256]) (ClientPtr /*client*/); +extern _X_EXPORT int (* SwappedProcVector[256]) (ClientPtr /*client*/); -extern ReplySwapPtr ReplySwapVector[256]; +extern _X_EXPORT ReplySwapPtr ReplySwapVector[256]; -extern int ProcBadRequest(ClientPtr /*client*/); +extern _X_EXPORT int ProcBadRequest(ClientPtr /*client*/); #endif /* DIXSTRUCT_H */ diff --git a/include/exevents.h b/include/exevents.h index 8788295bf..be6521049 100644 --- a/include/exevents.h +++ b/include/exevents.h @@ -41,24 +41,24 @@ typedef struct _XIClientRec { int minor_version; } XIClientRec, *XIClientPtr; -extern void RegisterOtherDevice ( +extern _X_EXPORT void RegisterOtherDevice ( DeviceIntPtr /* device */); -extern int +extern _X_EXPORT int UpdateDeviceState ( DeviceIntPtr /* device */, xEventPtr /* xE */, int /* count */); -extern void ProcessOtherEvent ( +extern _X_EXPORT void ProcessOtherEvent ( xEventPtr /* FIXME deviceKeyButtonPointer * xE */, DeviceIntPtr /* other */, int /* count */); -extern int InitProximityClassDeviceStruct( +extern _X_EXPORT int InitProximityClassDeviceStruct( DeviceIntPtr /* dev */); -extern void InitValuatorAxisStruct( +extern _X_EXPORT void InitValuatorAxisStruct( DeviceIntPtr /* dev */, int /* axnum */, int /* minval */, @@ -67,14 +67,14 @@ extern void InitValuatorAxisStruct( int /* min_res */, int /* max_res */); -extern void DeviceFocusEvent( +extern _X_EXPORT void DeviceFocusEvent( DeviceIntPtr /* dev */, int /* type */, int /* mode */, int /* detail */, WindowPtr /* pWin */); -extern int GrabButton( +extern _X_EXPORT int GrabButton( ClientPtr /* client */, DeviceIntPtr /* dev */, BYTE /* this_device_mode */, @@ -88,7 +88,7 @@ extern int GrabButton( Window /* rconfineTo */, Mask /* eventMask */); -extern int GrabKey( +extern _X_EXPORT int GrabKey( ClientPtr /* client */, DeviceIntPtr /* dev */, BYTE /* this_device_mode */, @@ -100,7 +100,7 @@ extern int GrabKey( BOOL /* ownerEvents */, Mask /* mask */); -extern int SelectForWindow( +extern _X_EXPORT int SelectForWindow( DeviceIntPtr /* dev */, WindowPtr /* pWin */, ClientPtr /* client */, @@ -108,20 +108,20 @@ extern int SelectForWindow( Mask /* exclusivemasks */, Mask /* validmasks */); -extern int AddExtensionClient ( +extern _X_EXPORT int AddExtensionClient ( WindowPtr /* pWin */, ClientPtr /* client */, Mask /* mask */, int /* mskidx */); -extern void RecalculateDeviceDeliverableEvents( +extern _X_EXPORT void RecalculateDeviceDeliverableEvents( WindowPtr /* pWin */); -extern int InputClientGone( +extern _X_EXPORT int InputClientGone( WindowPtr /* pWin */, XID /* id */); -extern int SendEvent ( +extern _X_EXPORT int SendEvent ( ClientPtr /* client */, DeviceIntPtr /* d */, Window /* dest */, @@ -130,13 +130,13 @@ extern int SendEvent ( Mask /* mask */, int /* count */); -extern int SetButtonMapping ( +extern _X_EXPORT int SetButtonMapping ( ClientPtr /* client */, DeviceIntPtr /* dev */, int /* nElts */, BYTE * /* map */); -extern int SetModifierMapping( +extern _X_EXPORT int SetModifierMapping( ClientPtr /* client */, DeviceIntPtr /* dev */, int /* len */, @@ -145,14 +145,14 @@ extern int SetModifierMapping( KeyCode * /* inputMap */, KeyClassPtr * /* k */); -extern void SendDeviceMappingNotify( +extern _X_EXPORT void SendDeviceMappingNotify( ClientPtr /* client, */, CARD8 /* request, */, KeyCode /* firstKeyCode */, CARD8 /* count */, DeviceIntPtr /* dev */); -extern int ChangeKeyMapping( +extern _X_EXPORT int ChangeKeyMapping( ClientPtr /* client */, DeviceIntPtr /* dev */, unsigned /* len */, @@ -162,15 +162,15 @@ extern int ChangeKeyMapping( CARD8 /* keySymsPerKeyCode */, KeySym * /* map */); -extern void DeleteWindowFromAnyExtEvents( +extern _X_EXPORT void DeleteWindowFromAnyExtEvents( WindowPtr /* pWin */, Bool /* freeResources */); -extern int MaybeSendDeviceMotionNotifyHint ( +extern _X_EXPORT int MaybeSendDeviceMotionNotifyHint ( deviceKeyButtonPointer * /* pEvents */, Mask /* mask */); -extern void CheckDeviceGrabAndHintWindow ( +extern _X_EXPORT void CheckDeviceGrabAndHintWindow ( WindowPtr /* pWin */, int /* type */, deviceKeyButtonPointer * /* xE */, @@ -178,34 +178,34 @@ extern void CheckDeviceGrabAndHintWindow ( ClientPtr /* client */, Mask /* deliveryMask */); -extern void MaybeStopDeviceHint( +extern _X_EXPORT void MaybeStopDeviceHint( DeviceIntPtr /* dev */, ClientPtr /* client */); -extern int DeviceEventSuppressForWindow( +extern _X_EXPORT int DeviceEventSuppressForWindow( WindowPtr /* pWin */, ClientPtr /* client */, Mask /* mask */, int /* maskndx */); -extern void SendEventToAllWindows( +extern _X_EXPORT void SendEventToAllWindows( DeviceIntPtr /* dev */, Mask /* mask */, xEvent * /* ev */, int /* count */); /* Input device properties */ -extern void XIDeleteAllDeviceProperties( +extern _X_EXPORT void XIDeleteAllDeviceProperties( DeviceIntPtr /* device */ ); -extern int XIDeleteDeviceProperty( +extern _X_EXPORT int XIDeleteDeviceProperty( DeviceIntPtr /* device */, Atom /* property */, Bool /* fromClient */ ); -extern int XIChangeDeviceProperty( +extern _X_EXPORT int XIChangeDeviceProperty( DeviceIntPtr /* dev */, Atom /* property */, Atom /* type */, @@ -216,19 +216,19 @@ extern int XIChangeDeviceProperty( Bool /* sendevent*/ ); -extern int XIGetDeviceProperty( +extern _X_EXPORT int XIGetDeviceProperty( DeviceIntPtr /* dev */, Atom /* property */, XIPropertyValuePtr* /* value */ ); -extern int XISetDevicePropertyDeletable( +extern _X_EXPORT int XISetDevicePropertyDeletable( DeviceIntPtr /* dev */, Atom /* property */, Bool /* deletable */ ); -extern long XIRegisterPropertyHandler( +extern _X_EXPORT long XIRegisterPropertyHandler( DeviceIntPtr dev, int (*SetProperty) (DeviceIntPtr dev, Atom property, @@ -240,15 +240,15 @@ extern long XIRegisterPropertyHandler( Atom property) ); -extern void XIUnRegisterPropertyHandler( +extern _X_EXPORT void XIUnRegisterPropertyHandler( DeviceIntPtr dev, long id ); -extern Atom XIGetKnownProperty( +extern _X_EXPORT Atom XIGetKnownProperty( char* name ); -extern DeviceIntPtr XIGetDevice(xEvent *ev); +extern _X_EXPORT DeviceIntPtr XIGetDevice(xEvent *ev); #endif /* EXEVENTS_H */ diff --git a/include/extension.h b/include/extension.h index 14526e9b5..29a11c300 100644 --- a/include/extension.h +++ b/include/extension.h @@ -50,17 +50,17 @@ SOFTWARE. _XFUNCPROTOBEGIN -extern unsigned short StandardMinorOpcode(ClientPtr /*client*/); +extern _X_EXPORT unsigned short StandardMinorOpcode(ClientPtr /*client*/); -extern unsigned short MinorOpcodeOfRequest(ClientPtr /*client*/); +extern _X_EXPORT unsigned short MinorOpcodeOfRequest(ClientPtr /*client*/); -extern Bool EnableDisableExtension(char *name, Bool enable); +extern _X_EXPORT Bool EnableDisableExtension(char *name, Bool enable); -extern void EnableDisableExtensionError(char *name, Bool enable); +extern _X_EXPORT void EnableDisableExtensionError(char *name, Bool enable); -extern void InitExtensions(int argc, char **argv); +extern _X_EXPORT void InitExtensions(int argc, char **argv); -extern void CloseDownExtensions(void); +extern _X_EXPORT void CloseDownExtensions(void); _XFUNCPROTOEND diff --git a/include/extinit.h b/include/extinit.h index d9964805e..340433a83 100644 --- a/include/extinit.h +++ b/include/extinit.h @@ -32,17 +32,17 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "extnsionst.h" -void +extern _X_EXPORT void XInputExtensionInit( void ); -Bool +extern _X_EXPORT Bool DeviceIsPointerType( DeviceIntPtr dev ); -void +extern _X_EXPORT void AssignTypeAndName ( DeviceIntPtr /* dev */, Atom /* type */, diff --git a/include/extnsionst.h b/include/extnsionst.h index 59acd0ef4..19c76fcc4 100644 --- a/include/extnsionst.h +++ b/include/extnsionst.h @@ -80,9 +80,9 @@ typedef struct _ExtensionEntry { */ typedef void (*EventSwapPtr) (xEvent *, xEvent *); -extern EventSwapPtr EventSwapVector[128]; +extern _X_EXPORT EventSwapPtr EventSwapVector[128]; -extern void NotImplemented ( /* FIXME: this may move to another file... */ +extern _X_EXPORT void NotImplemented ( /* FIXME: this may move to another file... */ xEvent *, xEvent *); @@ -91,7 +91,7 @@ extern void NotImplemented ( /* FIXME: this may move to another file... */ #define GetGCValue(pGC, GCElement) (pGC->GCElement) -extern ExtensionEntry *AddExtension( +extern _X_EXPORT ExtensionEntry *AddExtension( char* /*name*/, int /*NumEvents*/, int /*NumErrors*/, @@ -101,12 +101,12 @@ extern ExtensionEntry *AddExtension( unsigned short (* /*MinorOpcodeProc*/)(ClientPtr /*client*/) ); -extern Bool AddExtensionAlias( +extern _X_EXPORT Bool AddExtensionAlias( char* /*alias*/, ExtensionEntry * /*extension*/); -extern ExtensionEntry *CheckExtension(const char *extname); -extern ExtensionEntry *GetExtensionEntry(int major); +extern _X_EXPORT ExtensionEntry *CheckExtension(const char *extname); +extern _X_EXPORT ExtensionEntry *GetExtensionEntry(int major); #endif /* EXTENSIONSTRUCT_H */ diff --git a/include/gc.h b/include/gc.h index bf4c268a8..e75cc5e83 100644 --- a/include/gc.h +++ b/include/gc.h @@ -84,16 +84,16 @@ typedef struct _GCInterest *GCInterestPtr; typedef struct _GC *GCPtr; typedef struct _GCOps *GCOpsPtr; -extern void ValidateGC( +extern _X_EXPORT void ValidateGC( DrawablePtr /*pDraw*/, GCPtr /*pGC*/); -extern int ChangeGC( +extern _X_EXPORT int ChangeGC( GCPtr/*pGC*/, BITS32 /*mask*/, XID* /*pval*/); -extern int DoChangeGC( +extern _X_EXPORT int DoChangeGC( GCPtr/*pGC*/, BITS32 /*mask*/, XID* /*pval*/, @@ -104,14 +104,14 @@ typedef union { pointer ptr; } ChangeGCVal, *ChangeGCValPtr; -extern int dixChangeGC( +extern _X_EXPORT int dixChangeGC( ClientPtr /*client*/, GCPtr /*pGC*/, BITS32 /*mask*/, CARD32 * /*pval*/, ChangeGCValPtr /*pCGCV*/); -extern GCPtr CreateGC( +extern _X_EXPORT GCPtr CreateGC( DrawablePtr /*pDrawable*/, BITS32 /*mask*/, XID* /*pval*/, @@ -119,43 +119,43 @@ extern GCPtr CreateGC( XID /*gcid*/, ClientPtr /*client*/); -extern int CopyGC( +extern _X_EXPORT int CopyGC( GCPtr/*pgcSrc*/, GCPtr/*pgcDst*/, BITS32 /*mask*/); -extern int FreeGC( +extern _X_EXPORT int FreeGC( pointer /*pGC*/, XID /*gid*/); -extern GCPtr CreateScratchGC( +extern _X_EXPORT GCPtr CreateScratchGC( ScreenPtr /*pScreen*/, unsigned /*depth*/); -extern void FreeGCperDepth( +extern _X_EXPORT void FreeGCperDepth( int /*screenNum*/); -extern Bool CreateGCperDepth( +extern _X_EXPORT Bool CreateGCperDepth( int /*screenNum*/); -extern Bool CreateDefaultStipple( +extern _X_EXPORT Bool CreateDefaultStipple( int /*screenNum*/); -extern void FreeDefaultStipple( +extern _X_EXPORT void FreeDefaultStipple( int /*screenNum*/); -extern int SetDashes( +extern _X_EXPORT int SetDashes( GCPtr /*pGC*/, unsigned /*offset*/, unsigned /*ndash*/, unsigned char* /*pdash*/); -extern int VerifyRectOrder( +extern _X_EXPORT int VerifyRectOrder( int /*nrects*/, xRectangle* /*prects*/, int /*ordering*/); -extern int SetClipRects( +extern _X_EXPORT int SetClipRects( GCPtr /*pGC*/, int /*xOrigin*/, int /*yOrigin*/, @@ -163,11 +163,11 @@ extern int SetClipRects( xRectangle* /*prects*/, int /*ordering*/); -extern GCPtr GetScratchGC( +extern _X_EXPORT GCPtr GetScratchGC( unsigned /*depth*/, ScreenPtr /*pScreen*/); -extern void FreeScratchGC( +extern _X_EXPORT void FreeScratchGC( GCPtr /*pGC*/); #endif /* GC_H */ diff --git a/include/globals.h b/include/globals.h index c3d2dcfa2..e70e7c69e 100644 --- a/include/globals.h +++ b/include/globals.h @@ -6,135 +6,139 @@ /* Global X server variables that are visible to mi, dix, os, and ddx */ -extern CARD32 defaultScreenSaverTime; -extern CARD32 defaultScreenSaverInterval; -extern CARD32 ScreenSaverTime; -extern CARD32 ScreenSaverInterval; +extern _X_EXPORT CARD32 defaultScreenSaverTime; +extern _X_EXPORT CARD32 defaultScreenSaverInterval; +extern _X_EXPORT CARD32 ScreenSaverTime; +extern _X_EXPORT CARD32 ScreenSaverInterval; #ifdef SCREENSAVER -extern Bool screenSaverSuspended; +extern _X_EXPORT Bool screenSaverSuspended; #endif -extern char *defaultFontPath; -extern int monitorResolution; -extern int defaultColorVisualClass; +extern _X_EXPORT char *defaultFontPath; +extern _X_EXPORT int monitorResolution; +extern _X_EXPORT int defaultColorVisualClass; -extern WindowPtr WindowTable[MAXSCREENS]; -extern int GrabInProgress; -extern Bool noTestExtensions; +extern _X_EXPORT WindowPtr WindowTable[MAXSCREENS]; +extern _X_EXPORT int GrabInProgress; +extern _X_EXPORT Bool noTestExtensions; -extern DDXPointRec dixScreenOrigins[MAXSCREENS]; +extern _X_EXPORT DDXPointRec dixScreenOrigins[MAXSCREENS]; -extern char *ConnectionInfo; +extern _X_EXPORT char *ConnectionInfo; #ifdef DPMSExtension -extern CARD32 defaultDPMSStandbyTime; -extern CARD32 defaultDPMSSuspendTime; -extern CARD32 defaultDPMSOffTime; -extern CARD32 DPMSStandbyTime; -extern CARD32 DPMSSuspendTime; -extern CARD32 DPMSOffTime; -extern CARD16 DPMSPowerLevel; -extern Bool defaultDPMSEnabled; -extern Bool DPMSEnabled; -extern Bool DPMSEnabledSwitch; -extern Bool DPMSDisabledSwitch; -extern Bool DPMSCapableFlag; +extern _X_EXPORT CARD32 defaultDPMSStandbyTime; +extern _X_EXPORT CARD32 defaultDPMSSuspendTime; +extern _X_EXPORT CARD32 defaultDPMSOffTime; +extern _X_EXPORT CARD32 DPMSStandbyTime; +extern _X_EXPORT CARD32 DPMSSuspendTime; +extern _X_EXPORT CARD32 DPMSOffTime; +extern _X_EXPORT CARD16 DPMSPowerLevel; +extern _X_EXPORT Bool defaultDPMSEnabled; +extern _X_EXPORT Bool DPMSEnabled; +extern _X_EXPORT Bool DPMSEnabledSwitch; +extern _X_EXPORT Bool DPMSDisabledSwitch; +extern _X_EXPORT Bool DPMSCapableFlag; #endif #ifdef PANORAMIX -extern Bool PanoramiXExtensionDisabledHack; +extern _X_EXPORT Bool PanoramiXExtensionDisabledHack; #endif #ifdef COMPOSITE -extern Bool noCompositeExtension; +extern _X_EXPORT Bool noCompositeExtension; #endif #ifdef DAMAGE -extern Bool noDamageExtension; +extern _X_EXPORT Bool noDamageExtension; #endif #ifdef DBE -extern Bool noDbeExtension; +extern _X_EXPORT Bool noDbeExtension; #endif #ifdef DPMSExtension -extern Bool noDPMSExtension; +extern _X_EXPORT Bool noDPMSExtension; #endif #ifdef GLXEXT -extern Bool noGlxExtension; +extern _X_EXPORT Bool noGlxExtension; #endif #ifdef SCREENSAVER -extern Bool noScreenSaverExtension; +extern _X_EXPORT Bool noScreenSaverExtension; #endif #ifdef MITSHM -extern Bool noMITShmExtension; +extern _X_EXPORT Bool noMITShmExtension; #endif #ifdef MULTIBUFFER -extern Bool noMultibufferExtension; +extern _X_EXPORT Bool noMultibufferExtension; #endif #ifdef RANDR -extern Bool noRRExtension; +extern _X_EXPORT Bool noRRExtension; #endif #ifdef RENDER -extern Bool noRenderExtension; +extern _X_EXPORT Bool noRenderExtension; #endif #ifdef XCSECURITY -extern Bool noSecurityExtension; +extern _X_EXPORT Bool noSecurityExtension; #endif #ifdef RES -extern Bool noResExtension; +extern _X_EXPORT Bool noResExtension; #endif #ifdef XF86BIGFONT -extern Bool noXFree86BigfontExtension; +extern _X_EXPORT Bool noXFree86BigfontExtension; #endif #ifdef XFreeXDGA -extern Bool noXFree86DGAExtension; +extern _X_EXPORT Bool noXFree86DGAExtension; #endif #ifdef XF86DRI -extern Bool noXFree86DRIExtension; +extern _X_EXPORT Bool noXFree86DRIExtension; #endif #ifdef XF86VIDMODE -extern Bool noXFree86VidModeExtension; +extern _X_EXPORT Bool noXFree86VidModeExtension; #endif #ifdef XFIXES -extern Bool noXFixesExtension; +extern _X_EXPORT Bool noXFixesExtension; #endif #ifdef XKB -/* |noXkbExtension| is defined in xc/programs/Xserver/xkb/xkbInit.c */ -extern Bool noXkbExtension; +/* noXkbExtension is defined in xkb/xkbInit.c */ +extern _X_EXPORT Bool noXkbExtension; #endif #ifdef PANORAMIX -extern Bool noPanoramiXExtension; +extern _X_EXPORT Bool noPanoramiXExtension; #endif #ifdef XSELINUX -extern Bool noSELinuxExtension; +extern _X_EXPORT Bool noSELinuxExtension; #define SELINUX_MODE_DEFAULT 0 #define SELINUX_MODE_DISABLED 1 #define SELINUX_MODE_PERMISSIVE 2 #define SELINUX_MODE_ENFORCING 3 -extern int selinuxEnforcingState; +extern _X_EXPORT int selinuxEnforcingState; #endif #ifdef XV -extern Bool noXvExtension; +extern _X_EXPORT Bool noXvExtension; +#endif + +#ifdef DRI2 +extern _X_EXPORT Bool noDRI2Extension; #endif #endif /* !_XSERV_GLOBAL_H_ */ diff --git a/include/hotplug.h b/include/hotplug.h index b4f1bb60d..d074df31d 100644 --- a/include/hotplug.h +++ b/include/hotplug.h @@ -26,7 +26,7 @@ #ifndef HOTPLUG_H #define HOTPLUG_H -void config_init(void); -void config_fini(void); +extern _X_EXPORT void config_init(void); +extern _X_EXPORT void config_fini(void); #endif /* HOTPLUG_H */ diff --git a/include/input.h b/include/input.h index c78f0b750..6a8cda0a2 100644 --- a/include/input.h +++ b/include/input.h @@ -121,8 +121,8 @@ typedef struct _EventList { } EventList, *EventListPtr; /* The DIX stores incoming input events in this list */ -extern EventListPtr InputEventList; -extern int InputEventListLen; +extern _X_EXPORT EventListPtr InputEventList; +extern _X_EXPORT int InputEventListLen; typedef int (*DeviceProc)( DeviceIntPtr /*device*/, @@ -208,8 +208,8 @@ typedef struct { unsigned char id; } LedCtrl; -extern KeybdCtrl defaultKeyboardControl; -extern PtrCtrl defaultPointerControl; +extern _X_EXPORT KeybdCtrl defaultKeyboardControl; +extern _X_EXPORT PtrCtrl defaultPointerControl; typedef struct _InputOption { char *key; @@ -217,77 +217,77 @@ typedef struct _InputOption { struct _InputOption *next; } InputOption; -extern void InitCoreDevices(void); +extern _X_EXPORT void InitCoreDevices(void); -extern DeviceIntPtr AddInputDevice( +extern _X_EXPORT DeviceIntPtr AddInputDevice( ClientPtr /*client*/, DeviceProc /*deviceProc*/, Bool /*autoStart*/); -extern Bool EnableDevice( +extern _X_EXPORT Bool EnableDevice( DeviceIntPtr /*device*/); -extern Bool ActivateDevice( +extern _X_EXPORT Bool ActivateDevice( DeviceIntPtr /*device*/); -extern Bool DisableDevice( +extern _X_EXPORT Bool DisableDevice( DeviceIntPtr /*device*/); -extern int InitAndStartDevices(void); +extern _X_EXPORT int InitAndStartDevices(void); -extern void CloseDownDevices(void); +extern _X_EXPORT void CloseDownDevices(void); -extern void UndisplayDevices(void); +extern _X_EXPORT void UndisplayDevices(void); -extern int RemoveDevice( +extern _X_EXPORT int RemoveDevice( DeviceIntPtr /*dev*/); -extern int NumMotionEvents(void); +extern _X_EXPORT int NumMotionEvents(void); -extern void RegisterPointerDevice( +extern _X_EXPORT void RegisterPointerDevice( DeviceIntPtr /*device*/); -extern void RegisterKeyboardDevice( +extern _X_EXPORT void RegisterKeyboardDevice( DeviceIntPtr /*device*/); -extern int dixLookupDevice( +extern _X_EXPORT int dixLookupDevice( DeviceIntPtr * /* dev */, int /* id */, ClientPtr /* client */, Mask /* access_mode */); -extern void QueryMinMaxKeyCodes( +extern _X_EXPORT void QueryMinMaxKeyCodes( KeyCode* /*minCode*/, KeyCode* /*maxCode*/); -extern Bool SetKeySymsMap( +extern _X_EXPORT Bool SetKeySymsMap( KeySymsPtr /*dst*/, KeySymsPtr /*src*/); -extern Bool InitKeyClassDeviceStruct( +extern _X_EXPORT Bool InitKeyClassDeviceStruct( DeviceIntPtr /*device*/, KeySymsPtr /*pKeySyms*/, CARD8 /*pModifiers*/[]); -extern Bool InitButtonClassDeviceStruct( +extern _X_EXPORT Bool InitButtonClassDeviceStruct( DeviceIntPtr /*device*/, int /*numButtons*/, CARD8* /*map*/); -extern Bool InitValuatorClassDeviceStruct( +extern _X_EXPORT Bool InitValuatorClassDeviceStruct( DeviceIntPtr /*device*/, int /*numAxes*/, int /*numMotionEvents*/, int /*mode*/); -extern Bool InitPointerAccelerationScheme( +extern _X_EXPORT Bool InitPointerAccelerationScheme( DeviceIntPtr /*dev*/, int /*scheme*/); -extern Bool InitAbsoluteClassDeviceStruct( +extern _X_EXPORT Bool InitAbsoluteClassDeviceStruct( DeviceIntPtr /*device*/); -extern Bool InitFocusClassDeviceStruct( +extern _X_EXPORT Bool InitFocusClassDeviceStruct( DeviceIntPtr /*device*/); typedef void (*BellProcPtr)( @@ -300,7 +300,7 @@ typedef void (*KbdCtrlProcPtr)( DeviceIntPtr /*device*/, KeybdCtrl * /*ctrl*/); -extern Bool InitKbdFeedbackClassDeviceStruct( +extern _X_EXPORT Bool InitKbdFeedbackClassDeviceStruct( DeviceIntPtr /*device*/, BellProcPtr /*bellProc*/, KbdCtrlProcPtr /*controlProc*/); @@ -309,7 +309,7 @@ typedef void (*PtrCtrlProcPtr)( DeviceIntPtr /*device*/, PtrCtrl * /*ctrl*/); -extern Bool InitPtrFeedbackClassDeviceStruct( +extern _X_EXPORT Bool InitPtrFeedbackClassDeviceStruct( DeviceIntPtr /*device*/, PtrCtrlProcPtr /*controlProc*/); @@ -317,7 +317,7 @@ typedef void (*StringCtrlProcPtr)( DeviceIntPtr /*device*/, StringCtrl * /*ctrl*/); -extern Bool InitStringFeedbackClassDeviceStruct( +extern _X_EXPORT Bool InitStringFeedbackClassDeviceStruct( DeviceIntPtr /*device*/, StringCtrlProcPtr /*controlProc*/, int /*max_symbols*/, @@ -328,7 +328,7 @@ typedef void (*BellCtrlProcPtr)( DeviceIntPtr /*device*/, BellCtrl * /*ctrl*/); -extern Bool InitBellFeedbackClassDeviceStruct( +extern _X_EXPORT Bool InitBellFeedbackClassDeviceStruct( DeviceIntPtr /*device*/, BellProcPtr /*bellProc*/, BellCtrlProcPtr /*controlProc*/); @@ -337,7 +337,7 @@ typedef void (*LedCtrlProcPtr)( DeviceIntPtr /*device*/, LedCtrl * /*ctrl*/); -extern Bool InitLedFeedbackClassDeviceStruct( +extern _X_EXPORT Bool InitLedFeedbackClassDeviceStruct( DeviceIntPtr /*device*/, LedCtrlProcPtr /*controlProc*/); @@ -346,11 +346,11 @@ typedef void (*IntegerCtrlProcPtr)( IntegerCtrl * /*ctrl*/); -extern Bool InitIntegerFeedbackClassDeviceStruct( +extern _X_EXPORT Bool InitIntegerFeedbackClassDeviceStruct( DeviceIntPtr /*device*/, IntegerCtrlProcPtr /*controlProc*/); -extern Bool InitPointerDeviceStruct( +extern _X_EXPORT Bool InitPointerDeviceStruct( DevicePtr /*device*/, CARD8* /*map*/, int /*numButtons*/, @@ -358,88 +358,88 @@ extern Bool InitPointerDeviceStruct( int /*numMotionEvents*/, int /*numAxes*/); -extern Bool InitKeyboardDeviceStruct( +extern _X_EXPORT Bool InitKeyboardDeviceStruct( DevicePtr /*device*/, KeySymsPtr /*pKeySyms*/, CARD8 /*pModifiers*/[], BellProcPtr /*bellProc*/, KbdCtrlProcPtr /*controlProc*/); -extern void SendMappingNotify( +extern _X_EXPORT void SendMappingNotify( DeviceIntPtr /* pDev */, unsigned int /*request*/, unsigned int /*firstKeyCode*/, unsigned int /*count*/, ClientPtr /* client */); -extern Bool BadDeviceMap( +extern _X_EXPORT Bool BadDeviceMap( BYTE* /*buff*/, int /*length*/, unsigned /*low*/, unsigned /*high*/, XID* /*errval*/); -extern Bool AllModifierKeysAreUp( +extern _X_EXPORT Bool AllModifierKeysAreUp( DeviceIntPtr /*device*/, CARD8* /*map1*/, int /*per1*/, CARD8* /*map2*/, int /*per2*/); -extern void NoteLedState( +extern _X_EXPORT void NoteLedState( DeviceIntPtr /*keybd*/, int /*led*/, Bool /*on*/); -extern void MaybeStopHint( +extern _X_EXPORT void MaybeStopHint( DeviceIntPtr /*device*/, ClientPtr /*client*/); -extern void ProcessPointerEvent( +extern _X_EXPORT void ProcessPointerEvent( xEventPtr /*xE*/, DeviceIntPtr /*mouse*/, int /*count*/); -extern void ProcessKeyboardEvent( +extern _X_EXPORT void ProcessKeyboardEvent( xEventPtr /*xE*/, DeviceIntPtr /*keybd*/, int /*count*/); #ifdef XKB -extern void CoreProcessPointerEvent( +extern _X_EXPORT void CoreProcessPointerEvent( xEventPtr /*xE*/, DeviceIntPtr /*mouse*/, int /*count*/) _X_DEPRECATED; -extern _X_DEPRECATED void CoreProcessKeyboardEvent( +extern _X_EXPORT _X_DEPRECATED void CoreProcessKeyboardEvent( xEventPtr /*xE*/, DeviceIntPtr /*keybd*/, int /*count*/) _X_DEPRECATED; #endif -extern Bool LegalModifier( +extern _X_EXPORT Bool LegalModifier( unsigned int /*key*/, DeviceIntPtr /*pDev*/); -extern void ProcessInputEvents(void); +extern _X_EXPORT void ProcessInputEvents(void); -extern void InitInput( +extern _X_EXPORT void InitInput( int /*argc*/, char ** /*argv*/); -extern int GetMaximumEventsNum(void); +extern _X_EXPORT int GetMaximumEventsNum(void); -extern int GetEventList(EventListPtr* list); -extern EventListPtr InitEventList(int num_events); -extern void SetMinimumEventSize(EventListPtr list, +extern _X_EXPORT int GetEventList(EventListPtr* list); +extern _X_EXPORT EventListPtr InitEventList(int num_events); +extern _X_EXPORT void SetMinimumEventSize(EventListPtr list, int num_events, int min_size); -extern void FreeEventList(EventListPtr list, int num_events); +extern _X_EXPORT void FreeEventList(EventListPtr list, int num_events); -extern void CreateClassesChangedEvent(EventListPtr event, +extern _X_EXPORT void CreateClassesChangedEvent(EventListPtr event, DeviceIntPtr master, DeviceIntPtr slave); -extern int GetPointerEvents( +extern _X_EXPORT int GetPointerEvents( EventListPtr events, DeviceIntPtr pDev, int type, @@ -449,13 +449,13 @@ extern int GetPointerEvents( int num_valuators, int *valuators); -extern int GetKeyboardEvents( +extern _X_EXPORT int GetKeyboardEvents( EventListPtr events, DeviceIntPtr pDev, int type, int key_code); -extern int GetKeyboardValuatorEvents( +extern _X_EXPORT int GetKeyboardValuatorEvents( EventListPtr events, DeviceIntPtr pDev, int type, @@ -464,7 +464,7 @@ extern int GetKeyboardValuatorEvents( int num_valuator, int *valuators); -extern int GetProximityEvents( +extern _X_EXPORT int GetProximityEvents( EventListPtr events, DeviceIntPtr pDev, int type, @@ -472,20 +472,20 @@ extern int GetProximityEvents( int num_valuators, int *valuators); -extern void PostSyntheticMotion( +extern _X_EXPORT void PostSyntheticMotion( DeviceIntPtr pDev, int x, int y, int screen, unsigned long time); -extern int GetMotionHistorySize( +extern _X_EXPORT int GetMotionHistorySize( void); -extern void AllocateMotionHistory( +extern _X_EXPORT void AllocateMotionHistory( DeviceIntPtr pDev); -extern int GetMotionHistory( +extern _X_EXPORT int GetMotionHistory( DeviceIntPtr pDev, xTimecoord **buff, unsigned long start, @@ -493,29 +493,29 @@ extern int GetMotionHistory( ScreenPtr pScreen, BOOL core); -extern int AttachDevice(ClientPtr client, +extern _X_EXPORT int AttachDevice(ClientPtr client, DeviceIntPtr slave, DeviceIntPtr master); -extern DeviceIntPtr GetPairedDevice(DeviceIntPtr kbd); +extern _X_EXPORT DeviceIntPtr GetPairedDevice(DeviceIntPtr kbd); -extern int AllocMasterDevice(ClientPtr client, +extern _X_EXPORT int AllocMasterDevice(ClientPtr client, char* name, DeviceIntPtr* ptr, DeviceIntPtr* keybd); -extern void DeepCopyDeviceClasses(DeviceIntPtr from, +extern _X_EXPORT void DeepCopyDeviceClasses(DeviceIntPtr from, DeviceIntPtr to); -extern int FocusSemaphoresIsset(WindowPtr win); +extern _X_EXPORT int FocusSemaphoresIsset(WindowPtr win); /* Implemented by the DDX. */ -extern int NewInputDeviceRequest( +extern _X_EXPORT int NewInputDeviceRequest( InputOption *options, DeviceIntPtr *dev); extern void DeleteInputDeviceRequest( DeviceIntPtr dev); -extern void DDXRingBell( +extern _X_EXPORT void DDXRingBell( int volume, int pitch, int duration); diff --git a/include/inputstr.h b/include/inputstr.h index 4719d37d7..039d5bc23 100644 --- a/include/inputstr.h +++ b/include/inputstr.h @@ -63,7 +63,7 @@ SOFTWARE. #define EMASKSIZE MAXDEVICES + 1 -extern DevPrivateKey CoreDevicePrivateKey; +extern _X_EXPORT DevPrivateKey CoreDevicePrivateKey; /* Kludge: OtherClients and InputClients must be compatible, see code */ @@ -486,7 +486,7 @@ typedef struct { DeviceIntPtr pointer; } InputInfo; -extern InputInfo inputInfo; +extern _X_EXPORT InputInfo inputInfo; /* for keeping the events for devices grabbed synchronously */ typedef struct _QdEvent *QdEventPtr; diff --git a/include/misc.h b/include/misc.h index 85f9e5d4f..6a920cc9f 100644 --- a/include/misc.h +++ b/include/misc.h @@ -72,9 +72,6 @@ OF THIS SOFTWARE. * */ -extern unsigned long globalSerialNumber; -extern unsigned long serverGeneration; - #include <X11/Xosdefs.h> #include <X11/Xfuncproto.h> #include <X11/Xmd.h> @@ -227,17 +224,17 @@ typedef struct _xReq *xReqPtr; ((char *) &(dst))[0] = ((char *) &(src))[1];\ ((char *) &(dst))[1] = ((char *) &(src))[0]; } -extern void SwapLongs( +extern _X_EXPORT void SwapLongs( CARD32 *list, unsigned long count); -extern void SwapShorts( +extern _X_EXPORT void SwapShorts( short *list, unsigned long count); -extern void MakePredeclaredAtoms(void); +extern _X_EXPORT void MakePredeclaredAtoms(void); -extern int Ones( +extern _X_EXPORT int Ones( unsigned long /*mask*/); typedef struct _xPoint *DDXPointPtr; @@ -256,4 +253,7 @@ typedef struct _CharInfo *CharInfoPtr; /* also in fonts/include/font.h */ #define _XTYPEDEF_CHARINFOPTR #endif +extern _X_EXPORT unsigned long globalSerialNumber; +extern _X_EXPORT unsigned long serverGeneration; + #endif /* MISC_H */ diff --git a/include/opaque.h b/include/opaque.h index 07a0715ef..b3c7c70d6 100644 --- a/include/opaque.h +++ b/include/opaque.h @@ -33,46 +33,46 @@ from The Open Group. #include "globals.h" -extern char *defaultTextFont; -extern char *defaultCursorFont; -extern int MaxClients; -extern volatile char isItTimeToYield; -extern volatile char dispatchException; +extern _X_EXPORT char *defaultTextFont; +extern _X_EXPORT char *defaultCursorFont; +extern _X_EXPORT int MaxClients; +extern _X_EXPORT volatile char isItTimeToYield; +extern _X_EXPORT volatile char dispatchException; /* bit values for dispatchException */ #define DE_RESET 1 #define DE_TERMINATE 2 #define DE_PRIORITYCHANGE 4 /* set when a client's priority changes */ -extern CARD32 TimeOutValue; -extern int ScreenSaverBlanking; -extern int ScreenSaverAllowExposures; -extern int defaultScreenSaverBlanking; -extern int defaultScreenSaverAllowExposures; -extern char *display; - -extern int defaultBackingStore; -extern Bool disableBackingStore; -extern Bool enableBackingStore; -extern Bool PartialNetwork; +extern _X_EXPORT CARD32 TimeOutValue; +extern _X_EXPORT int ScreenSaverBlanking; +extern _X_EXPORT int ScreenSaverAllowExposures; +extern _X_EXPORT int defaultScreenSaverBlanking; +extern _X_EXPORT int defaultScreenSaverAllowExposures; +extern _X_EXPORT char *display; + +extern _X_EXPORT int defaultBackingStore; +extern _X_EXPORT Bool disableBackingStore; +extern _X_EXPORT Bool enableBackingStore; +extern _X_EXPORT Bool PartialNetwork; #ifndef NOLOGOHACK -extern int logoScreenSaver; +extern _X_EXPORT int logoScreenSaver; #endif #ifdef RLIMIT_DATA -extern int limitDataSpace; +extern _X_EXPORT int limitDataSpace; #endif #ifdef RLIMIT_STACK -extern int limitStackSpace; +extern _X_EXPORT int limitStackSpace; #endif #ifdef RLIMIT_NOFILE -extern int limitNoFile; +extern _X_EXPORT int limitNoFile; #endif -extern Bool defeatAccessControl; -extern long maxBigRequestSize; -extern Bool party_like_its_1989; -extern Bool whiteRoot; +extern _X_EXPORT Bool defeatAccessControl; +extern _X_EXPORT long maxBigRequestSize; +extern _X_EXPORT Bool party_like_its_1989; +extern _X_EXPORT Bool whiteRoot; -extern Bool CoreDump; +extern _X_EXPORT Bool CoreDump; #endif /* OPAQUE_H */ diff --git a/include/os.h b/include/os.h index 77e94486a..b1f69222a 100644 --- a/include/os.h +++ b/include/os.h @@ -93,85 +93,85 @@ typedef struct _NewClientRec *NewClientPtr; #define SIGVAL void #endif -extern void (*OsVendorVErrorFProc)(const char *, va_list args); +extern _X_EXPORT void (*OsVendorVErrorFProc)(const char *, va_list args); -extern int WaitForSomething( +extern _X_EXPORT int WaitForSomething( int* /*pClientsReady*/ ); -extern int ReadRequestFromClient(ClientPtr /*client*/); +extern _X_EXPORT int ReadRequestFromClient(ClientPtr /*client*/); -extern Bool InsertFakeRequest( +extern _X_EXPORT Bool InsertFakeRequest( ClientPtr /*client*/, char* /*data*/, int /*count*/); -extern void ResetCurrentRequest(ClientPtr /*client*/); +extern _X_EXPORT void ResetCurrentRequest(ClientPtr /*client*/); -extern void FlushAllOutput(void); +extern _X_EXPORT void FlushAllOutput(void); -extern void FlushIfCriticalOutputPending(void); +extern _X_EXPORT void FlushIfCriticalOutputPending(void); -extern void SetCriticalOutputPending(void); +extern _X_EXPORT void SetCriticalOutputPending(void); -extern int WriteToClient(ClientPtr /*who*/, int /*count*/, const void* /*buf*/); +extern _X_EXPORT int WriteToClient(ClientPtr /*who*/, int /*count*/, const void* /*buf*/); -extern void ResetOsBuffers(void); +extern _X_EXPORT void ResetOsBuffers(void); -extern void InitConnectionLimits(void); +extern _X_EXPORT void InitConnectionLimits(void); -extern void NotifyParentProcess(void); +extern _X_EXPORT void NotifyParentProcess(void); -extern void CreateWellKnownSockets(void); +extern _X_EXPORT void CreateWellKnownSockets(void); -extern void ResetWellKnownSockets(void); +extern _X_EXPORT void ResetWellKnownSockets(void); -extern void CloseWellKnownConnections(void); +extern _X_EXPORT void CloseWellKnownConnections(void); -extern XID AuthorizationIDOfClient(ClientPtr /*client*/); +extern _X_EXPORT XID AuthorizationIDOfClient(ClientPtr /*client*/); -extern char *ClientAuthorized( +extern _X_EXPORT char *ClientAuthorized( ClientPtr /*client*/, unsigned int /*proto_n*/, char* /*auth_proto*/, unsigned int /*string_n*/, char* /*auth_string*/); -extern Bool EstablishNewConnections( +extern _X_EXPORT Bool EstablishNewConnections( ClientPtr /*clientUnused*/, pointer /*closure*/); -extern void CheckConnections(void); +extern _X_EXPORT void CheckConnections(void); -extern void CloseDownConnection(ClientPtr /*client*/); +extern _X_EXPORT void CloseDownConnection(ClientPtr /*client*/); -extern void AddGeneralSocket(int /*fd*/); +extern _X_EXPORT void AddGeneralSocket(int /*fd*/); -extern void RemoveGeneralSocket(int /*fd*/); +extern _X_EXPORT void RemoveGeneralSocket(int /*fd*/); -extern void AddEnabledDevice(int /*fd*/); +extern _X_EXPORT void AddEnabledDevice(int /*fd*/); -extern void RemoveEnabledDevice(int /*fd*/); +extern _X_EXPORT void RemoveEnabledDevice(int /*fd*/); -extern int OnlyListenToOneClient(ClientPtr /*client*/); +extern _X_EXPORT int OnlyListenToOneClient(ClientPtr /*client*/); -extern void ListenToAllClients(void); +extern _X_EXPORT void ListenToAllClients(void); -extern void IgnoreClient(ClientPtr /*client*/); +extern _X_EXPORT void IgnoreClient(ClientPtr /*client*/); -extern void AttendClient(ClientPtr /*client*/); +extern _X_EXPORT void AttendClient(ClientPtr /*client*/); -extern void MakeClientGrabImpervious(ClientPtr /*client*/); +extern _X_EXPORT void MakeClientGrabImpervious(ClientPtr /*client*/); -extern void MakeClientGrabPervious(ClientPtr /*client*/); +extern _X_EXPORT void MakeClientGrabPervious(ClientPtr /*client*/); #ifdef XQUARTZ extern void ListenOnOpenFD(int /* fd */, int /* noxauth */); #endif -extern CARD32 GetTimeInMillis(void); +extern _X_EXPORT CARD32 GetTimeInMillis(void); -extern void AdjustWaitForDelay( +extern _X_EXPORT void AdjustWaitForDelay( pointer /*waitTime*/, unsigned long /*newdelay*/); @@ -182,69 +182,69 @@ typedef CARD32 (*OsTimerCallback)( CARD32 /* time */, pointer /* arg */); -extern void TimerInit(void); +extern _X_EXPORT void TimerInit(void); -extern Bool TimerForce(OsTimerPtr /* timer */); +extern _X_EXPORT Bool TimerForce(OsTimerPtr /* timer */); #define TimerAbsolute (1<<0) #define TimerForceOld (1<<1) -extern OsTimerPtr TimerSet( +extern _X_EXPORT OsTimerPtr TimerSet( OsTimerPtr /* timer */, int /* flags */, CARD32 /* millis */, OsTimerCallback /* func */, pointer /* arg */); -extern void TimerCheck(void); -extern void TimerCancel(OsTimerPtr /* pTimer */); -extern void TimerFree(OsTimerPtr /* pTimer */); +extern _X_EXPORT void TimerCheck(void); +extern _X_EXPORT void TimerCancel(OsTimerPtr /* pTimer */); +extern _X_EXPORT void TimerFree(OsTimerPtr /* pTimer */); -extern void SetScreenSaverTimer(void); -extern void FreeScreenSaverTimer(void); +extern _X_EXPORT void SetScreenSaverTimer(void); +extern _X_EXPORT void FreeScreenSaverTimer(void); -extern SIGVAL AutoResetServer(int /*sig*/); +extern _X_EXPORT SIGVAL AutoResetServer(int /*sig*/); -extern SIGVAL GiveUp(int /*sig*/); +extern _X_EXPORT SIGVAL GiveUp(int /*sig*/); -extern void UseMsg(void); +extern _X_EXPORT void UseMsg(void); -extern void ProcessCommandLine(int /*argc*/, char* /*argv*/[]); +extern _X_EXPORT void ProcessCommandLine(int /*argc*/, char* /*argv*/[]); -extern int set_font_authorizations( +extern _X_EXPORT int set_font_authorizations( char ** /* authorizations */, int * /*authlen */, pointer /* client */); #ifndef _HAVE_XALLOC_DECLS #define _HAVE_XALLOC_DECLS -extern pointer Xalloc(unsigned long /*amount*/); -extern pointer Xcalloc(unsigned long /*amount*/); -extern pointer Xrealloc(pointer /*ptr*/, unsigned long /*amount*/); -extern void Xfree(pointer /*ptr*/); +extern _X_EXPORT pointer Xalloc(unsigned long /*amount*/); +extern _X_EXPORT pointer Xcalloc(unsigned long /*amount*/); +extern _X_EXPORT pointer Xrealloc(pointer /*ptr*/, unsigned long /*amount*/); +extern _X_EXPORT void Xfree(pointer /*ptr*/); #endif -extern pointer XNFalloc(unsigned long /*amount*/); -extern pointer XNFcalloc(unsigned long /*amount*/); -extern pointer XNFrealloc(pointer /*ptr*/, unsigned long /*amount*/); +extern _X_EXPORT pointer XNFalloc(unsigned long /*amount*/); +extern _X_EXPORT pointer XNFcalloc(unsigned long /*amount*/); +extern _X_EXPORT pointer XNFrealloc(pointer /*ptr*/, unsigned long /*amount*/); -extern char *Xstrdup(const char *s); -extern char *XNFstrdup(const char *s); -extern char *Xprintf(const char *fmt, ...); -extern char *Xvprintf(const char *fmt, va_list va); -extern char *XNFprintf(const char *fmt, ...); -extern char *XNFvprintf(const char *fmt, va_list va); +extern _X_EXPORT char *Xstrdup(const char *s); +extern _X_EXPORT char *XNFstrdup(const char *s); +extern _X_EXPORT char *Xprintf(const char *fmt, ...); +extern _X_EXPORT char *Xvprintf(const char *fmt, va_list va); +extern _X_EXPORT char *XNFprintf(const char *fmt, ...); +extern _X_EXPORT char *XNFvprintf(const char *fmt, va_list va); typedef SIGVAL (*OsSigHandlerPtr)(int /* sig */); -extern OsSigHandlerPtr OsSignal(int /* sig */, OsSigHandlerPtr /* handler */); +extern _X_EXPORT OsSigHandlerPtr OsSignal(int /* sig */, OsSigHandlerPtr /* handler */); -extern int auditTrailLevel; +extern _X_EXPORT int auditTrailLevel; -extern void LockServer(void); -extern void UnlockServer(void); +extern _X_EXPORT void LockServer(void); +extern _X_EXPORT void UnlockServer(void); -extern int OsLookupColor( +extern _X_EXPORT int OsLookupColor( int /*screen*/, char * /*name*/, unsigned /*len*/, @@ -252,24 +252,24 @@ extern int OsLookupColor( unsigned short * /*pgreen*/, unsigned short * /*pblue*/); -extern void OsInit(void); +extern _X_EXPORT void OsInit(void); -extern void OsCleanup(Bool); +extern _X_EXPORT void OsCleanup(Bool); -extern void OsVendorFatalError(void); +extern _X_EXPORT void OsVendorFatalError(void); -extern void OsVendorInit(void); +extern _X_EXPORT void OsVendorInit(void); -void OsBlockSignals (void); +extern _X_EXPORT void OsBlockSignals (void); -void OsReleaseSignals (void); +extern _X_EXPORT void OsReleaseSignals (void); #if !defined(WIN32) -extern int System(char *); -extern pointer Popen(char *, char *); -extern int Pclose(pointer); -extern pointer Fopen(char *, char *); -extern int Fclose(pointer); +extern _X_EXPORT int System(char *); +extern _X_EXPORT pointer Popen(char *, char *); +extern _X_EXPORT int Pclose(pointer); +extern _X_EXPORT pointer Fopen(char *, char *); +extern _X_EXPORT int Fclose(pointer); #else #define System(a) system(a) #define Popen(a,b) popen(a,b) @@ -278,16 +278,16 @@ extern int Fclose(pointer); #define Fclose(a) fclose(a) #endif -extern void CheckUserParameters(int argc, char **argv, char **envp); -extern void CheckUserAuthorization(void); +extern _X_EXPORT void CheckUserParameters(int argc, char **argv, char **envp); +extern _X_EXPORT void CheckUserAuthorization(void); -extern int AddHost( +extern _X_EXPORT int AddHost( ClientPtr /*client*/, int /*family*/, unsigned /*length*/, pointer /*pAddr*/); -extern Bool ForEachHostInFamily ( +extern _X_EXPORT Bool ForEachHostInFamily ( int /*family*/, Bool (* /*func*/ )( unsigned char * /* addr */, @@ -295,13 +295,13 @@ extern Bool ForEachHostInFamily ( pointer /* closure */), pointer /*closure*/); -extern int RemoveHost( +extern _X_EXPORT int RemoveHost( ClientPtr /*client*/, int /*family*/, unsigned /*length*/, pointer /*pAddr*/); -extern int GetHosts( +extern _X_EXPORT int GetHosts( pointer * /*data*/, int * /*pnHosts*/, int * /*pLen*/, @@ -309,11 +309,11 @@ extern int GetHosts( typedef struct sockaddr * sockaddrPtr; -extern int InvalidHost(sockaddrPtr /*saddr*/, int /*len*/, ClientPtr client); +extern _X_EXPORT int InvalidHost(sockaddrPtr /*saddr*/, int /*len*/, ClientPtr client); -extern int LocalClient(ClientPtr /* client */); +extern _X_EXPORT int LocalClient(ClientPtr /* client */); -extern int LocalClientCred(ClientPtr, int *, int *); +extern _X_EXPORT int LocalClientCred(ClientPtr, int *, int *); #define LCC_UID_SET (1 << 0) #define LCC_GID_SET (1 << 1) @@ -330,42 +330,42 @@ typedef struct { int zoneid; /* Only set on Solaris 10 & later */ } LocalClientCredRec; -extern int GetLocalClientCreds(ClientPtr, LocalClientCredRec **); -extern void FreeLocalClientCreds(LocalClientCredRec *); +extern _X_EXPORT int GetLocalClientCreds(ClientPtr, LocalClientCredRec **); +extern _X_EXPORT void FreeLocalClientCreds(LocalClientCredRec *); -extern int ChangeAccessControl(ClientPtr /*client*/, int /*fEnabled*/); +extern _X_EXPORT int ChangeAccessControl(ClientPtr /*client*/, int /*fEnabled*/); -extern int GetAccessControl(void); +extern _X_EXPORT int GetAccessControl(void); -extern void AddLocalHosts(void); +extern _X_EXPORT void AddLocalHosts(void); -extern void ResetHosts(char *display); +extern _X_EXPORT void ResetHosts(char *display); -extern void EnableLocalHost(void); +extern _X_EXPORT void EnableLocalHost(void); -extern void DisableLocalHost(void); +extern _X_EXPORT void DisableLocalHost(void); -extern void AccessUsingXdmcp(void); +extern _X_EXPORT void AccessUsingXdmcp(void); -extern void DefineSelf(int /*fd*/); +extern _X_EXPORT void DefineSelf(int /*fd*/); -extern void AugmentSelf(pointer /*from*/, int /*len*/); +extern _X_EXPORT void AugmentSelf(pointer /*from*/, int /*len*/); -extern void InitAuthorization(char * /*filename*/); +extern _X_EXPORT void InitAuthorization(char * /*filename*/); /* extern int LoadAuthorization(void); */ -extern void RegisterAuthorizations(void); +extern _X_EXPORT void RegisterAuthorizations(void); -extern int AuthorizationFromID ( +extern _X_EXPORT int AuthorizationFromID ( XID id, unsigned short *name_lenp, char **namep, unsigned short *data_lenp, char **datap); -extern XID CheckAuthorization( +extern _X_EXPORT XID CheckAuthorization( unsigned int /*namelength*/, char * /*name*/, unsigned int /*datalength*/, @@ -374,21 +374,21 @@ extern XID CheckAuthorization( char ** /*reason*/ ); -extern void ResetAuthorization(void); +extern _X_EXPORT void ResetAuthorization(void); -extern int RemoveAuthorization ( +extern _X_EXPORT int RemoveAuthorization ( unsigned short name_length, char *name, unsigned short data_length, char *data); -extern int AddAuthorization( +extern _X_EXPORT int AddAuthorization( unsigned int /*name_length*/, char * /*name*/, unsigned int /*data_length*/, char * /*data*/); -extern XID GenerateAuthorization( +extern _X_EXPORT XID GenerateAuthorization( unsigned int /* name_length */, char * /* name */, unsigned int /* data_length */, @@ -396,9 +396,9 @@ extern XID GenerateAuthorization( unsigned int * /* data_length_return */, char ** /* data_return */); -extern int ddxProcessArgument(int /*argc*/, char * /*argv*/ [], int /*i*/); +extern _X_EXPORT int ddxProcessArgument(int /*argc*/, char * /*argv*/ [], int /*i*/); -extern void ddxUseMsg(void); +extern _X_EXPORT void ddxUseMsg(void); /* int ReqLen(xReq *req, ClientPtr client) * Given a pointer to a *complete* request, return its length in bytes. @@ -424,7 +424,7 @@ extern void ddxUseMsg(void); : (otherReqTypePtr)(((CARD32*)_pxReq)+1)) /* stuff for ReplyCallback */ -extern CallbackListPtr ReplyCallback; +extern _X_EXPORT CallbackListPtr ReplyCallback; typedef struct { ClientPtr client; const void *replyData; @@ -434,31 +434,31 @@ typedef struct { } ReplyInfoRec; /* stuff for FlushCallback */ -extern CallbackListPtr FlushCallback; +extern _X_EXPORT CallbackListPtr FlushCallback; -extern void AbortDDX(void); -extern void ddxGiveUp(void); -extern int TimeSinceLastInputEvent(void); +extern _X_EXPORT void AbortDDX(void); +extern _X_EXPORT void ddxGiveUp(void); +extern _X_EXPORT int TimeSinceLastInputEvent(void); /* strcasecmp.c */ #if NEED_STRCASECMP #define strcasecmp xstrcasecmp -extern int xstrcasecmp(const char *s1, const char *s2); +extern _X_EXPORT int xstrcasecmp(const char *s1, const char *s2); #endif #if NEED_STRNCASECMP #define strncasecmp xstrncasecmp -extern int xstrncasecmp(const char *s1, const char *s2, size_t n); +extern _X_EXPORT int xstrncasecmp(const char *s1, const char *s2, size_t n); #endif #if NEED_STRCASESTR #define strcasestr xstrcasestr -extern char *xstrcasestr(const char *s, const char *find); +extern _X_EXPORT char *xstrcasestr(const char *s, const char *find); #endif #ifndef HAS_STRLCPY -extern size_t strlcpy(char *dst, const char *src, size_t siz); -extern size_t strlcat(char *dst, const char *src, size_t siz); +extern _X_EXPORT size_t strlcpy(char *dst, const char *src, size_t siz); +extern _X_EXPORT size_t strlcat(char *dst, const char *src, size_t siz); #endif /* Logging. */ @@ -491,21 +491,21 @@ typedef enum { #define _printf_attribute(a,b) /**/ #endif -extern const char *LogInit(const char *fname, const char *backup); -extern void LogClose(void); -extern Bool LogSetParameter(LogParameter param, int value); -extern void LogVWrite(int verb, const char *f, va_list args); -extern void LogWrite(int verb, const char *f, ...) _printf_attribute(2,3); -extern void LogVMessageVerb(MessageType type, int verb, const char *format, +extern _X_EXPORT const char *LogInit(const char *fname, const char *backup); +extern _X_EXPORT void LogClose(void); +extern _X_EXPORT Bool LogSetParameter(LogParameter param, int value); +extern _X_EXPORT void LogVWrite(int verb, const char *f, va_list args); +extern _X_EXPORT void LogWrite(int verb, const char *f, ...) _printf_attribute(2,3); +extern _X_EXPORT void LogVMessageVerb(MessageType type, int verb, const char *format, va_list args); -extern void LogMessageVerb(MessageType type, int verb, const char *format, +extern _X_EXPORT void LogMessageVerb(MessageType type, int verb, const char *format, ...) _printf_attribute(3,4); -extern void LogMessage(MessageType type, const char *format, ...) +extern _X_EXPORT void LogMessage(MessageType type, const char *format, ...) _printf_attribute(2,3); -extern void FreeAuditTimer(void); -extern void AuditF(const char *f, ...) _printf_attribute(1,2); -extern void VAuditF(const char *f, va_list args); -extern void FatalError(const char *f, ...) _printf_attribute(1,2) +extern _X_EXPORT void FreeAuditTimer(void); +extern _X_EXPORT void AuditF(const char *f, ...) _printf_attribute(1,2); +extern _X_EXPORT void VAuditF(const char *f, va_list args); +extern _X_EXPORT void FatalError(const char *f, ...) _printf_attribute(1,2) #if defined(__GNUC__) && (__GNUC__ > 2) __attribute((noreturn)) #endif @@ -517,11 +517,11 @@ __attribute((noreturn)) #define DebugF(...) /* */ #endif -extern void VErrorF(const char *f, va_list args); -extern void ErrorF(const char *f, ...) _printf_attribute(1,2); -extern void Error(char *str); -extern void LogPrintMarkers(void); +extern _X_EXPORT void VErrorF(const char *f, va_list args); +extern _X_EXPORT void ErrorF(const char *f, ...) _printf_attribute(1,2); +extern _X_EXPORT void Error(char *str); +extern _X_EXPORT void LogPrintMarkers(void); -extern void xorg_backtrace(void); +extern _X_EXPORT void xorg_backtrace(void); #endif /* OS_H */ diff --git a/include/pixmap.h b/include/pixmap.h index 5ff0b8c16..55a9c818a 100644 --- a/include/pixmap.h +++ b/include/pixmap.h @@ -93,7 +93,7 @@ typedef union _PixUnion { #define WindowDrawable(type) \ ((type == DRAWABLE_WINDOW) || (type == UNDRAWABLE_WINDOW)) -extern PixmapPtr GetScratchPixmapHeader( +extern _X_EXPORT PixmapPtr GetScratchPixmapHeader( ScreenPtr /*pScreen*/, int /*width*/, int /*height*/, @@ -102,16 +102,16 @@ extern PixmapPtr GetScratchPixmapHeader( int /*devKind*/, pointer /*pPixData*/); -extern void FreeScratchPixmapHeader( +extern _X_EXPORT void FreeScratchPixmapHeader( PixmapPtr /*pPixmap*/); -extern Bool CreateScratchPixmapsForScreen( +extern _X_EXPORT Bool CreateScratchPixmapsForScreen( int /*scrnum*/); -extern void FreeScratchPixmapsForScreen( +extern _X_EXPORT void FreeScratchPixmapsForScreen( int /*scrnum*/); -extern PixmapPtr AllocatePixmap( +extern _X_EXPORT PixmapPtr AllocatePixmap( ScreenPtr /*pScreen*/, int /*pixDataSize*/); diff --git a/include/privates.h b/include/privates.h index e3fa83cde..3c5c32175 100644 --- a/include/privates.h +++ b/include/privates.h @@ -27,31 +27,31 @@ typedef struct _Private PrivateRec; * Request pre-allocated private space for your driver/module. * Calling this is not necessary if only a pointer by itself is needed. */ -extern int +extern _X_EXPORT int dixRequestPrivate(const DevPrivateKey key, unsigned size); /* * Allocates a new private and attaches it to an existing object. */ -extern pointer * +extern _X_EXPORT pointer * dixAllocatePrivate(PrivateRec **privates, const DevPrivateKey key); /* * Look up a private pointer. */ -pointer +extern _X_EXPORT pointer dixLookupPrivate(PrivateRec **privates, const DevPrivateKey key); /* * Look up the address of a private pointer. */ -pointer * +extern _X_EXPORT pointer * dixLookupPrivateAddr(PrivateRec **privates, const DevPrivateKey key); /* * Set a private pointer. */ -int +extern _X_EXPORT int dixSetPrivate(PrivateRec **privates, const DevPrivateKey key, pointer val); /* @@ -63,24 +63,24 @@ typedef struct _PrivateCallback { pointer *value; /* address of private pointer */ } PrivateCallbackRec; -extern int +extern _X_EXPORT int dixRegisterPrivateInitFunc(const DevPrivateKey key, CallbackProcPtr callback, pointer userdata); -extern int +extern _X_EXPORT int dixRegisterPrivateDeleteFunc(const DevPrivateKey key, CallbackProcPtr callback, pointer userdata); /* * Frees private data. */ -extern void +extern _X_EXPORT void dixFreePrivates(PrivateRec *privates); /* * Resets the subsystem, called from the main loop. */ -extern int +extern _X_EXPORT int dixResetPrivates(void); /* @@ -93,14 +93,14 @@ dixResetPrivates(void); * Looks up the offset where the devPrivates field is located. * Returns -1 if no offset has been registered for the resource type. */ -extern int +extern _X_EXPORT int dixLookupPrivateOffset(RESTYPE type); /* * Specifies the offset where the devPrivates field is located. * A negative value indicates no devPrivates field is available. */ -extern int +extern _X_EXPORT int dixRegisterPrivateOffset(RESTYPE type, int offset); /* diff --git a/include/property.h b/include/property.h index 1207e8191..075eb4a0d 100644 --- a/include/property.h +++ b/include/property.h @@ -52,14 +52,14 @@ SOFTWARE. typedef struct _Property *PropertyPtr; -extern int dixLookupProperty( +extern _X_EXPORT int dixLookupProperty( PropertyPtr * /*result*/, WindowPtr /*pWin*/, Atom /*proprty*/, ClientPtr /*pClient*/, Mask /*access_mode*/); -extern int dixChangeWindowProperty( +extern _X_EXPORT int dixChangeWindowProperty( ClientPtr /*pClient*/, WindowPtr /*pWin*/, Atom /*property*/, @@ -70,7 +70,7 @@ extern int dixChangeWindowProperty( pointer /*value*/, Bool /*sendevent*/); -extern int ChangeWindowProperty( +extern _X_EXPORT int ChangeWindowProperty( WindowPtr /*pWin*/, Atom /*property*/, Atom /*type*/, @@ -80,12 +80,12 @@ extern int ChangeWindowProperty( pointer /*value*/, Bool /*sendevent*/); -extern int DeleteProperty( +extern _X_EXPORT int DeleteProperty( ClientPtr /*client*/, WindowPtr /*pWin*/, Atom /*propName*/); -extern void DeleteAllWindowProperties( +extern _X_EXPORT void DeleteAllWindowProperties( WindowPtr /*pWin*/); #endif /* PROPERTY_H */ diff --git a/include/ptrveloc.h b/include/ptrveloc.h index 384f9a6f2..e491051e4 100644 --- a/include/ptrveloc.h +++ b/include/ptrveloc.h @@ -100,31 +100,31 @@ typedef struct _DeviceVelocityRec { } DeviceVelocityRec, *DeviceVelocityPtr; -extern void +extern _X_EXPORT void InitVelocityData(DeviceVelocityPtr s); -extern void +extern _X_EXPORT void InitFilterChain(DeviceVelocityPtr s, float rdecay, float degression, int lutsize, int stages); -extern int +extern _X_EXPORT int SetAccelerationProfile(DeviceVelocityPtr s, int profile_num); -extern DeviceVelocityPtr +extern _X_EXPORT DeviceVelocityPtr GetDevicePredictableAccelData(DeviceIntPtr pDev); -extern void +extern _X_EXPORT void SetDeviceSpecificAccelerationProfile(DeviceVelocityPtr s, PointerAccelerationProfileFunc profile); -extern void +extern _X_EXPORT void AccelerationDefaultCleanup(DeviceIntPtr pDev); -extern void +extern _X_EXPORT void acceleratePointerPredictable(DeviceIntPtr pDev, int first_valuator, int num_valuators, int *valuators, int evtime); -extern void +extern _X_EXPORT void acceleratePointerLightweight(DeviceIntPtr pDev, int first_valuator, int num_valuators, int *valuators, int ignore); diff --git a/include/regionstr.h b/include/regionstr.h index db712f8ae..eead1a1f2 100644 --- a/include/regionstr.h +++ b/include/regionstr.h @@ -66,9 +66,9 @@ typedef struct pixman_region16 RegionRec, *RegionPtr; typedef struct pixman_region16_data RegDataRec, *RegDataPtr; -extern BoxRec miEmptyBox; -extern RegDataRec miEmptyData; -extern RegDataRec miBrokenData; +extern _X_EXPORT BoxRec miEmptyBox; +extern _X_EXPORT RegDataRec miEmptyData; +extern _X_EXPORT RegDataRec miBrokenData; #define REGION_NIL(reg) ((reg)->data && !(reg)->data->numRects) /* not a region */ @@ -198,96 +198,96 @@ extern RegDataRec miBrokenData; /* moved from mi.h */ -extern void InitRegions (void); +extern _X_EXPORT void InitRegions (void); -extern RegionPtr miRegionCreate( +extern _X_EXPORT RegionPtr miRegionCreate( BoxPtr /*rect*/, int /*size*/); -extern void miRegionInit( +extern _X_EXPORT void miRegionInit( RegionPtr /*pReg*/, BoxPtr /*rect*/, int /*size*/); -extern void miRegionDestroy( +extern _X_EXPORT void miRegionDestroy( RegionPtr /*pReg*/); -extern void miRegionUninit( +extern _X_EXPORT void miRegionUninit( RegionPtr /*pReg*/); -extern Bool miRegionCopy( +extern _X_EXPORT Bool miRegionCopy( RegionPtr /*dst*/, RegionPtr /*src*/); -extern Bool miIntersect( +extern _X_EXPORT Bool miIntersect( RegionPtr /*newReg*/, RegionPtr /*reg1*/, RegionPtr /*reg2*/); -extern Bool miUnion( +extern _X_EXPORT Bool miUnion( RegionPtr /*newReg*/, RegionPtr /*reg1*/, RegionPtr /*reg2*/); -extern Bool miRegionAppend( +extern _X_EXPORT Bool miRegionAppend( RegionPtr /*dstrgn*/, RegionPtr /*rgn*/); -extern Bool miRegionValidate( +extern _X_EXPORT Bool miRegionValidate( RegionPtr /*badreg*/, Bool * /*pOverlap*/); -extern RegionPtr miRectsToRegion( +extern _X_EXPORT RegionPtr miRectsToRegion( int /*nrects*/, xRectanglePtr /*prect*/, int /*ctype*/); -extern Bool miSubtract( +extern _X_EXPORT Bool miSubtract( RegionPtr /*regD*/, RegionPtr /*regM*/, RegionPtr /*regS*/); -extern Bool miInverse( +extern _X_EXPORT Bool miInverse( RegionPtr /*newReg*/, RegionPtr /*reg1*/, BoxPtr /*invRect*/); -extern int miRectIn( +extern _X_EXPORT int miRectIn( RegionPtr /*region*/, BoxPtr /*prect*/); -extern void miTranslateRegion( +extern _X_EXPORT void miTranslateRegion( RegionPtr /*pReg*/, int /*x*/, int /*y*/); -extern void miRegionReset( +extern _X_EXPORT void miRegionReset( RegionPtr /*pReg*/, BoxPtr /*pBox*/); -extern Bool miRegionBreak( +extern _X_EXPORT Bool miRegionBreak( RegionPtr /*pReg*/); -extern Bool miPointInRegion( +extern _X_EXPORT Bool miPointInRegion( RegionPtr /*pReg*/, int /*x*/, int /*y*/, BoxPtr /*box*/); -extern Bool miRegionEqual( +extern _X_EXPORT Bool miRegionEqual( RegionPtr /*pReg1*/, RegionPtr /*pReg2*/); -extern Bool miRegionNotEmpty( +extern _X_EXPORT Bool miRegionNotEmpty( RegionPtr /*pReg*/); -extern void miRegionEmpty( +extern _X_EXPORT void miRegionEmpty( RegionPtr /*pReg*/); -extern BoxPtr miRegionExtents( +extern _X_EXPORT BoxPtr miRegionExtents( RegionPtr /*pReg*/); -extern void miPrintRegion( +extern _X_EXPORT void miPrintRegion( RegionPtr /*pReg*/); #endif /* REGIONSTRUCT_H */ diff --git a/include/registry.h b/include/registry.h index 29e5fdfd3..325f76515 100644 --- a/include/registry.h +++ b/include/registry.h @@ -28,22 +28,22 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * Registration functions. The name string is not copied, so it must * not be a stack variable. */ -void RegisterResourceName(RESTYPE type, char *name); -void RegisterExtensionNames(ExtensionEntry *ext); +extern _X_EXPORT void RegisterResourceName(RESTYPE type, char *name); +extern _X_EXPORT void RegisterExtensionNames(ExtensionEntry *ext); /* * Lookup functions. The returned string must not be modified or freed. */ -const char *LookupMajorName(int major); -const char *LookupRequestName(int major, int minor); -const char *LookupEventName(int event); -const char *LookupErrorName(int error); -const char *LookupResourceName(RESTYPE rtype); +extern _X_EXPORT const char *LookupMajorName(int major); +extern _X_EXPORT const char *LookupRequestName(int major, int minor); +extern _X_EXPORT const char *LookupEventName(int event); +extern _X_EXPORT const char *LookupErrorName(int error); +extern _X_EXPORT const char *LookupResourceName(RESTYPE rtype); /* * Setup and teardown */ -void dixResetRegistry(void); +extern _X_EXPORT void dixResetRegistry(void); #else /* XREGISTRY */ diff --git a/include/resource.h b/include/resource.h index b8105d45a..cb6e0644a 100644 --- a/include/resource.h +++ b/include/resource.h @@ -122,7 +122,7 @@ typedef unsigned long RESTYPE; #define BAD_RESOURCE 0xe0000000 /* Resource state callback */ -extern CallbackListPtr ResourceStateCallback; +extern _X_EXPORT CallbackListPtr ResourceStateCallback; typedef enum {ResourceStateAdding, ResourceStateFreeing} ResourceState; @@ -154,15 +154,15 @@ typedef Bool (*FindComplexResType)( XID /*id*/, pointer /*cdata*/); -extern RESTYPE CreateNewResourceType( +extern _X_EXPORT RESTYPE CreateNewResourceType( DeleteType /*deleteFunc*/); -extern RESTYPE CreateNewResourceClass(void); +extern _X_EXPORT RESTYPE CreateNewResourceClass(void); -extern Bool InitClientResources( +extern _X_EXPORT Bool InitClientResources( ClientPtr /*client*/); -extern XID FakeClientID( +extern _X_EXPORT XID FakeClientID( int /*client*/); /* Quartz support on Mac OS X uses the CarbonCore @@ -170,74 +170,74 @@ extern XID FakeClientID( #ifdef __APPLE__ #define AddResource Darwin_X_AddResource #endif -extern Bool AddResource( +extern _X_EXPORT Bool AddResource( XID /*id*/, RESTYPE /*type*/, pointer /*value*/); -extern void FreeResource( +extern _X_EXPORT void FreeResource( XID /*id*/, RESTYPE /*skipDeleteFuncType*/); -extern void FreeResourceByType( +extern _X_EXPORT void FreeResourceByType( XID /*id*/, RESTYPE /*type*/, Bool /*skipFree*/); -extern Bool ChangeResourceValue( +extern _X_EXPORT Bool ChangeResourceValue( XID /*id*/, RESTYPE /*rtype*/, pointer /*value*/); -extern void FindClientResourcesByType( +extern _X_EXPORT void FindClientResourcesByType( ClientPtr /*client*/, RESTYPE /*type*/, FindResType /*func*/, pointer /*cdata*/); -extern void FindAllClientResources( +extern _X_EXPORT void FindAllClientResources( ClientPtr /*client*/, FindAllRes /*func*/, pointer /*cdata*/); -extern void FreeClientNeverRetainResources( +extern _X_EXPORT void FreeClientNeverRetainResources( ClientPtr /*client*/); -extern void FreeClientResources( +extern _X_EXPORT void FreeClientResources( ClientPtr /*client*/); -extern void FreeAllResources(void); +extern _X_EXPORT void FreeAllResources(void); -extern Bool LegalNewID( +extern _X_EXPORT Bool LegalNewID( XID /*id*/, ClientPtr /*client*/); -extern pointer LookupClientResourceComplex( +extern _X_EXPORT pointer LookupClientResourceComplex( ClientPtr client, RESTYPE type, FindComplexResType func, pointer cdata); -extern int dixLookupResource( +extern _X_EXPORT int dixLookupResource( pointer *result, XID id, RESTYPE rtype, ClientPtr client, Mask access_mode); -extern void GetXIDRange( +extern _X_EXPORT void GetXIDRange( int /*client*/, Bool /*server*/, XID * /*minp*/, XID * /*maxp*/); -extern unsigned int GetXIDList( +extern _X_EXPORT unsigned int GetXIDList( ClientPtr /*client*/, unsigned int /*count*/, XID * /*pids*/); -extern RESTYPE lastResourceType; -extern RESTYPE TypeMask; +extern _X_EXPORT RESTYPE lastResourceType; +extern _X_EXPORT RESTYPE TypeMask; /* * These are deprecated compatibility functions and will be removed soon! @@ -245,26 +245,26 @@ extern RESTYPE TypeMask; */ /* replaced by dixLookupResource */ -extern pointer SecurityLookupIDByType( +extern _X_EXPORT pointer SecurityLookupIDByType( ClientPtr client, XID id, RESTYPE rtype, Mask access_mode); /* replaced by dixLookupResource */ -extern pointer SecurityLookupIDByClass( +extern _X_EXPORT pointer SecurityLookupIDByClass( ClientPtr client, XID id, RESTYPE classes, Mask access_mode); /* replaced by dixLookupResource */ -extern pointer LookupIDByType( +extern _X_EXPORT pointer LookupIDByType( XID id, RESTYPE rtype); /* replaced by dixLookupResource */ -extern pointer LookupIDByClass( +extern _X_EXPORT pointer LookupIDByClass( XID id, RESTYPE classes); diff --git a/include/screenint.h b/include/screenint.h index 6d074a375..4e6c574e7 100644 --- a/include/screenint.h +++ b/include/screenint.h @@ -55,7 +55,7 @@ typedef struct _Visual *VisualPtr; typedef struct _Depth *DepthPtr; typedef struct _Screen *ScreenPtr; -extern int AddScreen( +extern _X_EXPORT int AddScreen( Bool (* /*pfnInit*/)( int /*index*/, ScreenPtr /*pScreen*/, diff --git a/include/scrnintstr.h b/include/scrnintstr.h index a309077ce..ab50e7a32 100644 --- a/include/scrnintstr.h +++ b/include/scrnintstr.h @@ -611,9 +611,9 @@ typedef struct _ScreenInfo { int unused; } ScreenInfo; -extern ScreenInfo screenInfo; +extern _X_EXPORT ScreenInfo screenInfo; -extern void InitOutput( +extern _X_EXPORT void InitOutput( ScreenInfo * /*pScreenInfo*/, int /*argc*/, char ** /*argv*/); diff --git a/include/selection.h b/include/selection.h index dd9b056fe..3271f6abb 100644 --- a/include/selection.h +++ b/include/selection.h @@ -70,12 +70,12 @@ typedef struct _Selection { * Selection API */ -int dixLookupSelection(Selection **result, Atom name, +extern _X_EXPORT int dixLookupSelection(Selection **result, Atom name, ClientPtr client, Mask access_mode); -extern Selection *CurrentSelections; +extern _X_EXPORT Selection *CurrentSelections; -extern CallbackListPtr SelectionCallback; +extern _X_EXPORT CallbackListPtr SelectionCallback; typedef enum { SelectionSetOwner, @@ -94,11 +94,11 @@ typedef struct { * Selection server internals */ -void InitSelections(void); +extern _X_EXPORT void InitSelections(void); -void DeleteWindowFromAnySelections(WindowPtr pWin); +extern _X_EXPORT void DeleteWindowFromAnySelections(WindowPtr pWin); -void DeleteClientFromAnySelections(ClientPtr client); +extern _X_EXPORT void DeleteClientFromAnySelections(ClientPtr client); #endif /* SELECTION_H */ diff --git a/include/servermd.h b/include/servermd.h index dec9f3b9e..e1d644e00 100644 --- a/include/servermd.h +++ b/include/servermd.h @@ -288,6 +288,7 @@ SOFTWARE. #define LOG2_BYTES_PER_SCANLINE_PAD 2 #endif +#include <X11/Xfuncproto.h> /* * This returns the number of padding units, for depth d and width w. * For bitmaps this can be calculated with the macros above. @@ -303,7 +304,7 @@ typedef struct _PaddingInfo { int bytesPerPixel; /* only set when notPower2 is TRUE */ int bitsPerPixel; /* bits per pixel */ } PaddingInfo; -extern PaddingInfo PixmapWidthPaddingInfo[]; +extern _X_EXPORT PaddingInfo PixmapWidthPaddingInfo[]; /* The only portable way to get the bpp from the depth is to look it up */ #define BitsPerPixel(d) (PixmapWidthPaddingInfo[d].bitsPerPixel) diff --git a/include/swaprep.h b/include/swaprep.h index bebd3a814..8c02737d3 100644 --- a/include/swaprep.h +++ b/include/swaprep.h @@ -26,239 +26,239 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef SWAPREP_H #define SWAPREP_H 1 -extern void Swap32Write( +extern _X_EXPORT void Swap32Write( ClientPtr /* pClient */, int /* size */, CARD32 * /* pbuf */); -extern void CopySwap32Write( +extern _X_EXPORT void CopySwap32Write( ClientPtr /* pClient */, int /* size */, CARD32 * /* pbuf */); -extern void CopySwap16Write( +extern _X_EXPORT void CopySwap16Write( ClientPtr /* pClient */, int /* size */, short * /* pbuf */); -extern void SGenericReply( +extern _X_EXPORT void SGenericReply( ClientPtr /* pClient */, int /* size */, xGenericReply * /* pRep */); -extern void SGetWindowAttributesReply( +extern _X_EXPORT void SGetWindowAttributesReply( ClientPtr /* pClient */, int /* size */, xGetWindowAttributesReply * /* pRep */); -extern void SGetGeometryReply( +extern _X_EXPORT void SGetGeometryReply( ClientPtr /* pClient */, int /* size */, xGetGeometryReply * /* pRep */); -extern void SQueryTreeReply( +extern _X_EXPORT void SQueryTreeReply( ClientPtr /* pClient */, int /* size */, xQueryTreeReply * /* pRep */); -extern void SInternAtomReply( +extern _X_EXPORT void SInternAtomReply( ClientPtr /* pClient */, int /* size */, xInternAtomReply * /* pRep */); -extern void SGetAtomNameReply( +extern _X_EXPORT void SGetAtomNameReply( ClientPtr /* pClient */, int /* size */, xGetAtomNameReply * /* pRep */); -extern void SGetPropertyReply( +extern _X_EXPORT void SGetPropertyReply( ClientPtr /* pClient */, int /* size */, xGetPropertyReply * /* pRep */); -extern void SListPropertiesReply( +extern _X_EXPORT void SListPropertiesReply( ClientPtr /* pClient */, int /* size */, xListPropertiesReply * /* pRep */); -extern void SGetSelectionOwnerReply( +extern _X_EXPORT void SGetSelectionOwnerReply( ClientPtr /* pClient */, int /* size */, xGetSelectionOwnerReply * /* pRep */); -extern void SQueryPointerReply( +extern _X_EXPORT void SQueryPointerReply( ClientPtr /* pClient */, int /* size */, xQueryPointerReply * /* pRep */); -extern void SwapTimeCoordWrite( +extern _X_EXPORT void SwapTimeCoordWrite( ClientPtr /* pClient */, int /* size */, xTimecoord * /* pRep */); -extern void SGetMotionEventsReply( +extern _X_EXPORT void SGetMotionEventsReply( ClientPtr /* pClient */, int /* size */, xGetMotionEventsReply * /* pRep */); -extern void STranslateCoordsReply( +extern _X_EXPORT void STranslateCoordsReply( ClientPtr /* pClient */, int /* size */, xTranslateCoordsReply * /* pRep */); -extern void SGetInputFocusReply( +extern _X_EXPORT void SGetInputFocusReply( ClientPtr /* pClient */, int /* size */, xGetInputFocusReply * /* pRep */); -extern void SQueryKeymapReply( +extern _X_EXPORT void SQueryKeymapReply( ClientPtr /* pClient */, int /* size */, xQueryKeymapReply * /* pRep */); -extern void SQueryFontReply( +extern _X_EXPORT void SQueryFontReply( ClientPtr /* pClient */, int /* size */, xQueryFontReply * /* pRep */); -extern void SQueryTextExtentsReply( +extern _X_EXPORT void SQueryTextExtentsReply( ClientPtr /* pClient */, int /* size */, xQueryTextExtentsReply * /* pRep */); -extern void SListFontsReply( +extern _X_EXPORT void SListFontsReply( ClientPtr /* pClient */, int /* size */, xListFontsReply * /* pRep */); -extern void SListFontsWithInfoReply( +extern _X_EXPORT void SListFontsWithInfoReply( ClientPtr /* pClient */, int /* size */, xListFontsWithInfoReply * /* pRep */); -extern void SGetFontPathReply( +extern _X_EXPORT void SGetFontPathReply( ClientPtr /* pClient */, int /* size */, xGetFontPathReply * /* pRep */); -extern void SGetImageReply( +extern _X_EXPORT void SGetImageReply( ClientPtr /* pClient */, int /* size */, xGetImageReply * /* pRep */); -extern void SListInstalledColormapsReply( +extern _X_EXPORT void SListInstalledColormapsReply( ClientPtr /* pClient */, int /* size */, xListInstalledColormapsReply * /* pRep */); -extern void SAllocColorReply( +extern _X_EXPORT void SAllocColorReply( ClientPtr /* pClient */, int /* size */, xAllocColorReply * /* pRep */); -extern void SAllocNamedColorReply( +extern _X_EXPORT void SAllocNamedColorReply( ClientPtr /* pClient */, int /* size */, xAllocNamedColorReply * /* pRep */); -extern void SAllocColorCellsReply( +extern _X_EXPORT void SAllocColorCellsReply( ClientPtr /* pClient */, int /* size */, xAllocColorCellsReply * /* pRep */); -extern void SAllocColorPlanesReply( +extern _X_EXPORT void SAllocColorPlanesReply( ClientPtr /* pClient */, int /* size */, xAllocColorPlanesReply * /* pRep */); -extern void SQColorsExtend( +extern _X_EXPORT void SQColorsExtend( ClientPtr /* pClient */, int /* size */, xrgb * /* prgb */); -extern void SQueryColorsReply( +extern _X_EXPORT void SQueryColorsReply( ClientPtr /* pClient */, int /* size */, xQueryColorsReply * /* pRep */); -extern void SLookupColorReply( +extern _X_EXPORT void SLookupColorReply( ClientPtr /* pClient */, int /* size */, xLookupColorReply * /* pRep */); -extern void SQueryBestSizeReply( +extern _X_EXPORT void SQueryBestSizeReply( ClientPtr /* pClient */, int /* size */, xQueryBestSizeReply * /* pRep */); -extern void SListExtensionsReply( +extern _X_EXPORT void SListExtensionsReply( ClientPtr /* pClient */, int /* size */, xListExtensionsReply * /* pRep */); -extern void SGetKeyboardMappingReply( +extern _X_EXPORT void SGetKeyboardMappingReply( ClientPtr /* pClient */, int /* size */, xGetKeyboardMappingReply * /* pRep */); -extern void SGetPointerMappingReply( +extern _X_EXPORT void SGetPointerMappingReply( ClientPtr /* pClient */, int /* size */, xGetPointerMappingReply * /* pRep */); -extern void SGetModifierMappingReply( +extern _X_EXPORT void SGetModifierMappingReply( ClientPtr /* pClient */, int /* size */, xGetModifierMappingReply * /* pRep */); -extern void SGetKeyboardControlReply( +extern _X_EXPORT void SGetKeyboardControlReply( ClientPtr /* pClient */, int /* size */, xGetKeyboardControlReply * /* pRep */); -extern void SGetPointerControlReply( +extern _X_EXPORT void SGetPointerControlReply( ClientPtr /* pClient */, int /* size */, xGetPointerControlReply * /* pRep */); -extern void SGetScreenSaverReply( +extern _X_EXPORT void SGetScreenSaverReply( ClientPtr /* pClient */, int /* size */, xGetScreenSaverReply * /* pRep */); -extern void SLHostsExtend( +extern _X_EXPORT void SLHostsExtend( ClientPtr /* pClient */, int /* size */, char * /* buf */); -extern void SListHostsReply( +extern _X_EXPORT void SListHostsReply( ClientPtr /* pClient */, int /* size */, xListHostsReply * /* pRep */); -extern void SErrorEvent( +extern _X_EXPORT void SErrorEvent( xError * /* from */, xError * /* to */); -extern void SwapConnSetupInfo( +extern _X_EXPORT void SwapConnSetupInfo( char * /* pInfo */, char * /* pInfoTBase */); -extern void WriteSConnectionInfo( +extern _X_EXPORT void WriteSConnectionInfo( ClientPtr /* pClient */, unsigned long /* size */, char * /* pInfo */); -extern void SwapConnSetupPrefix( +extern _X_EXPORT void SwapConnSetupPrefix( xConnSetupPrefix * /* pcspFrom */, xConnSetupPrefix * /* pcspTo */); -extern void WriteSConnSetupPrefix( +extern _X_EXPORT void WriteSConnSetupPrefix( ClientPtr /* pClient */, xConnSetupPrefix * /* pcsp */); #undef SWAPREP_PROC -#define SWAPREP_PROC(func) void func(xEvent * /* from */, xEvent * /* to */) +#define SWAPREP_PROC(func) extern _X_EXPORT void func(xEvent * /* from */, xEvent * /* to */) SWAPREP_PROC(SCirculateEvent); SWAPREP_PROC(SClientMessageEvent); diff --git a/include/swapreq.h b/include/swapreq.h index 83e524bab..8038f0272 100644 --- a/include/swapreq.h +++ b/include/swapreq.h @@ -26,15 +26,15 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef SWAPREQ_H #define SWAPREQ_H 1 -extern void SwapColorItem( +extern _X_EXPORT void SwapColorItem( xColorItem * /* pItem */); -extern void SwapConnClientPrefix( +extern _X_EXPORT void SwapConnClientPrefix( xConnClientPrefix * /* pCCP */); #undef SWAPREQ_PROC -#define SWAPREQ_PROC(func) int func(ClientPtr /* client */) +#define SWAPREQ_PROC(func) extern _X_EXPORT int func(ClientPtr /* client */) SWAPREQ_PROC(SProcAllocColor); SWAPREQ_PROC(SProcAllocColorCells); diff --git a/include/window.h b/include/window.h index 04cbe2627..038e639a5 100644 --- a/include/window.h +++ b/include/window.h @@ -77,30 +77,30 @@ typedef int (*VisitWindowProcPtr)( WindowPtr /*pWin*/, pointer /*data*/); -extern int TraverseTree( +extern _X_EXPORT int TraverseTree( WindowPtr /*pWin*/, VisitWindowProcPtr /*func*/, pointer /*data*/); -extern int WalkTree( +extern _X_EXPORT int WalkTree( ScreenPtr /*pScreen*/, VisitWindowProcPtr /*func*/, pointer /*data*/); -extern Bool CreateRootWindow( +extern _X_EXPORT Bool CreateRootWindow( ScreenPtr /*pScreen*/); -extern void InitRootWindow( +extern _X_EXPORT void InitRootWindow( WindowPtr /*pWin*/); typedef WindowPtr (* RealChildHeadProc) (WindowPtr pWin); -void RegisterRealChildHeadProc (RealChildHeadProc proc); +extern void _X_EXPORT RegisterRealChildHeadProc (RealChildHeadProc proc); -extern WindowPtr RealChildHead( +extern _X_EXPORT WindowPtr RealChildHead( WindowPtr /*pWin*/); -extern WindowPtr CreateWindow( +extern _X_EXPORT WindowPtr CreateWindow( Window /*wid*/, WindowPtr /*pParent*/, int /*x*/, @@ -116,11 +116,11 @@ extern WindowPtr CreateWindow( VisualID /*visual*/, int* /*error*/); -extern int DeleteWindow( +extern _X_EXPORT int DeleteWindow( pointer /*pWin*/, XID /*wid*/); -extern int DestroySubwindows( +extern _X_EXPORT int DestroySubwindows( WindowPtr /*pWin*/, ClientPtr /*client*/); @@ -129,18 +129,18 @@ extern int DestroySubwindows( #ifdef __APPLE__ #define ChangeWindowAttributes Darwin_X_ChangeWindowAttributes #endif -extern int ChangeWindowAttributes( +extern _X_EXPORT int ChangeWindowAttributes( WindowPtr /*pWin*/, Mask /*vmask*/, XID* /*vlist*/, ClientPtr /*client*/); -extern int ChangeWindowDeviceCursor( +extern _X_EXPORT int ChangeWindowDeviceCursor( WindowPtr /*pWin*/, struct _DeviceIntRec* /*pDev*/, struct _Cursor* /*pCursor*/); -extern struct _Cursor* WindowGetDeviceCursor( +extern _X_EXPORT struct _Cursor* WindowGetDeviceCursor( WindowPtr /*pWin*/, struct _DeviceIntRec* /*pDev*/); @@ -150,16 +150,16 @@ extern struct _Cursor* WindowGetDeviceCursor( #define GetWindowAttributes(w,c,x) Darwin_X_GetWindowAttributes(w,c,x) extern void Darwin_X_GetWindowAttributes( #else -extern void GetWindowAttributes( +extern _X_EXPORT void GetWindowAttributes( #endif WindowPtr /*pWin*/, ClientPtr /*client*/, xGetWindowAttributesReply* /* wa */); -extern RegionPtr CreateUnclippedWinSize( +extern _X_EXPORT RegionPtr CreateUnclippedWinSize( WindowPtr /*pWin*/); -extern void GravityTranslate( +extern _X_EXPORT void GravityTranslate( int /*x*/, int /*y*/, int /*oldx*/, @@ -170,103 +170,103 @@ extern void GravityTranslate( int* /*destx*/, int* /*desty*/); -extern int ConfigureWindow( +extern _X_EXPORT int ConfigureWindow( WindowPtr /*pWin*/, Mask /*mask*/, XID* /*vlist*/, ClientPtr /*client*/); -extern int CirculateWindow( +extern _X_EXPORT int CirculateWindow( WindowPtr /*pParent*/, int /*direction*/, ClientPtr /*client*/); -extern int ReparentWindow( +extern _X_EXPORT int ReparentWindow( WindowPtr /*pWin*/, WindowPtr /*pParent*/, int /*x*/, int /*y*/, ClientPtr /*client*/); -extern int MapWindow( +extern _X_EXPORT int MapWindow( WindowPtr /*pWin*/, ClientPtr /*client*/); -extern void MapSubwindows( +extern _X_EXPORT void MapSubwindows( WindowPtr /*pParent*/, ClientPtr /*client*/); -extern int UnmapWindow( +extern _X_EXPORT int UnmapWindow( WindowPtr /*pWin*/, Bool /*fromConfigure*/); -extern void UnmapSubwindows( +extern _X_EXPORT void UnmapSubwindows( WindowPtr /*pWin*/); -extern void HandleSaveSet( +extern _X_EXPORT void HandleSaveSet( ClientPtr /*client*/); -extern Bool PointInWindowIsVisible( +extern _X_EXPORT Bool PointInWindowIsVisible( WindowPtr /*pWin*/, int /*x*/, int /*y*/); -extern RegionPtr NotClippedByChildren( +extern _X_EXPORT RegionPtr NotClippedByChildren( WindowPtr /*pWin*/); -extern void SendVisibilityNotify( +extern _X_EXPORT void SendVisibilityNotify( WindowPtr /*pWin*/); -extern int dixSaveScreens( +extern _X_EXPORT int dixSaveScreens( ClientPtr client, int on, int mode); -extern int SaveScreens( +extern _X_EXPORT int SaveScreens( int on, int mode); -extern WindowPtr FindWindowWithOptional( +extern _X_EXPORT WindowPtr FindWindowWithOptional( WindowPtr /*w*/); -extern void CheckWindowOptionalNeed( +extern _X_EXPORT void CheckWindowOptionalNeed( WindowPtr /*w*/); -extern Bool MakeWindowOptional( +extern _X_EXPORT Bool MakeWindowOptional( WindowPtr /*pWin*/); -extern WindowPtr MoveWindowInStack( +extern _X_EXPORT WindowPtr MoveWindowInStack( WindowPtr /*pWin*/, WindowPtr /*pNextSib*/); -void SetWinSize( +extern _X_EXPORT void SetWinSize( WindowPtr /*pWin*/); -void SetBorderSize( +extern _X_EXPORT void SetBorderSize( WindowPtr /*pWin*/); -void ResizeChildrenWinSize( +extern _X_EXPORT void ResizeChildrenWinSize( WindowPtr /*pWin*/, int /*dx*/, int /*dy*/, int /*dw*/, int /*dh*/); -extern void ShapeExtensionInit(void); +extern _X_EXPORT void ShapeExtensionInit(void); -extern void SendShapeNotify( +extern _X_EXPORT void SendShapeNotify( WindowPtr /* pWin */, int /* which */ ); -extern RegionPtr CreateBoundingShape( +extern _X_EXPORT RegionPtr CreateBoundingShape( WindowPtr /* pWin */ ); -extern RegionPtr CreateClipShape( +extern _X_EXPORT RegionPtr CreateClipShape( WindowPtr /* pWin */ ); -extern void DisableMapUnmapEvents( +extern _X_EXPORT void DisableMapUnmapEvents( WindowPtr /* pWin */ ); -extern void EnableMapUnmapEvents( +extern _X_EXPORT void EnableMapUnmapEvents( WindowPtr /* pWin */ ); #endif /* WINDOW_H */ diff --git a/include/windowstr.h b/include/windowstr.h index 159ee3629..ccd42a778 100644 --- a/include/windowstr.h +++ b/include/windowstr.h @@ -201,7 +201,7 @@ typedef struct _Window { * fields (or filling the appropriate default value) */ -extern Mask DontPropagateMasks[]; +extern _X_EXPORT Mask DontPropagateMasks[]; #define wTrackParent(w,field) ((w)->optional ? \ (w)->optional->field \ @@ -248,7 +248,7 @@ typedef struct _ScreenSaverStuff { #define HasSaverWindow(i) (savedScreenInfo[i].pWindow != NullWindow) -extern int screenIsSaved; -extern ScreenSaverStuffRec savedScreenInfo[MAXSCREENS]; +extern _X_EXPORT int screenIsSaved; +extern _X_EXPORT ScreenSaverStuffRec savedScreenInfo[MAXSCREENS]; #endif /* WINDOWSTRUCT_H */ diff --git a/include/xkbfile.h b/include/xkbfile.h index d12aad557..40197c0fe 100644 --- a/include/xkbfile.h +++ b/include/xkbfile.h @@ -80,97 +80,97 @@ typedef void (*XkbFileAddOnFunc)( _XFUNCPROTOBEGIN -extern char * XkbIndentText( +extern _X_EXPORT char * XkbIndentText( unsigned /* size */ ); -extern char * XkbAtomText( +extern _X_EXPORT char * XkbAtomText( Atom /* atm */, unsigned /* format */ ); -extern char * XkbKeysymText( +extern _X_EXPORT char * XkbKeysymText( KeySym /* sym */, unsigned /* format */ ); -extern char * XkbStringText( +extern _X_EXPORT char * XkbStringText( char * /* str */, unsigned /* format */ ); -extern char * XkbKeyNameText( +extern _X_EXPORT char * XkbKeyNameText( char * /* name */, unsigned /* format */ ); -extern char * +extern _X_EXPORT char * XkbModIndexText( unsigned /* ndx */, unsigned /* format */ ); -extern char * +extern _X_EXPORT char * XkbModMaskText( unsigned /* mask */, unsigned /* format */ ); -extern char * XkbVModIndexText( +extern _X_EXPORT char * XkbVModIndexText( XkbDescPtr /* xkb */, unsigned /* ndx */, unsigned /* format */ ); -extern char * XkbVModMaskText( +extern _X_EXPORT char * XkbVModMaskText( XkbDescPtr /* xkb */, unsigned /* modMask */, unsigned /* mask */, unsigned /* format */ ); -extern char * XkbConfigText( +extern _X_EXPORT char * XkbConfigText( unsigned /* config */, unsigned /* format */ ); -extern char * XkbSIMatchText( +extern _X_EXPORT char * XkbSIMatchText( unsigned /* type */, unsigned /* format */ ); -extern char * XkbIMWhichStateMaskText( +extern _X_EXPORT char * XkbIMWhichStateMaskText( unsigned /* use_which */, unsigned /* format */ ); -extern char * XkbControlsMaskText( +extern _X_EXPORT char * XkbControlsMaskText( unsigned /* ctrls */, unsigned /* format */ ); -extern char * XkbGeomFPText( +extern _X_EXPORT char * XkbGeomFPText( int /* val */, unsigned /* format */ ); -extern char * XkbDoodadTypeText( +extern _X_EXPORT char * XkbDoodadTypeText( unsigned /* type */, unsigned /* format */ ); -extern char * XkbActionTypeText( +extern _X_EXPORT char * XkbActionTypeText( unsigned /* type */, unsigned /* format */ ); -extern char * XkbActionText( +extern _X_EXPORT char * XkbActionText( XkbDescPtr /* xkb */, XkbAction * /* action */, unsigned /* format */ ); -extern char * XkbBehaviorText( +extern _X_EXPORT char * XkbBehaviorText( XkbDescPtr /* xkb */, XkbBehavior * /* behavior */, unsigned /* format */ @@ -187,11 +187,11 @@ extern char * XkbBehaviorText( #define XkbKSIsDeadKey(k) \ (((k)>=XK_dead_grave)&&((k)<=XK_dead_semivoiced_sound)) -extern unsigned _XkbKSCheckCase( +extern _X_EXPORT unsigned _XkbKSCheckCase( KeySym /* sym */ ); -extern int XkbFindKeycodeByName( +extern _X_EXPORT int XkbFindKeycodeByName( XkbDescPtr /* xkb */, char * /* name */, Bool /* use_aliases */ @@ -199,7 +199,7 @@ extern int XkbFindKeycodeByName( /***====================================================================***/ -extern Atom XkbInternAtom( +extern _X_EXPORT Atom XkbInternAtom( char * /* name */, Bool /* onlyIfExists */ ); @@ -225,19 +225,19 @@ typedef struct _XkbDrawable { /***====================================================================***/ -extern unsigned XkbConvertGetByNameComponents( +extern _X_EXPORT unsigned XkbConvertGetByNameComponents( Bool /* toXkm */, unsigned /* orig */ ); -extern Bool XkbNameMatchesPattern( +extern _X_EXPORT Bool XkbNameMatchesPattern( char * /* name */, char * /* pattern */ ); /***====================================================================***/ -extern Bool XkbWriteXKBKeycodes( +extern _X_EXPORT Bool XkbWriteXKBKeycodes( FILE * /* file */, XkbDescPtr /* result */, Bool /* topLevel */, @@ -246,7 +246,7 @@ extern Bool XkbWriteXKBKeycodes( void * /* priv */ ); -extern Bool XkbWriteXKBKeyTypes( +extern _X_EXPORT Bool XkbWriteXKBKeyTypes( FILE * /* file */, XkbDescPtr /* result */, Bool /* topLevel */, @@ -255,7 +255,7 @@ extern Bool XkbWriteXKBKeyTypes( void * /* priv */ ); -extern Bool XkbWriteXKBCompatMap( +extern _X_EXPORT Bool XkbWriteXKBCompatMap( FILE * /* file */, XkbDescPtr /* result */, Bool /* topLevel */, @@ -264,7 +264,7 @@ extern Bool XkbWriteXKBCompatMap( void * /* priv */ ); -extern Bool XkbWriteXKBSymbols( +extern _X_EXPORT Bool XkbWriteXKBSymbols( FILE * /* file */, XkbDescPtr /* result */, Bool /* topLevel */, @@ -273,7 +273,7 @@ extern Bool XkbWriteXKBSymbols( void * /* priv */ ); -extern Bool XkbWriteXKBGeometry( +extern _X_EXPORT Bool XkbWriteXKBGeometry( FILE * /* file */, XkbDescPtr /* result */, Bool /* topLevel */, @@ -282,11 +282,11 @@ extern Bool XkbWriteXKBGeometry( void * /* priv */ ); -extern void XkbEnsureSafeMapName( +extern _X_EXPORT void XkbEnsureSafeMapName( char * /* name */ ); -extern Bool XkbWriteXKBKeymapForNames( +extern _X_EXPORT Bool XkbWriteXKBKeymapForNames( FILE * /* file */, XkbComponentNamesPtr /* names */, XkbDescPtr /* xkb */, @@ -296,11 +296,11 @@ extern Bool XkbWriteXKBKeymapForNames( /***====================================================================***/ -extern Bool XkmProbe( +extern _X_EXPORT Bool XkmProbe( FILE * /* file */ ); -extern unsigned XkmReadFile( +extern _X_EXPORT unsigned XkmReadFile( FILE * /* file */, unsigned /* need */, unsigned /* want */, diff --git a/include/xkbrules.h b/include/xkbrules.h index 648e2e9c6..ff77ddc77 100644 --- a/include/xkbrules.h +++ b/include/xkbrules.h @@ -103,24 +103,24 @@ typedef struct _XkbRF_Rules { _XFUNCPROTOBEGIN -extern Bool XkbRF_GetComponents( +extern _X_EXPORT Bool XkbRF_GetComponents( XkbRF_RulesPtr /* rules */, XkbRF_VarDefsPtr /* var_defs */, XkbComponentNamesPtr /* names */ ); -extern XkbRF_RulePtr XkbRF_AddRule( +extern _X_EXPORT XkbRF_RulePtr XkbRF_AddRule( XkbRF_RulesPtr /* rules */ ); -extern XkbRF_GroupPtr XkbRF_AddGroup(XkbRF_RulesPtr rules); +extern _X_EXPORT XkbRF_GroupPtr XkbRF_AddGroup(XkbRF_RulesPtr rules); -extern Bool XkbRF_LoadRules( +extern _X_EXPORT Bool XkbRF_LoadRules( FILE * /* file */, XkbRF_RulesPtr /* rules */ ); -extern Bool XkbRF_LoadRulesByName( +extern _X_EXPORT Bool XkbRF_LoadRulesByName( char * /* base */, char * /* locale */, XkbRF_RulesPtr /* rules */ @@ -128,46 +128,46 @@ extern Bool XkbRF_LoadRulesByName( /***====================================================================***/ -extern XkbRF_VarDescPtr XkbRF_AddVarDesc( +extern _X_EXPORT XkbRF_VarDescPtr XkbRF_AddVarDesc( XkbRF_DescribeVarsPtr /* vars */ ); -extern XkbRF_VarDescPtr XkbRF_AddVarDescCopy( +extern _X_EXPORT XkbRF_VarDescPtr XkbRF_AddVarDescCopy( XkbRF_DescribeVarsPtr /* vars */, XkbRF_VarDescPtr /* copy_from */ ); -extern XkbRF_DescribeVarsPtr XkbRF_AddVarToDescribe( +extern _X_EXPORT XkbRF_DescribeVarsPtr XkbRF_AddVarToDescribe( XkbRF_RulesPtr /* rules */, char * /* name */ ); -extern Bool XkbRF_LoadDescriptions( +extern _X_EXPORT Bool XkbRF_LoadDescriptions( FILE * /* file */, XkbRF_RulesPtr /* rules */ ); -extern Bool XkbRF_LoadDescriptionsByName( +extern _X_EXPORT Bool XkbRF_LoadDescriptionsByName( char * /* base */, char * /* locale */, XkbRF_RulesPtr /* rules */ ); -extern XkbRF_RulesPtr XkbRF_Load( +extern _X_EXPORT XkbRF_RulesPtr XkbRF_Load( char * /* base */, char * /* locale */, Bool /* wantDesc */, Bool /* wantRules */ ); -extern XkbRF_RulesPtr XkbRF_Create( +extern _X_EXPORT XkbRF_RulesPtr XkbRF_Create( int /* sz_rules */, int /* sz_extra */ ); /***====================================================================***/ -extern void XkbRF_Free( +extern _X_EXPORT void XkbRF_Free( XkbRF_RulesPtr /* rules */, Bool /* freeRules */ ); diff --git a/include/xkbsrv.h b/include/xkbsrv.h index 32661a931..ac1d82236 100644 --- a/include/xkbsrv.h +++ b/include/xkbsrv.h @@ -273,10 +273,10 @@ typedef struct device->public.realInputProc = oldprocs->realInputProc; \ device->unwrapProc = oldprocs->unwrapProc; -extern DevPrivateKey xkbDevicePrivateKey; +extern _X_EXPORT DevPrivateKey xkbDevicePrivateKey; #define XKBDEVICEINFO(dev) ((xkbDeviceInfoPtr)dixLookupPrivate(&(dev)->devPrivates, xkbDevicePrivateKey)) -extern void xkbUnwrapProc(DeviceIntPtr, DeviceHandleProc, pointer); +extern _X_EXPORT void xkbUnwrapProc(DeviceIntPtr, DeviceHandleProc, pointer); /***====================================================================***/ @@ -289,18 +289,20 @@ extern void xkbUnwrapProc(DeviceIntPtr, DeviceHandleProc, pointer); /***====================================================================***/ -extern int XkbReqCode; -extern int XkbEventBase; -extern int XkbDisableLockActions; -extern int XkbKeyboardErrorCode; -extern char * XkbBaseDirectory; -extern char * XkbBinDirectory; +extern _X_EXPORT int XkbReqCode; +extern _X_EXPORT int XkbEventBase; +extern _X_EXPORT int XkbDisableLockActions; +extern _X_EXPORT int XkbKeyboardErrorCode; +extern _X_EXPORT char * XkbBaseDirectory; +extern _X_EXPORT char * XkbBinDirectory; +extern _X_EXPORT int XkbDfltRepeatDelay; +extern _X_EXPORT int XkbDfltRepeatInterval; -extern Bool noXkbExtension; +extern _X_EXPORT Bool noXkbExtension; -extern pointer XkbLastRepeatEvent; +extern _X_EXPORT pointer XkbLastRepeatEvent; -extern CARD32 xkbDebugFlags; +extern _X_EXPORT CARD32 xkbDebugFlags; #define _XkbAlloc(s) xalloc((s)) #define _XkbCalloc(n,s) Xcalloc((n)*(s)) @@ -317,9 +319,9 @@ extern CARD32 xkbDebugFlags; #define _XkbErrCode3(a,b,c) _XkbErrCode2(a,(((unsigned int)(b))<<16)|(c)) #define _XkbErrCode4(a,b,c,d) _XkbErrCode3(a,b,((((unsigned int)(c))<<8)|(d))) -extern int DeviceKeyPress,DeviceKeyRelease,DeviceMotionNotify; -extern int DeviceButtonPress,DeviceButtonRelease; -extern int DeviceEnterNotify,DeviceLeaveNotify; +extern _X_EXPORT int DeviceKeyPress,DeviceKeyRelease,DeviceMotionNotify; +extern _X_EXPORT int DeviceButtonPress,DeviceButtonRelease; +extern _X_EXPORT int DeviceEnterNotify,DeviceLeaveNotify; #define _XkbIsPressEvent(t) (((t)==KeyPress)||((t)==DeviceKeyPress)) #define _XkbIsReleaseEvent(t) (((t)==KeyRelease)||((t)==DeviceKeyRelease)) @@ -342,31 +344,31 @@ extern int DeviceEnterNotify,DeviceLeaveNotify; _XFUNCPROTOBEGIN -extern void XkbUseMsg( +extern _X_EXPORT void XkbUseMsg( void ); -extern int XkbProcessArguments( +extern _X_EXPORT int XkbProcessArguments( int /* argc */, char ** /* argv */, int /* i */ ); -extern void XkbSetExtension(DeviceIntPtr device, ProcessInputProc proc); +extern _X_EXPORT void XkbSetExtension(DeviceIntPtr device, ProcessInputProc proc); -extern void XkbFreeCompatMap( +extern _X_EXPORT void XkbFreeCompatMap( XkbDescPtr /* xkb */, unsigned int /* which */, Bool /* freeMap */ ); -extern void XkbFreeNames( +extern _X_EXPORT void XkbFreeNames( XkbDescPtr /* xkb */, unsigned int /* which */, Bool /* freeMap */ ); -extern int _XkbLookupAnyDevice( +extern _X_EXPORT int _XkbLookupAnyDevice( DeviceIntPtr *pDev, int id, ClientPtr client, @@ -374,7 +376,7 @@ extern int _XkbLookupAnyDevice( int *xkb_err ); -extern int _XkbLookupKeyboard( +extern _X_EXPORT int _XkbLookupKeyboard( DeviceIntPtr *pDev, int id, ClientPtr client, @@ -382,7 +384,7 @@ extern int _XkbLookupKeyboard( int *xkb_err ); -extern int _XkbLookupBellDevice( +extern _X_EXPORT int _XkbLookupBellDevice( DeviceIntPtr *pDev, int id, ClientPtr client, @@ -390,7 +392,7 @@ extern int _XkbLookupBellDevice( int *xkb_err ); -extern int _XkbLookupLedDevice( +extern _X_EXPORT int _XkbLookupLedDevice( DeviceIntPtr *pDev, int id, ClientPtr client, @@ -398,7 +400,7 @@ extern int _XkbLookupLedDevice( int *xkb_err ); -extern int _XkbLookupButtonDevice( +extern _X_EXPORT int _XkbLookupButtonDevice( DeviceIntPtr *pDev, int id, ClientPtr client, @@ -406,63 +408,63 @@ extern int _XkbLookupButtonDevice( int *xkb_err ); -extern XkbDescPtr XkbAllocKeyboard( +extern _X_EXPORT XkbDescPtr XkbAllocKeyboard( void ); -extern Status XkbAllocClientMap( +extern _X_EXPORT Status XkbAllocClientMap( XkbDescPtr /* xkb */, unsigned int /* which */, unsigned int /* nTypes */ ); -extern Status XkbAllocServerMap( +extern _X_EXPORT Status XkbAllocServerMap( XkbDescPtr /* xkb */, unsigned int /* which */, unsigned int /* nNewActions */ ); -extern void XkbFreeClientMap( +extern _X_EXPORT void XkbFreeClientMap( XkbDescPtr /* xkb */, unsigned int /* what */, Bool /* freeMap */ ); -extern void XkbFreeServerMap( +extern _X_EXPORT void XkbFreeServerMap( XkbDescPtr /* xkb */, unsigned int /* what */, Bool /* freeMap */ ); -extern Status XkbAllocIndicatorMaps( +extern _X_EXPORT Status XkbAllocIndicatorMaps( XkbDescPtr /* xkb */ ); -extern Status XkbAllocCompatMap( +extern _X_EXPORT Status XkbAllocCompatMap( XkbDescPtr /* xkb */, unsigned int /* which */, unsigned int /* nInterpret */ ); -extern Status XkbAllocNames( +extern _X_EXPORT Status XkbAllocNames( XkbDescPtr /* xkb */, unsigned int /* which */, int /* nTotalRG */, int /* nTotalAliases */ ); -extern Status XkbAllocControls( +extern _X_EXPORT Status XkbAllocControls( XkbDescPtr /* xkb */, unsigned int /* which*/ ); -extern Status XkbCopyKeyTypes( +extern _X_EXPORT Status XkbCopyKeyTypes( XkbKeyTypePtr /* from */, XkbKeyTypePtr /* into */, int /* num_types */ ); -extern Status XkbResizeKeyType( +extern _X_EXPORT Status XkbResizeKeyType( XkbDescPtr /* xkb */, int /* type_ndx */, int /* map_count */, @@ -470,61 +472,61 @@ extern Status XkbResizeKeyType( int /* new_num_lvls */ ); -extern void XkbFreeKeyboard( +extern _X_EXPORT void XkbFreeKeyboard( XkbDescPtr /* xkb */, unsigned int /* which */, Bool /* freeDesc */ ); -extern void XkbSetActionKeyMods( +extern _X_EXPORT void XkbSetActionKeyMods( XkbDescPtr /* xkb */, XkbAction * /* act */, unsigned int /* mods */ ); -extern unsigned int XkbMaskForVMask( +extern _X_EXPORT unsigned int XkbMaskForVMask( XkbDescPtr /* xkb */, unsigned int /* vmask */ ); -extern Bool XkbVirtualModsToReal( +extern _X_EXPORT Bool XkbVirtualModsToReal( XkbDescPtr /* xkb */, unsigned int /* virtua_mask */, unsigned int * /* mask_rtrn */ ); -extern unsigned int XkbAdjustGroup( +extern _X_EXPORT unsigned int XkbAdjustGroup( int /* group */, XkbControlsPtr /* ctrls */ ); -extern KeySym *XkbResizeKeySyms( +extern _X_EXPORT KeySym *XkbResizeKeySyms( XkbDescPtr /* xkb */, int /* key */, int /* needed */ ); -extern XkbAction *XkbResizeKeyActions( +extern _X_EXPORT XkbAction *XkbResizeKeyActions( XkbDescPtr /* xkb */, int /* key */, int /* needed */ ); -extern void XkbUpdateKeyTypesFromCore( +extern _X_EXPORT void XkbUpdateKeyTypesFromCore( DeviceIntPtr /* pXDev */, KeyCode /* first */, CARD8 /* num */, XkbChangesPtr /* pChanges */ ); -extern void XkbUpdateDescActions( +extern _X_EXPORT void XkbUpdateDescActions( XkbDescPtr /* xkb */, KeyCode /* first */, CARD8 /* num */, XkbChangesPtr /* changes */ ); -extern void XkbUpdateActions( +extern _X_EXPORT void XkbUpdateActions( DeviceIntPtr /* pXDev */, KeyCode /* first */, CARD8 /* num */, @@ -533,12 +535,12 @@ extern void XkbUpdateActions( XkbEventCausePtr /* cause */ ); -extern void XkbUpdateCoreDescription( +extern _X_EXPORT void XkbUpdateCoreDescription( DeviceIntPtr /* keybd */, Bool /* resize */ ); -extern void XkbApplyMappingChange( +extern _X_EXPORT void XkbApplyMappingChange( DeviceIntPtr /* pXDev */, CARD8 /* request */, KeyCode /* firstKey */, @@ -546,14 +548,14 @@ extern void XkbApplyMappingChange( ClientPtr /* client */ ); -extern void XkbSetIndicators( +extern _X_EXPORT void XkbSetIndicators( DeviceIntPtr /* pXDev */, CARD32 /* affect */, CARD32 /* values */, XkbEventCausePtr /* cause */ ); -extern void XkbUpdateIndicators( +extern _X_EXPORT void XkbUpdateIndicators( DeviceIntPtr /* keybd */, CARD32 /* changed */, Bool /* check_edevs */, @@ -561,14 +563,14 @@ extern void XkbUpdateIndicators( XkbEventCausePtr /* cause */ ); -extern XkbSrvLedInfoPtr XkbAllocSrvLedInfo( +extern _X_EXPORT XkbSrvLedInfoPtr XkbAllocSrvLedInfo( DeviceIntPtr /* dev */, KbdFeedbackPtr /* kf */, LedFeedbackPtr /* lf */, unsigned int /* needed_parts */ ); -extern XkbSrvLedInfoPtr XkbCopySrvLedInfo( +extern _X_EXPORT XkbSrvLedInfoPtr XkbCopySrvLedInfo( DeviceIntPtr /* dev */, XkbSrvLedInfoPtr /* src */, KbdFeedbackPtr /* kf */, @@ -576,14 +578,14 @@ extern XkbSrvLedInfoPtr XkbCopySrvLedInfo( ); -extern XkbSrvLedInfoPtr XkbFindSrvLedInfo( +extern _X_EXPORT XkbSrvLedInfoPtr XkbFindSrvLedInfo( DeviceIntPtr /* dev */, unsigned int /* class */, unsigned int /* id */, unsigned int /* needed_parts */ ); -extern void XkbApplyLedNameChanges( +extern _X_EXPORT void XkbApplyLedNameChanges( DeviceIntPtr /* dev */, XkbSrvLedInfoPtr /* sli */, unsigned int /* changed_names */, @@ -592,7 +594,7 @@ extern void XkbApplyLedNameChanges( XkbEventCausePtr /* cause */ ); -extern void XkbApplyLedMapChanges( +extern _X_EXPORT void XkbApplyLedMapChanges( DeviceIntPtr /* dev */, XkbSrvLedInfoPtr /* sli */, unsigned int /* changed_maps */, @@ -601,7 +603,7 @@ extern void XkbApplyLedMapChanges( XkbEventCausePtr /* cause */ ); -extern void XkbApplyLedStateChanges( +extern _X_EXPORT void XkbApplyLedStateChanges( DeviceIntPtr /* dev */, XkbSrvLedInfoPtr /* sli */, unsigned int /* changed_leds */, @@ -610,7 +612,7 @@ extern void XkbApplyLedStateChanges( XkbEventCausePtr /* cause */ ); -extern void XkbFlushLedEvents( +extern _X_EXPORT void XkbFlushLedEvents( DeviceIntPtr /* dev */, DeviceIntPtr /* kbd */, XkbSrvLedInfoPtr /* sli */, @@ -619,45 +621,45 @@ extern void XkbFlushLedEvents( XkbEventCausePtr /* cause */ ); -extern unsigned int XkbIndicatorsToUpdate( +extern _X_EXPORT unsigned int XkbIndicatorsToUpdate( DeviceIntPtr /* dev */, unsigned long /* state_changes */, Bool /* enabled_ctrl_changes */ ); -extern void XkbComputeDerivedState( +extern _X_EXPORT void XkbComputeDerivedState( XkbSrvInfoPtr /* xkbi */ ); -extern void XkbCheckSecondaryEffects( +extern _X_EXPORT void XkbCheckSecondaryEffects( XkbSrvInfoPtr /* xkbi */, unsigned int /* which */, XkbChangesPtr /* changes */, XkbEventCausePtr /* cause */ ); -extern void XkbCheckIndicatorMaps( +extern _X_EXPORT void XkbCheckIndicatorMaps( DeviceIntPtr /* dev */, XkbSrvLedInfoPtr /* sli */, unsigned int /* which */ ); -extern unsigned int XkbStateChangedFlags( +extern _X_EXPORT unsigned int XkbStateChangedFlags( XkbStatePtr /* old */, XkbStatePtr /* new */ ); -extern void XkbSendStateNotify( +extern _X_EXPORT void XkbSendStateNotify( DeviceIntPtr /* kbd */, xkbStateNotify * /* pSN */ ); -extern void XkbSendMapNotify( +extern _X_EXPORT void XkbSendMapNotify( DeviceIntPtr /* kbd */, xkbMapNotify * /* ev */ ); -extern int XkbComputeControlsNotify( +extern _X_EXPORT int XkbComputeControlsNotify( DeviceIntPtr /* kbd */, XkbControlsPtr /* old */, XkbControlsPtr /* new */, @@ -665,17 +667,17 @@ extern int XkbComputeControlsNotify( Bool /* forceCtrlProc */ ); -extern void XkbSendControlsNotify( +extern _X_EXPORT void XkbSendControlsNotify( DeviceIntPtr /* kbd */, xkbControlsNotify * /* ev */ ); -extern void XkbSendCompatMapNotify( +extern _X_EXPORT void XkbSendCompatMapNotify( DeviceIntPtr /* kbd */, xkbCompatMapNotify * /* ev */ ); -extern void XkbHandleBell( +extern _X_EXPORT void XkbHandleBell( BOOL /* force */, BOOL /* eventOnly */, DeviceIntPtr /* kbd */, @@ -687,47 +689,47 @@ extern void XkbHandleBell( ClientPtr /* pClient */ ); -extern void XkbSendAccessXNotify( +extern _X_EXPORT void XkbSendAccessXNotify( DeviceIntPtr /* kbd */, xkbAccessXNotify * /* pEv */ ); -extern void XkbSendNamesNotify( +extern _X_EXPORT void XkbSendNamesNotify( DeviceIntPtr /* kbd */, xkbNamesNotify * /* ev */ ); -extern void XkbSendActionMessage( +extern _X_EXPORT void XkbSendActionMessage( DeviceIntPtr /* kbd */, xkbActionMessage * /* ev */ ); -extern void XkbSendExtensionDeviceNotify( +extern _X_EXPORT void XkbSendExtensionDeviceNotify( DeviceIntPtr /* kbd */, ClientPtr /* client */, xkbExtensionDeviceNotify * /* ev */ ); -extern void XkbSendNotification( +extern _X_EXPORT void XkbSendNotification( DeviceIntPtr /* kbd */, XkbChangesPtr /* pChanges */, XkbEventCausePtr /* cause */ ); -extern void XkbProcessKeyboardEvent( +extern _X_EXPORT void XkbProcessKeyboardEvent( struct _xEvent * /* xE */, DeviceIntPtr /* keybd */, int /* count */ ); -extern void XkbHandleActions( +extern _X_EXPORT void XkbHandleActions( DeviceIntPtr /* dev */, DeviceIntPtr /* kbd */, struct _xEvent * /* xE */, int /* count */ ); -extern Bool XkbEnableDisableControls( +extern _X_EXPORT Bool XkbEnableDisableControls( XkbSrvInfoPtr /* xkbi */, unsigned long /* change */, unsigned long /* newValues */, @@ -735,145 +737,145 @@ extern Bool XkbEnableDisableControls( XkbEventCausePtr /* cause */ ); -extern void AccessXInit( +extern _X_EXPORT void AccessXInit( DeviceIntPtr /* dev */ ); -extern Bool AccessXFilterPressEvent( +extern _X_EXPORT Bool AccessXFilterPressEvent( struct _xEvent * /* xE */, DeviceIntPtr /* keybd */, int /* count */ ); -extern Bool AccessXFilterReleaseEvent( +extern _X_EXPORT Bool AccessXFilterReleaseEvent( struct _xEvent * /* xE */, DeviceIntPtr /* keybd */, int /* count */ ); -extern void AccessXCancelRepeatKey( +extern _X_EXPORT void AccessXCancelRepeatKey( XkbSrvInfoPtr /* xkbi */, KeyCode /* key */ ); -extern void AccessXComputeCurveFactor( +extern _X_EXPORT void AccessXComputeCurveFactor( XkbSrvInfoPtr /* xkbi */, XkbControlsPtr /* ctrls */ ); -extern XkbInterestPtr XkbFindClientResource( +extern _X_EXPORT XkbInterestPtr XkbFindClientResource( DevicePtr /* inDev */, ClientPtr /* client */ ); -extern XkbInterestPtr XkbAddClientResource( +extern _X_EXPORT XkbInterestPtr XkbAddClientResource( DevicePtr /* inDev */, ClientPtr /* client */, XID /* id */ ); -extern int XkbRemoveResourceClient( +extern _X_EXPORT int XkbRemoveResourceClient( DevicePtr /* inDev */, XID /* id */ ); -extern int XkbDDXInitDevice( +extern _X_EXPORT int XkbDDXInitDevice( DeviceIntPtr /* dev */ ); -extern int XkbDDXAccessXBeep( +extern _X_EXPORT int XkbDDXAccessXBeep( DeviceIntPtr /* dev */, unsigned int /* what */, unsigned int /* which */ ); -extern void XkbDDXKeyClick( +extern _X_EXPORT void XkbDDXKeyClick( DeviceIntPtr /* dev */, int /* keycode */, int /* synthetic */ ); -extern int XkbDDXUsesSoftRepeat( +extern _X_EXPORT int XkbDDXUsesSoftRepeat( DeviceIntPtr /* dev */ ); -extern void XkbDDXKeybdCtrlProc( +extern _X_EXPORT void XkbDDXKeybdCtrlProc( DeviceIntPtr /* dev */, KeybdCtrl * /* ctrl */ ); -extern void XkbDDXChangeControls( +extern _X_EXPORT void XkbDDXChangeControls( DeviceIntPtr /* dev */, XkbControlsPtr /* old */, XkbControlsPtr /* new */ ); -extern void XkbDDXUpdateDeviceIndicators( +extern _X_EXPORT void XkbDDXUpdateDeviceIndicators( DeviceIntPtr /* dev */, XkbSrvLedInfoPtr /* sli */, CARD32 /* newState */ ); -extern void XkbDDXFakePointerMotion( +extern _X_EXPORT void XkbDDXFakePointerMotion( unsigned int /* flags */, int /* x */, int /* y */ ); -extern void XkbDDXFakeDeviceButton( +extern _X_EXPORT void XkbDDXFakeDeviceButton( DeviceIntPtr /* dev */, Bool /* press */, int /* button */ ); -extern int XkbDDXTerminateServer( +extern _X_EXPORT int XkbDDXTerminateServer( DeviceIntPtr /* dev */, KeyCode /* key */, XkbAction * /* act */ ); -extern int XkbDDXSwitchScreen( +extern _X_EXPORT int XkbDDXSwitchScreen( DeviceIntPtr /* dev */, KeyCode /* key */, XkbAction * /* act */ ); -extern int XkbDDXPrivate( +extern _X_EXPORT int XkbDDXPrivate( DeviceIntPtr /* dev */, KeyCode /* key */, XkbAction * /* act */ ); -extern void XkbDisableComputedAutoRepeats( +extern _X_EXPORT void XkbDisableComputedAutoRepeats( DeviceIntPtr /* pXDev */, unsigned int /* key */ ); -extern void XkbSetRepeatKeys( +extern _X_EXPORT void XkbSetRepeatKeys( DeviceIntPtr /* pXDev */, int /* key */, int /* onoff */ ); -extern int XkbLatchModifiers( +extern _X_EXPORT int XkbLatchModifiers( DeviceIntPtr /* pXDev */, CARD8 /* mask */, CARD8 /* latches */ ); -extern int XkbLatchGroup( +extern _X_EXPORT int XkbLatchGroup( DeviceIntPtr /* pXDev */, int /* group */ ); -extern void XkbClearAllLatchesAndLocks( +extern _X_EXPORT void XkbClearAllLatchesAndLocks( DeviceIntPtr /* dev */, XkbSrvInfoPtr /* xkbi */, Bool /* genEv */, XkbEventCausePtr /* cause */ ); -extern void XkbSetRulesDflts( +extern _X_EXPORT void XkbSetRulesDflts( char * /* rulesFile */, char * /* model */, char * /* layout */, @@ -881,15 +883,15 @@ extern void XkbSetRulesDflts( char * /* options */ ); -extern void XkbDeleteRulesDflts( +extern _X_EXPORT void XkbDeleteRulesDflts( void ); -extern void XkbInitDevice( +extern _X_EXPORT void XkbInitDevice( DeviceIntPtr /* pXDev */ ); -extern Bool XkbInitKeyboardDeviceStruct( +extern _X_EXPORT Bool XkbInitKeyboardDeviceStruct( DeviceIntPtr /* pXDev */, XkbComponentNamesPtr /* pNames */, KeySymsPtr /* pSyms */, @@ -898,46 +900,46 @@ extern Bool XkbInitKeyboardDeviceStruct( KbdCtrlProcPtr /* ctrlProc */ ); -extern int SProcXkbDispatch( +extern _X_EXPORT int SProcXkbDispatch( ClientPtr /* client */ ); -extern XkbGeometryPtr XkbLookupNamedGeometry( +extern _X_EXPORT XkbGeometryPtr XkbLookupNamedGeometry( DeviceIntPtr /* dev */, Atom /* name */, Bool * /* shouldFree */ ); -extern char * _XkbDupString( +extern _X_EXPORT char * _XkbDupString( char * /* str */ ); -extern void XkbConvertCase( +extern _X_EXPORT void XkbConvertCase( KeySym /* sym */, KeySym * /* lower */, KeySym * /* upper */ ); -extern Status XkbChangeKeycodeRange( +extern _X_EXPORT Status XkbChangeKeycodeRange( XkbDescPtr /* xkb */, int /* minKC */, int /* maxKC */, XkbChangesPtr /* changes */ ); -extern int XkbFinishDeviceInit( +extern _X_EXPORT int XkbFinishDeviceInit( DeviceIntPtr /* pXDev */ ); -extern void XkbFreeSrvLedInfo( +extern _X_EXPORT void XkbFreeSrvLedInfo( XkbSrvLedInfoPtr /* sli */ ); -extern void XkbFreeInfo( +extern _X_EXPORT void XkbFreeInfo( XkbSrvInfoPtr /* xkbi */ ); -extern Status XkbChangeTypesOfKey( +extern _X_EXPORT Status XkbChangeTypesOfKey( XkbDescPtr /* xkb */, int /* key */, int /* nGroups */, @@ -946,7 +948,7 @@ extern Status XkbChangeTypesOfKey( XkbMapChangesPtr /* changes */ ); -extern int XkbKeyTypesForCoreSymbols( +extern _X_EXPORT int XkbKeyTypesForCoreSymbols( XkbDescPtr /* xkb */, int /* map_width */, KeySym * /* core_syms */, @@ -955,19 +957,19 @@ extern int XkbKeyTypesForCoreSymbols( KeySym * /* xkb_syms_rtrn */ ); -extern Bool XkbApplyCompatMapToKey( +extern _X_EXPORT Bool XkbApplyCompatMapToKey( XkbDescPtr /* xkb */, KeyCode /* key */, XkbChangesPtr /* changes */ ); -extern Bool XkbApplyVirtualModChanges( +extern _X_EXPORT Bool XkbApplyVirtualModChanges( XkbDescPtr /* xkb */, unsigned int /* changed */, XkbChangesPtr /* changes */ ); -extern void XkbSendNewKeyboardNotify( +extern _X_EXPORT void XkbSendNewKeyboardNotify( DeviceIntPtr /* kbd */, xkbNewKeyboardNotify * /* pNKN */ ); @@ -996,13 +998,13 @@ typedef struct _XkbSrvListInfo { int nFound[_XkbListNumComponents]; } XkbSrvListInfoRec,*XkbSrvListInfoPtr; -extern Status XkbDDXList( +extern _X_EXPORT Status XkbDDXList( DeviceIntPtr /* dev */, XkbSrvListInfoPtr /* listing */, ClientPtr /* client */ ); -extern unsigned int XkbDDXLoadKeymapByNames( +extern _X_EXPORT unsigned int XkbDDXLoadKeymapByNames( DeviceIntPtr /* keybd */, XkbComponentNamesPtr /* names */, unsigned int /* want */, @@ -1012,7 +1014,7 @@ extern unsigned int XkbDDXLoadKeymapByNames( int /* keymapNameRtrnLen */ ); -extern Bool XkbDDXNamesFromRules( +extern _X_EXPORT Bool XkbDDXNamesFromRules( DeviceIntPtr /* keybd */, char * /* rules */, XkbRF_VarDefsPtr /* defs */, |