diff options
| -rwxr-xr-x | composite.h | 6 | ||||
| -rwxr-xr-x | compositeproto.h | 32 | ||||
| -rw-r--r-- | packaging/xorg-x11-proto-composite.spec | 8 |
3 files changed, 42 insertions, 4 deletions
diff --git a/composite.h b/composite.h index e460118..5dfb96e 100755 --- a/composite.h +++ b/composite.h @@ -63,9 +63,13 @@ #define X_CompositeNameWindowPixmap 6 #define X_CompositeGetOverlayWindow 7 #define X_CompositeReleaseOverlayWindow 8 +#ifdef _F_INPUT_REDIRECTION_ +#define X_CompositeSetCoordinateTransform 9 +#define CompositeNumberRequests (X_CompositeSetCoordinateTransform + 1) +#else //_F_INPUT_REDIRECTION_ #define CompositeNumberRequests (X_CompositeReleaseOverlayWindow + 1) - +#endif //_F_INPUT_REDIRECTION_ #define CompositeNumberEvents 0 #endif /* _COMPOSITE_H_ */ diff --git a/compositeproto.h b/compositeproto.h index 0417f2c..f9ff11b 100755 --- a/compositeproto.h +++ b/compositeproto.h @@ -52,7 +52,7 @@ #define Region CARD32 #define Pixmap CARD32 -/* +/* * requests and replies */ typedef struct { @@ -185,6 +185,36 @@ typedef struct { #define sz_xCompositeReleaseOverlayWindowReq sizeof(xCompositeReleaseOverlayWindowReq) +#ifdef _F_INPUT_REDIRECTION_ +#define Fixed INT32 +/* + * This can't use an array because 32-bit values may be in bitfields + */ +typedef struct { + Fixed matrix11 B32; + Fixed matrix12 B32; + Fixed matrix13 B32; + Fixed matrix21 B32; + Fixed matrix22 B32; + Fixed matrix23 B32; + Fixed matrix31 B32; + Fixed matrix32 B32; + Fixed matrix33 B32; +} xCompTransform; + +#define sz_xCompTransform 36 + +typedef struct { + CARD8 reqType; + CARD8 compositeReqType; + CARD16 length; + Window window B32; + xCompTransform transform; +} xCompositeSetCoordinateTransformReq; + +#define sz_xCompositeSetCoordinateTransformReq 44 +#endif //_F_INPUT_REDIRECTION_ + #undef Window #undef Region #undef Pixmap diff --git a/packaging/xorg-x11-proto-composite.spec b/packaging/xorg-x11-proto-composite.spec index b3e8518..9004bcc 100644 --- a/packaging/xorg-x11-proto-composite.spec +++ b/packaging/xorg-x11-proto-composite.spec @@ -1,6 +1,6 @@ Name: xorg-x11-proto-composite Summary: X.Org X11 Protocol compositeproto -Version: 0.4.2 +Version: 0.4.3 Release: 2 Group: Development/System License: MIT @@ -25,7 +25,11 @@ Description: %{summary} ./autogen.sh %reconfigure --disable-static \ --libdir=%{_datadir} \ - --without-xmlto + --without-xmlto \ + CFLAGS="${CFLAGS} \ + -Wall -g \ + -D_F_INPUT_REDIRECTION_ \ + " # Call make instruction with smp support make %{?jobs:-j%jobs} |