diff options
| author | Matthieu Herrb <matthieu.herrb@laas.fr> | 2012-12-16 18:33:35 +0100 |
|---|---|---|
| committer | Matthieu Herrb <matthieu.herrb@laas.fr> | 2012-12-16 18:33:35 +0100 |
| commit | b2e9e29b589a8bc859e672ad9d8117c96fbfa44e (patch) | |
| tree | 24adced79716e90bf00b0de3f1335eef189295f8 /xserver/include | |
| parent | a1e41c27a1152a638a43091b4f722ad8ea84fcef (diff) | |
update to xserver 1.13.1
Diffstat (limited to 'xserver/include')
| -rw-r--r-- | xserver/include/Makefile.in | 2 | ||||
| -rw-r--r-- | xserver/include/input.h | 1 | ||||
| -rw-r--r-- | xserver/include/xkbsrv.h | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/xserver/include/Makefile.in b/xserver/include/Makefile.in index d6a95f7be..0824e6375 100644 --- a/xserver/include/Makefile.in +++ b/xserver/include/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.12.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. diff --git a/xserver/include/input.h b/xserver/include/input.h index 5747f3cd2..f8459b8c8 100644 --- a/xserver/include/input.h +++ b/xserver/include/input.h @@ -579,6 +579,7 @@ extern int TouchListenerAcceptReject(DeviceIntPtr dev, TouchPointInfoPtr ti, int listener, int mode); extern int TouchAcceptReject(ClientPtr client, DeviceIntPtr dev, int mode, uint32_t touchid, Window grab_window, XID *error); +extern void TouchEndPhysicallyActiveTouches(DeviceIntPtr dev); /* misc event helpers */ extern Mask GetEventMask(DeviceIntPtr dev, xEvent *ev, InputClientsPtr clients); diff --git a/xserver/include/xkbsrv.h b/xserver/include/xkbsrv.h index d58478543..78b8f5abe 100644 --- a/xserver/include/xkbsrv.h +++ b/xserver/include/xkbsrv.h @@ -171,6 +171,7 @@ typedef struct _XkbSrvInfo { KeyCode mouseKey; KeyCode inactiveKey; KeyCode slowKey; + KeyCode slowKeyEnableKey; KeyCode repeatKey; CARD8 krgTimerActive; CARD8 beepType; |