Code-style consistency improvement:
Apply clang-format-all.sh using the _clang-format file through all the cpp/.h files. make sure not to apply it to certain serialization structures, since some parser expects the * as part of the name, instead of type. This commit contains no other changes aside from adding and applying clang-format-all.sh
This commit is contained in:
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -6,74 +6,74 @@
|
||||
* Do not change! Changing this file implies a protocol change!
|
||||
*/
|
||||
|
||||
#define XA_PRIMARY ((Atom) 1)
|
||||
#define XA_SECONDARY ((Atom) 2)
|
||||
#define XA_ARC ((Atom) 3)
|
||||
#define XA_ATOM ((Atom) 4)
|
||||
#define XA_BITMAP ((Atom) 5)
|
||||
#define XA_CARDINAL ((Atom) 6)
|
||||
#define XA_COLORMAP ((Atom) 7)
|
||||
#define XA_CURSOR ((Atom) 8)
|
||||
#define XA_CUT_BUFFER0 ((Atom) 9)
|
||||
#define XA_CUT_BUFFER1 ((Atom) 10)
|
||||
#define XA_CUT_BUFFER2 ((Atom) 11)
|
||||
#define XA_CUT_BUFFER3 ((Atom) 12)
|
||||
#define XA_CUT_BUFFER4 ((Atom) 13)
|
||||
#define XA_CUT_BUFFER5 ((Atom) 14)
|
||||
#define XA_CUT_BUFFER6 ((Atom) 15)
|
||||
#define XA_CUT_BUFFER7 ((Atom) 16)
|
||||
#define XA_DRAWABLE ((Atom) 17)
|
||||
#define XA_FONT ((Atom) 18)
|
||||
#define XA_INTEGER ((Atom) 19)
|
||||
#define XA_PIXMAP ((Atom) 20)
|
||||
#define XA_POINT ((Atom) 21)
|
||||
#define XA_RECTANGLE ((Atom) 22)
|
||||
#define XA_RESOURCE_MANAGER ((Atom) 23)
|
||||
#define XA_RGB_COLOR_MAP ((Atom) 24)
|
||||
#define XA_RGB_BEST_MAP ((Atom) 25)
|
||||
#define XA_RGB_BLUE_MAP ((Atom) 26)
|
||||
#define XA_RGB_DEFAULT_MAP ((Atom) 27)
|
||||
#define XA_RGB_GRAY_MAP ((Atom) 28)
|
||||
#define XA_RGB_GREEN_MAP ((Atom) 29)
|
||||
#define XA_RGB_RED_MAP ((Atom) 30)
|
||||
#define XA_STRING ((Atom) 31)
|
||||
#define XA_VISUALID ((Atom) 32)
|
||||
#define XA_WINDOW ((Atom) 33)
|
||||
#define XA_WM_COMMAND ((Atom) 34)
|
||||
#define XA_WM_HINTS ((Atom) 35)
|
||||
#define XA_WM_CLIENT_MACHINE ((Atom) 36)
|
||||
#define XA_WM_ICON_NAME ((Atom) 37)
|
||||
#define XA_WM_ICON_SIZE ((Atom) 38)
|
||||
#define XA_WM_NAME ((Atom) 39)
|
||||
#define XA_WM_NORMAL_HINTS ((Atom) 40)
|
||||
#define XA_WM_SIZE_HINTS ((Atom) 41)
|
||||
#define XA_WM_ZOOM_HINTS ((Atom) 42)
|
||||
#define XA_MIN_SPACE ((Atom) 43)
|
||||
#define XA_NORM_SPACE ((Atom) 44)
|
||||
#define XA_MAX_SPACE ((Atom) 45)
|
||||
#define XA_END_SPACE ((Atom) 46)
|
||||
#define XA_SUPERSCRIPT_X ((Atom) 47)
|
||||
#define XA_SUPERSCRIPT_Y ((Atom) 48)
|
||||
#define XA_SUBSCRIPT_X ((Atom) 49)
|
||||
#define XA_SUBSCRIPT_Y ((Atom) 50)
|
||||
#define XA_UNDERLINE_POSITION ((Atom) 51)
|
||||
#define XA_UNDERLINE_THICKNESS ((Atom) 52)
|
||||
#define XA_STRIKEOUT_ASCENT ((Atom) 53)
|
||||
#define XA_STRIKEOUT_DESCENT ((Atom) 54)
|
||||
#define XA_ITALIC_ANGLE ((Atom) 55)
|
||||
#define XA_X_HEIGHT ((Atom) 56)
|
||||
#define XA_QUAD_WIDTH ((Atom) 57)
|
||||
#define XA_WEIGHT ((Atom) 58)
|
||||
#define XA_POINT_SIZE ((Atom) 59)
|
||||
#define XA_RESOLUTION ((Atom) 60)
|
||||
#define XA_COPYRIGHT ((Atom) 61)
|
||||
#define XA_NOTICE ((Atom) 62)
|
||||
#define XA_FONT_NAME ((Atom) 63)
|
||||
#define XA_FAMILY_NAME ((Atom) 64)
|
||||
#define XA_FULL_NAME ((Atom) 65)
|
||||
#define XA_CAP_HEIGHT ((Atom) 66)
|
||||
#define XA_WM_CLASS ((Atom) 67)
|
||||
#define XA_WM_TRANSIENT_FOR ((Atom) 68)
|
||||
#define XA_PRIMARY ((Atom)1)
|
||||
#define XA_SECONDARY ((Atom)2)
|
||||
#define XA_ARC ((Atom)3)
|
||||
#define XA_ATOM ((Atom)4)
|
||||
#define XA_BITMAP ((Atom)5)
|
||||
#define XA_CARDINAL ((Atom)6)
|
||||
#define XA_COLORMAP ((Atom)7)
|
||||
#define XA_CURSOR ((Atom)8)
|
||||
#define XA_CUT_BUFFER0 ((Atom)9)
|
||||
#define XA_CUT_BUFFER1 ((Atom)10)
|
||||
#define XA_CUT_BUFFER2 ((Atom)11)
|
||||
#define XA_CUT_BUFFER3 ((Atom)12)
|
||||
#define XA_CUT_BUFFER4 ((Atom)13)
|
||||
#define XA_CUT_BUFFER5 ((Atom)14)
|
||||
#define XA_CUT_BUFFER6 ((Atom)15)
|
||||
#define XA_CUT_BUFFER7 ((Atom)16)
|
||||
#define XA_DRAWABLE ((Atom)17)
|
||||
#define XA_FONT ((Atom)18)
|
||||
#define XA_INTEGER ((Atom)19)
|
||||
#define XA_PIXMAP ((Atom)20)
|
||||
#define XA_POINT ((Atom)21)
|
||||
#define XA_RECTANGLE ((Atom)22)
|
||||
#define XA_RESOURCE_MANAGER ((Atom)23)
|
||||
#define XA_RGB_COLOR_MAP ((Atom)24)
|
||||
#define XA_RGB_BEST_MAP ((Atom)25)
|
||||
#define XA_RGB_BLUE_MAP ((Atom)26)
|
||||
#define XA_RGB_DEFAULT_MAP ((Atom)27)
|
||||
#define XA_RGB_GRAY_MAP ((Atom)28)
|
||||
#define XA_RGB_GREEN_MAP ((Atom)29)
|
||||
#define XA_RGB_RED_MAP ((Atom)30)
|
||||
#define XA_STRING ((Atom)31)
|
||||
#define XA_VISUALID ((Atom)32)
|
||||
#define XA_WINDOW ((Atom)33)
|
||||
#define XA_WM_COMMAND ((Atom)34)
|
||||
#define XA_WM_HINTS ((Atom)35)
|
||||
#define XA_WM_CLIENT_MACHINE ((Atom)36)
|
||||
#define XA_WM_ICON_NAME ((Atom)37)
|
||||
#define XA_WM_ICON_SIZE ((Atom)38)
|
||||
#define XA_WM_NAME ((Atom)39)
|
||||
#define XA_WM_NORMAL_HINTS ((Atom)40)
|
||||
#define XA_WM_SIZE_HINTS ((Atom)41)
|
||||
#define XA_WM_ZOOM_HINTS ((Atom)42)
|
||||
#define XA_MIN_SPACE ((Atom)43)
|
||||
#define XA_NORM_SPACE ((Atom)44)
|
||||
#define XA_MAX_SPACE ((Atom)45)
|
||||
#define XA_END_SPACE ((Atom)46)
|
||||
#define XA_SUPERSCRIPT_X ((Atom)47)
|
||||
#define XA_SUPERSCRIPT_Y ((Atom)48)
|
||||
#define XA_SUBSCRIPT_X ((Atom)49)
|
||||
#define XA_SUBSCRIPT_Y ((Atom)50)
|
||||
#define XA_UNDERLINE_POSITION ((Atom)51)
|
||||
#define XA_UNDERLINE_THICKNESS ((Atom)52)
|
||||
#define XA_STRIKEOUT_ASCENT ((Atom)53)
|
||||
#define XA_STRIKEOUT_DESCENT ((Atom)54)
|
||||
#define XA_ITALIC_ANGLE ((Atom)55)
|
||||
#define XA_X_HEIGHT ((Atom)56)
|
||||
#define XA_QUAD_WIDTH ((Atom)57)
|
||||
#define XA_WEIGHT ((Atom)58)
|
||||
#define XA_POINT_SIZE ((Atom)59)
|
||||
#define XA_RESOLUTION ((Atom)60)
|
||||
#define XA_COPYRIGHT ((Atom)61)
|
||||
#define XA_NOTICE ((Atom)62)
|
||||
#define XA_FONT_NAME ((Atom)63)
|
||||
#define XA_FAMILY_NAME ((Atom)64)
|
||||
#define XA_FULL_NAME ((Atom)65)
|
||||
#define XA_CAP_HEIGHT ((Atom)66)
|
||||
#define XA_WM_CLASS ((Atom)67)
|
||||
#define XA_WM_TRANSIENT_FOR ((Atom)68)
|
||||
|
||||
#define XA_LAST_PREDEFINED ((Atom) 68)
|
||||
#define XA_LAST_PREDEFINED ((Atom)68)
|
||||
#endif /* XATOM_H */
|
||||
|
||||
@@ -60,7 +60,7 @@ in this Software without prior written authorization from The Open Group.
|
||||
#ifdef NARROWPROTO
|
||||
#define NeedWidePrototypes 0
|
||||
#else
|
||||
#define NeedWidePrototypes 1 /* default to make interropt. easier */
|
||||
#define NeedWidePrototypes 1 /* default to make interropt. easier */
|
||||
#endif
|
||||
#endif /* NeedWidePrototypes */
|
||||
|
||||
@@ -68,7 +68,9 @@ in this Software without prior written authorization from The Open Group.
|
||||
|
||||
#ifndef _XFUNCPROTOBEGIN
|
||||
#if defined(__cplusplus) || defined(c_plusplus) /* for C++ V2.0 */
|
||||
#define _XFUNCPROTOBEGIN extern "C" { /* do not leave open across includes */
|
||||
#define _XFUNCPROTOBEGIN \
|
||||
extern "C" \
|
||||
{ /* do not leave open across includes */
|
||||
#define _XFUNCPROTOEND }
|
||||
#else
|
||||
#define _XFUNCPROTOBEGIN
|
||||
@@ -78,98 +80,97 @@ in this Software without prior written authorization from The Open Group.
|
||||
|
||||
/* Added in X11R6.9, so available in any version of modular xproto */
|
||||
#if defined(__GNUC__) && (__GNUC__ >= 4)
|
||||
# define _X_SENTINEL(x) __attribute__ ((__sentinel__(x)))
|
||||
#define _X_SENTINEL(x) __attribute__((__sentinel__(x)))
|
||||
#else
|
||||
# define _X_SENTINEL(x)
|
||||
#define _X_SENTINEL(x)
|
||||
#endif /* GNUC >= 4 */
|
||||
|
||||
/* Added in X11R6.9, so available in any version of modular xproto */
|
||||
#if defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__CYGWIN__) && !defined(__MINGW32__)
|
||||
# define _X_EXPORT __attribute__((visibility("default")))
|
||||
# define _X_HIDDEN __attribute__((visibility("hidden")))
|
||||
# define _X_INTERNAL __attribute__((visibility("internal")))
|
||||
#define _X_EXPORT __attribute__((visibility("default")))
|
||||
#define _X_HIDDEN __attribute__((visibility("hidden")))
|
||||
#define _X_INTERNAL __attribute__((visibility("internal")))
|
||||
#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
|
||||
# define _X_EXPORT __global
|
||||
# define _X_HIDDEN __hidden
|
||||
# define _X_INTERNAL __hidden
|
||||
#define _X_EXPORT __global
|
||||
#define _X_HIDDEN __hidden
|
||||
#define _X_INTERNAL __hidden
|
||||
#else /* not gcc >= 4 and not Sun Studio >= 8 */
|
||||
# define _X_EXPORT
|
||||
# define _X_HIDDEN
|
||||
# define _X_INTERNAL
|
||||
#define _X_EXPORT
|
||||
#define _X_HIDDEN
|
||||
#define _X_INTERNAL
|
||||
#endif /* GNUC >= 4 */
|
||||
|
||||
/* requires xproto >= 7.0.9 */
|
||||
#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303)
|
||||
# define _X_LIKELY(x) __builtin_expect(!!(x), 1)
|
||||
# define _X_UNLIKELY(x) __builtin_expect(!!(x), 0)
|
||||
#define _X_LIKELY(x) __builtin_expect(!!(x), 1)
|
||||
#define _X_UNLIKELY(x) __builtin_expect(!!(x), 0)
|
||||
#else /* not gcc >= 3.3 */
|
||||
# define _X_LIKELY(x) (x)
|
||||
# define _X_UNLIKELY(x) (x)
|
||||
#define _X_LIKELY(x) (x)
|
||||
#define _X_UNLIKELY(x) (x)
|
||||
#endif
|
||||
|
||||
/* Added in X11R6.9, so available in any version of modular xproto */
|
||||
#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 301)
|
||||
# define _X_DEPRECATED __attribute__((deprecated))
|
||||
#define _X_DEPRECATED __attribute__((deprecated))
|
||||
#else /* not gcc >= 3.1 */
|
||||
# define _X_DEPRECATED
|
||||
#define _X_DEPRECATED
|
||||
#endif
|
||||
|
||||
/* requires xproto >= 7.0.17 */
|
||||
#if (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)) \
|
||||
|| (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
|
||||
# define _X_NORETURN __attribute((noreturn))
|
||||
#if (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
|
||||
#define _X_NORETURN __attribute((noreturn))
|
||||
#else
|
||||
# define _X_NORETURN
|
||||
#define _X_NORETURN
|
||||
#endif /* GNUC */
|
||||
|
||||
/* Added in X11R6.9, so available in any version of modular xproto */
|
||||
#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 203)
|
||||
# define _X_ATTRIBUTE_PRINTF(x,y) __attribute__((__format__(__printf__,x,y)))
|
||||
#define _X_ATTRIBUTE_PRINTF(x, y) __attribute__((__format__(__printf__, x, y)))
|
||||
#else /* not gcc >= 2.3 */
|
||||
# define _X_ATTRIBUTE_PRINTF(x,y)
|
||||
#define _X_ATTRIBUTE_PRINTF(x, y)
|
||||
#endif
|
||||
|
||||
/* requires xproto >= 7.0.22 - since this uses either gcc or C99 variable
|
||||
argument macros, must be only used inside #ifdef _X_NONNULL guards, as
|
||||
many legacy X clients are compiled in C89 mode still. */
|
||||
#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303)
|
||||
#define _X_NONNULL(args...) __attribute__((nonnull(args)))
|
||||
#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303)
|
||||
#define _X_NONNULL(args...) __attribute__((nonnull(args)))
|
||||
#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */
|
||||
#define _X_NONNULL(...) /* */
|
||||
#define _X_NONNULL(...) /* */
|
||||
#endif
|
||||
|
||||
/* requires xproto >= 7.0.22 */
|
||||
#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)
|
||||
#define _X_UNUSED __attribute__((__unused__))
|
||||
#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)
|
||||
#define _X_UNUSED __attribute__((__unused__))
|
||||
#else
|
||||
#define _X_UNUSED /* */
|
||||
#define _X_UNUSED /* */
|
||||
#endif
|
||||
|
||||
/* C99 keyword "inline" or equivalent extensions in pre-C99 compilers */
|
||||
/* requires xproto >= 7.0.9
|
||||
(introduced in 7.0.8 but didn't support all compilers until 7.0.9) */
|
||||
#if defined(inline) /* assume autoconf set it correctly */ || \
|
||||
(defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L)) /* C99 */ || \
|
||||
(defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550))
|
||||
# define _X_INLINE inline
|
||||
#if defined(inline) /* assume autoconf set it correctly */ || \
|
||||
(defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L)) /* C99 */ || \
|
||||
(defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550))
|
||||
#define _X_INLINE inline
|
||||
#elif defined(__GNUC__) && !defined(__STRICT_ANSI__) /* gcc w/C89+extensions */
|
||||
# define _X_INLINE __inline__
|
||||
#define _X_INLINE __inline__
|
||||
#else
|
||||
# define _X_INLINE
|
||||
#define _X_INLINE
|
||||
#endif
|
||||
|
||||
/* C99 keyword "restrict" or equivalent extensions in pre-C99 compilers */
|
||||
/* requires xproto >= 7.0.21 */
|
||||
#ifndef _X_RESTRICT_KYWD
|
||||
# if defined(restrict) /* assume autoconf set it correctly */ || \
|
||||
(defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */ \
|
||||
&& !defined(__cplusplus)) /* Workaround g++ issue on Solaris */
|
||||
# define _X_RESTRICT_KYWD restrict
|
||||
# elif defined(__GNUC__) && !defined(__STRICT_ANSI__) /* gcc w/C89+extensions */
|
||||
# define _X_RESTRICT_KYWD __restrict__
|
||||
# else
|
||||
# define _X_RESTRICT_KYWD
|
||||
# endif
|
||||
#if defined(restrict) /* assume autoconf set it correctly */ || \
|
||||
(defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */ \
|
||||
&& !defined(__cplusplus)) /* Workaround g++ issue on Solaris */
|
||||
#define _X_RESTRICT_KYWD restrict
|
||||
#elif defined(__GNUC__) && !defined(__STRICT_ANSI__) /* gcc w/C89+extensions */
|
||||
#define _X_RESTRICT_KYWD __restrict__
|
||||
#else
|
||||
#define _X_RESTRICT_KYWD
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#endif /* _XFUNCPROTO_H_ */
|
||||
|
||||
@@ -25,45 +25,45 @@ in this Software without prior written authorization from The Open Group.
|
||||
*/
|
||||
|
||||
#ifndef _XFUNCS_H_
|
||||
# define _XFUNCS_H_
|
||||
#define _XFUNCS_H_
|
||||
|
||||
# include <X11/Xosdefs.h>
|
||||
#include <X11/Xosdefs.h>
|
||||
|
||||
/* the old Xfuncs.h, for pre-R6 */
|
||||
# if !(defined(XFree86LOADER) && defined(IN_MODULE))
|
||||
#if !(defined(XFree86LOADER) && defined(IN_MODULE))
|
||||
|
||||
# ifdef X_USEBFUNCS
|
||||
#ifdef X_USEBFUNCS
|
||||
void bcopy();
|
||||
void bzero();
|
||||
int bcmp();
|
||||
# else
|
||||
# if defined(SYSV) && !defined(__SCO__) && !defined(__sun) && !defined(__UNIXWARE__)
|
||||
# include <memory.h>
|
||||
#else
|
||||
#if defined(SYSV) && !defined(__SCO__) && !defined(__sun) && !defined(__UNIXWARE__)
|
||||
#include <memory.h>
|
||||
void bcopy();
|
||||
# define bzero(b,len) memset(b, 0, len)
|
||||
# define bcmp(b1,b2,len) memcmp(b1, b2, len)
|
||||
# else
|
||||
# include <string.h>
|
||||
# if defined(__SCO__) || defined(__sun) || defined(__UNIXWARE__) || defined(__CYGWIN__)
|
||||
# include <strings.h>
|
||||
# endif
|
||||
# define _XFUNCS_H_INCLUDED_STRING_H
|
||||
# endif
|
||||
# endif /* X_USEBFUNCS */
|
||||
#define bzero(b, len) memset(b, 0, len)
|
||||
#define bcmp(b1, b2, len) memcmp(b1, b2, len)
|
||||
#else
|
||||
#include <string.h>
|
||||
#if defined(__SCO__) || defined(__sun) || defined(__UNIXWARE__) || defined(__CYGWIN__)
|
||||
#include <strings.h>
|
||||
#endif
|
||||
#define _XFUNCS_H_INCLUDED_STRING_H
|
||||
#endif
|
||||
#endif /* X_USEBFUNCS */
|
||||
|
||||
/* the new Xfuncs.h */
|
||||
|
||||
/* the ANSI C way */
|
||||
# ifndef _XFUNCS_H_INCLUDED_STRING_H
|
||||
# include <string.h>
|
||||
# endif
|
||||
# undef bzero
|
||||
# define bzero(b,len) memset(b,0,len)
|
||||
#ifndef _XFUNCS_H_INCLUDED_STRING_H
|
||||
#include <string.h>
|
||||
#endif
|
||||
#undef bzero
|
||||
#define bzero(b, len) memset(b, 0, len)
|
||||
|
||||
# if defined WIN32 && defined __MINGW32__
|
||||
# define bcopy(b1,b2,len) memmove(b2, b1, (size_t)(len))
|
||||
# endif
|
||||
#if defined WIN32 && defined __MINGW32__
|
||||
#define bcopy(b1, b2, len) memmove(b2, b1, (size_t)(len))
|
||||
#endif
|
||||
|
||||
# endif /* !(defined(XFree86LOADER) && defined(IN_MODULE)) */
|
||||
#endif /* !(defined(XFree86LOADER) && defined(IN_MODULE)) */
|
||||
|
||||
#endif /* _XFUNCS_H_ */
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -45,7 +45,7 @@ SOFTWARE.
|
||||
|
||||
******************************************************************/
|
||||
#ifndef XMD_H
|
||||
# define XMD_H 1
|
||||
#define XMD_H 1
|
||||
/*
|
||||
* Xmd.h: MACHINE DEPENDENT DECLARATIONS.
|
||||
*/
|
||||
@@ -53,30 +53,29 @@ SOFTWARE.
|
||||
/*
|
||||
* Special per-machine configuration flags.
|
||||
*/
|
||||
# if defined(__sun) && defined(__SVR4)
|
||||
# include <sys/isa_defs.h> /* Solaris: defines _LP64 if necessary */
|
||||
# endif
|
||||
#if defined(__sun) && defined(__SVR4)
|
||||
#include <sys/isa_defs.h> /* Solaris: defines _LP64 if necessary */
|
||||
#endif
|
||||
|
||||
# if defined (_LP64) || defined(__LP64__) || \
|
||||
defined(__alpha) || defined(__alpha__) || \
|
||||
defined(__ia64__) || defined(ia64) || \
|
||||
defined(__sparc64__) || \
|
||||
defined(__s390x__) || \
|
||||
defined(__amd64__) || defined(amd64) || \
|
||||
defined(__powerpc64__)
|
||||
# if !defined(__ILP32__) /* amd64-x32 is 32bit */
|
||||
# define LONG64 /* 32/64-bit architecture */
|
||||
# endif /* !__ILP32__ */
|
||||
# endif
|
||||
#if defined(_LP64) || defined(__LP64__) || \
|
||||
defined(__alpha) || defined(__alpha__) || \
|
||||
defined(__ia64__) || defined(ia64) || \
|
||||
defined(__sparc64__) || \
|
||||
defined(__s390x__) || \
|
||||
defined(__amd64__) || defined(amd64) || \
|
||||
defined(__powerpc64__)
|
||||
#if !defined(__ILP32__) /* amd64-x32 is 32bit */
|
||||
#define LONG64 /* 32/64-bit architecture */
|
||||
#endif /* !__ILP32__ */
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Stuff to handle large architecture machines; the constants were generated
|
||||
* on a 32-bit machine and must correspond to the protocol.
|
||||
*/
|
||||
# ifdef WORD64
|
||||
# define MUSTCOPY
|
||||
# endif /* WORD64 */
|
||||
|
||||
#ifdef WORD64
|
||||
#define MUSTCOPY
|
||||
#endif /* WORD64 */
|
||||
|
||||
/*
|
||||
* Definition of macro used to set constants for size of network structures;
|
||||
@@ -92,96 +91,94 @@ SOFTWARE.
|
||||
* The extra indirection is to get macro arguments to expand correctly before
|
||||
* the concatenation, rather than afterward.
|
||||
*/
|
||||
# define _SIZEOF(x) sz_##x
|
||||
# define SIZEOF(x) _SIZEOF(x)
|
||||
#define _SIZEOF(x) sz_##x
|
||||
#define SIZEOF(x) _SIZEOF(x)
|
||||
|
||||
/*
|
||||
* Bitfield suffixes for the protocol structure elements, if you
|
||||
* need them. Note that bitfields are not guaranteed to be signed
|
||||
* (or even unsigned) according to ANSI C.
|
||||
*/
|
||||
# ifdef WORD64
|
||||
#ifdef WORD64
|
||||
typedef long INT64;
|
||||
typedef unsigned long CARD64;
|
||||
# define B32 :32
|
||||
# define B16 :16
|
||||
# ifdef UNSIGNEDBITFIELDS
|
||||
#define B32 :32
|
||||
#define B16 :16
|
||||
#ifdef UNSIGNEDBITFIELDS
|
||||
typedef unsigned int INT32;
|
||||
typedef unsigned int INT16;
|
||||
# else
|
||||
#else
|
||||
typedef signed int INT32;
|
||||
typedef signed int INT16;
|
||||
# endif
|
||||
# else
|
||||
# define B32
|
||||
# define B16
|
||||
# ifdef LONG64
|
||||
#endif
|
||||
#else
|
||||
#define B32
|
||||
#define B16
|
||||
#ifdef LONG64
|
||||
typedef long INT64;
|
||||
typedef int INT32;
|
||||
# else
|
||||
#else
|
||||
typedef long INT32;
|
||||
# endif
|
||||
#endif
|
||||
typedef short INT16;
|
||||
# endif
|
||||
#endif
|
||||
|
||||
typedef signed char INT8;
|
||||
typedef signed char INT8;
|
||||
|
||||
# ifdef LONG64
|
||||
#ifdef LONG64
|
||||
typedef unsigned long CARD64;
|
||||
typedef unsigned int CARD32;
|
||||
# else
|
||||
#else
|
||||
typedef unsigned long CARD32;
|
||||
# endif
|
||||
# if !defined(WORD64) && !defined(LONG64)
|
||||
#endif
|
||||
#if !defined(WORD64) && !defined(LONG64)
|
||||
typedef unsigned long long CARD64;
|
||||
# endif
|
||||
#endif
|
||||
typedef unsigned short CARD16;
|
||||
typedef unsigned char CARD8;
|
||||
typedef unsigned char CARD8;
|
||||
|
||||
typedef CARD32 BITS32;
|
||||
typedef CARD16 BITS16;
|
||||
typedef CARD32 BITS32;
|
||||
typedef CARD16 BITS16;
|
||||
|
||||
typedef CARD8 BYTE;
|
||||
typedef CARD8 BOOL;
|
||||
typedef CARD8 BYTE;
|
||||
typedef CARD8 BOOL;
|
||||
|
||||
/*
|
||||
* definitions for sign-extending bitfields on 64-bit architectures
|
||||
*/
|
||||
# if defined(WORD64) && defined(UNSIGNEDBITFIELDS)
|
||||
# define cvtINT8toInt(val) (((val) & 0x00000080) ? ((val) | 0xffffffffffffff00) : (val))
|
||||
# define cvtINT16toInt(val) (((val) & 0x00008000) ? ((val) | 0xffffffffffff0000) : (val))
|
||||
# define cvtINT32toInt(val) (((val) & 0x80000000) ? ((val) | 0xffffffff00000000) : (val))
|
||||
# define cvtINT8toShort(val) cvtINT8toInt(val)
|
||||
# define cvtINT16toShort(val) cvtINT16toInt(val)
|
||||
# define cvtINT32toShort(val) cvtINT32toInt(val)
|
||||
# define cvtINT8toLong(val) cvtINT8toInt(val)
|
||||
# define cvtINT16toLong(val) cvtINT16toInt(val)
|
||||
# define cvtINT32toLong(val) cvtINT32toInt(val)
|
||||
# else
|
||||
# define cvtINT8toInt(val) (val)
|
||||
# define cvtINT16toInt(val) (val)
|
||||
# define cvtINT32toInt(val) (val)
|
||||
# define cvtINT8toShort(val) (val)
|
||||
# define cvtINT16toShort(val) (val)
|
||||
# define cvtINT32toShort(val) (val)
|
||||
# define cvtINT8toLong(val) (val)
|
||||
# define cvtINT16toLong(val) (val)
|
||||
# define cvtINT32toLong(val) (val)
|
||||
# endif /* WORD64 and UNSIGNEDBITFIELDS */
|
||||
#if defined(WORD64) && defined(UNSIGNEDBITFIELDS)
|
||||
#define cvtINT8toInt(val) (((val)&0x00000080) ? ((val) | 0xffffffffffffff00) : (val))
|
||||
#define cvtINT16toInt(val) (((val)&0x00008000) ? ((val) | 0xffffffffffff0000) : (val))
|
||||
#define cvtINT32toInt(val) (((val)&0x80000000) ? ((val) | 0xffffffff00000000) : (val))
|
||||
#define cvtINT8toShort(val) cvtINT8toInt(val)
|
||||
#define cvtINT16toShort(val) cvtINT16toInt(val)
|
||||
#define cvtINT32toShort(val) cvtINT32toInt(val)
|
||||
#define cvtINT8toLong(val) cvtINT8toInt(val)
|
||||
#define cvtINT16toLong(val) cvtINT16toInt(val)
|
||||
#define cvtINT32toLong(val) cvtINT32toInt(val)
|
||||
#else
|
||||
#define cvtINT8toInt(val) (val)
|
||||
#define cvtINT16toInt(val) (val)
|
||||
#define cvtINT32toInt(val) (val)
|
||||
#define cvtINT8toShort(val) (val)
|
||||
#define cvtINT16toShort(val) (val)
|
||||
#define cvtINT32toShort(val) (val)
|
||||
#define cvtINT8toLong(val) (val)
|
||||
#define cvtINT16toLong(val) (val)
|
||||
#define cvtINT32toLong(val) (val)
|
||||
#endif /* WORD64 and UNSIGNEDBITFIELDS */
|
||||
|
||||
|
||||
|
||||
# ifdef MUSTCOPY
|
||||
#ifdef MUSTCOPY
|
||||
/*
|
||||
* This macro must not cast or else pointers will get aligned and be wrong
|
||||
*/
|
||||
# define NEXTPTR(p,t) (((char *) p) + SIZEOF(t))
|
||||
# else /* else not MUSTCOPY, this is used for 32-bit machines */
|
||||
#define NEXTPTR(p, t) (((char *)p) + SIZEOF(t))
|
||||
#else /* else not MUSTCOPY, this is used for 32-bit machines */
|
||||
/*
|
||||
* this version should leave result of type (t *), but that should only be
|
||||
* used when not in MUSTCOPY
|
||||
*/
|
||||
# define NEXTPTR(p,t) (((t *)(p)) + 1)
|
||||
# endif /* MUSTCOPY - used machines whose C structs don't line up with proto */
|
||||
#define NEXTPTR(p, t) (((t *)(p)) + 1)
|
||||
#endif /* MUSTCOPY - used machines whose C structs don't line up with proto */
|
||||
|
||||
#endif /* XMD_H */
|
||||
|
||||
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
|
||||
*/
|
||||
|
||||
#ifndef _XOSDEFS_H_
|
||||
# define _XOSDEFS_H_
|
||||
#define _XOSDEFS_H_
|
||||
|
||||
/*
|
||||
* X_NOT_POSIX means does not have POSIX header files. Lack of this
|
||||
@@ -33,84 +33,80 @@ in this Software without prior written authorization from The Open Group.
|
||||
* You may still have to define _POSIX_SOURCE to get it.
|
||||
*/
|
||||
|
||||
#ifdef _SCO_DS
|
||||
#ifndef __SCO__
|
||||
#define __SCO__
|
||||
#endif
|
||||
#endif
|
||||
|
||||
# ifdef _SCO_DS
|
||||
# ifndef __SCO__
|
||||
# define __SCO__
|
||||
# endif
|
||||
# endif
|
||||
|
||||
# ifdef __i386__
|
||||
# ifdef SYSV
|
||||
# if !defined(__SCO__) && \
|
||||
#ifdef __i386__
|
||||
#ifdef SYSV
|
||||
#if !defined(__SCO__) && \
|
||||
!defined(__UNIXWARE__) && !defined(__sun)
|
||||
# if !defined(_POSIX_SOURCE)
|
||||
# define X_NOT_POSIX
|
||||
# endif
|
||||
# endif
|
||||
# endif
|
||||
# endif
|
||||
#if !defined(_POSIX_SOURCE)
|
||||
#define X_NOT_POSIX
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
# ifdef __sun
|
||||
#ifdef __sun
|
||||
/* Imake configs define SVR4 on Solaris, but cc & gcc only define __SVR4
|
||||
* This check allows non-Imake configured programs to build correctly.
|
||||
*/
|
||||
# if defined(__SVR4) && !defined(SVR4)
|
||||
# define SVR4 1
|
||||
# endif
|
||||
# ifdef SVR4
|
||||
#if defined(__SVR4) && !defined(SVR4)
|
||||
#define SVR4 1
|
||||
#endif
|
||||
#ifdef SVR4
|
||||
/* define this to whatever it needs to be */
|
||||
# define X_POSIX_C_SOURCE 199300L
|
||||
# endif
|
||||
# endif
|
||||
#define X_POSIX_C_SOURCE 199300L
|
||||
#endif
|
||||
#endif
|
||||
|
||||
# ifdef WIN32
|
||||
# ifndef _POSIX_
|
||||
# define X_NOT_POSIX
|
||||
# endif
|
||||
# endif
|
||||
#ifdef WIN32
|
||||
#ifndef _POSIX_
|
||||
#define X_NOT_POSIX
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
# ifdef __APPLE__
|
||||
# define NULL_NOT_ZERO
|
||||
#ifdef __APPLE__
|
||||
#define NULL_NOT_ZERO
|
||||
|
||||
/* Defining any of these will sanitize the namespace to JUST want is defined by
|
||||
* that particular standard. If that happens, we don't get some expected
|
||||
* prototypes, typedefs, etc (like fd_mask). We can define _DARWIN_C_SOURCE to
|
||||
* loosen our belts a tad.
|
||||
*/
|
||||
# if defined(_XOPEN_SOURCE) || defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE)
|
||||
# ifndef _DARWIN_C_SOURCE
|
||||
# define _DARWIN_C_SOURCE
|
||||
# endif
|
||||
# endif
|
||||
#if defined(_XOPEN_SOURCE) || defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE)
|
||||
#ifndef _DARWIN_C_SOURCE
|
||||
#define _DARWIN_C_SOURCE
|
||||
#endif
|
||||
#endif
|
||||
|
||||
# endif
|
||||
#endif
|
||||
|
||||
# ifdef __GNU__
|
||||
# ifndef PATH_MAX
|
||||
# define PATH_MAX 4096
|
||||
# endif
|
||||
# ifndef MAXPATHLEN
|
||||
# define MAXPATHLEN 4096
|
||||
# endif
|
||||
# endif
|
||||
#ifdef __GNU__
|
||||
#ifndef PATH_MAX
|
||||
#define PATH_MAX 4096
|
||||
#endif
|
||||
#ifndef MAXPATHLEN
|
||||
#define MAXPATHLEN 4096
|
||||
#endif
|
||||
#endif
|
||||
|
||||
# if defined(__SCO__) || defined(__UNIXWARE__)
|
||||
# ifndef PATH_MAX
|
||||
# define PATH_MAX 1024
|
||||
# endif
|
||||
# ifndef MAXPATHLEN
|
||||
# define MAXPATHLEN 1024
|
||||
# endif
|
||||
# endif
|
||||
#if defined(__SCO__) || defined(__UNIXWARE__)
|
||||
#ifndef PATH_MAX
|
||||
#define PATH_MAX 1024
|
||||
#endif
|
||||
#ifndef MAXPATHLEN
|
||||
#define MAXPATHLEN 1024
|
||||
#endif
|
||||
#endif
|
||||
|
||||
# if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) \
|
||||
|| defined(__APPLE__) || defined(__DragonFly__)
|
||||
# ifndef CSRG_BASED
|
||||
# define CSRG_BASED
|
||||
# endif
|
||||
# endif
|
||||
#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__APPLE__) || defined(__DragonFly__)
|
||||
#ifndef CSRG_BASED
|
||||
#define CSRG_BASED
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#endif /* _XOSDEFS_H_ */
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -51,27 +51,31 @@ SOFTWARE.
|
||||
|
||||
/* Used by PolySegment */
|
||||
|
||||
typedef struct _xSegment {
|
||||
INT16 x1 B16, y1 B16, x2 B16, y2 B16;
|
||||
typedef struct _xSegment
|
||||
{
|
||||
INT16 x1 B16, y1 B16, x2 B16, y2 B16;
|
||||
} xSegment;
|
||||
|
||||
/* POINT */
|
||||
|
||||
typedef struct _xPoint {
|
||||
INT16 x B16, y B16;
|
||||
typedef struct _xPoint
|
||||
{
|
||||
INT16 x B16, y B16;
|
||||
} xPoint;
|
||||
|
||||
typedef struct _xRectangle {
|
||||
INT16 x B16, y B16;
|
||||
CARD16 width B16, height B16;
|
||||
typedef struct _xRectangle
|
||||
{
|
||||
INT16 x B16, y B16;
|
||||
CARD16 width B16, height B16;
|
||||
} xRectangle;
|
||||
|
||||
/* ARC */
|
||||
|
||||
typedef struct _xArc {
|
||||
INT16 x B16, y B16;
|
||||
CARD16 width B16, height B16;
|
||||
INT16 angle1 B16, angle2 B16;
|
||||
typedef struct _xArc
|
||||
{
|
||||
INT16 x B16, y B16;
|
||||
CARD16 width B16, height B16;
|
||||
INT16 angle1 B16, angle2 B16;
|
||||
} xArc;
|
||||
|
||||
#endif /* XPROTOSTRUCTS_H */
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -35,98 +35,100 @@ in this Software without prior written authorization from The Open Group.
|
||||
#ifndef _XSHM_SERVER_
|
||||
typedef unsigned long ShmSeg;
|
||||
|
||||
typedef struct {
|
||||
int type; /* of event */
|
||||
unsigned long serial; /* # of last request processed by server */
|
||||
Bool send_event; /* true if this came frome a SendEvent request */
|
||||
Display *display; /* Display the event was read from */
|
||||
Drawable drawable; /* drawable of request */
|
||||
int major_code; /* ShmReqCode */
|
||||
int minor_code; /* X_ShmPutImage */
|
||||
ShmSeg shmseg; /* the ShmSeg used in the request */
|
||||
unsigned long offset; /* the offset into ShmSeg used in the request */
|
||||
typedef struct
|
||||
{
|
||||
int type; /* of event */
|
||||
unsigned long serial; /* # of last request processed by server */
|
||||
Bool send_event; /* true if this came frome a SendEvent request */
|
||||
Display* display; /* Display the event was read from */
|
||||
Drawable drawable; /* drawable of request */
|
||||
int major_code; /* ShmReqCode */
|
||||
int minor_code; /* X_ShmPutImage */
|
||||
ShmSeg shmseg; /* the ShmSeg used in the request */
|
||||
unsigned long offset; /* the offset into ShmSeg used in the request */
|
||||
} XShmCompletionEvent;
|
||||
|
||||
typedef struct {
|
||||
ShmSeg shmseg; /* resource id */
|
||||
int shmid; /* kernel id */
|
||||
char *shmaddr; /* address in client */
|
||||
Bool readOnly; /* how the server should attach it */
|
||||
typedef struct
|
||||
{
|
||||
ShmSeg shmseg; /* resource id */
|
||||
int shmid; /* kernel id */
|
||||
char* shmaddr; /* address in client */
|
||||
Bool readOnly; /* how the server should attach it */
|
||||
} XShmSegmentInfo;
|
||||
|
||||
_XFUNCPROTOBEGIN
|
||||
|
||||
Bool XShmQueryExtension(
|
||||
Display* /* dpy */
|
||||
Display* /* dpy */
|
||||
);
|
||||
|
||||
int XShmGetEventBase(
|
||||
Display* /* dpy */
|
||||
Display* /* dpy */
|
||||
);
|
||||
|
||||
Bool XShmQueryVersion(
|
||||
Display* /* dpy */,
|
||||
int* /* majorVersion */,
|
||||
int* /* minorVersion */,
|
||||
Bool* /* sharedPixmaps */
|
||||
Display* /* dpy */,
|
||||
int* /* majorVersion */,
|
||||
int* /* minorVersion */,
|
||||
Bool* /* sharedPixmaps */
|
||||
);
|
||||
|
||||
int XShmPixmapFormat(
|
||||
Display* /* dpy */
|
||||
Display* /* dpy */
|
||||
);
|
||||
|
||||
Bool XShmAttach(
|
||||
Display* /* dpy */,
|
||||
XShmSegmentInfo* /* shminfo */
|
||||
Display* /* dpy */,
|
||||
XShmSegmentInfo* /* shminfo */
|
||||
);
|
||||
|
||||
Bool XShmDetach(
|
||||
Display* /* dpy */,
|
||||
XShmSegmentInfo* /* shminfo */
|
||||
Display* /* dpy */,
|
||||
XShmSegmentInfo* /* shminfo */
|
||||
);
|
||||
|
||||
Bool XShmPutImage(
|
||||
Display* /* dpy */,
|
||||
Drawable /* d */,
|
||||
GC /* gc */,
|
||||
XImage* /* image */,
|
||||
int /* src_x */,
|
||||
int /* src_y */,
|
||||
int /* dst_x */,
|
||||
int /* dst_y */,
|
||||
unsigned int /* src_width */,
|
||||
unsigned int /* src_height */,
|
||||
Bool /* send_event */
|
||||
Display* /* dpy */,
|
||||
Drawable /* d */,
|
||||
GC /* gc */,
|
||||
XImage* /* image */,
|
||||
int /* src_x */,
|
||||
int /* src_y */,
|
||||
int /* dst_x */,
|
||||
int /* dst_y */,
|
||||
unsigned int /* src_width */,
|
||||
unsigned int /* src_height */,
|
||||
Bool /* send_event */
|
||||
);
|
||||
|
||||
Bool XShmGetImage(
|
||||
Display* /* dpy */,
|
||||
Drawable /* d */,
|
||||
XImage* /* image */,
|
||||
int /* x */,
|
||||
int /* y */,
|
||||
unsigned long /* plane_mask */
|
||||
Display* /* dpy */,
|
||||
Drawable /* d */,
|
||||
XImage* /* image */,
|
||||
int /* x */,
|
||||
int /* y */,
|
||||
unsigned long /* plane_mask */
|
||||
);
|
||||
|
||||
XImage *XShmCreateImage(
|
||||
Display* /* dpy */,
|
||||
Visual* /* visual */,
|
||||
unsigned int /* depth */,
|
||||
int /* format */,
|
||||
char* /* data */,
|
||||
XShmSegmentInfo* /* shminfo */,
|
||||
unsigned int /* width */,
|
||||
unsigned int /* height */
|
||||
XImage* XShmCreateImage(
|
||||
Display* /* dpy */,
|
||||
Visual* /* visual */,
|
||||
unsigned int /* depth */,
|
||||
int /* format */,
|
||||
char* /* data */,
|
||||
XShmSegmentInfo* /* shminfo */,
|
||||
unsigned int /* width */,
|
||||
unsigned int /* height */
|
||||
);
|
||||
|
||||
Pixmap XShmCreatePixmap(
|
||||
Display* /* dpy */,
|
||||
Drawable /* d */,
|
||||
char* /* data */,
|
||||
XShmSegmentInfo* /* shminfo */,
|
||||
unsigned int /* width */,
|
||||
unsigned int /* height */,
|
||||
unsigned int /* depth */
|
||||
Display* /* dpy */,
|
||||
Drawable /* d */,
|
||||
char* /* data */,
|
||||
XShmSegmentInfo* /* shminfo */,
|
||||
unsigned int /* width */,
|
||||
unsigned int /* height */,
|
||||
unsigned int /* depth */
|
||||
);
|
||||
|
||||
_XFUNCPROTOEND
|
||||
|
||||
@@ -30,19 +30,19 @@ in this Software without prior written authorization from The Open Group.
|
||||
|
||||
_XFUNCPROTOBEGIN
|
||||
|
||||
typedef int (*XextErrorHandler) (
|
||||
Display * /* dpy */,
|
||||
_Xconst char* /* ext_name */,
|
||||
_Xconst char* /* reason */
|
||||
typedef int (*XextErrorHandler)(
|
||||
Display* /* dpy */,
|
||||
_Xconst char* /* ext_name */,
|
||||
_Xconst char* /* reason */
|
||||
);
|
||||
|
||||
extern XextErrorHandler XSetExtensionErrorHandler(
|
||||
XextErrorHandler /* handler */
|
||||
XextErrorHandler /* handler */
|
||||
);
|
||||
|
||||
extern int XMissingExtension(
|
||||
Display* /* dpy */,
|
||||
_Xconst char* /* ext_name */
|
||||
Display* /* dpy */,
|
||||
_Xconst char* /* ext_name */
|
||||
);
|
||||
|
||||
_XFUNCPROTOEND
|
||||
|
||||
@@ -41,108 +41,117 @@ in this Software without prior written authorization from The Open Group.
|
||||
* public. We also have to per-display info in a separate block since it isn't
|
||||
* stored directly in the Display structure.
|
||||
*/
|
||||
typedef struct _XExtDisplayInfo {
|
||||
struct _XExtDisplayInfo *next; /* keep a linked list */
|
||||
Display *display; /* which display this is */
|
||||
XExtCodes *codes; /* the extension protocol codes */
|
||||
XPointer data; /* extra data for extension to use */
|
||||
typedef struct _XExtDisplayInfo
|
||||
{
|
||||
struct _XExtDisplayInfo* next; /* keep a linked list */
|
||||
Display* display; /* which display this is */
|
||||
XExtCodes* codes; /* the extension protocol codes */
|
||||
XPointer data; /* extra data for extension to use */
|
||||
} XExtDisplayInfo;
|
||||
|
||||
typedef struct _XExtensionInfo {
|
||||
XExtDisplayInfo *head; /* start of list */
|
||||
XExtDisplayInfo *cur; /* most recently used */
|
||||
int ndisplays; /* number of displays */
|
||||
typedef struct _XExtensionInfo
|
||||
{
|
||||
XExtDisplayInfo* head; /* start of list */
|
||||
XExtDisplayInfo* cur; /* most recently used */
|
||||
int ndisplays; /* number of displays */
|
||||
} XExtensionInfo;
|
||||
|
||||
typedef struct _XExtensionHooks {
|
||||
int (*create_gc)(
|
||||
Display* /* display */,
|
||||
GC /* gc */,
|
||||
XExtCodes* /* codes */
|
||||
);
|
||||
int (*copy_gc)(
|
||||
Display* /* display */,
|
||||
GC /* gc */,
|
||||
XExtCodes* /* codes */
|
||||
);
|
||||
int (*flush_gc)(
|
||||
Display* /* display */,
|
||||
GC /* gc */,
|
||||
XExtCodes* /* codes */
|
||||
);
|
||||
int (*free_gc)(
|
||||
Display* /* display */,
|
||||
GC /* gc */,
|
||||
XExtCodes* /* codes */
|
||||
);
|
||||
int (*create_font)(
|
||||
Display* /* display */,
|
||||
XFontStruct* /* fs */,
|
||||
XExtCodes* /* codes */
|
||||
);
|
||||
int (*free_font)(
|
||||
Display* /* display */,
|
||||
XFontStruct* /* fs */,
|
||||
XExtCodes* /* codes */
|
||||
);
|
||||
int (*close_display)(
|
||||
Display* /* display */,
|
||||
XExtCodes* /* codes */
|
||||
);
|
||||
Bool (*wire_to_event)(
|
||||
Display* /* display */,
|
||||
XEvent* /* re */,
|
||||
xEvent* /* event */
|
||||
);
|
||||
Status (*event_to_wire)(
|
||||
Display* /* display */,
|
||||
XEvent* /* re */,
|
||||
xEvent* /* event */
|
||||
);
|
||||
int (*error)(
|
||||
Display* /* display */,
|
||||
xError* /* err */,
|
||||
XExtCodes* /* codes */,
|
||||
int* /* ret_code */
|
||||
);
|
||||
char *(*error_string)(
|
||||
Display* /* display */,
|
||||
int /* code */,
|
||||
XExtCodes* /* codes */,
|
||||
char* /* buffer */,
|
||||
int /* nbytes */
|
||||
);
|
||||
typedef struct _XExtensionHooks
|
||||
{
|
||||
int (*create_gc)(
|
||||
Display* /* display */,
|
||||
GC /* gc */,
|
||||
XExtCodes* /* codes */
|
||||
);
|
||||
int (*copy_gc)(
|
||||
Display* /* display */,
|
||||
GC /* gc */,
|
||||
XExtCodes* /* codes */
|
||||
);
|
||||
int (*flush_gc)(
|
||||
Display* /* display */,
|
||||
GC /* gc */,
|
||||
XExtCodes* /* codes */
|
||||
);
|
||||
int (*free_gc)(
|
||||
Display* /* display */,
|
||||
GC /* gc */,
|
||||
XExtCodes* /* codes */
|
||||
);
|
||||
int (*create_font)(
|
||||
Display* /* display */,
|
||||
XFontStruct* /* fs */,
|
||||
XExtCodes* /* codes */
|
||||
);
|
||||
int (*free_font)(
|
||||
Display* /* display */,
|
||||
XFontStruct* /* fs */,
|
||||
XExtCodes* /* codes */
|
||||
);
|
||||
int (*close_display)(
|
||||
Display* /* display */,
|
||||
XExtCodes* /* codes */
|
||||
);
|
||||
Bool (*wire_to_event)(
|
||||
Display* /* display */,
|
||||
XEvent* /* re */,
|
||||
xEvent* /* event */
|
||||
);
|
||||
Status (*event_to_wire)(
|
||||
Display* /* display */,
|
||||
XEvent* /* re */,
|
||||
xEvent* /* event */
|
||||
);
|
||||
int (*error)(
|
||||
Display* /* display */,
|
||||
xError* /* err */,
|
||||
XExtCodes* /* codes */,
|
||||
int* /* ret_code */
|
||||
);
|
||||
char* (*error_string)(
|
||||
Display* /* display */,
|
||||
int /* code */,
|
||||
XExtCodes* /* codes */,
|
||||
char* /* buffer */,
|
||||
int /* nbytes */
|
||||
);
|
||||
} XExtensionHooks;
|
||||
|
||||
extern XExtensionInfo *XextCreateExtension(
|
||||
void
|
||||
);
|
||||
extern XExtensionInfo* XextCreateExtension(
|
||||
void);
|
||||
extern void XextDestroyExtension(
|
||||
XExtensionInfo* /* info */
|
||||
XExtensionInfo* /* info */
|
||||
);
|
||||
extern XExtDisplayInfo *XextAddDisplay(
|
||||
XExtensionInfo* /* extinfo */,
|
||||
Display* /* dpy */,
|
||||
_Xconst char* /* ext_name */,
|
||||
XExtensionHooks* /* hooks */,
|
||||
int /* nevents */,
|
||||
XPointer /* data */
|
||||
extern XExtDisplayInfo* XextAddDisplay(
|
||||
XExtensionInfo* /* extinfo */,
|
||||
Display* /* dpy */,
|
||||
_Xconst char* /* ext_name */,
|
||||
XExtensionHooks* /* hooks */,
|
||||
int /* nevents */,
|
||||
XPointer /* data */
|
||||
);
|
||||
extern int XextRemoveDisplay(
|
||||
XExtensionInfo* /* extinfo */,
|
||||
Display* /* dpy */
|
||||
XExtensionInfo* /* extinfo */,
|
||||
Display* /* dpy */
|
||||
);
|
||||
extern XExtDisplayInfo *XextFindDisplay(
|
||||
XExtensionInfo* /* extinfo */,
|
||||
Display* /* dpy */
|
||||
extern XExtDisplayInfo* XextFindDisplay(
|
||||
XExtensionInfo* /* extinfo */,
|
||||
Display* /* dpy */
|
||||
);
|
||||
|
||||
#define XextHasExtension(i) ((i) && ((i)->codes))
|
||||
#define XextCheckExtension(dpy,i,name,val) \
|
||||
if (!XextHasExtension(i)) { XMissingExtension (dpy, name); return val; }
|
||||
#define XextSimpleCheckExtension(dpy,i,name) \
|
||||
if (!XextHasExtension(i)) { XMissingExtension (dpy, name); return; }
|
||||
|
||||
#define XextCheckExtension(dpy, i, name, val) \
|
||||
if (!XextHasExtension(i)) \
|
||||
{ \
|
||||
XMissingExtension(dpy, name); \
|
||||
return val; \
|
||||
}
|
||||
#define XextSimpleCheckExtension(dpy, i, name) \
|
||||
if (!XextHasExtension(i)) \
|
||||
{ \
|
||||
XMissingExtension(dpy, name); \
|
||||
return; \
|
||||
}
|
||||
|
||||
/*
|
||||
* helper macros to generate code that is common to all extensions; caller
|
||||
@@ -150,41 +159,45 @@ extern XExtDisplayInfo *XextFindDisplay(
|
||||
* could be a utility function, but have to stack 6 unused arguments for
|
||||
* something that is called many, many times would be bad.
|
||||
*/
|
||||
#define XEXT_GENERATE_FIND_DISPLAY(proc,extinfo,extname,hooks,nev,data) \
|
||||
XExtDisplayInfo *proc (Display *dpy) \
|
||||
{ \
|
||||
XExtDisplayInfo *dpyinfo; \
|
||||
if (!extinfo) { if (!(extinfo = XextCreateExtension())) return NULL; } \
|
||||
if (!(dpyinfo = XextFindDisplay (extinfo, dpy))) \
|
||||
dpyinfo = XextAddDisplay (extinfo,dpy,extname,hooks,nev,data); \
|
||||
return dpyinfo; \
|
||||
}
|
||||
#define XEXT_GENERATE_FIND_DISPLAY(proc, extinfo, extname, hooks, nev, data) \
|
||||
XExtDisplayInfo* proc(Display* dpy) \
|
||||
{ \
|
||||
XExtDisplayInfo* dpyinfo; \
|
||||
if (!extinfo) \
|
||||
{ \
|
||||
if (!(extinfo = XextCreateExtension())) return NULL; \
|
||||
} \
|
||||
if (!(dpyinfo = XextFindDisplay(extinfo, dpy))) \
|
||||
dpyinfo = XextAddDisplay(extinfo, dpy, extname, hooks, nev, data); \
|
||||
return dpyinfo; \
|
||||
}
|
||||
|
||||
#define XEXT_FIND_DISPLAY_PROTO(proc) \
|
||||
XExtDisplayInfo *proc(Display *dpy)
|
||||
XExtDisplayInfo* proc(Display* dpy)
|
||||
|
||||
#define XEXT_GENERATE_CLOSE_DISPLAY(proc,extinfo) \
|
||||
int proc (Display *dpy, XExtCodes *codes) \
|
||||
{ \
|
||||
return XextRemoveDisplay (extinfo, dpy); \
|
||||
}
|
||||
#define XEXT_GENERATE_CLOSE_DISPLAY(proc, extinfo) \
|
||||
int proc(Display* dpy, XExtCodes* codes) \
|
||||
{ \
|
||||
return XextRemoveDisplay(extinfo, dpy); \
|
||||
}
|
||||
|
||||
#define XEXT_CLOSE_DISPLAY_PROTO(proc) \
|
||||
int proc(Display *dpy, XExtCodes *codes)
|
||||
int proc(Display* dpy, XExtCodes* codes)
|
||||
|
||||
#define XEXT_GENERATE_ERROR_STRING(proc,extname,nerr,errl) \
|
||||
char *proc (Display *dpy, int code, XExtCodes *codes, char *buf, int n) \
|
||||
{ \
|
||||
code -= codes->first_error; \
|
||||
if (code >= 0 && code < nerr) { \
|
||||
char tmp[256]; \
|
||||
sprintf (tmp, "%s.%d", extname, code); \
|
||||
XGetErrorDatabaseText (dpy, "XProtoError", tmp, errl[code], buf, n); \
|
||||
return buf; \
|
||||
} \
|
||||
return (char *)0; \
|
||||
}
|
||||
#define XEXT_GENERATE_ERROR_STRING(proc, extname, nerr, errl) \
|
||||
char* proc(Display* dpy, int code, XExtCodes* codes, char* buf, int n) \
|
||||
{ \
|
||||
code -= codes->first_error; \
|
||||
if (code >= 0 && code < nerr) \
|
||||
{ \
|
||||
char tmp[256]; \
|
||||
sprintf(tmp, "%s.%d", extname, code); \
|
||||
XGetErrorDatabaseText(dpy, "XProtoError", tmp, errl[code], buf, n); \
|
||||
return buf; \
|
||||
} \
|
||||
return (char*)0; \
|
||||
}
|
||||
|
||||
#define XEXT_ERROR_STRING_PROTO(proc) \
|
||||
char *proc(Display *dpy, int code, XExtCodes *codes, char *buf, int n)
|
||||
char* proc(Display* dpy, int code, XExtCodes* codes, char* buf, int n)
|
||||
#endif
|
||||
|
||||
@@ -33,116 +33,117 @@ in this Software without prior written authorization from The Open Group.
|
||||
#ifndef _SHAPE_SERVER_
|
||||
#include <X11/Xutil.h>
|
||||
|
||||
typedef struct {
|
||||
int type; /* of event */
|
||||
unsigned long serial; /* # of last request processed by server */
|
||||
Bool send_event; /* true if this came frome a SendEvent request */
|
||||
Display *display; /* Display the event was read from */
|
||||
Window window; /* window of event */
|
||||
int kind; /* ShapeBounding or ShapeClip */
|
||||
int x, y; /* extents of new region */
|
||||
unsigned width, height;
|
||||
Time time; /* server timestamp when region changed */
|
||||
Bool shaped; /* true if the region exists */
|
||||
typedef struct
|
||||
{
|
||||
int type; /* of event */
|
||||
unsigned long serial; /* # of last request processed by server */
|
||||
Bool send_event; /* true if this came frome a SendEvent request */
|
||||
Display* display; /* Display the event was read from */
|
||||
Window window; /* window of event */
|
||||
int kind; /* ShapeBounding or ShapeClip */
|
||||
int x, y; /* extents of new region */
|
||||
unsigned width, height;
|
||||
Time time; /* server timestamp when region changed */
|
||||
Bool shaped; /* true if the region exists */
|
||||
} XShapeEvent;
|
||||
|
||||
_XFUNCPROTOBEGIN
|
||||
|
||||
extern Bool XShapeQueryExtension (
|
||||
Display* /* display */,
|
||||
int* /* event_base */,
|
||||
int* /* error_base */
|
||||
extern Bool XShapeQueryExtension(
|
||||
Display* /* display */,
|
||||
int* /* event_base */,
|
||||
int* /* error_base */
|
||||
);
|
||||
|
||||
extern Status XShapeQueryVersion (
|
||||
Display* /* display */,
|
||||
int* /* major_version */,
|
||||
int* /* minor_version */
|
||||
extern Status XShapeQueryVersion(
|
||||
Display* /* display */,
|
||||
int* /* major_version */,
|
||||
int* /* minor_version */
|
||||
);
|
||||
|
||||
extern void XShapeCombineRegion (
|
||||
Display* /* display */,
|
||||
Window /* dest */,
|
||||
int /* dest_kind */,
|
||||
int /* x_off */,
|
||||
int /* y_off */,
|
||||
Region /* region */,
|
||||
int /* op */
|
||||
extern void XShapeCombineRegion(
|
||||
Display* /* display */,
|
||||
Window /* dest */,
|
||||
int /* dest_kind */,
|
||||
int /* x_off */,
|
||||
int /* y_off */,
|
||||
Region /* region */,
|
||||
int /* op */
|
||||
);
|
||||
|
||||
extern void XShapeCombineRectangles (
|
||||
Display* /* display */,
|
||||
Window /* dest */,
|
||||
int /* dest_kind */,
|
||||
int /* x_off */,
|
||||
int /* y_off */,
|
||||
XRectangle* /* rectangles */,
|
||||
int /* n_rects */,
|
||||
int /* op */,
|
||||
int /* ordering */
|
||||
extern void XShapeCombineRectangles(
|
||||
Display* /* display */,
|
||||
Window /* dest */,
|
||||
int /* dest_kind */,
|
||||
int /* x_off */,
|
||||
int /* y_off */,
|
||||
XRectangle* /* rectangles */,
|
||||
int /* n_rects */,
|
||||
int /* op */,
|
||||
int /* ordering */
|
||||
);
|
||||
|
||||
extern void XShapeCombineMask (
|
||||
Display* /* display */,
|
||||
Window /* dest */,
|
||||
int /* dest_kind */,
|
||||
int /* x_off */,
|
||||
int /* y_off */,
|
||||
Pixmap /* src */,
|
||||
int /* op */
|
||||
extern void XShapeCombineMask(
|
||||
Display* /* display */,
|
||||
Window /* dest */,
|
||||
int /* dest_kind */,
|
||||
int /* x_off */,
|
||||
int /* y_off */,
|
||||
Pixmap /* src */,
|
||||
int /* op */
|
||||
);
|
||||
|
||||
extern void XShapeCombineShape (
|
||||
Display* /* display */,
|
||||
Window /* dest */,
|
||||
int /* dest_kind */,
|
||||
int /* x_off */,
|
||||
int /* y_off */,
|
||||
Window /* src */,
|
||||
int /* src_kind */,
|
||||
int /* op */
|
||||
extern void XShapeCombineShape(
|
||||
Display* /* display */,
|
||||
Window /* dest */,
|
||||
int /* dest_kind */,
|
||||
int /* x_off */,
|
||||
int /* y_off */,
|
||||
Window /* src */,
|
||||
int /* src_kind */,
|
||||
int /* op */
|
||||
);
|
||||
|
||||
extern void XShapeOffsetShape (
|
||||
Display* /* display */,
|
||||
Window /* dest */,
|
||||
int /* dest_kind */,
|
||||
int /* x_off */,
|
||||
int /* y_off */
|
||||
extern void XShapeOffsetShape(
|
||||
Display* /* display */,
|
||||
Window /* dest */,
|
||||
int /* dest_kind */,
|
||||
int /* x_off */,
|
||||
int /* y_off */
|
||||
);
|
||||
|
||||
extern Status XShapeQueryExtents (
|
||||
Display* /* display */,
|
||||
Window /* window */,
|
||||
Bool* /* bounding_shaped */,
|
||||
int* /* x_bounding */,
|
||||
int* /* y_bounding */,
|
||||
unsigned int* /* w_bounding */,
|
||||
unsigned int* /* h_bounding */,
|
||||
Bool* /* clip_shaped */,
|
||||
int* /* x_clip */,
|
||||
int* /* y_clip */,
|
||||
unsigned int* /* w_clip */,
|
||||
unsigned int* /* h_clip */
|
||||
extern Status XShapeQueryExtents(
|
||||
Display* /* display */,
|
||||
Window /* window */,
|
||||
Bool* /* bounding_shaped */,
|
||||
int* /* x_bounding */,
|
||||
int* /* y_bounding */,
|
||||
unsigned int* /* w_bounding */,
|
||||
unsigned int* /* h_bounding */,
|
||||
Bool* /* clip_shaped */,
|
||||
int* /* x_clip */,
|
||||
int* /* y_clip */,
|
||||
unsigned int* /* w_clip */,
|
||||
unsigned int* /* h_clip */
|
||||
);
|
||||
|
||||
extern void XShapeSelectInput (
|
||||
Display* /* display */,
|
||||
Window /* window */,
|
||||
unsigned long /* mask */
|
||||
extern void XShapeSelectInput(
|
||||
Display* /* display */,
|
||||
Window /* window */,
|
||||
unsigned long /* mask */
|
||||
);
|
||||
|
||||
extern unsigned long XShapeInputSelected (
|
||||
Display* /* display */,
|
||||
Window /* window */
|
||||
extern unsigned long XShapeInputSelected(
|
||||
Display* /* display */,
|
||||
Window /* window */
|
||||
);
|
||||
|
||||
extern XRectangle *XShapeGetRectangles (
|
||||
Display* /* display */,
|
||||
Window /* window */,
|
||||
int /* kind */,
|
||||
int* /* count */,
|
||||
int* /* ordering */
|
||||
extern XRectangle* XShapeGetRectangles(
|
||||
Display* /* display */,
|
||||
Window /* window */,
|
||||
int /* kind */,
|
||||
int* /* count */,
|
||||
int* /* ordering */
|
||||
);
|
||||
|
||||
_XFUNCPROTOEND
|
||||
|
||||
@@ -34,22 +34,22 @@ in this Software without prior written authorization from The Open Group.
|
||||
|
||||
#define SHAPENAME "SHAPE"
|
||||
|
||||
#define SHAPE_MAJOR_VERSION 1 /* current version numbers */
|
||||
#define SHAPE_MINOR_VERSION 1
|
||||
#define SHAPE_MAJOR_VERSION 1 /* current version numbers */
|
||||
#define SHAPE_MINOR_VERSION 1
|
||||
|
||||
#define ShapeSet 0
|
||||
#define ShapeUnion 1
|
||||
#define ShapeIntersect 2
|
||||
#define ShapeSubtract 3
|
||||
#define ShapeInvert 4
|
||||
#define ShapeSet 0
|
||||
#define ShapeUnion 1
|
||||
#define ShapeIntersect 2
|
||||
#define ShapeSubtract 3
|
||||
#define ShapeInvert 4
|
||||
|
||||
#define ShapeBounding 0
|
||||
#define ShapeClip 1
|
||||
#define ShapeInput 2
|
||||
#define ShapeBounding 0
|
||||
#define ShapeClip 1
|
||||
#define ShapeInput 2
|
||||
|
||||
#define ShapeNotifyMask (1L << 0)
|
||||
#define ShapeNotify 0
|
||||
#define ShapeNotifyMask (1L << 0)
|
||||
#define ShapeNotify 0
|
||||
|
||||
#define ShapeNumberEvents (ShapeNotify + 1)
|
||||
#define ShapeNumberEvents (ShapeNotify + 1)
|
||||
|
||||
#endif /* _SHAPECONST_H_ */
|
||||
|
||||
@@ -31,14 +31,13 @@ in this Software without prior written authorization from The Open Group.
|
||||
|
||||
#define SHMNAME "MIT-SHM"
|
||||
|
||||
#define SHM_MAJOR_VERSION 1 /* current version numbers */
|
||||
#define SHM_MINOR_VERSION 2
|
||||
#define SHM_MAJOR_VERSION 1 /* current version numbers */
|
||||
#define SHM_MINOR_VERSION 2
|
||||
|
||||
#define ShmCompletion 0
|
||||
#define ShmNumberEvents (ShmCompletion + 1)
|
||||
|
||||
#define BadShmSeg 0
|
||||
#define ShmNumberErrors (BadShmSeg + 1)
|
||||
#define ShmCompletion 0
|
||||
#define ShmNumberEvents (ShmCompletion + 1)
|
||||
|
||||
#define BadShmSeg 0
|
||||
#define ShmNumberErrors (BadShmSeg + 1)
|
||||
|
||||
#endif /* _SHM_H_ */
|
||||
|
||||
@@ -71,4 +71,3 @@ SOFTWARE.
|
||||
#define XK_SINHALA
|
||||
|
||||
#include <X11/keysymdef.h>
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user