diff options
| author | Chase Douglas <chase.douglas@canonical.com> | 2010-12-17 17:13:27 +0000 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2010-12-31 12:36:43 +0000 |
| commit | 05e437c2ce230b588362f012c06ead5c6d89c006 (patch) | |
| tree | f00cbc4d0f0097fdbad4a5ab6fd7193b6b43f765 | |
| parent | efcb63d0ce43f96d0ac02b6f4a480dfd2374fc84 (diff) | |
Export all valuator_mask_* functions
Input drivers may use valuator masks for internal state. Having all the
valuator_mask_* functions available will help.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Bump ABI_XINPUT_VERSION minor.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | hw/xfree86/common/xf86Module.h | 2 | ||||
| -rw-r--r-- | include/input.h | 8 | ||||
| -rw-r--r-- | include/inpututils.h | 8 |
3 files changed, 8 insertions, 10 deletions
diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h index af7b778da..609819b52 100644 --- a/hw/xfree86/common/xf86Module.h +++ b/hw/xfree86/common/xf86Module.h @@ -83,7 +83,7 @@ typedef enum { */ #define ABI_ANSIC_VERSION SET_ABI_VERSION(0, 4) #define ABI_VIDEODRV_VERSION SET_ABI_VERSION(9, 0) -#define ABI_XINPUT_VERSION SET_ABI_VERSION(12, 0) +#define ABI_XINPUT_VERSION SET_ABI_VERSION(12, 1) #define ABI_EXTENSION_VERSION SET_ABI_VERSION(5, 0) #define ABI_FONT_VERSION SET_ABI_VERSION(0, 6) diff --git a/include/input.h b/include/input.h index 8feac28f5..fef69a1fa 100644 --- a/include/input.h +++ b/include/input.h @@ -554,7 +554,6 @@ extern _X_HIDDEN void valuator_set_mode(DeviceIntPtr dev, int axis, int mode); xfixes/cursor.c uses it to determine if the cursor is enabled */ extern Bool EnableCursor; -/* For server-internal functions, see inpututil.h */ extern _X_EXPORT ValuatorMask *valuator_mask_new(int num_valuators); extern _X_EXPORT void valuator_mask_set_range(ValuatorMask *mask, int first_valuator, int num_valuators, @@ -563,5 +562,12 @@ extern _X_EXPORT void valuator_mask_set(ValuatorMask *mask, int valuator, int data); extern _X_EXPORT void valuator_mask_zero(ValuatorMask *mask); +extern _X_EXPORT int valuator_mask_size(const ValuatorMask *mask); +extern _X_EXPORT int valuator_mask_isset(const ValuatorMask *mask, int bit); +extern _X_EXPORT void valuator_mask_unset(ValuatorMask *mask, int bit); +extern _X_EXPORT int valuator_mask_num_valuators(const ValuatorMask *mask); +extern _X_EXPORT void valuator_mask_copy(ValuatorMask *dest, + const ValuatorMask *src); +extern _X_EXPORT int valuator_mask_get(const ValuatorMask *mask, int valnum); #endif /* INPUT_H */ diff --git a/include/inpututils.h b/include/inpututils.h index 54b5764a4..b8ca6abfc 100644 --- a/include/inpututils.h +++ b/include/inpututils.h @@ -37,12 +37,4 @@ struct _ValuatorMask { int valuators[MAX_VALUATORS]; /* valuator data */ }; -/* server-internal */ -extern _X_HIDDEN int valuator_mask_size(const ValuatorMask *mask); -extern _X_HIDDEN int valuator_mask_isset(const ValuatorMask *mask, int bit); -extern _X_HIDDEN void valuator_mask_unset(ValuatorMask *mask, int bit); -extern _X_HIDDEN int valuator_mask_num_valuators(const ValuatorMask *mask); -extern _X_HIDDEN void valuator_mask_copy(ValuatorMask *dest, const ValuatorMask *src); -extern _X_HIDDEN int valuator_mask_get(const ValuatorMask *mask, int valnum); - #endif |