diff options
| author | marha <marha@users.sourceforge.net> | 2013-02-11 08:04:06 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-02-11 08:04:06 +0100 |
| commit | c4583f59d8460f05ee211c2f8ed6208addfe3087 (patch) | |
| tree | 59420aaa7f249fcf3766adfab41e5285d48048e8 /xorg-server/include/inputstr.h | |
| parent | 71ff3367cab660035c6ea38e5171841dacd461b5 (diff) | |
| parent | 8753441b3ba4316448e1ae5f408e6a84b0116a3c (diff) | |
| download | vcxsrv-c4583f59d8460f05ee211c2f8ed6208addfe3087.tar.gz vcxsrv-c4583f59d8460f05ee211c2f8ed6208addfe3087.tar.bz2 vcxsrv-c4583f59d8460f05ee211c2f8ed6208addfe3087.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa git update 11 Feb 2013
Diffstat (limited to 'xorg-server/include/inputstr.h')
| -rw-r--r-- | xorg-server/include/inputstr.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/xorg-server/include/inputstr.h b/xorg-server/include/inputstr.h index 48a29bede..de96faeda 100644 --- a/xorg-server/include/inputstr.h +++ b/xorg-server/include/inputstr.h @@ -588,8 +588,12 @@ typedef struct _DeviceIntRec { XIPropertyHandlerPtr handlers; /* NULL-terminated */ } properties; - /* coordinate transformation matrix for absolute input devices */ - struct pixman_f_transform transform; + /* coordinate transformation matrix for relative movement. Matrix with + * the translation component dropped */ + struct pixman_f_transform relative_transform; + /* scale matrix for absolute devices, this is the combined matrix of + [1/scale] . [transform] . [scale]. See DeviceSetTransform */ + struct pixman_f_transform scale_and_transform; /* XTest related master device id */ int xtest_master_id; |