summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2010-07-01 23:46:53 -0400
committerKeith Packard <keithp@keithp.com>2010-07-01 23:46:53 -0400
commit69b2b5c85ec079ef49f84722daa5f148cedc2e1b (patch)
tree765156d03f4b5a47f77fb7bfe77ac319aabd3229 /include
parentb90faa71567c4461b28515756ba5c1e6286dda16 (diff)
parent14327858391ebe929b806efb53ad79e789361883 (diff)
Merge remote branch 'whot/for-keith'
Diffstat (limited to 'include')
-rw-r--r--include/xkbsrv.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 5847e6395..9f1507e8e 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -924,6 +924,15 @@ extern int XkbGetEffectiveGroup(
XkbStatePtr /* xkbstate */,
CARD8 /* keycode */);
+extern void XkbMergeLockedPtrBtns(
+ DeviceIntPtr /* master */);
+
+extern void XkbFakeDeviceButton(
+ DeviceIntPtr /* dev */,
+ int /* press */,
+ int /* button */);
+
+
#include "xkbfile.h"
#include "xkbrules.h"