XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

input: Add labels to buttons and valuators - ABI_XINPUT_VERSION 7

Browse Source 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer
2009-06-16 16:38:11 +10:00
parent 17f9723f48
commit a30fef9956
14 changed files with 201 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/exevents.h
View File

@@ -73,6 +73,7 @@ extern _X_EXPORT int InitProximityClassDeviceStruct(
extern _X_EXPORT void InitValuatorAxisStruct(
DeviceIntPtr /* dev */,
int /* axnum */,
Atom /* label */,
int /* minval */,
int /* maxval */,
int /* resolution */,

6
include/input.h
View File

@@ -274,11 +274,13 @@ extern _X_EXPORT Bool SetKeySymsMap(
extern _X_EXPORT Bool InitButtonClassDeviceStruct(
DeviceIntPtr /*device*/,
int /*numButtons*/,
Atom* /* labels */,
CARD8* /*map*/);
extern _X_EXPORT Bool InitValuatorClassDeviceStruct(
DeviceIntPtr /*device*/,
int /*numAxes*/,
Atom* /* labels */,
int /*numMotionEvents*/,
int /*mode*/);
@@ -351,9 +353,11 @@ extern _X_EXPORT Bool InitPointerDeviceStruct(
DevicePtr /*device*/,
CARD8* /*map*/,
int /*numButtons*/,
Atom* /* btn_labels */,
PtrCtrlProcPtr /*controlProc*/,
int /*numMotionEvents*/,
int /*numAxes*/);
int /*numAxes*/,
Atom* /* axes_labels */);
extern _X_EXPORT Bool InitKeyboardDeviceStruct(
DeviceIntPtr /*device*/,

2
include/inputstr.h
View File

@@ -215,6 +215,7 @@ typedef struct _AxisInfo {
int max_resolution;
int min_value;
int max_value;
Atom label;
} AxisInfo, *AxisInfoPtr;
typedef struct _ValuatorAccelerationRec {
@@ -254,6 +255,7 @@ typedef struct _ButtonClassRec {
CARD8 postdown[DOWN_LENGTH];
CARD8 map[MAP_LENGTH];
union _XkbAction *xkb_acts;
Atom labels[MAX_BUTTONS];
} ButtonClassRec, *ButtonClassPtr;
typedef struct _FocusClassRec {