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/window.h | |
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/window.h')
-rw-r--r-- | include/window.h | 82 |
1 files changed, 41 insertions, 41 deletions
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 */ |