diff options
Diffstat (limited to 'xorg-server/include')
28 files changed, 221 insertions, 90 deletions
diff --git a/xorg-server/include/callback.h b/xorg-server/include/callback.h index df638c0d4..3529225b4 100644 --- a/xorg-server/include/callback.h +++ b/xorg-server/include/callback.h @@ -52,6 +52,10 @@ SOFTWARE. #include <X11/Xproto.h> #include <X11/Xfuncproto.h> +#ifdef _MSC_VER +#define inline __inline +#endif + /* * callback manager stuff */ @@ -66,14 +70,14 @@ typedef void (*CallbackProcPtr) (CallbackListPtr *, void *, void *); extern _X_EXPORT Bool AddCallback(CallbackListPtr * /*pcbl */ , CallbackProcPtr /*callback */ , - void */*data */ ); + void * /*data */ ); extern _X_EXPORT Bool DeleteCallback(CallbackListPtr * /*pcbl */ , CallbackProcPtr /*callback */ , - void */*data */ ); + void * /*data */ ); extern _X_EXPORT void _CallCallbacks(CallbackListPtr * /*pcbl */ , - void */*call_data */ ); + void * /*call_data */ ); static inline void CallCallbacks(CallbackListPtr *pcbl, void *call_data) diff --git a/xorg-server/include/closestr.h b/xorg-server/include/closestr.h index 60e6f09bc..87a2f1781 100644 --- a/xorg-server/include/closestr.h +++ b/xorg-server/include/closestr.h @@ -52,6 +52,7 @@ typedef struct _OFclosure { XID fontid; char *fontname; int fnamelen; + Bool from_dispatch; FontPtr non_cachable_font; } OFclosureRec; @@ -77,6 +78,7 @@ typedef struct _LFWIclosure { LFWIstateRec saved; int savedNumFonts; Bool haveSaved; + Bool from_dispatch; char *savedName; } LFWIclosureRec; @@ -90,6 +92,7 @@ typedef struct _LFclosure { LFWIstateRec current; LFWIstateRec saved; Bool haveSaved; + Bool from_dispatch; char *savedName; int savedNameLen; } LFclosureRec; @@ -108,6 +111,7 @@ typedef struct _PTclosure { CARD8 reqType; XID did; int err; + Bool from_dispatch; } PTclosureRec; /* ImageText */ @@ -122,5 +126,6 @@ typedef struct _ITclosure { int yorg; CARD8 reqType; XID did; + Bool from_dispatch; } ITclosureRec; #endif /* CLOSESTR_H */ diff --git a/xorg-server/include/colormap.h b/xorg-server/include/colormap.h index 22229ca84..30e508557 100644 --- a/xorg-server/include/colormap.h +++ b/xorg-server/include/colormap.h @@ -82,14 +82,14 @@ extern _X_EXPORT int CreateColormap(Colormap /*mid */ , int /*alloc */ , int /*client */ ); -extern _X_EXPORT int FreeColormap(void */*pmap */ , +extern _X_EXPORT int FreeColormap(void * /*pmap */ , XID /*mid */ ); extern _X_EXPORT int TellLostMap(WindowPtr /*pwin */ , - void */* Colormap *pmid */ ); + void * /* Colormap *pmid */ ); extern _X_EXPORT int TellGainedMap(WindowPtr /*pwin */ , - void */* Colormap *pmid */ ); + void * /* Colormap *pmid */ ); extern _X_EXPORT int CopyColormapAndFree(Colormap /*mid */ , ColormapPtr /*pSrc */ , @@ -126,7 +126,7 @@ extern _X_EXPORT int QueryColors(ColormapPtr /*pmap */ , xrgb * /*prgbList */ , ClientPtr client); -extern _X_EXPORT int FreeClientPixels(void */*pcr */ , +extern _X_EXPORT int FreeClientPixels(void * /*pcr */ , XID /*fakeid */ ); extern _X_EXPORT int AllocColorCells(int /*client */ , diff --git a/xorg-server/include/cursor.h b/xorg-server/include/cursor.h index 9da08affd..5e9ed92d4 100644 --- a/xorg-server/include/cursor.h +++ b/xorg-server/include/cursor.h @@ -68,7 +68,7 @@ extern _X_EXPORT DevScreenPrivateKeyRec cursorScreenDevPriv; extern _X_EXPORT CursorPtr rootCursor; -extern _X_EXPORT int FreeCursor(void */*pCurs */ , +extern _X_EXPORT int FreeCursor(void * /*pCurs */ , XID /*cid */ ); extern _X_EXPORT CursorPtr RefCursor(CursorPtr /* cursor */); diff --git a/xorg-server/include/dix.h b/xorg-server/include/dix.h index f42e23655..82bb58cbc 100644 --- a/xorg-server/include/dix.h +++ b/xorg-server/include/dix.h @@ -147,14 +147,14 @@ extern _X_EXPORT void UpdateCurrentTime(void); extern _X_EXPORT void UpdateCurrentTimeIf(void); -extern _X_EXPORT int dixDestroyPixmap(void */*value */ , +extern _X_EXPORT int dixDestroyPixmap(void * /*value */ , XID /*pid */ ); extern _X_EXPORT void InitClient(ClientPtr /*client */ , int /*i */ , - void */*ospriv */ ); + void * /*ospriv */ ); -extern _X_EXPORT ClientPtr NextAvailableClient(void */*ospriv */ ); +extern _X_EXPORT ClientPtr NextAvailableClient(void * /*ospriv */ ); extern _X_EXPORT void SendErrorToClient(ClientPtr /*client */ , unsigned int /*majorCode */ , @@ -203,11 +203,11 @@ extern _X_EXPORT int AlterSaveSetForClient(ClientPtr /*client */ , extern _X_EXPORT void DeleteWindowFromAnySaveSet(WindowPtr /*pWin */ ); -extern _X_EXPORT void BlockHandler(void */*pTimeout */ , - void */*pReadmask */ ); +extern _X_EXPORT void BlockHandler(void * /*pTimeout */ , + void * /*pReadmask */ ); extern _X_EXPORT void WakeupHandler(int /*result */ , - void */*pReadmask */ ); + void * /*pReadmask */ ); void EnableLimitedSchedulingLatency(void); @@ -215,21 +215,21 @@ void void DisableLimitedSchedulingLatency(void); -typedef void (*WakeupHandlerProcPtr) (void */* blockData */ , +typedef void (*WakeupHandlerProcPtr) (void * /* blockData */ , int /* result */ , - void */* pReadmask */ ); + void * /* pReadmask */ ); extern _X_EXPORT Bool RegisterBlockAndWakeupHandlers(BlockHandlerProcPtr /*blockHandler */ , WakeupHandlerProcPtr /*wakeupHandler */ , - void */*blockData */ ); + void * /*blockData */ ); extern _X_EXPORT void RemoveBlockAndWakeupHandlers(BlockHandlerProcPtr /*blockHandler */ , WakeupHandlerProcPtr /*wakeupHandler */ , - void */*blockData */ ); + void * /*blockData */ ); extern _X_EXPORT void InitBlockAndWakeupHandlers(void); @@ -244,15 +244,15 @@ extern _X_EXPORT Bool QueueWorkProc(Bool (* /*function */ )( void * /*closure */ ), ClientPtr /*client */ , - void */*closure */ + void * /*closure */ ); typedef Bool (*ClientSleepProcPtr) (ClientPtr /*client */ , - void */*closure */ ); + void * /*closure */ ); extern _X_EXPORT Bool ClientSleep(ClientPtr /*client */ , ClientSleepProcPtr /* function */ , - void */*closure */ ); + void * /*closure */ ); #ifndef ___CLIENTSIGNAL_DEFINED___ #define ___CLIENTSIGNAL_DEFINED___ @@ -444,7 +444,7 @@ extern void RecalculateDeliverableEvents(WindowPtr /* pWin */ ); extern _X_EXPORT int -OtherClientGone(void */* value */ , +OtherClientGone(void * /* value */ , XID /* id */ ); extern void diff --git a/xorg-server/include/dixfont.h b/xorg-server/include/dixfont.h index 40d80c141..baa4235e9 100644 --- a/xorg-server/include/dixfont.h +++ b/xorg-server/include/dixfont.h @@ -40,9 +40,9 @@ extern _X_EXPORT void QueueFontWakeup(FontPathElementPtr /*fpe */ ); extern _X_EXPORT void RemoveFontWakeup(FontPathElementPtr /*fpe */ ); -extern _X_EXPORT void FontWakeup(void */*data */ , +extern _X_EXPORT void FontWakeup(void * /*data */ , int /*count */ , - void */*LastSelectMask */ ); + void * /*LastSelectMask */ ); extern _X_EXPORT int OpenFont(ClientPtr /*client */ , XID /*fid */ , @@ -50,7 +50,7 @@ extern _X_EXPORT int OpenFont(ClientPtr /*client */ , unsigned /*lenfname */ , const char * /*pfontname */ ); -extern _X_EXPORT int CloseFont(void */*pfont */ , +extern _X_EXPORT int CloseFont(void * /*pfont */ , XID /*fid */ ); typedef struct _xQueryFontReply *xQueryFontReplyPtr; diff --git a/xorg-server/include/dixgrabs.h b/xorg-server/include/dixgrabs.h index d78d8127b..2d8c8584c 100644 --- a/xorg-server/include/dixgrabs.h +++ b/xorg-server/include/dixgrabs.h @@ -47,7 +47,7 @@ extern GrabPtr CreateGrab(int /* client */ , WindowPtr /* confineTo */ , CursorPtr /* cursor */ ); -extern _X_EXPORT int DeletePassiveGrab(void */* value */ , +extern _X_EXPORT int DeletePassiveGrab(void * /* value */ , XID /* id */ ); extern _X_EXPORT Bool GrabMatchesSecond(GrabPtr /* pFirstGrab */ , diff --git a/xorg-server/include/dixstruct.h b/xorg-server/include/dixstruct.h index 6c13895d7..02ba33ec2 100644 --- a/xorg-server/include/dixstruct.h +++ b/xorg-server/include/dixstruct.h @@ -90,7 +90,7 @@ typedef struct _Client { int priority; ReplySwapPtr pSwapReplyFunc; XID errorValue; - int sequence; + unsigned short sequence; //MH int ignoreCount; /* count for Attend/IgnoreClient */ int numSaved; SaveSetElt *saveSet; diff --git a/xorg-server/include/gc.h b/xorg-server/include/gc.h index ecaa257bb..1e69b5c3d 100644 --- a/xorg-server/include/gc.h +++ b/xorg-server/include/gc.h @@ -87,8 +87,8 @@ extern _X_EXPORT void ValidateGC(DrawablePtr /*pDraw */ , GCPtr /*pGC */ ); typedef union { - CARD32 val; void *ptr; + CARD32 val; } ChangeGCVal, *ChangeGCValPtr; extern int ChangeGCXIDs(ClientPtr /*client */ , @@ -112,7 +112,7 @@ extern _X_EXPORT int CopyGC(GCPtr /*pgcSrc */ , GCPtr /*pgcDst */ , BITS32 /*mask */ ); -extern _X_EXPORT int FreeGC(void */*pGC */ , +extern _X_EXPORT int FreeGC(void * /*pGC */ , XID /*gid */ ); extern _X_EXPORT void FreeGCperDepth(int /*screenNum */ ); diff --git a/xorg-server/include/gcstruct.h b/xorg-server/include/gcstruct.h index c830ccde7..1adea22b5 100644 --- a/xorg-server/include/gcstruct.h +++ b/xorg-server/include/gcstruct.h @@ -78,7 +78,7 @@ typedef struct _GCFuncs { void (*ChangeClip) (GCPtr /*pGC */ , int /*type */ , - void */*pvalue */ , + void * /*pvalue */ , int /*nrects */ ); void (*DestroyClip) (GCPtr /*pGC */ ); @@ -216,7 +216,7 @@ typedef struct _GCOps { int /*y */ , unsigned int /*nglyph */ , CharInfoPtr * /*ppci */ , - void */*pglyphBase */ ); + void * /*pglyphBase */ ); void (*PolyGlyphBlt) (DrawablePtr /*pDrawable */ , GCPtr /*pGC */ , @@ -224,7 +224,7 @@ typedef struct _GCOps { int /*y */ , unsigned int /*nglyph */ , CharInfoPtr * /*ppci */ , - void */*pglyphBase */ ); + void * /*pglyphBase */ ); void (*PushPixels) (GCPtr /*pGC */ , PixmapPtr /*pBitMap */ , diff --git a/xorg-server/include/input.h b/xorg-server/include/input.h index cbf949b53..af1bfd05e 100644 --- a/xorg-server/include/input.h +++ b/xorg-server/include/input.h @@ -316,7 +316,7 @@ extern _X_EXPORT Bool InitTouchClassDeviceStruct(DeviceIntPtr /*device */ , typedef void (*BellProcPtr) (int /*percent */ , DeviceIntPtr /*device */ , - void */*ctrl */ , + void * /*ctrl */ , int); typedef void (*KbdCtrlProcPtr) (DeviceIntPtr /*device */ , @@ -576,7 +576,7 @@ extern void TouchEventHistoryReplay(TouchPointInfoPtr ti, DeviceIntPtr dev, extern Bool TouchResourceIsOwner(TouchPointInfoPtr ti, XID resource); extern void TouchAddListener(TouchPointInfoPtr ti, XID resource, int resource_type, enum InputLevel level, enum TouchListenerType type, - enum TouchListenerState state, WindowPtr window, GrabPtr grab); + enum TouchListenerState state, WindowPtr window, const GrabPtr grab); extern Bool TouchRemoveListener(TouchPointInfoPtr ti, XID resource); extern void TouchSetupListeners(DeviceIntPtr dev, TouchPointInfoPtr ti, InternalEvent *ev); diff --git a/xorg-server/include/list.h b/xorg-server/include/list.h index 455c670d3..7bf3cc5f4 100644 --- a/xorg-server/include/list.h +++ b/xorg-server/include/list.h @@ -305,7 +305,7 @@ xorg_list_is_empty(struct xorg_list *head) * */ #define xorg_list_for_each_entry(pos, head, member) \ - for (pos = __container_of((head)->next, pos, member); \ + for (pos = NULL, pos = __container_of((head)->next, pos, member); \ &pos->member != (head); \ pos = __container_of(pos->member.next, pos, member)) @@ -317,7 +317,7 @@ xorg_list_is_empty(struct xorg_list *head) * See xorg_list_for_each_entry for more details. */ #define xorg_list_for_each_entry_safe(pos, tmp, head, member) \ - for (pos = __container_of((head)->next, pos, member), \ + for (pos = NULL, pos = __container_of((head)->next, pos, member), \ tmp = __container_of(pos->member.next, pos, member); \ &pos->member != (head); \ pos = tmp, tmp = __container_of(pos->member.next, tmp, member)) diff --git a/xorg-server/include/misc.h b/xorg-server/include/misc.h index 17de71041..19e71035c 100644 --- a/xorg-server/include/misc.h +++ b/xorg-server/include/misc.h @@ -79,6 +79,16 @@ OF THIS SOFTWARE. #include <stddef.h> #include <stdint.h> +#include <unistd.h> + +#ifdef _MSC_VER +#define inline __inline +#include <math.h> +static double __inline trunc(double d) +{ + return (d>0) ? floor(d) : ceil(d) ; +} +#endif #ifndef MAXSCREENS #define MAXSCREENS 16 @@ -86,7 +96,7 @@ OF THIS SOFTWARE. #ifndef MAXGPUSCREENS #define MAXGPUSCREENS 16 #endif -#define MAXCLIENTS 256 +#define MAXCLIENTS 1024 #define MAXEXTENSIONS 128 #define MAXFORMATS 8 #define MAXDEVICES 40 /* input devices */ @@ -173,9 +183,9 @@ lswaps(uint16_t x) #include <math.h> #undef MAXSHORT -#define MAXSHORT SHRT_MAX +#define MAXSHORT 32767 #undef MINSHORT -#define MINSHORT SHRT_MIN +#define MINSHORT -32768 #undef MAXINT #define MAXINT INT_MAX #undef MININT @@ -203,7 +213,7 @@ lswaps(uint16_t x) * @param bits The minimum number of bits needed. * @return The number of bytes needed to hold bits. */ -static inline int +static __inline int bits_to_bytes(const int bits) { return ((bits + 7) >> 3); @@ -215,7 +225,7 @@ bits_to_bytes(const int bits) * @param bytes The minimum number of bytes needed. * @return The number of 4-byte units needed to hold bytes. */ -static inline int +static __inline int bytes_to_int32(const int bytes) { return (((bytes) + 3) >> 2); @@ -226,7 +236,7 @@ bytes_to_int32(const int bytes) * @param bytes The minimum number of bytes needed. * @return The closest multiple of 4 that is equal or higher than bytes. */ -static inline int +static __inline int pad_to_int32(const int bytes) { return (((bytes) + 3) & ~3); @@ -422,7 +432,7 @@ extern _X_EXPORT unsigned long serverGeneration; do { if (cond) { \ ErrorFSigSafe("BUG: triggered 'if (" #cond ")'\n"); \ ErrorFSigSafe("BUG: %s:%u in %s()\n", \ - __FILE__, __LINE__, __func__); \ + __FILE__, __LINE__, __FUNCTION__); \ if (with_msg) ErrorFSigSafe(__VA_ARGS__); \ xorg_backtrace(); \ } } while(0) diff --git a/xorg-server/include/os.h b/xorg-server/include/os.h index d26e399b6..ed7e8806a 100644 --- a/xorg-server/include/os.h +++ b/xorg-server/include/os.h @@ -121,6 +121,8 @@ extern _X_EXPORT int WriteToClient(ClientPtr /*who */ , int /*count */ , extern _X_EXPORT void ResetOsBuffers(void); +extern _X_EXPORT int TransIsListening(char *protocol); + extern _X_EXPORT void InitConnectionLimits(void); extern _X_EXPORT void NotifyParentProcess(void); @@ -140,7 +142,7 @@ extern _X_EXPORT const char *ClientAuthorized(ClientPtr /*client */ , char * /*auth_string */ ); extern _X_EXPORT Bool EstablishNewConnections(ClientPtr /*clientUnused */ , - void */*closure */ ); + void * /*closure */ ); extern _X_EXPORT void CheckConnections(void); @@ -173,14 +175,14 @@ extern _X_EXPORT Bool AddClientOnOpenFD(int /* fd */ ); extern _X_EXPORT CARD32 GetTimeInMillis(void); extern _X_EXPORT CARD64 GetTimeInMicros(void); -extern _X_EXPORT void AdjustWaitForDelay(void */*waitTime */ , +extern _X_EXPORT void AdjustWaitForDelay(void * /*waitTime */ , unsigned long /*newdelay */ ); typedef struct _OsTimerRec *OsTimerPtr; typedef CARD32 (*OsTimerCallback) (OsTimerPtr /* timer */ , CARD32 /* time */ , - void */* arg */ ); + void * /* arg */ ); extern _X_EXPORT void TimerInit(void); @@ -193,7 +195,7 @@ extern _X_EXPORT OsTimerPtr TimerSet(OsTimerPtr /* timer */ , int /* flags */ , CARD32 /* millis */ , OsTimerCallback /* func */ , - void */* arg */ ); + void * /* arg */ ); extern _X_EXPORT void TimerCheck(void); extern _X_EXPORT void TimerCancel(OsTimerPtr /* pTimer */ ); @@ -212,7 +214,7 @@ extern _X_EXPORT void ProcessCommandLine(int /*argc */ , char * /*argv */ []); extern _X_EXPORT int set_font_authorizations(char ** /* authorizations */ , int * /*authlen */ , - void */* client */ ); + void * /* client */ ); #ifndef _HAVE_XALLOC_DECLS #define _HAVE_XALLOC_DECLS @@ -395,14 +397,14 @@ ForEachHostInFamily(int /*family */ , Bool (* /*func */ )( unsigned char * /* addr */ , short /* len */ , - void */* closure */ ), - void */*closure */ ); + void * /* closure */ ), + void * /*closure */ ); extern _X_EXPORT int RemoveHost(ClientPtr /*client */ , int /*family */ , unsigned /*length */ , - void */*pAddr */ ); + void * /*pAddr */ ); extern _X_EXPORT int GetHosts(void ** /*data */ , @@ -460,11 +462,11 @@ extern _X_EXPORT void AccessUsingXdmcp(void); extern _X_EXPORT void -DefineSelf(int /*fd */ ); +DefineSelf(int /*fd */ , const int /*protocol*/); #if XDMCP extern _X_EXPORT void -AugmentSelf(void */*from */ , int /*len */ ); +AugmentSelf(void * /*from */ , int /*len */ ); extern _X_EXPORT void RegisterAuthorizations(void); @@ -668,10 +670,20 @@ _X_ATTRIBUTE_PRINTF(1, 2) #define DebugF(...) /* */ #endif +#ifdef _MSC_VER +#ifdef INSERVER +#define SERVEXTERN _declspec(dllimport) +#else +#define SERVEXTERN _declspec(dllexport) +#endif +#else +#define SERVEXTERN _X_EXPORT +#endif + extern _X_EXPORT void VErrorF(const char *f, va_list args) _X_ATTRIBUTE_PRINTF(1, 0); -extern _X_EXPORT void +extern SERVEXTERN void ErrorF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1, 2); extern _X_EXPORT void @@ -686,6 +698,10 @@ LogPrintMarkers(void); extern _X_EXPORT void xorg_backtrace(void); +#ifdef _MSC_VER +#define snprintf _snprintf +#endif + extern _X_EXPORT int os_move_fd(int fd); diff --git a/xorg-server/include/pixmap.h b/xorg-server/include/pixmap.h index 46ec3f5a2..12bb94fd1 100644 --- a/xorg-server/include/pixmap.h +++ b/xorg-server/include/pixmap.h @@ -99,7 +99,7 @@ extern _X_EXPORT PixmapPtr GetScratchPixmapHeader(ScreenPtr /*pScreen */ , int /*depth */ , int /*bitsPerPixel */ , int /*devKind */ , - void */*pPixData */ ); + void * /*pPixData */ ); extern _X_EXPORT void FreeScratchPixmapHeader(PixmapPtr /*pPixmap */ ); diff --git a/xorg-server/include/pixmapstr.h b/xorg-server/include/pixmapstr.h index 2a1ef9b85..d933a5916 100644 --- a/xorg-server/include/pixmapstr.h +++ b/xorg-server/include/pixmapstr.h @@ -76,10 +76,8 @@ typedef struct _Pixmap { int refcnt; int devKind; /* This is the pitch of the pixmap, typically width*bpp/8. */ DevUnion devPrivate; /* When !NULL, devPrivate.ptr points to the raw pixel data. */ -#ifdef COMPOSITE short screen_x; short screen_y; -#endif unsigned usage_hint; /* see CREATE_PIXMAP_USAGE_* */ PixmapPtr master_pixmap; /* pointer to master copy of pixmap for pixmap sharing */ diff --git a/xorg-server/include/property.h b/xorg-server/include/property.h index 3b8ea8b2d..2e8b54f87 100644 --- a/xorg-server/include/property.h +++ b/xorg-server/include/property.h @@ -64,7 +64,7 @@ extern _X_EXPORT int dixChangeWindowProperty(ClientPtr /*pClient */ , int /*format */ , int /*mode */ , unsigned long /*len */ , - void */*value */ , + void * /*value */ , Bool /*sendevent */ ); extern _X_EXPORT int ChangeWindowProperty(WindowPtr /*pWin */ , @@ -73,7 +73,7 @@ extern _X_EXPORT int ChangeWindowProperty(WindowPtr /*pWin */ , int /*format */ , int /*mode */ , unsigned long /*len */ , - void */*value */ , + void * /*value */ , Bool /*sendevent */ ); extern _X_EXPORT int DeleteProperty(ClientPtr /*client */ , diff --git a/xorg-server/include/resource.h b/xorg-server/include/resource.h index db44aefad..ffe02a67e 100644 --- a/xorg-server/include/resource.h +++ b/xorg-server/include/resource.h @@ -69,7 +69,7 @@ typedef uint32_t RESTYPE; #define RC_LASTPREDEF RC_NEVERRETAIN #define RC_ANY (~(RESTYPE)0) -/* types for Resource routines */ +/* types for Resource routines. When you change one of them, please also update the predefTypes array in resource.c*/ #define RT_WINDOW ((RESTYPE)1|RC_DRAWABLE) #define RT_PIXMAP ((RESTYPE)2|RC_DRAWABLE) @@ -99,6 +99,9 @@ typedef uint32_t RESTYPE; #if MAXCLIENTS == 512 #define RESOURCE_CLIENT_BITS 9 #endif +#if MAXCLIENTS == 1024 +#define RESOURCE_CLIENT_BITS 10 +#endif /* client field offset */ #define CLIENTOFFSET (RESOURCE_AND_CLIENT_COUNT - RESOURCE_CLIENT_BITS) /* resource field */ @@ -136,21 +139,21 @@ typedef struct { void *value; } ResourceStateInfoRec; -typedef int (*DeleteType) (void */*value */ , +typedef int (*DeleteType) (void * /*value */ , XID /*id */ ); -typedef void (*FindResType) (void */*value */ , +typedef void (*FindResType) (void * /*value */ , XID /*id */ , - void */*cdata */ ); + void * /*cdata */ ); -typedef void (*FindAllRes) (void */*value */ , +typedef void (*FindAllRes) (void * /*value */ , XID /*id */ , RESTYPE /*type */ , - void */*cdata */ ); + void * /*cdata */ ); -typedef Bool (*FindComplexResType) (void */*value */ , +typedef Bool (*FindComplexResType) (void * /*value */ , XID /*id */ , - void */*cdata */ ); + void * /*cdata */ ); /* Structure for estimating resource memory usage. Memory usage * consists of space allocated for the resource itself and of @@ -166,16 +169,16 @@ typedef struct { unsigned long refCnt; } ResourceSizeRec, *ResourceSizePtr; -typedef void (*SizeType)(void */*value*/, +typedef void (*SizeType)(void * /*value*/, XID /*id*/, ResourceSizePtr /*size*/); extern _X_EXPORT RESTYPE CreateNewResourceType(DeleteType /*deleteFunc */ , const char * /*name */ ); -typedef void (*FindTypeSubResources)(void */* value */, +typedef void (*FindTypeSubResources)(void * /* value */, FindAllRes /* func */, - void */* cdata */); + void * /* cdata */); extern _X_EXPORT SizeType GetResourceTypeSizeFunc( RESTYPE /*type*/); @@ -202,7 +205,7 @@ extern _X_EXPORT XID FakeClientID(int /*client */ ); #endif extern _X_EXPORT Bool AddResource(XID /*id */ , RESTYPE /*type */ , - void */*value */ ); + void * /*value */ ); extern _X_EXPORT void FreeResource(XID /*id */ , RESTYPE /*skipDeleteFuncType */ ); @@ -213,25 +216,25 @@ extern _X_EXPORT void FreeResourceByType(XID /*id */ , extern _X_EXPORT Bool ChangeResourceValue(XID /*id */ , RESTYPE /*rtype */ , - void */*value */ ); + void * /*value */ ); extern _X_EXPORT void FindClientResourcesByType(ClientPtr /*client */ , RESTYPE /*type */ , FindResType /*func */ , - void */*cdata */ ); + void * /*cdata */ ); extern _X_EXPORT void FindAllClientResources(ClientPtr /*client */ , FindAllRes /*func */ , - void */*cdata */ ); + void * /*cdata */ ); /** @brief Iterate through all subresources of a resource. @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*/, +extern _X_EXPORT void FindSubResources(void * /*resource*/, RESTYPE /*type*/, FindAllRes /*func*/, - void */*cdata*/); + void * /*cdata*/); extern _X_EXPORT void FreeClientNeverRetainResources(ClientPtr /*client */ ); diff --git a/xorg-server/include/scrnintstr.h b/xorg-server/include/scrnintstr.h index 6acdadd7a..f6a5ef3aa 100644 --- a/xorg-server/include/scrnintstr.h +++ b/xorg-server/include/scrnintstr.h @@ -66,7 +66,7 @@ typedef struct _Visual { VisualID vid; short class; short bitsPerRGBValue; - short ColormapEntries; + long ColormapEntries; short nplanes; /* = log2 (ColormapEntries). This does not * imply that the screen has this many planes. * it may have more or fewer */ @@ -260,12 +260,12 @@ typedef void (*SendGraphicsExposeProcPtr) (ClientPtr /*client */ , int /*minor */ ); typedef void (*ScreenBlockHandlerProcPtr) (ScreenPtr /*pScreen*/ , - void */*pTimeout */ , - void */*pReadmask */ ); + void * /*pTimeout */ , + void * /*pReadmask */ ); typedef void (*ScreenWakeupHandlerProcPtr) (ScreenPtr /*pScreen*/ , unsigned long /*result */ , - void */*pReadMask */ ); + void * /*pReadMask */ ); typedef Bool (*CreateScreenResourcesProcPtr) (ScreenPtr /*pScreen */ ); @@ -275,7 +275,7 @@ typedef Bool (*ModifyPixmapHeaderProcPtr) (PixmapPtr /*pPixmap */ , int /*depth */ , int /*bitsPerPixel */ , int /*devKind */ , - void */*pPixData */ ); + void * /*pPixData */ ); typedef PixmapPtr (*GetWindowPixmapProcPtr) (WindowPtr /*pWin */ ); @@ -332,6 +332,10 @@ typedef void (*MarkUnrealizedWindowProcPtr) (WindowPtr /*pChild */ , WindowPtr /*pWin */ , Bool /*fromConfigure */ ); +#ifdef CreateWindow +#undef CreateWindow +#endif + typedef Bool (*DeviceCursorInitializeProcPtr) (DeviceIntPtr /* pDev */ , ScreenPtr /* pScreen */ ); diff --git a/xorg-server/include/servermd.h b/xorg-server/include/servermd.h index 11f6c1022..a7b9a686d 100644 --- a/xorg-server/include/servermd.h +++ b/xorg-server/include/servermd.h @@ -300,6 +300,12 @@ SOFTWARE. #endif /* __aarch64__ */ +#ifdef WIN32 +#define IMAGE_BYTE_ORDER LSBFirst +#define BITMAP_BIT_ORDER LSBFirst +#define GLYPHPADBYTES 4 +#endif + /* size of buffer to use with GetImage, measured in bytes. There's obviously * a trade-off between the amount of heap used and the number of times the * ddx routine has to be called. diff --git a/xorg-server/include/site.h b/xorg-server/include/site.h index 25caabbb3..52a5e8388 100644 --- a/xorg-server/include/site.h +++ b/xorg-server/include/site.h @@ -51,7 +51,7 @@ SOFTWARE. * server executable. */ #ifndef VENDOR_STRING -#define VENDOR_STRING "The X.Org Foundation" +#define VENDOR_STRING "HC-Consult" #endif /* @@ -60,7 +60,7 @@ SOFTWARE. * by the vendor. */ #ifndef VENDOR_RELEASE -#define VENDOR_RELEASE 6600 +#define VENDOR_RELEASE XORG_VERSION_CURRENT #endif /* diff --git a/xorg-server/include/version-config.h b/xorg-server/include/version-config.h new file mode 100644 index 000000000..b8d482ce8 --- /dev/null +++ b/xorg-server/include/version-config.h @@ -0,0 +1,16 @@ +/* version-config.h.in: not generated */ + +#ifndef VERSION_CONFIG_H +#define VERSION_CONFIG_H + +/* Vendor man version */ +#undef VENDOR_MAN_VERSION + +/* Vendor name */ +#define VENDOR_NAME "HC-Consult" + +/* Vendor release */ +#define VENDOR_RELEASE XORG_VERSION_CURRENT + +#endif /* VERSION_CONFIG_H */ + diff --git a/xorg-server/include/window.h b/xorg-server/include/window.h index b5a937eef..175ca5e31 100644 --- a/xorg-server/include/window.h +++ b/xorg-server/include/window.h @@ -73,15 +73,15 @@ typedef struct _BackingStore *BackingStorePtr; typedef struct _Window *WindowPtr; typedef int (*VisitWindowProcPtr) (WindowPtr /*pWin */ , - void */*data */ ); + void * /*data */ ); extern _X_EXPORT int TraverseTree(WindowPtr /*pWin */ , VisitWindowProcPtr /*func */ , - void */*data */ ); + void * /*data */ ); extern _X_EXPORT int WalkTree(ScreenPtr /*pScreen */ , VisitWindowProcPtr /*func */ , - void */*data */ ); + void * /*data */ ); extern _X_EXPORT Bool CreateRootWindow(ScreenPtr /*pScreen */ ); @@ -108,7 +108,7 @@ extern _X_EXPORT WindowPtr CreateWindow(Window /*wid */ , VisualID /*visual */ , int * /*error */ ); -extern _X_EXPORT int DeleteWindow(void */*pWin */ , +extern _X_EXPORT int DeleteWindow(void * /*pWin */ , XID /*wid */ ); extern _X_EXPORT int DestroySubwindows(WindowPtr /*pWin */ , diff --git a/xorg-server/include/windowstr.h b/xorg-server/include/windowstr.h index 6b79bbd2e..e06418659 100644 --- a/xorg-server/include/windowstr.h +++ b/xorg-server/include/windowstr.h @@ -140,7 +140,7 @@ typedef struct _Window { RegionRec borderSize; DDXPointRec origin; /* position relative to parent */ unsigned short borderWidth; - unsigned short deliverableEvents; /* all masks from all clients */ + unsigned long deliverableEvents; /* all masks from all clients */ Mask eventMask; /* mask from the creating client */ PixUnion background; PixUnion border; diff --git a/xorg-server/include/xkb-config.h b/xorg-server/include/xkb-config.h new file mode 100644 index 000000000..7041656fe --- /dev/null +++ b/xorg-server/include/xkb-config.h @@ -0,0 +1,33 @@ +/* include/xkb-config.h. Generated from xkb-config.h.in by configure. */ +/* xkb-config.h.in: not at all generated. -*- c -*- + * + */ + +#ifndef _XKB_CONFIG_H_ +#define _XKB_CONFIG_H_ + +/* Default set of XKB rules. */ +#define XKB_DFLT_RULES "xorg" + +/* Default XKB model. */ +#define XKB_DFLT_MODEL "pc104" + +/* Default XKB layout. */ +#define XKB_DFLT_LAYOUT "us" + +/* Default XKB variant. */ +#define XKB_DFLT_VARIANT "" + +/* Default XKB options. */ +#define XKB_DFLT_OPTIONS "" + +/* Path to XKB definitions. */ +#define XKB_BASE_DIRECTORY "xkbdata" + +/* Path to xkbcomp. */ +#define XKB_BIN_DIRECTORY "." + +/* XKB output dir for compiled keymaps. */ +#define XKM_OUTPUT_DIR "xkbdata/compiled/" + +#endif /* _XKB_CONFIG_H_ */ diff --git a/xorg-server/include/xkbsrv.h b/xorg-server/include/xkbsrv.h index 229de2194..a1bb62110 100644 --- a/xorg-server/include/xkbsrv.h +++ b/xorg-server/include/xkbsrv.h @@ -600,7 +600,7 @@ extern _X_EXPORT void XkbHandleBell(BOOL /* force */ , BOOL /* eventOnly */ , DeviceIntPtr /* kbd */ , CARD8 /* percent */ , - void */* ctrl */ , + void * /* ctrl */ , CARD8 /* class */ , Atom /* name */ , WindowPtr /* pWin */ , diff --git a/xorg-server/include/xkbstr.h b/xorg-server/include/xkbstr.h index 935330c7c..b85bf9220 100644 --- a/xorg-server/include/xkbstr.h +++ b/xorg-server/include/xkbstr.h @@ -46,10 +46,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. typedef struct _XkbStateRec { unsigned char group; /* base + latched + locked */ + unsigned char locked_group; /* FIXME: Why are base + latched short and not char?? */ unsigned short base_group; /* physically ... down? */ unsigned short latched_group; - unsigned char locked_group; unsigned char mods; /* base + latched + locked */ unsigned char base_mods; /* physically down */ diff --git a/xorg-server/include/xwin-config.h b/xorg-server/include/xwin-config.h new file mode 100644 index 000000000..e6c4488a3 --- /dev/null +++ b/xorg-server/include/xwin-config.h @@ -0,0 +1,36 @@ +/* + * xwin-config.h.in + * + * This file has all defines used in the xwin ddx + * + */ +#include <dix-config.h> + +/* Winsock networking */ +#define HAS_WINSOCK + +/* Cygwin has /dev/windows for signaling new win32 messages */ +/* #undef HAS_DEVWINDOWS */ + +/* Switch on debug messages */ +/* #undef CYGDEBUG */ +/* #undef CYGWINDOWING_DEBUG */ +/* #undef CYGMULTIWINDOW_DEBUG */ + +/* Define to 1 if unsigned long is 64 bits. */ +/* #undef _XSERVER64 */ + +/* Short vendor name */ +#define XVENDORNAMESHORT "VcXsrv" + +/* Vendor web address for support */ +#define __VENDORDWEBSUPPORT__ "http://www.hc-consult.be/" + +/* Location of system.XWinrc */ +#define SYSCONFDIR "." + +/* Default log location */ +#define DEFAULT_LOGDIR "." + +/* Whether we should re-locate the root to where the executable lives */ +/* #undef RELOCATE_PROJECTROOT */ |