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>
This commit is contained in:
parent
56d9c736f0
commit
871c1e17e5
|
@ -83,7 +83,7 @@ typedef enum {
|
||||||
*/
|
*/
|
||||||
#define ABI_ANSIC_VERSION SET_ABI_VERSION(0, 4)
|
#define ABI_ANSIC_VERSION SET_ABI_VERSION(0, 4)
|
||||||
#define ABI_VIDEODRV_VERSION SET_ABI_VERSION(9, 0)
|
#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_EXTENSION_VERSION SET_ABI_VERSION(5, 0)
|
||||||
#define ABI_FONT_VERSION SET_ABI_VERSION(0, 6)
|
#define ABI_FONT_VERSION SET_ABI_VERSION(0, 6)
|
||||||
|
|
||||||
|
|
|
@ -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 */
|
xfixes/cursor.c uses it to determine if the cursor is enabled */
|
||||||
extern Bool EnableCursor;
|
extern Bool EnableCursor;
|
||||||
|
|
||||||
/* For server-internal functions, see inpututil.h */
|
|
||||||
extern _X_EXPORT ValuatorMask *valuator_mask_new(int num_valuators);
|
extern _X_EXPORT ValuatorMask *valuator_mask_new(int num_valuators);
|
||||||
extern _X_EXPORT void valuator_mask_set_range(ValuatorMask *mask,
|
extern _X_EXPORT void valuator_mask_set_range(ValuatorMask *mask,
|
||||||
int first_valuator, int num_valuators,
|
int first_valuator, int num_valuators,
|
||||||
|
@ -563,5 +562,12 @@ extern _X_EXPORT void valuator_mask_set(ValuatorMask *mask,
|
||||||
int valuator,
|
int valuator,
|
||||||
int data);
|
int data);
|
||||||
extern _X_EXPORT void valuator_mask_zero(ValuatorMask *mask);
|
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 */
|
#endif /* INPUT_H */
|
||||||
|
|
|
@ -37,12 +37,4 @@ struct _ValuatorMask {
|
||||||
int valuators[MAX_VALUATORS]; /* valuator data */
|
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
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue
Block a user