diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile.am | 1 | ||||
| -rw-r--r-- | include/dix-config.h.in | 11 | ||||
| -rw-r--r-- | include/dix.h | 3 | ||||
| -rw-r--r-- | include/hotplug.h | 49 | ||||
| -rw-r--r-- | include/inputstr.h | 1 | ||||
| -rw-r--r-- | include/miscstruct.h | 2 | ||||
| -rw-r--r-- | include/os.h | 2 | ||||
| -rw-r--r-- | include/pixmap.h | 1 | ||||
| -rw-r--r-- | include/pixmapstr.h | 1 | ||||
| -rw-r--r-- | include/servermd.h | 2 | ||||
| -rw-r--r-- | include/window.h | 1 | ||||
| -rw-r--r-- | include/windowstr.h | 29 | ||||
| -rw-r--r-- | include/xorg-server.h.in | 3 |
13 files changed, 70 insertions, 36 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index 4289b818d..96d98b526 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -47,6 +47,7 @@ sdk_HEADERS = \ validate.h \ window.h \ windowstr.h \ + xkbsrv.h \ xorg-server.h endif diff --git a/include/dix-config.h.in b/include/dix-config.h.in index 919da6008..69fab5e53 100644 --- a/include/dix-config.h.in +++ b/include/dix-config.h.in @@ -282,6 +282,9 @@ /* Support MIT-SCREEN-SAVER extension */ #undef SCREENSAVER +/* Support Secure RPC ("SUN-DES-1") authentication for X11 clients */ +#undef SECURE_RPC + /* Use a lock to prevent multiple servers on a display */ #undef SERVER_LOCK @@ -465,9 +468,15 @@ /* Define to 1 if modules should avoid the libcwrapper */ #undef NO_LIBCWRAPPER -/* Support D-BUS */ +/* Support D-Bus */ #undef HAVE_DBUS +/* Support the D-Bus hotplug API */ +#undef CONFIG_DBUS_API + +/* Support HAL for hotplug */ +#undef CONFIG_HAL + /* Use only built-in fonts */ #undef BUILTIN_FONTS diff --git a/include/dix.h b/include/dix.h index 2d452d1c7..c1d609a61 100644 --- a/include/dix.h +++ b/include/dix.h @@ -640,7 +640,4 @@ typedef struct { extern int xstrcasecmp(char *s1, char *s2); #endif -/* ffs.c */ -extern int ffs(int i); - #endif /* DIX_H */ diff --git a/include/hotplug.h b/include/hotplug.h index 0c304b15e..b4f1bb60d 100644 --- a/include/hotplug.h +++ b/include/hotplug.h @@ -1,31 +1,32 @@ /* - * Copyright © 2006 Daniel Stone + * Copyright © 2006-2007 Daniel Stone * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of the copyright holders and/or authors - * not be used in advertising or publicity pertaining to distribution of the - * software without specific, written prior permission. The copyright holders - * and/or authors make no representations about the suitability of this - * software for any purpose. It is provided "as is" without express or - * implied warranty. + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: * - * THE COPYRIGHT HOLDERS AND/OR AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD - * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS AND/OR AUTHORS BE LIABLE - * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER - * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF - * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Author: Daniel Stone <daniel@fooishbar.org> */ -#ifndef CONFIG_H -#define CONFIG_H +#ifndef HOTPLUG_H +#define HOTPLUG_H -void configInitialise(void); -void configFini(void); -void configDispatch(void); +void config_init(void); +void config_fini(void); -#endif /* CONFIG_H */ +#endif /* HOTPLUG_H */ diff --git a/include/inputstr.h b/include/inputstr.h index 8f4e9b9d1..3398949d4 100644 --- a/include/inputstr.h +++ b/include/inputstr.h @@ -326,6 +326,7 @@ typedef struct _DeviceIntRec { #else void *pad0; #endif + char *config_info; /* used by the hotplug layer */ DevUnion *devPrivates; int nPrivates; DeviceUnwrapProc unwrapProc; diff --git a/include/miscstruct.h b/include/miscstruct.h index 4f5b1d516..d240f1b28 100644 --- a/include/miscstruct.h +++ b/include/miscstruct.h @@ -51,7 +51,7 @@ SOFTWARE. #include "misc.h" #include <X11/Xprotostr.h> #include "gc.h" -#include <pixman/pixman.h> +#include <pixman.h> typedef xPoint DDXPointRec; diff --git a/include/os.h b/include/os.h index 7399436fb..3d689478e 100644 --- a/include/os.h +++ b/include/os.h @@ -272,7 +272,7 @@ void OsBlockSignals (void); void OsReleaseSignals (void); -#if !defined(WIN32) && !defined(__UNIXOS2__) +#if !defined(WIN32) extern int System(char *); extern pointer Popen(char *, char *); extern int Pclose(pointer); diff --git a/include/pixmap.h b/include/pixmap.h index 19e682a50..5ff0b8c16 100644 --- a/include/pixmap.h +++ b/include/pixmap.h @@ -44,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86$ */ #ifndef PIXMAP_H #define PIXMAP_H diff --git a/include/pixmapstr.h b/include/pixmapstr.h index 93bd45db8..459488226 100644 --- a/include/pixmapstr.h +++ b/include/pixmapstr.h @@ -44,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86$ */ #ifndef PIXMAPSTRUCT_H #define PIXMAPSTRUCT_H diff --git a/include/servermd.h b/include/servermd.h index 4f32a9d2b..74b90b38a 100644 --- a/include/servermd.h +++ b/include/servermd.h @@ -447,8 +447,6 @@ SOFTWARE. #if (defined(SVR4) && defined(i386)) || \ defined(__alpha__) || defined(__alpha) || \ defined(__i386__) || defined(__i386) || \ - defined(__UNIXOS2__) || \ - defined(__OS2ELF__) || \ defined(__QNX__) || \ defined(__s390x__) || defined(__s390__) diff --git a/include/window.h b/include/window.h index cd8c5b283..312b75e88 100644 --- a/include/window.h +++ b/include/window.h @@ -44,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86$ */ #ifndef WINDOW_H #define WINDOW_H diff --git a/include/windowstr.h b/include/windowstr.h index 9fd6d768c..6d874ae9e 100644 --- a/include/windowstr.h +++ b/include/windowstr.h @@ -94,6 +94,33 @@ typedef struct _WindowOpt { #define BackgroundPixel 2L #define BackgroundPixmap 3L +/* + * The redirectDraw field can have one of three values: + * + * RedirectDrawNone + * A normal window; painted into the same pixmap as the parent + * and clipping parent and siblings to its geometry. These + * windows get a clip list equal to the intersection of their + * geometry with the parent geometry, minus the geometry + * of overlapping None and Clipped siblings. + * RedirectDrawAutomatic + * A redirected window which clips parent and sibling drawing. + * Contents for these windows are manage inside the server. + * These windows get an internal clip list equal to their + * geometry. + * RedirectDrawManual + * A redirected window which does not clip parent and sibling + * drawing; the window must be represented within the parent + * geometry by the client performing the redirection management. + * Contents for these windows are managed outside the server. + * These windows get an internal clip list equal to their + * geometry. + */ + +#define RedirectDrawNone 0 +#define RedirectDrawAutomatic 1 +#define RedirectDrawManual 2 + typedef struct _Window { DrawableRec drawable; WindowPtr parent; /* ancestor chain */ @@ -130,7 +157,7 @@ typedef struct _Window { unsigned dontPropagate:3;/* index into DontPropagateMasks */ unsigned forcedBS:1; /* system-supplied backingStore */ #ifdef COMPOSITE - unsigned redirectDraw:1; /* rendering is redirected from here */ + unsigned redirectDraw:2; /* rendering is redirected from here */ #endif DevUnion *devPrivates; } WindowRec; diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in index 7b2a4d193..3c2ff470c 100644 --- a/include/xorg-server.h.in +++ b/include/xorg-server.h.in @@ -233,6 +233,9 @@ /* System is BSD-like */ #undef CSRG_BASED +/* Solaris 8 or later? */ +#undef __SOL8__ + /* System has PC console */ #undef PCCONS_SUPPORT |