diff options
| -rw-r--r-- | src/jstk.c | 2 | ||||
| -rw-r--r-- | src/jstk_axis.c | 4 | ||||
| -rw-r--r-- | src/jstk_key.c | 6 | ||||
| -rw-r--r-- | src/jstk_options.c | 2 |
4 files changed, 9 insertions, 5 deletions
@@ -519,7 +519,7 @@ jstkCorePreInit(InputDriverPtr drv, IDevPtr dev, int flags) local->private = priv; local->type_name = XI_JOYSTICK; local->history_size = 0; - local->always_core_feedback = 0; + local->always_core_feedback = NULL; local->conf_idev = dev; priv->fd = -1; diff --git a/src/jstk_axis.c b/src/jstk_axis.c index 3c49bd3..233b2be 100644 --- a/src/jstk_axis.c +++ b/src/jstk_axis.c @@ -351,9 +351,9 @@ jstkHandleAbsoluteAxis(LocalDevicePtr device, int number) { float rel; int dif; - if (priv->axis[i].value >= priv->axis[i].deadzone) + if (priv->axis[i].value > priv->axis[i].deadzone) rel = (priv->axis[i].value - priv->axis[i].deadzone); - if (priv->axis[i].value <= -priv->axis[i].deadzone) + else rel = (priv->axis[i].value + priv->axis[i].deadzone); rel = (rel) / (2.0f * (float)(32768 - priv->axis[i].deadzone)); diff --git a/src/jstk_key.c b/src/jstk_key.c index 4e9f710..b2c5b5d 100644 --- a/src/jstk_key.c +++ b/src/jstk_key.c @@ -34,9 +34,14 @@ #include <X11/keysym.h> #include <X11/XF86keysym.h> #include <xf86Optrec.h> + #include "jstk.h" #include "jstk_key.h" +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5 +#include <xkbsrv.h> +#endif + #define AltMask Mod1Mask #define NumLockMask Mod2Mask #define AltLangMask Mod3Mask @@ -70,7 +75,6 @@ jstkInitKeys(DeviceIntPtr pJstk, JoystickDevPtr priv) int i, j; XkbSrvInfoPtr xkbi; XkbControlsPtr ctrls; - XkbComponentNamesRec xkbnames; static struct { KeySym keysym; CARD8 mask; } modifiers[] = { { XK_Shift_L, ShiftMask }, diff --git a/src/jstk_options.c b/src/jstk_options.c index 309175e..8c0aba1 100644 --- a/src/jstk_options.c +++ b/src/jstk_options.c @@ -50,7 +50,7 @@ *********************************************************************** */ -int +static int jstkGetKeyNumberInMap(JoystickDevPtr priv, KeySym keysym) { |