From: Chase Douglas <chase.doug...@ubuntu.com> Input drivers may use valuator masks for internal state. Having all the valuator_mask_* functions available will help.
Signed-off-by: Chase Douglas <chase.doug...@canonical.com> --- include/input.h | 8 +++++++- include/inpututils.h | 8 -------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/include/input.h b/include/input.h index 8feac28..fef69a1 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 54b5764..b8ca6ab 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 -- 1.7.1 _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel