From e8d5e7c4bb11f7fcb0a4ba5c13f43e7929849a2f Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 15 Jun 2015 20:27:26 +0200 Subject: fontconfig libX11 libxcb xcb-proto mesa pixman xserver xkeyboard-config git update 15 June 2015 xserver commit fa12f2c150b2f50de9dac4a2b09265f13af353af libxcb commit f85661c3bca97faa72431df92a3867be39a74e23 libxcb/xcb-proto commit fef8a4cdc2cacd9541a656026371a3d338dadb8e xkeyboard-config commit 61fb58a95a071cc1c212f6d3808908c086219fe0 libX11 commit f0286b2770ece10aef5e2e8c004260217f12fd25 pixman commit eebc1b78200aff075dbcae9c8d00edad1f830d91 fontconfig commit f6d61c9beed856a925bd60c025b55284b2d88161 mesa commit 932d1613d1e15ec22555e5ec09105c49eb850e36 --- xorg-server/include/input.h | 15 +++++++++++++++ xorg-server/include/inpututils.h | 2 ++ xorg-server/include/os.h | 17 +++++++++++++++++ 3 files changed, 34 insertions(+) (limited to 'xorg-server/include') diff --git a/xorg-server/include/input.h b/xorg-server/include/input.h index 00a9cbd6d..d8bd9c602 100644 --- a/xorg-server/include/input.h +++ b/xorg-server/include/input.h @@ -673,6 +673,21 @@ extern _X_EXPORT Bool valuator_mask_fetch(const ValuatorMask *mask, extern _X_EXPORT Bool valuator_mask_fetch_double(const ValuatorMask *mask, int valnum, double *val); +extern _X_EXPORT Bool valuator_mask_has_unaccelerated(const ValuatorMask *mask); +extern _X_EXPORT void valuator_mask_set_unaccelerated(ValuatorMask *mask, + int valuator, + double accel, + double unaccel); +extern _X_EXPORT double valuator_mask_get_accelerated(const ValuatorMask *mask, + int valuator); +extern _X_EXPORT double valuator_mask_get_unaccelerated(const ValuatorMask *mask, + int valuator); +extern _X_EXPORT Bool valuator_mask_fetch_unaccelerated(const ValuatorMask *mask, + int valuator, + double *accel, + double *unaccel); +extern _X_HIDDEN void valuator_mask_drop_unaccelerated(ValuatorMask *mask); + /* InputOption handling interface */ extern _X_EXPORT InputOption *input_option_new(InputOption *list, const char *key, diff --git a/xorg-server/include/inpututils.h b/xorg-server/include/inpututils.h index 53c96ba1c..4e9081563 100644 --- a/xorg-server/include/inpututils.h +++ b/xorg-server/include/inpututils.h @@ -36,8 +36,10 @@ extern Mask event_filters[MAXDEVICES][MAXEVENTS]; struct _ValuatorMask { int8_t last_bit; /* highest bit set in mask */ + int8_t has_unaccelerated; uint8_t mask[(MAX_VALUATORS + 7) / 8]; double valuators[MAX_VALUATORS]; /* valuator data */ + double unaccelerated[MAX_VALUATORS]; /* valuator data */ }; extern void verify_internal_event(const InternalEvent *ev); diff --git a/xorg-server/include/os.h b/xorg-server/include/os.h index 6638c8443..b2b96c863 100644 --- a/xorg-server/include/os.h +++ b/xorg-server/include/os.h @@ -430,12 +430,29 @@ AddLocalHosts(void); extern _X_EXPORT void ResetHosts(const char *display); +extern _X_EXPORT void +EnableLocalAccess(void); + +extern _X_EXPORT void +DisableLocalAccess(void); + extern _X_EXPORT void EnableLocalHost(void); extern _X_EXPORT void DisableLocalHost(void); +#ifndef NO_LOCAL_CLIENT_CRED +extern _X_EXPORT void +EnableLocalUser(void); + +extern _X_EXPORT void +DisableLocalUser(void); + +extern _X_EXPORT void +LocalAccessScopeUser(void); +#endif + extern _X_EXPORT void AccessUsingXdmcp(void); -- cgit v1.2.3