diff options
Diffstat (limited to 'xorg-server/include')
| -rw-r--r-- | xorg-server/include/input.h | 3 | ||||
| -rw-r--r-- | xorg-server/include/inputstr.h | 8 | ||||
| -rw-r--r-- | xorg-server/include/list.h | 2 | ||||
| -rw-r--r-- | xorg-server/include/misc.h | 1 | ||||
| -rw-r--r-- | xorg-server/include/protocol-versions.h | 2 |
5 files changed, 12 insertions, 4 deletions
diff --git a/xorg-server/include/input.h b/xorg-server/include/input.h index f53ed9905..5c65597e4 100644 --- a/xorg-server/include/input.h +++ b/xorg-server/include/input.h @@ -62,6 +62,7 @@ SOFTWARE. #define DEVICE_ON 1 #define DEVICE_OFF 2 #define DEVICE_CLOSE 3 +#define DEVICE_ABORT 4 #define POINTER_RELATIVE (1 << 1) #define POINTER_ABSOLUTE (1 << 2) @@ -69,6 +70,7 @@ SOFTWARE. #define POINTER_SCREEN (1 << 4) /* Data in screen coordinates */ #define POINTER_NORAW (1 << 5) /* Don't generate RawEvents */ #define POINTER_EMULATED (1 << 6) /* Event was emulated from another event */ +#define POINTER_DESKTOP (1 << 7) /* Data in desktop coordinates */ /* GetTouchEvent flags */ #define TOUCH_ACCEPT (1 << 0) @@ -268,6 +270,7 @@ extern void DisableAllDevices(void); extern int InitAndStartDevices(void); extern void CloseDownDevices(void); +extern void AbortDevices(void); extern void UndisplayDevices(void); 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; diff --git a/xorg-server/include/list.h b/xorg-server/include/list.h index 61b10bd2a..cb5caf881 100644 --- a/xorg-server/include/list.h +++ b/xorg-server/include/list.h @@ -358,7 +358,7 @@ xorg_list_is_empty(struct xorg_list *head) * struct foo *element = list; * while ((element = nt_list_next(element, next)) { } * - * This macro is not safe for node deletion. Use xorg_list_for_each_entry_safe + * This macro is not safe for node deletion. Use nt_list_for_each_entry_safe * instead. * * @param list The list or current element. diff --git a/xorg-server/include/misc.h b/xorg-server/include/misc.h index 9ed54b1a8..664e02cae 100644 --- a/xorg-server/include/misc.h +++ b/xorg-server/include/misc.h @@ -260,6 +260,7 @@ extern char **xstrtokenize(const char *str, const char *separators); extern void FormatInt64(int64_t num, char *string); extern void FormatUInt64(uint64_t num, char *string); extern void FormatUInt64Hex(uint64_t num, char *string); +extern void FormatDouble(double dbl, char *string); /** * Compare the two version numbers comprising of major.minor. diff --git a/xorg-server/include/protocol-versions.h b/xorg-server/include/protocol-versions.h index 10f5117f2..5ceaeb012 100644 --- a/xorg-server/include/protocol-versions.h +++ b/xorg-server/include/protocol-versions.h @@ -65,7 +65,7 @@ /* RandR */ #define SERVER_RANDR_MAJOR_VERSION 1 -#define SERVER_RANDR_MINOR_VERSION 3 +#define SERVER_RANDR_MINOR_VERSION 4 /* Record */ #define SERVER_RECORD_MAJOR_VERSION 1 |