frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Turn boxes and regions into typedefs for pixman types

This commit is contained in:
Soren Sandmann Pedersen 2007-05-12 16:58:54 -04:00
parent 8e56f5be4b
commit e037052ac5
3 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/misc.h
View File

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

5
include/miscstruct.h
View File

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

13
include/regionstr.h
View File

@ -48,7 +48,7 @@ SOFTWARE.
#ifndef REGIONSTRUCT_H #ifndef REGIONSTRUCT_H
#define REGIONSTRUCT_H #define REGIONSTRUCT_H
typedef struct _Region RegionRec, *RegionPtr; typedef struct pixman_region16 RegionRec, *RegionPtr;
#include "miscstruct.h" #include "miscstruct.h"
@ -64,16 +64,7 @@ typedef struct _Region RegionRec, *RegionPtr;
* clip region * clip region
*/ */
typedef struct _RegData { typedef struct pixman_region16_data RegDataRec, *RegDataPtr;
long size;
long numRects;
/* BoxRec rects[size]; in memory but not explicitly declared */
} RegDataRec, *RegDataPtr;
struct _Region {
BoxRec extents;
RegDataPtr data;
};
extern BoxRec miEmptyBox; extern BoxRec miEmptyBox;
extern RegDataRec miEmptyData; extern RegDataRec miEmptyData;