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 'master' into mpx

Browse source 
Conflicts:

	dix/devices.c
	hw/xfree86/common/xf86Xinput.c
	hw/xfree86/loader/xf86sym.c
	mi/mieq.c
This commit is contained in:
Peter Hutterer 2007-06-19 17:20:52 +09:30
commit 1f97a76476
129 changed files with 3200 additions and 15260 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -102,6 +102,9 @@
/* Define to 1 if you have the <byteswap.h> header file. */
#undef HAVE_BYTESWAP_H
/* Define to 1 if you have cbrt */
#undef HAVE_CBRT
/* Define to 1 if you have the <dbm.h> header file. */
#undef HAVE_DBM_H

4
include/dixstruct.h
View file

@ -209,10 +209,6 @@ extern int (* ProcVector[256]) (ClientPtr /*client*/);
extern int (* SwappedProcVector[256]) (ClientPtr /*client*/);
#ifdef K5AUTH
extern int (*k5_Vector[256])(ClientPtr /*client*/);
#endif
extern ReplySwapPtr ReplySwapVector[256];
extern int ProcBadRequest(ClientPtr /*client*/);

2
include/misc.h
View file

@ -239,7 +239,7 @@ extern int Ones(
unsigned long /*mask*/);
typedef struct _xPoint *DDXPointPtr;
typedef struct _Box *BoxPtr;
typedef struct pixman_box16 *BoxPtr;
typedef struct _xEvent *xEventPtr;
typedef struct _xRectangle *xRectanglePtr;
typedef struct _GrabRec *GrabPtr;

5
include/miscstruct.h
View file

@ -51,12 +51,11 @@ SOFTWARE.
#include "misc.h"
#include <X11/Xprotostr.h>
#include "gc.h"
#include <pixman/pixman.h>
typedef xPoint DDXPointRec;
typedef struct _Box {
short x1, y1, x2, y2;
} BoxRec;
typedef struct pixman_box16 BoxRec;
typedef union _DevUnion {
pointer ptr;

15
include/regionstr.h
View file

@ -48,7 +48,7 @@ SOFTWARE.
#ifndef REGIONSTRUCT_H
#define REGIONSTRUCT_H
typedef struct _Region RegionRec, *RegionPtr;
typedef struct pixman_region16 RegionRec, *RegionPtr;
#include "miscstruct.h"
@ -64,16 +64,7 @@ typedef struct _Region RegionRec, *RegionPtr;
* clip region
*/
typedef struct _RegData {
long size;
long numRects;
/* BoxRec rects[size]; in memory but not explicitly declared */
} RegDataRec, *RegDataPtr;
struct _Region {
BoxRec extents;
RegDataPtr data;
};
typedef struct pixman_region16_data RegDataRec, *RegDataPtr;
extern BoxRec miEmptyBox;
extern RegDataRec miEmptyData;
@ -234,6 +225,8 @@ extern RegDataRec miBrokenData;
/* moved from mi.h */
extern void InitRegions (void);
extern RegionPtr miRegionCreate(
BoxPtr /*rect*/,
int /*size*/);

10
include/servermd.h
View file

@ -515,7 +515,15 @@ SOFTWARE.
#define GLYPHPADBYTES 4
#define GETLEFTBITS_ALIGNMENT 1
#endif
/* linux on IBM S/390 */
#if defined (linux) && defined (__s390__)
#define IMAGE_BYTE_ORDER MSBFirst
#define BITMAP_BIT_ORDER MSBFirst
#define GLYPHPADBYTES 4
#define GETLEFTBITS_ALIGNMENT 1
#endif /* linux/s390 */
/* size of buffer to use with GetImage, measured in bytes. There's obviously
* a trade-off between the amount of stack (or whatever ALLOCATE_LOCAL gives
* you) used and the number of times the ddx routine has to be called.