hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-09-22 20:35:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'mpx' into mdsd

Browse source 
Conflicts:

	Xi/opendev.c
This commit is contained in:
Peter Hutterer 2007-11-08 09:34:35 +10:30
commit 184a7b8917
626 changed files with 18280 additions and 195262 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/bstorestr.h
View file

@ -45,13 +45,11 @@ typedef PixmapPtr (* BackingStoreGetImagePixmapProcPtr)(void);
typedef PixmapPtr (* BackingStoreGetSpansPixmapProcPtr)(void);
typedef struct _BSFuncs {
BackingStoreSaveAreasProcPtr SaveAreas;
BackingStoreRestoreAreasProcPtr RestoreAreas;
BackingStoreSetClipmaskRgnProcPtr SetClipmaskRgn;
BackingStoreGetImagePixmapProcPtr GetImagePixmap;
BackingStoreGetSpansPixmapProcPtr GetSpansPixmap;
} BSFuncRec, *BSFuncPtr;
#endif /* _BSTORESTR_H_ */

20
include/dix-config.h.in
View file

@ -136,6 +136,9 @@
/* Define to 1 if you have the `getuid' function. */
#undef HAVE_GETUID
/* Define to 1 if you have the `getzoneid' function. */
#undef HAVE_GETZONEID
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
@ -181,6 +184,9 @@
/* 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. */
#undef HAVE_STDINT_H
@ -282,6 +288,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
@ -317,12 +326,6 @@
/* Support UNIX socket connections */
#undef UNIXCONN
/* Use builtin rgb color database */
#undef USE_RGB_BUILTIN
/* Use rgb.txt directly */
#undef USE_RGB_TXT
/* Define to use byteswap macros from <sys/endian.h> */
#undef USE_SYS_ENDIAN_H
@ -419,6 +422,8 @@
/* Support DRI extension */
#undef XF86DRI
#undef XEPHYR_DRI
/* Build DBE support */
#undef DBE
@ -453,9 +458,6 @@
/* Define to 1 if unsigned long is 64 bits. */
#undef _XSERVER64
/* Define to location of RGB database */
#undef RGB_DB
/* System is BSD-like */
#undef CSRG_BASED

4
include/dix.h
View file

@ -435,6 +435,10 @@ extern void InitializeSprite(
DeviceIntPtr /* pDev */,
WindowPtr /* pWin */);
extern void UpdateSpriteForScreen(
DeviceIntPtr /* pDev */,
ScreenPtr /* pScreen */);
extern void WindowHasNewCursor(
WindowPtr /* pWin */);

6
include/dixstruct.h
View file

@ -152,11 +152,9 @@ extern long SmartScheduleTime;
extern long SmartScheduleInterval;
extern long SmartScheduleSlice;
extern long SmartScheduleMaxSlice;
extern unsigned long SmartScheduleIdleCount;
extern Bool SmartScheduleDisable;
extern Bool SmartScheduleIdle;
extern Bool SmartScheduleTimerStopped;
extern Bool SmartScheduleStartTimer(void);
extern void SmartScheduleStartTimer(void);
extern void SmartScheduleStopTimer(void);
#define SMART_MAX_PRIORITY (20)
#define SMART_MIN_PRIORITY (-20)

3
include/exevents.h
View file

