From 1ad0feba7bd4b8f35eb63e0ec9bf37e8fd4a6800 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Thu, 20 Nov 2025 12:13:36 +0100 Subject: [PATCH] WIP Signed-off-by: Enrico Weigelt, metux IT consult --- include/input.h | 110 ++++++++++++++++++++++----------------------- include/misc.h | 19 +++++--- include/os.h | 12 ++--- include/pixmap.h | 8 ++-- include/privates.h | 26 ++++++----- include/region.h | 1 + include/resource.h | 28 +++++++----- include/window.h | 59 ++++++++++++------------ 8 files changed, 139 insertions(+), 124 deletions(-) diff --git a/include/input.h b/include/input.h index de89ee37db..da749aff70 100644 --- a/include/input.h +++ b/include/input.h @@ -281,40 +281,40 @@ typedef struct _InputAttributes { #define KEY_POSTED 2 #define BUTTON_POSTED 2 -extern _X_EXPORT void set_key_down(DeviceIntPtr pDev, int key_code, int type); -extern _X_EXPORT void set_key_up(DeviceIntPtr pDev, int key_code, int type); -extern _X_EXPORT int key_is_down(DeviceIntPtr pDev, int key_code, int type); -extern _X_EXPORT void set_button_down(DeviceIntPtr pDev, int button, int type); -extern _X_EXPORT void set_button_up(DeviceIntPtr pDev, int button, int type); -extern _X_EXPORT int button_is_down(DeviceIntPtr pDev, int button, int type); +void set_key_down(DeviceIntPtr pDev, int key_code, int type); +void set_key_up(DeviceIntPtr pDev, int key_code, int type); +int key_is_down(DeviceIntPtr pDev, int key_code, int type); +void set_button_down(DeviceIntPtr pDev, int button, int type); +void set_button_up(DeviceIntPtr pDev, int button, int type); +int button_is_down(DeviceIntPtr pDev, int button, int type); -extern _X_EXPORT DeviceIntPtr AddInputDevice(ClientPtr /*client */ , +DeviceIntPtr AddInputDevice(ClientPtr /*client */ , DeviceProc /*deviceProc */ , Bool /*autoStart */ ); -extern _X_EXPORT Bool EnableDevice(DeviceIntPtr /*device */ , +Bool EnableDevice(DeviceIntPtr /*device */ , BOOL /* sendevent */ ); -extern _X_EXPORT Bool ActivateDevice(DeviceIntPtr /*device */ , +Bool ActivateDevice(DeviceIntPtr /*device */ , BOOL /* sendevent */ ); -extern _X_EXPORT Bool DisableDevice(DeviceIntPtr /*device */ , +Bool DisableDevice(DeviceIntPtr /*device */ , BOOL /* sendevent */ ); -extern _X_EXPORT int RemoveDevice(DeviceIntPtr /*dev */ , +int RemoveDevice(DeviceIntPtr /*dev */ , BOOL /* sendevent */ ); -extern _X_EXPORT int NumMotionEvents(void); +int NumMotionEvents(void); -extern _X_EXPORT int dixLookupDevice(DeviceIntPtr * /* dev */ , +int dixLookupDevice(DeviceIntPtr * /* dev */ , int /* id */ , ClientPtr /* client */ , Mask /* access_mode */ ); -extern _X_EXPORT void QueryMinMaxKeyCodes(KeyCode * /*minCode */ , +void QueryMinMaxKeyCodes(KeyCode * /*minCode */ , KeyCode * /*maxCode */ ); -extern _X_EXPORT Bool InitButtonClassDeviceStruct(DeviceIntPtr /*device */ , +Bool InitButtonClassDeviceStruct(DeviceIntPtr /*device */ , int /*numButtons */ , Atom * /* labels */ , CARD8 * /*map */ ); @@ -325,7 +325,7 @@ extern _X_EXPORT Bool InitValuatorClassDeviceStruct(DeviceIntPtr /*device */ , int /*numMotionEvents */ , int /*mode */ ); -extern _X_EXPORT Bool InitPointerAccelerationScheme(DeviceIntPtr /*dev */ , +Bool InitPointerAccelerationScheme(DeviceIntPtr /*dev */ , int /*scheme */ ); extern _X_EXPORT Bool InitFocusClassDeviceStruct(DeviceIntPtr /*device */ ); @@ -357,7 +357,7 @@ extern _X_EXPORT Bool InitPtrFeedbackClassDeviceStruct(DeviceIntPtr /*device */ typedef void (*StringCtrlProcPtr) (DeviceIntPtr /*device */ , StringCtrl * /*ctrl */ ); -extern _X_EXPORT Bool InitStringFeedbackClassDeviceStruct(DeviceIntPtr +Bool InitStringFeedbackClassDeviceStruct(DeviceIntPtr /*device */ , StringCtrlProcPtr /*controlProc */ , @@ -371,7 +371,7 @@ extern _X_EXPORT Bool InitStringFeedbackClassDeviceStruct(DeviceIntPtr typedef void (*BellCtrlProcPtr) (DeviceIntPtr /*device */ , BellCtrl * /*ctrl */ ); -extern _X_EXPORT Bool InitBellFeedbackClassDeviceStruct(DeviceIntPtr /*device */ +Bool InitBellFeedbackClassDeviceStruct(DeviceIntPtr /*device */ , BellProcPtr /*bellProc */ , @@ -389,7 +389,7 @@ extern _X_EXPORT Bool InitLedFeedbackClassDeviceStruct(DeviceIntPtr /*device */ typedef void (*IntegerCtrlProcPtr) (DeviceIntPtr /*device */ , IntegerCtrl * /*ctrl */ ); -extern _X_EXPORT Bool InitIntegerFeedbackClassDeviceStruct(DeviceIntPtr +Bool InitIntegerFeedbackClassDeviceStruct(DeviceIntPtr /*device */ , IntegerCtrlProcPtr /*controlProc */ ); @@ -409,44 +409,44 @@ extern _X_EXPORT Bool InitKeyboardDeviceStruct(DeviceIntPtr /*device */ , KbdCtrlProcPtr /*controlProc */ ); -extern _X_EXPORT Bool InitKeyboardDeviceStructFromString(DeviceIntPtr dev, +Bool InitKeyboardDeviceStructFromString(DeviceIntPtr dev, const char *keymap, int keymap_length, BellProcPtr bell_func, KbdCtrlProcPtr ctrl_func); -extern _X_EXPORT void ProcessInputEvents(void); +void ProcessInputEvents(void); -extern _X_EXPORT void InitInput(int /*argc */ , +void InitInput(int /*argc */ , char ** /*argv */ ); -extern _X_EXPORT void CloseInput(void); +void CloseInput(void); -extern _X_EXPORT int GetMaximumEventsNum(void); +int GetMaximumEventsNum(void); -extern _X_EXPORT InternalEvent *InitEventList(int num_events); -extern _X_EXPORT void FreeEventList(InternalEvent *list, int num_events); +InternalEvent *InitEventList(int num_events); +void FreeEventList(InternalEvent *list, int num_events); -extern _X_EXPORT int GetPointerEvents(InternalEvent *events, +int GetPointerEvents(InternalEvent *events, DeviceIntPtr pDev, int type, int buttons, int flags, const ValuatorMask *mask); -extern _X_EXPORT void QueuePointerEvents(DeviceIntPtr pDev, +void QueuePointerEvents(DeviceIntPtr pDev, int type, int buttons, int flags, const ValuatorMask *mask); -extern _X_EXPORT int GetKeyboardEvents(InternalEvent *events, +int GetKeyboardEvents(InternalEvent *events, DeviceIntPtr pDev, int type, int key_code); -extern _X_EXPORT void QueueKeyboardEvents(DeviceIntPtr pDev, +void QueueKeyboardEvents(DeviceIntPtr pDev, int type, int key_code); -extern _X_EXPORT int GetProximityEvents(InternalEvent *events, +int GetProximityEvents(InternalEvent *events, DeviceIntPtr pDev, int type, const ValuatorMask *mask); @@ -455,7 +455,7 @@ extern _X_EXPORT void QueueProximityEvents(DeviceIntPtr pDev, extern _X_EXPORT int GetMotionHistorySize(void); -extern _X_EXPORT void AllocateMotionHistory(DeviceIntPtr pDev); +void AllocateMotionHistory(DeviceIntPtr pDev); extern _X_EXPORT int GetMotionHistory(DeviceIntPtr pDev, xTimecoord ** buff, @@ -463,10 +463,10 @@ extern _X_EXPORT int GetMotionHistory(DeviceIntPtr pDev, unsigned long stop, ScreenPtr pScreen, BOOL core); -extern _X_EXPORT DeviceIntPtr GetPairedDevice(DeviceIntPtr kbd); -extern _X_EXPORT DeviceIntPtr GetMaster(DeviceIntPtr dev, int type); +DeviceIntPtr GetPairedDevice(DeviceIntPtr kbd); +DeviceIntPtr GetMaster(DeviceIntPtr dev, int type); -extern _X_EXPORT int AllocDevicePair(ClientPtr client, +int AllocDevicePair(ClientPtr client, const char *name, DeviceIntPtr *ptr, DeviceIntPtr *keybd, @@ -474,7 +474,7 @@ extern _X_EXPORT int AllocDevicePair(ClientPtr client, DeviceProc keybd_proc, Bool master); /* Helper functions. */ -extern _X_EXPORT int generate_modkeymap(ClientPtr client, DeviceIntPtr dev, +int generate_modkeymap(ClientPtr client, DeviceIntPtr dev, KeyCode **modkeymap, int *max_keys_per_mod); @@ -511,12 +511,12 @@ extern _X_EXPORT void FreeInputAttributes(InputAttributes * attrs); extern _X_EXPORT int NewInputDeviceRequest(InputOption *options, InputAttributes * attrs, DeviceIntPtr *dev); -extern _X_EXPORT void DeleteInputDeviceRequest(DeviceIntPtr dev); -extern _X_EXPORT void RemoveInputDeviceTraces(const char *config_info); -extern _X_EXPORT void DDXRingBell(int volume, int pitch, int duration); +void DeleteInputDeviceRequest(DeviceIntPtr dev); +void RemoveInputDeviceTraces(const char *config_info); +void DDXRingBell(int volume, int pitch, int duration); extern _X_EXPORT ValuatorMask *valuator_mask_new(int num_valuators); extern _X_EXPORT void valuator_mask_free(ValuatorMask **mask); -extern _X_EXPORT void valuator_mask_set_range(ValuatorMask *mask, +void valuator_mask_set_range(ValuatorMask *mask, int first_valuator, int num_valuators, const int *valuators); @@ -536,22 +536,22 @@ extern _X_EXPORT double valuator_mask_get_double(const ValuatorMask *mask, int valnum); extern _X_EXPORT Bool valuator_mask_fetch(const ValuatorMask *mask, int valnum, int *val); -extern _X_EXPORT Bool valuator_mask_fetch_double(const ValuatorMask *mask, +Bool valuator_mask_fetch_double(const ValuatorMask *mask, int valnum, double *val); -extern _X_EXPORT Bool valuator_mask_has_unaccelerated(const ValuatorMask *mask); +Bool valuator_mask_has_unaccelerated(const ValuatorMask *mask); extern _X_EXPORT void valuator_mask_set_unaccelerated(ValuatorMask *mask, int valuator, double accel, double unaccel); -extern _X_EXPORT void valuator_mask_set_absolute_unaccelerated(ValuatorMask *mask, +void valuator_mask_set_absolute_unaccelerated(ValuatorMask *mask, int valuator, int absolute, double unaccel); -extern _X_EXPORT double valuator_mask_get_accelerated(const ValuatorMask *mask, +double valuator_mask_get_accelerated(const ValuatorMask *mask, int valuator); -extern _X_EXPORT double valuator_mask_get_unaccelerated(const ValuatorMask *mask, +double valuator_mask_get_unaccelerated(const ValuatorMask *mask, int valuator); -extern _X_EXPORT Bool valuator_mask_fetch_unaccelerated(const ValuatorMask *mask, +Bool valuator_mask_fetch_unaccelerated(const ValuatorMask *mask, int valuator, double *accel, double *unaccel); @@ -560,21 +560,21 @@ extern _X_EXPORT InputOption *input_option_new(InputOption *list, const char *key, const char *value); extern _X_EXPORT void input_option_free_list(InputOption **opt); -extern _X_EXPORT InputOption *input_option_free_element(InputOption *opt, +InputOption *input_option_free_element(InputOption *opt, const char *key); -extern _X_EXPORT InputOption *input_option_find(InputOption *list, +InputOption *input_option_find(InputOption *list, const char *key); -extern _X_EXPORT const char *input_option_get_key(const InputOption *opt); -extern _X_EXPORT const char *input_option_get_value(const InputOption *opt); -extern _X_EXPORT void input_option_set_key(InputOption *opt, const char *key); -extern _X_EXPORT void input_option_set_value(InputOption *opt, +const char *input_option_get_key(const InputOption *opt); +const char *input_option_get_value(const InputOption *opt); +void input_option_set_key(InputOption *opt, const char *key); +void input_option_set_value(InputOption *opt, const char *value); extern _X_EXPORT void input_lock(void); extern _X_EXPORT void input_unlock(void); -extern _X_EXPORT void input_force_unlock(void); -extern _X_EXPORT int in_input_thread(void); +void input_force_unlock(void); +int in_input_thread(void); -extern _X_EXPORT Bool InputThreadEnable; +extern Bool InputThreadEnable; #endif /* INPUT_H */ diff --git a/include/misc.h b/include/misc.h index 725fe9ff80..49d43fad64 100644 --- a/include/misc.h +++ b/include/misc.h @@ -84,19 +84,19 @@ OF THIS SOFTWARE. #ifndef MAXSCREENS #define MAXSCREENS 16 #endif -#ifndef MAXGPUSCREENS +#ifndef MAXGPUSCREENS // unexport #define MAXGPUSCREENS 16 #endif -#define MAXFORMATS 8 -#ifndef MAXDEVICES +#define MAXFORMATS 8 // unexport +#ifndef MAXDEVICES // unexport #define MAXDEVICES 256 /* input devices */ #endif #define GPU_SCREEN_OFFSET 256 /* 128 event opcodes for core + extension events, excluding GE */ -#define MAXEVENTS 128 -#define EXTENSION_EVENT_BASE 64 -#define EXTENSION_BASE 128 +#define MAXEVENTS 128 // unexport +#define EXTENSION_EVENT_BASE 64 // unexport +#define EXTENSION_BASE 128 // unexport typedef uint32_t ATOM; @@ -157,7 +157,7 @@ typedef int XRetCode; #endif /* some macros to help swap requests, replies, and events */ - +// unexport #define LengthRestS(stuff) \ ((client->req_len << 1) - (sizeof(*stuff) >> 1)) @@ -174,6 +174,7 @@ wrong_size(void) } #endif +// unexport ? #if !(defined(__GNUC__)) static inline int __builtin_constant_p(int x) @@ -195,6 +196,7 @@ bswap_64(uint64_t x) ((x & 0x00000000000000FFull) << 56)); } +// unexport #define swapll(x) do { \ if (sizeof(*(x)) != 8) \ wrong_size(); \ @@ -210,6 +212,7 @@ bswap_32(uint32_t x) ((x & 0x000000FF) << 24)); } +// keep #define swapl(x) do { \ if (sizeof(*(x)) != 4) \ wrong_size(); \ @@ -229,6 +232,7 @@ bswap_16(uint16_t x) *(x) = bswap_16(*(x)); \ } while (0) +// unexport /* copy 32-bit value from src to dst byteswapping on the way */ #define cpswapl(src, dst) do { \ if (sizeof((src)) != 4 || sizeof((dst)) != 4) \ @@ -236,6 +240,7 @@ bswap_16(uint16_t x) (dst) = bswap_32((src)); \ } while (0) +// unexport /* copy short from src to dst byteswapping on the way */ #define cpswaps(src, dst) do { \ if (sizeof((src)) != 2 || sizeof((dst)) != 2) \ diff --git a/include/os.h b/include/os.h index 519c465ce3..b9b9d3e32f 100644 --- a/include/os.h +++ b/include/os.h @@ -102,7 +102,7 @@ typedef struct _NewClientRec *NewClientPtr; #include #include -extern _X_EXPORT int ReadFdFromClient(ClientPtr client); +int ReadFdFromClient(ClientPtr client); extern _X_EXPORT int WriteToClient(ClientPtr /*who */ , int /*count */ , const void * /*buf */ ); @@ -145,6 +145,7 @@ extern _X_EXPORT OsTimerPtr TimerSet(OsTimerPtr timer, extern _X_EXPORT void TimerCancel(OsTimerPtr /* pTimer */ ); extern _X_EXPORT void TimerFree(OsTimerPtr /* pTimer */ ); +// FIXME: drop use in sisusb driver! extern _X_EXPORT void GiveUp(int /*sig */ ); /* @@ -197,11 +198,9 @@ typedef int (*OsSigWrapperPtr) (int /* sig */ ); extern _X_EXPORT OsSigWrapperPtr OsRegisterSigWrapper(OsSigWrapperPtr newWrap); -extern _X_EXPORT Bool -PrivsElevated(void); +Bool PrivsElevated(void); -extern _X_EXPORT int -GetClientFd(ClientPtr); +int GetClientFd(ClientPtr); /* stuff for FlushCallback */ extern _X_EXPORT CallbackListPtr FlushCallback; @@ -235,6 +234,7 @@ extern _X_EXPORT char * strndup(const char *str, size_t n); #endif +// drop from driver's AC #ifndef HAVE_TIMINGSAFE_MEMCMP extern _X_EXPORT int timingsafe_memcmp(const void *b1, const void *b2, size_t len); @@ -266,7 +266,7 @@ extern _X_EXPORT void LogMessage(MessageType type, const char *format, ...) _X_ATTRIBUTE_PRINTF(2, 3); -extern _X_EXPORT void +void LogHdrMessageVerb(MessageType type, int verb, const char *msg_format, va_list msg_args, const char *hdr_format, ...) diff --git a/include/pixmap.h b/include/pixmap.h index be6df98900..9f06372a0a 100644 --- a/include/pixmap.h +++ b/include/pixmap.h @@ -103,17 +103,17 @@ extern _X_EXPORT PixmapPtr GetScratchPixmapHeader(ScreenPtr pScreen, extern _X_EXPORT void FreeScratchPixmapHeader(PixmapPtr /*pPixmap */ ); -extern _X_EXPORT Bool PixmapScreenInit(ScreenPtr /*pScreen */ ); +Bool PixmapScreenInit(ScreenPtr /*pScreen */ ); extern _X_EXPORT PixmapPtr AllocatePixmap(ScreenPtr /*pScreen */ , int /*pixDataSize */ ); extern _X_EXPORT void FreePixmap(PixmapPtr /*pPixmap */ ); -extern _X_EXPORT PixmapPtr +PixmapPtr PixmapShareToSecondary(PixmapPtr pixmap, ScreenPtr secondary); -extern _X_EXPORT void +void PixmapUnshareSecondaryPixmap(PixmapPtr secondary_pixmap); #define HAS_DIRTYTRACKING_ROTATION 1 @@ -132,7 +132,7 @@ PixmapStopDirtyTracking(DrawablePtr src, PixmapPtr slave_dst); extern _X_EXPORT Bool PixmapSyncDirtyHelper(PixmapDirtyUpdatePtr dirty); -extern _X_EXPORT void +void PixmapDirtyCopyArea(PixmapPtr dst, DrawablePtr src, int x, int y, int dst_x, int dst_y, RegionPtr dirty_region); diff --git a/include/privates.h b/include/privates.h index 5e89b664fc..51a83d0fe2 100644 --- a/include/privates.h +++ b/include/privates.h @@ -9,6 +9,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ +// FIXME: move out non-exported functions + #ifndef PRIVATES_H #define PRIVATES_H 1 @@ -255,7 +257,7 @@ dixLookupScreenPrivateAddr(PrivatePtr *privates, const DevScreenPrivateKeyPtr ke #define HAVE_SCREEN_SPECIFIC_PRIVATE_KEYS 1 -extern _X_EXPORT Bool +Bool dixRegisterScreenSpecificPrivateKey(ScreenPtr pScreen, DevPrivateKey key, DevPrivateType type, unsigned size); @@ -281,7 +283,7 @@ _dixAllocateScreenObjectWithPrivates(ScreenPtr pScreen, extern _X_EXPORT int dixScreenSpecificPrivatesSize(ScreenPtr pScreen, DevPrivateType type); -extern _X_EXPORT void +void _dixInitScreenPrivates(ScreenPtr pScreen, PrivatePtr *privates, void *addr, DevPrivateType type); #define dixInitScreenPrivates(s, o, v, type) _dixInitScreenPrivates(s, &(o)->devPrivates, (v), type); @@ -295,19 +297,20 @@ _dixInitScreenPrivates(ScreenPtr pScreen, PrivatePtr *privates, void *addr, DevP * This includes screens, the serverClient, default colormaps and * extensions entries. */ -extern _X_EXPORT Bool +Bool dixAllocatePrivates(PrivatePtr *privates, DevPrivateType type); /* * Frees separately allocated private data */ +// FIXME: intel driver extern _X_EXPORT void dixFreePrivates(PrivatePtr privates, DevPrivateType type); /* * Initialize privates by zeroing them */ -extern _X_EXPORT void +void _dixInitPrivates(PrivatePtr *privates, void *addr, DevPrivateType type); #define dixInitPrivates(o, v, type) _dixInitPrivates(&(o)->devPrivates, (v), type); @@ -315,7 +318,7 @@ _dixInitPrivates(PrivatePtr *privates, void *addr, DevPrivateType type); /* * Clean up privates */ -extern _X_EXPORT void +void _dixFiniPrivates(PrivatePtr privates, DevPrivateType type); #define dixFiniPrivates(o,t) _dixFiniPrivates((o)->devPrivates,t) @@ -325,15 +328,14 @@ extern _X_EXPORT void * for almost all objects, except for the list described * above for dixAllocatePrivates. */ -extern _X_EXPORT void *_dixAllocateObjectWithPrivates(unsigned size, +void *_dixAllocateObjectWithPrivates(unsigned size, unsigned clear, unsigned offset, DevPrivateType type); #define dixAllocateObjectWithPrivates(t, type) (t *) _dixAllocateObjectWithPrivates(sizeof(t), sizeof(t), offsetof(t, devPrivates), type) -extern _X_EXPORT void - +void _dixFreeObjectWithPrivates(void *object, PrivatePtr privates, DevPrivateType type); @@ -342,7 +344,7 @@ _dixFreeObjectWithPrivates(void *object, PrivatePtr privates, /* * Return size of privates for the specified type */ -extern _X_EXPORT int +int dixPrivatesSize(DevPrivateType type); /* @@ -355,8 +357,7 @@ extern void * Resets the privates subsystem. dixResetPrivates is called from the main loop * before each server generation. This function must only be called by main(). */ -extern _X_EXPORT void - dixResetPrivates(void); +void dixResetPrivates(void); /* * Looks up the offset where the devPrivates field is located. @@ -366,13 +367,14 @@ extern _X_EXPORT void * and calling code might only know the resource type, not the * structure definition. */ -extern _X_EXPORT int +int dixLookupPrivateOffset(RESTYPE type); /* * Convenience macro for adding an offset to an object pointer * when making a call to one of the devPrivates functions */ +// unexport #define DEVPRIV_AT(ptr, offset) ((PrivatePtr *)((char *)(ptr) + offset)) #endif /* PRIVATES_H */ diff --git a/include/region.h b/include/region.h index 14d283f882..35f5d5271b 100644 --- a/include/region.h +++ b/include/region.h @@ -47,6 +47,7 @@ SOFTWARE. #ifndef REGION_H #define REGION_H +// FIXME: remove it #include "regionstr.h" #endif /* REGION_H */ diff --git a/include/resource.h b/include/resource.h index e7567f7dd5..078eae6406 100644 --- a/include/resource.h +++ b/include/resource.h @@ -147,22 +147,23 @@ typedef void (*FindTypeSubResources)(void *value, FindAllRes func, void *cdata); -extern _X_EXPORT SizeType GetResourceTypeSizeFunc( +SizeType GetResourceTypeSizeFunc( RESTYPE /*type*/); -extern _X_EXPORT void SetResourceTypeFindSubResFunc( +void SetResourceTypeFindSubResFunc( RESTYPE /*type*/, FindTypeSubResources /*findFunc*/); -extern _X_EXPORT void SetResourceTypeSizeFunc( +void SetResourceTypeSizeFunc( RESTYPE /*type*/, SizeType /*sizeFunc*/); -extern _X_EXPORT void SetResourceTypeErrorValue( +void SetResourceTypeErrorValue( RESTYPE /*type*/, int /*errorValue*/); extern _X_EXPORT RESTYPE CreateNewResourceClass(void); -extern _X_EXPORT Bool InitClientResources(ClientPtr /*client */ ); +Bool InitClientResources(ClientPtr /*client */ ); +// FIXME: replace it by dixAllocServerXID() extern _X_EXPORT XID FakeClientID(int /*client */ ); /* Quartz support on Mac OS X uses the CarbonCore @@ -181,7 +182,7 @@ extern _X_EXPORT void FreeResourceByType(XID /*id */ , RESTYPE /*type */ , Bool /*skipFree */ ); -extern _X_EXPORT Bool ChangeResourceValue(XID id, +Bool ChangeResourceValue(XID id, RESTYPE rtype, void *value); @@ -190,7 +191,7 @@ extern _X_EXPORT void FindClientResourcesByType(ClientPtr client, FindResType func, void *cdata); -extern _X_EXPORT void FindAllClientResources(ClientPtr client, +void FindAllClientResources(ClientPtr client, FindAllRes func, void *cdata); @@ -198,31 +199,34 @@ extern _X_EXPORT void FindAllClientResources(ClientPtr client, @note The XID argument provided to the FindAllRes function may be 0 for subresources that don't have an XID */ -extern _X_EXPORT void FindSubResources(void *resource, +void FindSubResources(void *resource, RESTYPE type, FindAllRes func, void *cdata); -extern _X_EXPORT void FreeClientNeverRetainResources(ClientPtr /*client */ ); +void FreeClientNeverRetainResources(ClientPtr /*client */ ); -extern _X_EXPORT void FreeClientResources(ClientPtr /*client */ ); +void FreeClientResources(ClientPtr /*client */ ); -extern _X_EXPORT void FreeAllResources(void); +void FreeAllResources(void); -extern _X_EXPORT Bool LegalNewID(XID /*id */ , +Bool LegalNewID(XID /*id */ , ClientPtr /*client */ ); +// FIXME intel extern _X_EXPORT void *LookupClientResourceComplex(ClientPtr client, RESTYPE type, FindComplexResType func, void *cdata); +// FIXME: intel extern _X_EXPORT int dixLookupResourceByType(void **result, XID id, RESTYPE rtype, ClientPtr client, Mask access_mode); +// Nvidia extern _X_EXPORT int dixLookupResourceByClass(void **result, XID id, RESTYPE rclass, diff --git a/include/window.h b/include/window.h index b2ff98e887..d63342fa2b 100644 --- a/include/window.h +++ b/include/window.h @@ -91,20 +91,20 @@ extern _X_EXPORT int WalkTree(ScreenPtr pScreen, VisitWindowProcPtr func, void *data); -extern _X_EXPORT Bool CreateRootWindow(ScreenPtr /*pScreen */ ); +Bool CreateRootWindow(ScreenPtr /*pScreen */ ); -extern _X_EXPORT void InitRootWindow(WindowPtr /*pWin */ ); +void InitRootWindow(WindowPtr /*pWin */ ); typedef WindowPtr (*RealChildHeadProc) (WindowPtr pWin); -extern _X_EXPORT void RegisterRealChildHeadProc(RealChildHeadProc proc); +void RegisterRealChildHeadProc(RealChildHeadProc proc); -extern _X_EXPORT WindowPtr RealChildHead(WindowPtr /*pWin */ ); +WindowPtr RealChildHead(WindowPtr /*pWin */ ); -extern _X_EXPORT int DeleteWindow(void *pWin, +int DeleteWindow(void *pWin, XID wid); -extern _X_EXPORT int DestroySubwindows(WindowPtr /*pWin */ , +int DestroySubwindows(WindowPtr /*pWin */ , ClientPtr /*client */ ); /* Quartz support on Mac OS X uses the HIToolbox @@ -117,11 +117,11 @@ extern _X_EXPORT int ChangeWindowAttributes(WindowPtr /*pWin */ , XID * /*vlist */ , ClientPtr /*client */ ); -extern _X_EXPORT int ChangeWindowDeviceCursor(WindowPtr /*pWin */ , +int ChangeWindowDeviceCursor(WindowPtr /*pWin */ , struct _DeviceIntRec * /*pDev */ , struct _Cursor * /*pCursor */ ); -extern _X_EXPORT struct _Cursor *WindowGetDeviceCursor(WindowPtr /*pWin */ , +struct _Cursor *WindowGetDeviceCursor(WindowPtr /*pWin */ , struct _DeviceIntRec * /*pDev */ ); @@ -138,7 +138,7 @@ extern _X_EXPORT void GetWindowAttributes( xGetWindowAttributesReply * /* wa */ ); -extern _X_EXPORT void GravityTranslate(int /*x */ , +void GravityTranslate(int /*x */ , int /*y */ , int /*oldx */ , int /*oldy */ , @@ -148,71 +148,74 @@ extern _X_EXPORT void GravityTranslate(int /*x */ , int * /*destx */ , int * /*desty */ ); -extern _X_EXPORT int ConfigureWindow(WindowPtr /*pWin */ , +int ConfigureWindow(WindowPtr /*pWin */ , Mask /*mask */ , XID * /*vlist */ , ClientPtr /*client */ ); -extern _X_EXPORT int CirculateWindow(WindowPtr /*pParent */ , +int CirculateWindow(WindowPtr /*pParent */ , int /*direction */ , ClientPtr /*client */ ); +// FIXME extern _X_EXPORT int ReparentWindow(WindowPtr /*pWin */ , WindowPtr /*pParent */ , int /*x */ , int /*y */ , ClientPtr /*client */ ); -extern _X_EXPORT int MapWindow(WindowPtr /*pWin */ , +int MapWindow(WindowPtr /*pWin */ , ClientPtr /*client */ ); -extern _X_EXPORT void MapSubwindows(WindowPtr /*pParent */ , +void MapSubwindows(WindowPtr /*pParent */ , ClientPtr /*client */ ); -extern _X_EXPORT int UnmapWindow(WindowPtr /*pWin */ , +int UnmapWindow(WindowPtr /*pWin */ , Bool /*fromConfigure */ ); -extern _X_EXPORT void UnmapSubwindows(WindowPtr /*pWin */ ); +void UnmapSubwindows(WindowPtr /*pWin */ ); -extern _X_EXPORT void HandleSaveSet(ClientPtr /*client */ ); +void HandleSaveSet(ClientPtr /*client */ ); -extern _X_EXPORT Bool PointInWindowIsVisible(WindowPtr /*pWin */ , +Bool PointInWindowIsVisible(WindowPtr /*pWin */ , int /*x */ , int /*y */ ); +// FIXME:intel extern _X_EXPORT RegionPtr NotClippedByChildren(WindowPtr /*pWin */ ); -extern _X_EXPORT void SendVisibilityNotify(WindowPtr /*pWin */ ); +void SendVisibilityNotify(WindowPtr /*pWin */ ); -extern _X_EXPORT int dixSaveScreens(ClientPtr client, int on, int mode); +int dixSaveScreens(ClientPtr client, int on, int mode); +// fixme: intel extern _X_EXPORT int SaveScreens(int on, int mode); extern _X_EXPORT WindowPtr FindWindowWithOptional(WindowPtr /*w */ ); -extern _X_EXPORT void CheckWindowOptionalNeed(WindowPtr /*w */ ); +void CheckWindowOptionalNeed(WindowPtr /*w */ ); -extern _X_EXPORT WindowPtr MoveWindowInStack(WindowPtr /*pWin */ , +WindowPtr MoveWindowInStack(WindowPtr /*pWin */ , WindowPtr /*pNextSib */ ); -extern _X_EXPORT void SetWinSize(WindowPtr /*pWin */ ); +void SetWinSize(WindowPtr /*pWin */ ); -extern _X_EXPORT void SetBorderSize(WindowPtr /*pWin */ ); +void SetBorderSize(WindowPtr /*pWin */ ); -extern _X_EXPORT void ResizeChildrenWinSize(WindowPtr /*pWin */ , +void ResizeChildrenWinSize(WindowPtr /*pWin */ , int /*dx */ , int /*dy */ , int /*dw */ , int /*dh */ ); -extern _X_EXPORT void SendShapeNotify(WindowPtr /* pWin */ , +void SendShapeNotify(WindowPtr /* pWin */ , int /* which */); -extern _X_EXPORT RegionPtr CreateBoundingShape(WindowPtr /* pWin */ ); +RegionPtr CreateBoundingShape(WindowPtr /* pWin */ ); -extern _X_EXPORT RegionPtr CreateClipShape(WindowPtr /* pWin */ ); +RegionPtr CreateClipShape(WindowPtr /* pWin */ ); extern _X_EXPORT void SetRootClip(ScreenPtr pScreen, int enable); -extern _X_EXPORT VisualPtr WindowGetVisual(WindowPtr /*pWin*/); +VisualPtr WindowGetVisual(WindowPtr /*pWin*/); #endif /* WINDOW_H */