diff options
Diffstat (limited to 'xorg-server/include')
| -rw-r--r-- | xorg-server/include/dix-config.h | 534 | ||||
| -rw-r--r-- | xorg-server/include/dixstruct.h | 2 | ||||
| -rw-r--r-- | xorg-server/include/do-not-use-config.h | 6 | ||||
| -rw-r--r-- | xorg-server/include/globals.h | 2 | ||||
| -rw-r--r-- | xorg-server/include/misc.h | 4 | ||||
| -rw-r--r-- | xorg-server/include/os.h | 4 | ||||
| -rw-r--r-- | xorg-server/include/pixmapstr.h | 2 | ||||
| -rw-r--r-- | xorg-server/include/scrnintstr.h | 6 | ||||
| -rw-r--r-- | xorg-server/include/windowstr.h | 2 | ||||
| -rw-r--r-- | xorg-server/include/xkb-config.h | 6 |
10 files changed, 19 insertions, 549 deletions
diff --git a/xorg-server/include/dix-config.h b/xorg-server/include/dix-config.h deleted file mode 100644 index 5d08cb401..000000000 --- a/xorg-server/include/dix-config.h +++ /dev/null @@ -1,534 +0,0 @@ -/* include/dix-config.h. Generated from dix-config.h.in by configure. */ -/* dix-config.h.in: not at all generated. -*- c -*- */ - -#ifndef _DIX_CONFIG_H_ -#define _DIX_CONFIG_H_ - -/* Support BigRequests extension */ -#define BIGREQS 1 - -/* Builder address */ -#define BUILDERADDR "xorg@lists.freedesktop.org" - -/* Operating System Name */ -#define OSNAME "Linux 2.6.27-13.fc10.i686 i686" - -/* Operating System Vendor */ -#define OSVENDOR "" - -/* Builder string */ -#define BUILDERSTRING "" - -/* Default font path */ -#define COMPILEDDEFAULTFONTPATH "/usr/local/lib/X11/fonts/misc/,/usr/local/lib/X11/fonts/TTF/,/usr/local/lib/X11/fonts/OTF,/usr/local/lib/X11/fonts/Type1/,/usr/local/lib/X11/fonts/100dpi/,/usr/local/lib/X11/fonts/75dpi/" - -/* Miscellaneous server configuration files path */ -#define SERVER_MISC_CONFIG_PATH "/usr/local/lib/xorg" - -/* Support Composite Extension */ -#define COMPOSITE 1 - -/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP - systems. This function is required for `alloca.c' support on those systems. - */ -/* #undef CRAY_STACKSEG_END */ - -/* Define to 1 if using `alloca.c'. */ -/* #undef C_ALLOCA */ - -/* Support Damage extension */ -#define DAMAGE 1 - -/* Build for darwin with Quartz support */ -/* #undef DARWIN_WITH_QUARTZ */ - -/* Use OsVendorInit */ -#define DDXOSINIT 1 - -/* Use GetTimeInMillis */ -/* #undef DDXTIME */ - -/* Use OsVendorFatalError */ -/* #undef DDXOSFATALERROR */ - -/* Use OsVendorVErrorF */ -/* #undef DDXOSVERRORF */ - -/* Use ddxBeforeReset */ -/* #undef DDXBEFORERESET */ - -/* Build DPMS extension */ -#define DPMSExtension 1 - -/* Build GLX extension */ -#define GLXEXT 1 - -/* Build GLX DRI loader */ -/* #undef GLX_DRI */ - -/* Path to DRI drivers */ -#define DRI_DRIVER_PATH "/usr/local/lib/dri" - -/* Include handhelds.org h3600 touchscreen driver */ -/* #undef H3600_TS */ - -/* Support XDM-AUTH*-1 */ -#define HASXDMAUTH 1 - -/* Define to 1 if you have the `getdtablesize' function. */ -#define HAS_GETDTABLESIZE 1 - -/* Define to 1 if you have the `getifaddrs' function. */ -#define HAS_GETIFADDRS 1 - -/* Define to 1 if you have the `getpeereid' function. */ -/* #undef HAS_GETPEEREID */ - -/* Define to 1 if you have the `getpeerucred' function. */ -/* #undef HAS_GETPEERUCRED */ - -/* Define to 1 if you have the `mmap' function. */ -#define HAS_MMAP 1 - -/* Support SHM */ -#define HAS_SHM 1 - -/* Define to 1 if you have `alloca', as a function or macro. */ -#define HAVE_ALLOCA 1 - -/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix). - */ -#define HAVE_ALLOCA_H 1 - -/* Define to 1 if you have the <asm/mtrr.h> header file. */ -#define HAVE_ASM_MTRR_H 1 - -/* Has backtrace support */ -#define HAVE_BACKTRACE 1 - -/* Define to 1 if you have the <byteswap.h> header file. */ -#define HAVE_BYTESWAP_H 1 - -/* Define to 1 if you have cbrt */ -#define HAVE_CBRT 1 - -/* Define to 1 if you have the <dbm.h> header file. */ -/* #undef HAVE_DBM_H */ - -/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'. - */ -#define HAVE_DIRENT_H 1 - -/* Define to 1 if you have the <dlfcn.h> header file. */ -#define HAVE_DLFCN_H 1 - -/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ -/* #undef HAVE_DOPRNT */ - -/* Have execinfo.h */ -#define HAVE_EXECINFO_H 1 - -/* Define to 1 if you have the <fcntl.h> header file. */ -#define HAVE_FCNTL_H 1 - -/* Define to 1 if you have the `geteuid' function. */ -#define HAVE_GETEUID 1 - -/* Define to 1 if you have the `getisax' function. */ -/* #undef HAVE_GETISAX */ - -/* Define to 1 if you have the `getopt' function. */ -#define HAVE_GETOPT 1 - -/* Define to 1 if you have the `getopt_long' function. */ -#define HAVE_GETOPT_LONG 1 - -/* Define to 1 if you have the `getuid' function. */ -#define HAVE_GETUID 1 - -/* Define to 1 if you have the `getzoneid' function. */ -/* #undef HAVE_GETZONEID */ - -/* Define to 1 if you have the <inttypes.h> header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define to 1 if you have version 2.2 (or newer) of the drm library */ -#define HAVE_LIBDRM_2_2 1 - -/* Have Quartz */ -/* #undef XQUARTZ */ - -/* Define to 1 if you have the `m' library (-lm). */ -#define HAVE_LIBM 1 - -/* Define to 1 if you have the `link' function. */ -#define HAVE_LINK 1 - -/* Define to 1 if you have the <linux/agpgart.h> header file. */ -#define HAVE_LINUX_AGPGART_H 1 - -/* Define to 1 if you have the <linux/apm_bios.h> header file. */ -#define HAVE_LINUX_APM_BIOS_H 1 - -/* Define to 1 if you have the <linux/fb.h> header file. */ -#define HAVE_LINUX_FB_H 1 - -/* Define to 1 if you have the <linux/h3600_ts.h> header file. */ -/* #undef HAVE_LINUX_H3600_TS_H */ - -/* Define to 1 if you have the `memmove' function. */ -#define HAVE_MEMMOVE 1 - -/* Define to 1 if you have the <memory.h> header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the `memset' function. */ -#define HAVE_MEMSET 1 - -/* Define to 1 if you have the `mkstemp' function. */ -#define HAVE_MKSTEMP 1 - -/* Define to 1 if you have the <ndbm.h> header file. */ -/* #undef HAVE_NDBM_H */ - -/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */ -/* #undef HAVE_NDIR_H */ - -/* Define to 1 if you have the <rpcsvc/dbm.h> header file. */ -/* #undef HAVE_RPCSVC_DBM_H */ - -/* Define to 1 if you have the `shmctl64' function. */ -/* #undef HAVE_SHMCTL64 */ - -/* Define to 1 if you have the <stdint.h> header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the <stdlib.h> header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the `strchr' function. */ -#define HAVE_STRCHR 1 - -/* Define to 1 if you have the <strings.h> header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the <string.h> header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the `strrchr' function. */ -#define HAVE_STRRCHR 1 - -/* Define to 1 if you have the `strtol' function. */ -#define HAVE_STRTOL 1 - -/* Define to 1 if SYSV IPC is available */ -#define HAVE_SYSV_IPC 1 - -/* Define to 1 if you have the <sys/agpio.h> header file. */ -/* #undef HAVE_SYS_AGPIO_H */ - -/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'. - */ -/* #undef HAVE_SYS_DIR_H */ - -/* Define to 1 if you have the <sys/io.h> header file. */ -/* #undef HAVE_SYS_IO_H */ - -/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'. - */ -/* #undef HAVE_SYS_NDIR_H */ - -/* Define to 1 if you have the <sys/stat.h> header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the <sys/types.h> header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the <sys/vm86.h> header file. */ -/* #undef HAVE_SYS_VM86_H */ - -/* Define to 1 if you have the <tslib.h> header file. */ -/* #undef HAVE_TSLIB_H */ - -/* Define to 1 if you have the <unistd.h> header file. */ -#define HAVE_UNISTD_H 1 - -/* Have /dev/urandom */ -#define HAVE_URANDOM 1 - -/* Define to 1 if you have the `vprintf' function. */ -#define HAVE_VPRINTF 1 - -/* Support IPv6 for TCP connections */ -#define IPv6 1 - -/* Support os-specific local connections */ -/* #undef LOCALCONN */ - -/* Support MIT Misc extension */ -#define MITMISC 1 - -/* Support MIT-SHM Extension */ -#define MITSHM 1 - -/* Disable some debugging code */ -#define NDEBUG 1 - -/* Enable some debugging code */ -/* #undef DEBUG */ - -/* Name of package */ -#define PACKAGE "xorg-server" - -/* Internal define for Xinerama */ -#define PANORAMIX 1 - -/* Overall prefix */ -#define PROJECTROOT "/usr/local" - -/* Support RANDR extension */ -#define RANDR 1 - -/* Support Record extension */ -/* #undef XRECORD */ - -/* Support RENDER extension */ -#define RENDER 1 - -/* Support X resource extension */ -#define RES 1 - -/* Support MIT-SCREEN-SAVER extension */ -#define SCREENSAVER 1 - -/* Support Secure RPC ("SUN-DES-1") authentication for X11 clients */ -#define SECURE_RPC 1 - -/* Use a lock to prevent multiple servers on a display */ -#define SERVER_LOCK 1 - -/* Support SHAPE extension */ -#define SHAPE 1 - -/* Include time-based scheduler */ -#define SMART_SCHEDULE 1 - -/* If using the C implementation of alloca, define if you know the - direction of stack growth for your system; otherwise it will be - automatically deduced at run-time. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown */ -/* #undef STACK_DIRECTION */ - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Define to 1 on systems derived from System V Release 4 */ -/* #undef SVR4 */ - -/* Support TCP socket connections */ -#define TCPCONN 1 - -/* Enable touchscreen support */ -/* #undef TOUCHSCREEN */ - -/* Support tslib touchscreen abstraction library */ -/* #undef TSLIB */ - -/* Support UNIX socket connections */ -#define UNIXCONN 1 - -/* Define to use byteswap macros from <sys/endian.h> */ -/* #undef USE_SYS_ENDIAN_H */ - -/* unaligned word accesses behave as expected */ -/* #undef WORKING_UNALIGNED_INT */ - -/* Build X string registry */ -#define XREGISTRY 1 - -/* Build X-ACE extension */ -#define XACE 1 - -/* Build SELinux extension */ -/* #undef XSELINUX */ - -/* Support XCMisc extension */ -#define XCMISC 1 - -/* Build Security extension */ -/* #undef XCSECURITY */ - -/* Support Xdmcp */ -#define XDMCP 1 - -/* Build XEvIE extension */ -#define XEVIE 1 - -/* Build XFree86 BigFont extension */ -/* #undef XF86BIGFONT */ - -/* Support XFree86 miscellaneous extensions */ -#define XF86MISC 1 - -/* Support XFree86 Video Mode extension */ -#define XF86VIDMODE 1 - -/* Support XFixes extension */ -#define XFIXES 1 - -/* Build XDGA support */ -#define XFreeXDGA 1 - -/* Support Xinerama extension */ -#define XINERAMA 1 - -/* Support X Input extension */ -#define XINPUT 1 - -/* Build XKB */ -#define XKB 1 - -/* Enable XKB per default */ -#define XKB_DFLT_DISABLED 0 - -/* Build XKB server */ -#define XKB_IN_SERVER 1 - -/* Vendor release */ -/* #undef XORG_RELEASE */ - -/* Current Xorg version */ -#define XORG_VERSION_CURRENT (((1) * 10000000) + ((5) * 100000) + ((3) * 1000) + 0) - -/* Xorg release date */ -#define XORG_DATE "5 November 2008" - -/* Build Xv Extension */ -#define XvExtension 1 - -/* Build XvMC Extension */ -#define XvMCExtension 1 - -/* Build XRes extension */ -#define XResExtension 1 - -/* Support XSync extension */ -#define XSYNC 1 - -/* Support XTest extension */ -#define XTEST 1 - -/* Support XTrap extension */ -/* #undef XTRAP */ - -/* Support Xv extension */ -#define XV 1 - -/* Build APPGROUP extension */ -/* #undef XAPPGROUP */ - -/* Build TOG-CUP extension */ -#define TOGCUP 1 - -/* Build Extended-Visual-Information extension */ -#define EVI 1 - -/* Build Multibuffer extension */ -/* #undef MULTIBUFFER */ - -/* Support DRI extension */ -#define XF86DRI 1 - -/* #undef XEPHYR_DRI */ - -/* Build DRI2 extension */ -/* #undef DRI2 */ - -/* Build DBE support */ -#define DBE 1 - -/* Vendor name */ -#define XVENDORNAME "The X.Org Foundation" - -/* Endian order */ -#define _X_BYTE_ORDER X_LITTLE_ENDIAN -/* Deal with multiple architecture compiles on Mac OS X */ -#ifndef __APPLE_CC__ -#define X_BYTE_ORDER _X_BYTE_ORDER -#else -#ifdef __BIG_ENDIAN__ -#define X_BYTE_ORDER X_BIG_ENDIAN -#else -#define X_BYTE_ORDER X_LITTLE_ENDIAN -#endif -#endif - -/* Enable GNU and other extensions to the C environment for GLIBC */ -#define _GNU_SOURCE 1 - -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef const */ - -/* Define to `int' if <sys/types.h> does not define. */ -/* #undef pid_t */ - -/* Build Rootless code */ -/* #undef ROOTLESS */ - -/* Define to 1 if unsigned long is 64 bits. */ -/* #undef _XSERVER64 */ - -/* System is BSD-like */ -/* #undef CSRG_BASED */ - -/* Define to 1 if `struct sockaddr_in' has a `sin_len' member */ -/* #undef BSD44SOCKETS */ - -/* Define to 1 if modules should avoid the libcwrapper */ -#define NO_LIBCWRAPPER 1 - -/* Support D-Bus */ -#define HAVE_DBUS 1 - -/* Support the D-Bus hotplug API */ -/* #undef CONFIG_DBUS_API */ - -/* Support HAL for hotplug */ -#define CONFIG_HAL 1 - -/* Use only built-in fonts */ -/* #undef BUILTIN_FONTS */ - -/* Avoid using font servers */ -/* #undef NOFONTSERVERACCESS */ - -/* Use an empty root cursor */ -/* #undef NULL_ROOT_CURSOR */ - -/* Have a monotonic clock from clock_gettime() */ -#define MONOTONIC_CLOCK 1 - -/* Define to 1 if the DTrace Xserver provider probes should be built in */ -/* #undef XSERVER_DTRACE */ - -/* Define to 16-bit byteswap macro */ -/* #undef bswap_16 */ - -/* Define to 32-bit byteswap macro */ -/* #undef bswap_32 */ - -/* Define to 64-bit byteswap macro */ -/* #undef bswap_64 */ - -/* Need the strcasecmp function. */ -/* #undef NEED_STRCASECMP */ - -/* Need the strncasecmp function. */ -/* #undef NEED_STRNCASECMP */ - -/* Need the strcasestr function. */ -/* #undef NEED_STRCASESTR */ - -#endif /* _DIX_CONFIG_H_ */ diff --git a/xorg-server/include/dixstruct.h b/xorg-server/include/dixstruct.h index d44b9cfa7..88d1df342 100644 --- a/xorg-server/include/dixstruct.h +++ b/xorg-server/include/dixstruct.h @@ -97,7 +97,7 @@ typedef struct _Client { Bool swapped; ReplySwapPtr pSwapReplyFunc; XID errorValue; - int sequence; + unsigned short sequence; //MH int closeDownMode; int clientGone; int noClientException; /* this client died or needs to be diff --git a/xorg-server/include/do-not-use-config.h b/xorg-server/include/do-not-use-config.h index b2c9161ee..ddec02eee 100644 --- a/xorg-server/include/do-not-use-config.h +++ b/xorg-server/include/do-not-use-config.h @@ -643,10 +643,10 @@ #define XKB 1 /* Path to XKB data */ -#define XKB_BASE_DIRECTORY "/usr/local/share/X11/xkb" +#define XKB_BASE_DIRECTORY "xkbdata" /* Path to XKB bin dir */ -#define XKB_BIN_DIRECTORY "/usr/local/bin" +#define XKB_BIN_DIRECTORY "." /* Disable XKB per default */ #define XKB_DFLT_DISABLED 0 @@ -655,7 +655,7 @@ #define XKB_IN_SERVER 1 /* Path to XKB output dir */ -#define XKM_OUTPUT_DIR "/usr/local/share/X11/xkb/compiled/" +#define XKM_OUTPUT_DIR "xkbdata/compiled/" /* Building Xorg server */ #define XORGSERVER 1 diff --git a/xorg-server/include/globals.h b/xorg-server/include/globals.h index 2ca9531d9..1ff701380 100644 --- a/xorg-server/include/globals.h +++ b/xorg-server/include/globals.h @@ -50,9 +50,7 @@ extern Bool PanoramiXExtensionDisabledHack; extern Bool noBigReqExtension; #endif -#ifdef COMPOSITE extern Bool noCompositeExtension; -#endif #ifdef DAMAGE extern Bool noDamageExtension; diff --git a/xorg-server/include/misc.h b/xorg-server/include/misc.h index a1cbe8670..ca740c08b 100644 --- a/xorg-server/include/misc.h +++ b/xorg-server/include/misc.h @@ -164,9 +164,9 @@ typedef struct _xReq *xReqPtr; #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 diff --git a/xorg-server/include/os.h b/xorg-server/include/os.h index c67821967..100686f61 100644 --- a/xorg-server/include/os.h +++ b/xorg-server/include/os.h @@ -526,4 +526,8 @@ extern void LogPrintMarkers(void); extern void xorg_backtrace(void); +#ifdef _MSC_VER +#define snprintf _snprintf +#endif + #endif /* OS_H */ diff --git a/xorg-server/include/pixmapstr.h b/xorg-server/include/pixmapstr.h index cc5a8d8de..4150b69b7 100644 --- a/xorg-server/include/pixmapstr.h +++ b/xorg-server/include/pixmapstr.h @@ -76,10 +76,8 @@ typedef struct _Pixmap { int refcnt; int devKind; DevUnion devPrivate; -#ifdef COMPOSITE short screen_x; short screen_y; -#endif unsigned usage_hint; /* see CREATE_PIXMAP_USAGE_* */ } PixmapRec; diff --git a/xorg-server/include/scrnintstr.h b/xorg-server/include/scrnintstr.h index 3b2cf9f81..c49487585 100644 --- a/xorg-server/include/scrnintstr.h +++ b/xorg-server/include/scrnintstr.h @@ -68,7 +68,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 */ @@ -432,6 +432,10 @@ typedef void (* MarkUnrealizedWindowProcPtr)( WindowPtr /*pWin*/, Bool /*fromConfigure*/); +#ifdef CreateWindow +#undef CreateWindow +#endif + typedef struct _Screen { int myNum; /* index of this instance in Screens[] */ ATOM id; diff --git a/xorg-server/include/windowstr.h b/xorg-server/include/windowstr.h index e06a2f1bd..f370a25d2 100644 --- a/xorg-server/include/windowstr.h +++ b/xorg-server/include/windowstr.h @@ -137,7 +137,7 @@ typedef struct _Window { RegionRec borderSize; DDXPointRec origin; /* position relative to parent */ unsigned short borderWidth; - unsigned short deliverableEvents; + unsigned long deliverableEvents; Mask eventMask; PixUnion background; PixUnion border; diff --git a/xorg-server/include/xkb-config.h b/xorg-server/include/xkb-config.h index 8dc80b6c5..91c7957bf 100644 --- a/xorg-server/include/xkb-config.h +++ b/xorg-server/include/xkb-config.h @@ -10,13 +10,13 @@ #define __XKBDEFRULES__ "xorg" /* Path to XKB definitions. */ -#define XKB_BASE_DIRECTORY "/usr/local/share/X11/xkb" +#define XKB_BASE_DIRECTORY "xkbdata" /* Path to xkbcomp. */ -#define XKB_BIN_DIRECTORY "/usr/local/bin" +#define XKB_BIN_DIRECTORY "." /* XKB output dir for compiled keymaps. */ -#define XKM_OUTPUT_DIR "/usr/local/share/X11/xkb/compiled/" +#define XKM_OUTPUT_DIR "xkbdata/compiled/" /* Do not have `strcasecmp'. */ /* #undef NEED_STRCASECMP */ |