|
 |
eee5ef9 |
From 7bdea0bb8f38dba2d214482301de981c3260450d Mon Sep 17 00:00:00 2001
|
|
|
eee5ef9 |
From: Adam Tkac <atkac@redhat.com>
|
|
|
eee5ef9 |
Date: Mon, 22 Mar 2010 14:52:29 +0100
|
|
|
eee5ef9 |
Subject: [PATCH] dix: Export AllocDevicePair GetPointerEvents, GetKeyboardEvents and generate_modkeymap functions from Xorg.
|
|
|
eee5ef9 |
|
|
|
eee5ef9 |
Those functions are used by TigerVNC libvnc.so module which doesn't
|
|
|
eee5ef9 |
use standard XInput infrastructure but uses same functions like,
|
|
|
eee5ef9 |
for example, XTest devices.
|
|
|
eee5ef9 |
|
|
|
eee5ef9 |
Signed-off-by: Adam Tkac <atkac@redhat.com>
|
|
|
eee5ef9 |
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
eee5ef9 |
---
|
|
|
eee5ef9 |
include/input.h | 8 ++++----
|
|
|
eee5ef9 |
1 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
eee5ef9 |
|
|
|
eee5ef9 |
diff --git a/include/input.h b/include/input.h
|
|
|
eee5ef9 |
index 8561308..63f981e 100644
|
|
|
eee5ef9 |
--- a/include/input.h
|
|
|
eee5ef9 |
+++ b/include/input.h
|
|
|
eee5ef9 |
@@ -432,7 +432,7 @@ extern void CreateClassesChangedEvent(EventListPtr event,
|
|
|
eee5ef9 |
DeviceIntPtr master,
|
|
|
eee5ef9 |
DeviceIntPtr slave,
|
|
|
eee5ef9 |
int type);
|
|
|
eee5ef9 |
-extern int GetPointerEvents(
|
|
|
eee5ef9 |
+extern _X_EXPORT int GetPointerEvents(
|
|
|
eee5ef9 |
EventListPtr events,
|
|
|
eee5ef9 |
DeviceIntPtr pDev,
|
|
|
eee5ef9 |
int type,
|
|
|
eee5ef9 |
@@ -442,7 +442,7 @@ extern int GetPointerEvents(
|
|
|
eee5ef9 |
int num_valuators,
|
|
|
eee5ef9 |
int *valuators);
|
|
|
eee5ef9 |
|
|
|
eee5ef9 |
-extern int GetKeyboardEvents(
|
|
|
eee5ef9 |
+extern _X_EXPORT int GetKeyboardEvents(
|
|
|
eee5ef9 |
EventListPtr events,
|
|
|
eee5ef9 |
DeviceIntPtr pDev,
|
|
|
eee5ef9 |
int type,
|
|
|
eee5ef9 |
@@ -493,7 +493,7 @@ extern int AttachDevice(ClientPtr client,
|
|
|
eee5ef9 |
extern _X_EXPORT DeviceIntPtr GetPairedDevice(DeviceIntPtr kbd);
|
|
|
eee5ef9 |
extern DeviceIntPtr GetMaster(DeviceIntPtr dev, int type);
|
|
|
eee5ef9 |
|
|
|
eee5ef9 |
-extern int AllocDevicePair(ClientPtr client,
|
|
|
eee5ef9 |
+extern _X_EXPORT int AllocDevicePair(ClientPtr client,
|
|
|
eee5ef9 |
char* name,
|
|
|
eee5ef9 |
DeviceIntPtr* ptr,
|
|
|
eee5ef9 |
DeviceIntPtr* keybd,
|
|
|
eee5ef9 |
@@ -505,7 +505,7 @@ extern void DeepCopyDeviceClasses(DeviceIntPtr from,
|
|
|
eee5ef9 |
DeviceChangedEvent *dce);
|
|
|
eee5ef9 |
|
|
|
eee5ef9 |
/* Helper functions. */
|
|
|
eee5ef9 |
-extern int generate_modkeymap(ClientPtr client, DeviceIntPtr dev,
|
|
|
eee5ef9 |
+extern _X_EXPORT int generate_modkeymap(ClientPtr client, DeviceIntPtr dev,
|
|
|
eee5ef9 |
KeyCode **modkeymap, int *max_keys_per_mod);
|
|
|
eee5ef9 |
extern int change_modmap(ClientPtr client, DeviceIntPtr dev, KeyCode *map,
|
|
|
eee5ef9 |
int max_keys_per_mod);
|
|
|
eee5ef9 |
--
|
|
|
eee5ef9 |
1.6.6.1
|
|
|
eee5ef9 |
|