@ -30,6 +30,8 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef EXEVENTS_H
#define EXEVENTS_H
#include <X11/extensions/XIproto.h>
extern void RegisterOtherDevice (
DeviceIntPtr /* device */);
@ -129,6 +131,7 @@ extern int SetModifierMapping(
KeyClassPtr * /* k */);
extern void SendDeviceMappingNotify(
ClientPtr /* client, */,
CARD8 /* request, */,
KeyCode /* firstKeyCode */,
CARD8 /* count */,

1
include/globals.h
View file

@ -16,7 +16,6 @@ extern Bool screenSaverSuspended;
#endif
extern char *defaultFontPath;
extern char *rgbPath;
extern int monitorResolution;
extern Bool loadableFonts;
extern int defaultColorVisualClass;

1
include/inputstr.h
View file

@ -139,6 +139,7 @@ typedef struct _GrabRec {
typedef struct _KeyClassRec {
CARD8 down[DOWN_LENGTH];
CARD8 postdown[DOWN_LENGTH];
KeyCode *modifierKeyMap;
KeySymsRec curKeySyms;
int modifierKeyCount[8];

25
include/os.h
View file

@ -50,9 +50,6 @@ SOFTWARE.
#define OS_H
#include "misc.h"
#define ALLOCATE_LOCAL_FALLBACK(_size) Xalloc((unsigned long)(_size))
#define DEALLOCATE_LOCAL_FALLBACK(_ptr) Xfree((pointer)(_ptr))
#include <X11/Xalloca.h>
#include <stdarg.h>
#define NullFID ((FID) 0)
@ -124,6 +121,8 @@ extern void ResetOsBuffers(void);
extern void InitConnectionLimits(void);
extern void NotifyParentProcess(void);
extern void CreateWellKnownSockets(void);
extern void ResetWellKnownSockets(void);
@ -323,6 +322,24 @@ extern int LocalClient(ClientPtr /* client */);
extern int LocalClientCred(ClientPtr, int *, int *);
#define LCC_UID_SET (1 << 0)
#define LCC_GID_SET (1 << 1)
#define LCC_PID_SET (1 << 2)
#define LCC_ZID_SET (1 << 3)
typedef struct {
int fieldsSet; /* Bit mask of fields set */
int euid; /* Effective uid */
int egid; /* Primary effective group id */
int nSuppGids; /* Number of supplementary group ids */
int *pSuppGids; /* Array of supplementary group ids */
int pid; /* Process id */
int zoneid; /* Only set on Solaris 10 & later */
} LocalClientCredRec;
extern int GetLocalClientCreds(ClientPtr, LocalClientCredRec **);
extern void FreeLocalClientCreds(LocalClientCredRec *);
extern int ChangeAccessControl(ClientPtr /*client*/, int /*fEnabled*/);
extern int GetAccessControl(void);
@ -499,7 +516,7 @@ __attribute((noreturn))
#ifdef DEBUG
#define DebugF ErrorF
#else
#define DebugF(x, ...) /* */
#define DebugF(...) /* */
#endif
extern void VErrorF(const char *f, va_list args);

14
include/scrnintstr.h
View file

@ -198,11 +198,19 @@ typedef void (* ClipNotifyProcPtr)(
int /*dx*/,
int /*dy*/);
/* pixmap will exist only for the duration of the current rendering operation */
#define CREATE_PIXMAP_USAGE_SCRATCH 1
/* pixmap will be the backing pixmap for a redirected window */
#define CREATE_PIXMAP_USAGE_BACKING_PIXMAP 2
/* pixmap will contain a glyph */
#define CREATE_PIMXAP_USAGE_GLYPH_PICTURE 3
typedef PixmapPtr (* CreatePixmapProcPtr)(
ScreenPtr /*pScreen*/,
int /*width*/,
int /*height*/,
int /*depth*/);
int /*depth*/,
unsigned /*usage_hint*/);
typedef Bool (* DestroyPixmapProcPtr)(
PixmapPtr /*pPixmap*/);
@ -497,8 +505,8 @@ typedef struct _Screen {
ValidateTreeProcPtr ValidateTree;
PostValidateTreeProcPtr PostValidateTree;
WindowExposuresProcPtr WindowExposures;
PaintWindowBackgroundProcPtr PaintWindowBackground;
PaintWindowBorderProcPtr PaintWindowBorder;
PaintWindowBackgroundProcPtr PaintWindowBackground; /** unused */
PaintWindowBorderProcPtr PaintWindowBorder; /** unused */
CopyWindowProcPtr CopyWindow;
ClearToBackgroundProcPtr ClearToBackground;
ClipNotifyProcPtr ClipNotify;

9
include/servermd.h
View file

@ -260,7 +260,7 @@ SOFTWARE.
#if defined(ibm032) || defined (ibm)
#ifdef i386
#ifdef __i386__
# define IMAGE_BYTE_ORDER LSBFirst /* Value for PS/2 only */
#else
# define IMAGE_BYTE_ORDER MSBFirst /* Values for the RT only*/
@ -270,7 +270,7 @@ SOFTWARE.
#define GETLEFTBITS_ALIGNMENT 4
/* ibm pcc doesn't understand pragmas. */
#ifdef i386
#ifdef __i386__
#define BITMAP_SCANLINE_UNIT 8
#endif
@ -444,10 +444,9 @@ SOFTWARE.
#endif /* luna */
#if (defined(SVR4) && defined(i386)) || \
#if (defined(SVR4) && defined(__i386__)) || \
defined(__alpha__) || defined(__alpha) || \
defined(__i386__) || defined(__i386) || \
defined(__QNX__) || \
defined(__i386__) || defined(__QNX__) || \
defined(__s390x__) || defined(__s390__)
#ifndef IMAGE_BYTE_ORDER

3
include/site.h
View file

@ -75,9 +75,6 @@ SOFTWARE.
#ifndef COMPILEDDEFAULTFONTPATH
#define COMPILEDDEFAULTFONTPATH "/usr/lib/X11/fonts/misc/"
#endif
#ifndef RGB_DB
#define RGB_DB "/usr/lib/X11/rgb"
#endif
/*
* The following constants contain default values for all of the variables

3
include/xkbsrv.h
View file

@ -268,8 +268,11 @@ typedef struct
device->public.realInputProc = oldprocs->realInputProc; \
device->unwrapProc = oldprocs->unwrapProc;
extern int xkbDevicePrivateIndex;
#define XKBDEVICEINFO(dev) ((xkbDeviceInfoPtr) (dev)->devPrivates[xkbDevicePrivateIndex].ptr)
extern void xkbUnwrapProc(DeviceIntPtr, DeviceHandleProc, pointer);
/***====================================================================***/

3
include/xorg-config.h.in
View file

@ -115,4 +115,7 @@
/* Have execinfo.h */
#undef HAVE_EXECINFO_H
/* Path to text files containing PCI IDs */
#undef PCI_TXT_IDS_PATH
#endif /* _XORG_CONFIG_H_ */

9
include/xorg-server.h.in
View file

@ -109,12 +109,6 @@
/* Support UNIX socket connections */
#undef UNIXCONN
/* Use builtin rgb color database */
#undef USE_RGB_BUILTIN
/* Use rgb.txt directly */
#undef USE_RGB_TXT
/* unaligned word accesses behave as expected */
#undef WORKING_UNALIGNED_INT
@ -251,4 +245,7 @@
/* Loadable XFree86 server awesomeness */
#undef XFree86LOADER
/* Use libpciaccess */
#undef XSERVER_LIBPCIACCESS
#endif /* _XORG_SERVER_H_ */