xserver-xorg-input-joystick: Changes to 'upstream-unstable'
configure.ac | 2 -
man/Makefile.am | 1
man/joystick.man | 66 +++++++++++++++++++++++++++++++------------------
src/StrKeysym.h | 22 ++++++++++++++++
src/backend_bsd.c | 2 -
src/backend_bsd.h | 2 -
src/backend_evdev.c | 8 ++---
src/backend_evdev.h | 2 -
src/backend_joystick.c | 2 -
src/backend_joystick.h | 2 -
src/jstk.c | 11 +++++---
src/jstk.h | 4 +-
src/jstk_axis.c | 2 -
src/jstk_axis.h | 2 -
src/jstk_key.c | 11 +++++---
src/jstk_key.h | 2 -
src/jstk_options.c | 9 ++++--
src/jstk_options.h | 2 -
18 files changed, 102 insertions(+), 50 deletions(-)
New commits:
commit 0961ffa84825f3f32d9c973f054400ab9d2b7c08
Author: Sascha Hlusiak <saschahlusiak@arcor.de>
Date: Sun Apr 27 19:16:29 2008 +0200
Bumped to version 1.3.2
diff --git a/configure.ac b/configure.ac
index a4b9e4a..ba7fa58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-joystick],
- 1.3.1,
+ 1.3.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-joystick)
commit c3e3fb8795c19a292ca37ab4d67b308fbb20911b
Author: Sascha Hlusiak <saschahlusiak@arcor.de>
Date: Wed Apr 9 15:09:46 2008 +0200
Display evdev bus/vendor/product/version in separate line
diff --git a/src/backend_evdev.c b/src/backend_evdev.c
index 5f34394..231bc2d 100644
--- a/src/backend_evdev.c
+++ b/src/backend_evdev.c
@@ -176,9 +176,9 @@ jstkOpenDevice_evdev(JoystickDevPtr joystick)
if (ioctl(joystick->fd, EVIOCGUNIQ(sizeof(uniq)), uniq) == -1)
strcpy(uniq, "No name");
- xf86Msg(X_INFO, "Joystick: %s. %d axes, %d buttons.\n", name, axes, buttons);
- xf86Msg(X_INFO, "Joystick: bus 0x%x vendor 0x%x product 0x%x version 0x%x\n",
- id.bustype, id.vendor, id.product, id.version);
+ xf86Msg(X_INFO, "Joystick: %s. bus 0x%x vendor 0x%x product 0x%x version 0x%x\n",
+ name, id.bustype, id.vendor, id.product, id.version);
+ xf86Msg(X_INFO, "Joystick: found %d axes, %d buttons\n", axes, buttons);
joystick->read_proc = jstkReadData_evdev;
joystick->close_proc = jstkCloseDevice_evdev;
commit edcc8c26dfa3f89672a66c47665d89c7c9200b13
Author: Sascha Hlusiak <saschahlusiak@arcor.de>
Date: Sun Mar 30 13:21:22 2008 +0200
Fixed keymap size to 8-256 to prevent crash
Newer xservers don't like keymaps that are smaller than 248 keys.
diff --git a/src/jstk.h b/src/jstk.h
index e6c22c0..c2cef9d 100644
--- a/src/jstk.h
+++ b/src/jstk.h
@@ -127,7 +127,7 @@ typedef struct _JoystickDevRec {
} buttonmap;
struct _KEYMAP {
int size;
- KeySym map[MAP_LENGTH];
+ KeySym map[256-MIN_KEYCODE];
} keymap;
AXIS axis[MAXAXES]; /* Configuration per axis */
diff --git a/src/jstk_key.c b/src/jstk_key.c
index 42492c4..a9a6e0d 100644
--- a/src/jstk_key.c
+++ b/src/jstk_key.c
@@ -70,8 +70,12 @@ jstkInitKeys(DeviceIntPtr pJstk, JoystickDevPtr priv)
DBG(1, xf86Msg(X_CONFIG, "Initializing Keyboard with %d keys\n",
priv->keymap.size));
+ for (i = 0; i < priv->keymap.size; i++)
+ {
+ DBG(6, xf86Msg(X_CONFIG, "Keymap [%d]: 0x%08X\n", MIN_KEYCODE+i,priv->keymap.map[i]));
+ }
- memset(modMap, 0, sizeof modMap);
+ memset(modMap, 0, sizeof(modMap));
for (i = 0; i < priv->keymap.size; i++) {
sym = priv->keymap.map[i];
@@ -84,7 +88,8 @@ jstkInitKeys(DeviceIntPtr pJstk, JoystickDevPtr priv)
keySyms.map = priv->keymap.map;
keySyms.mapWidth = 1;
keySyms.minKeyCode = MIN_KEYCODE;
- keySyms.maxKeyCode = MIN_KEYCODE + priv->keymap.size - 1;
+/* keySyms.maxKeyCode = MIN_KEYCODE + priv->keymap.size - 1; */
+ keySyms.maxKeyCode = MIN_KEYCODE + sizeof(priv->keymap.map)/sizeof(priv->keymap.map[0]) - 1;
for (i = 0; i < priv->keymap.size; i++) {
sym = priv->keymap.map[i];
diff --git a/src/jstk_options.c b/src/jstk_options.c
index 24912b5..510c160 100644
--- a/src/jstk_options.c
+++ b/src/jstk_options.c
@@ -83,7 +83,7 @@ jstkGetKeyNumberInMap(JoystickDevPtr priv,
for (j=0; j<priv->keymap.size; j++)
if (priv->keymap.map[j] == keysym)
break;
- if (j > MAP_LENGTH+1) return 0;
+ if (j >= sizeof(priv->keymap.map)/sizeof(priv->keymap.map[0])) return 0;
priv->keymap.map[j] = keysym;
if (j + 1 > priv->keymap.size) priv->keymap.size = j + 1;
return j;
commit fac2c42a01cf030a05d2305a01700f3677f6a8dc
Author: Sascha Hlusiak <saschahlusiak@arcor.de>
Date: Sun Mar 30 13:05:35 2008 +0200
Clear complete keymap instead of only the first element
diff --git a/src/jstk.c b/src/jstk.c
index 73d41b4..a77f0ae 100644
--- a/src/jstk.c
+++ b/src/jstk.c
@@ -481,7 +481,7 @@ jstkCorePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
priv->amplify = 1.0f;
priv->buttonmap.size = 0;
priv->keymap.size = 1;
- priv->keymap.map[0] = NoSymbol;
+ memset(priv->keymap.map, NoSymbol, sizeof(priv->keymap.map));
priv->repeat_delay = 0;
priv->repeat_interval = 0;
commit a44e15ad7576b77b48ecb13aae1faeb2ec25d922
Author: Sascha Hlusiak <saschahlusiak@arcor.de>
Date: Sun Mar 30 13:03:57 2008 +0200
Fixed off-by-one in keymap generation code
diff --git a/src/jstk_options.c b/src/jstk_options.c
index bf69c63..24912b5 100644
--- a/src/jstk_options.c
+++ b/src/jstk_options.c
@@ -80,7 +80,7 @@ jstkGetKeyNumberInMap(JoystickDevPtr priv,
KeySym keysym)
{
int j;
- for (j=0; j<=priv->keymap.size; j++)
+ for (j=0; j<priv->keymap.size; j++)
if (priv->keymap.map[j] == keysym)
break;
if (j > MAP_LENGTH+1) return 0;
commit 2aeaf7b7f3a5117db5cde9f704a2c612fbab75c8
Author: Sascha Hlusiak <saschahlusiak@arcor.de>
Date: Sun Mar 30 12:44:39 2008 +0200
Allow '+' as separator for key mapping as in "key=Alt_L+Tab"
diff --git a/src/jstk_options.c b/src/jstk_options.c
index 04d0e5d..bf69c63 100644
--- a/src/jstk_options.c
+++ b/src/jstk_options.c
@@ -178,6 +178,7 @@ jstkParseButtonOption(const char* org,
for (value = 0; value < MAXKEYSPERBUTTON; value++) if (current != NULL) {
unsigned key;
next = strchr(current, ',');
+ if (!next) next = strchr(current, '+');
if (next) *(next++) = '\0';
#ifdef _STRKEYSYM_H_INCLUDED_
key = XStringToKeysym(current);
@@ -284,6 +285,7 @@ jstkParseAxisOption(const char* org,
for (value = 0; value < MAXKEYSPERBUTTON; value++)
if (current != NULL) {
next = strchr(current, ',');
+ if (!next) next = strchr(current, '+');
if (next) *(next++) = '\0';
#ifdef _STRKEYSYM_H_INCLUDED_
@@ -313,6 +315,7 @@ jstkParseAxisOption(const char* org,
for (value = 0; value < MAXKEYSPERBUTTON; value++)
if (current != NULL) {
next = strchr(current, ',');
+ if (!next) next = strchr(current, '+');
if (next) *(next++) = '\0';
key = strtol(current, NULL, 0);
#ifdef _STRKEYSYM_H_INCLUDED_
commit ce01777488a0f1f9ba2d22d7315aebd431e9cb65
Author: Matthieu Herrb <matthieu@bluenote.herrb.net>
Date: Sat Mar 8 23:02:08 2008 +0100
Makefile.am: nuke RCS Id
diff --git a/man/Makefile.am b/man/Makefile.am
index bf7ec17..f0eb29b 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,4 +1,3 @@
-# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
commit 94cc174cd80952418614dc9b2fbc95ad21b8598c
Author: Sascha Hlusiak <saschahlusiak@arcor.de>
Date: Sun Jan 6 18:58:47 2008 +0100
Added "StartMouseEnabled" and "StartKeysEnabled" options
With the disable-mouse and disable-keys button mapping the event generation can be toggled.
These two options will start X with the event generation already disabled, so it can be
enabled later with the appropriate button mapping. Default: Event generation is enabled.
diff --git a/man/joystick.man b/man/joystick.man
index 5578caf..9735fa8 100644
--- a/man/joystick.man
+++ b/man/joystick.man
@@ -52,11 +52,6 @@ For Linux, joysticks are mostly accessible as
In *BSD, joysticks are usually recognized as
.IR /dev/uhidX .
.TP 7
-.BI "Option \*qDebugLevel\*q \*q" integer \*q
-If compiled with debugging information, controls the verbosity of the driver.
-The higher the DebugLevel, the more output is produced.
-Default: 0
-.TP 7
.BI "Option \*qAutoRepeat\*q \*q" "delay rate" \*q
Sets the auto repeat behaviour for key events.
.I delay
@@ -64,6 +59,11 @@ is the time in milliseconds before a key starts repeating.
.I rate
is the number of times a key repeats per second. Default: Xorg default
.TP 7
+.BI "Option \*qDebugLevel\*q \*q" integer \*q
+If compiled with debugging information, controls the verbosity of the driver.
+The higher the DebugLevel, the more output is produced.
+Default: 0
+.TP 7
.BI "Option \*qMapButton<number>\*q \*q" string \*q
Sets the mapping of the joystick button to the desired action. Counting of buttons starts with
.IR 1 ,
@@ -107,7 +107,6 @@ See special section about key events below.
Disables either the generation of mouse events, key events or the generation of
all X events by the driver. Press button again to allow the driver to generate
events again.
-
.RE
.PP
.TP 7
@@ -175,23 +174,44 @@ This can be between
.IR "0" " and " "30000" .
Default: 5000
.RE
-
.PP
-The default configuration looks like follows:
+.TP 7
+.BI "Option \*qStartKeysEnabled\*q \*q" "boolean" \*q
+Set to
+.I False
+to disable key event generation after startup. You can toggle key event generation with the
+.I disable-keys
+button mapping. Default: enabled
+.TP 7
+.BI "Option \*qStartMouseEnabled\*q \*q" "boolean" \*q
+Set to
+.I False
+to disable mouse event generation after startup. You can toggle mouse event generation with the
+.I disable-mouse
+button mapping. Default: enabled
+.RE
+.PP
+
+
+.SH "DEFAULT CONFIGURATION"
+The default configuration is as follows:
.nf
-.BI " Option \*qMapButton1\*q \*q" button=1 \*q
-.BI " Option \*qMapButton2\*q \*q" button=2 \*q
-.BI " Option \*qMapButton3\*q \*q" button=3 \*q
-.BI " Option \*qMapButton4\*q \*q" none \*q
+.BI " Option \*qDebugLevel\*q \*q" 0 \*q
+.BI " Option \*qStartKeysEnabled\*q \*q" True \*q
+.BI " Option \*qStartMouseEnabled\*q \*q" True \*q
+.BI " Option \*qMapButton1\*q \*q" button=1 \*q
+.BI " Option \*qMapButton2\*q \*q" button=2 \*q
+.BI " Option \*qMapButton3\*q \*q" button=3 \*q
+.BI " Option \*qMapButton4\*q \*q" none \*q
\ \ ...
-.BI " Option \*qMapAxis1\*q \*q" "mode=relative axis=+1x deadzone=5000" \*q
-.BI " Option \*qMapAxis2\*q \*q" "mode=relative axis=+1y deadzone=5000" \*q
-.BI " Option \*qMapAxis3\*q \*q" "mode=relative axis=+1zx deadzone=5000" \*q
-.BI " Option \*qMapAxis4\*q \*q" "mode=relative axis=+1zy deadzone=5000" \*q
-.BI " Option \*qMapAxis5\*q \*q" "mode=accelerated axis=+1x deadzone=5000" \*q
-.BI " Option \*qMapAxis6\*q \*q" "mode=accelerated axis=+1y deadzone=5000" \*q
-.BI " Option \*qMapAxis7\*q \*q" "mode=none" \*q
+.BI " Option \*qMapAxis1\*q \*q" "mode=relative axis=+1x deadzone=5000" \*q
+.BI " Option \*qMapAxis2\*q \*q" "mode=relative axis=+1y deadzone=5000" \*q
+.BI " Option \*qMapAxis3\*q \*q" "mode=relative axis=+1zx deadzone=5000" \*q
+.BI " Option \*qMapAxis4\*q \*q" "mode=relative axis=+1zy deadzone=5000" \*q
+.BI " Option \*qMapAxis5\*q \*q" "mode=accelerated axis=+1x deadzone=5000" \*q
+.BI " Option \*qMapAxis6\*q \*q" "mode=accelerated axis=+1y deadzone=5000" \*q
+.BI " Option \*qMapAxis7\*q \*q" "mode=none" \*q
\ \ ...
.fi
@@ -295,13 +315,13 @@ will be ignored. The mode has no effect on the reported value. The axis does not
.SH "NOTES"
The driver does not do hotplugging on it's own. The joystick needs to be plugged in when the driver is loaded.
-If the joystick is unplugged, the device will be deactivated.
+If the joystick is unplugged, the device will be automatically deactivated.
.P
There is an example hal policy in
.I ${sourcecode}/config/50-x11-input-joystick.fdi
which will take care of hotplugging. Place it in
.I /etc/hal/fdi/policy
-and customize it to your needs. This is highly experimental and for now you can't pass options to the driver.
+and customize it to your needs. This is HIGHLY experimental and you can't pass any options to the driver, yet.
.P
Make sure you add the
.I \*qSendCoreEvents\*q
@@ -320,6 +340,6 @@ Example:
.SH "SEE ALSO"
__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__), xmodmap(1)
.SH AUTHORS
-Sascha Hlusiak (2007),
+Sascha Hlusiak (2007-2008),
.fi
Frederic Lepied (1995-1999)
diff --git a/src/jstk.c b/src/jstk.c
index 6e0f7c2..73d41b4 100644
--- a/src/jstk.c
+++ b/src/jstk.c
@@ -588,6 +588,9 @@ jstkCorePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
xfree(s);
}
+ priv->mouse_enabled = xf86SetBoolOption(dev->commonOptions, "StartMouseEnabled", TRUE);
+ priv->keys_enabled = xf86SetBoolOption(dev->commonOptions, "StartKeysEnabled", TRUE);
+
/* Process button mapping options */
for (i=0; i<MAXBUTTONS; i++) {
char p[64];
commit c968077dcb3e7dec4886e9bc60faa63e750695e2
Author: Sascha Hlusiak <saschahlusiak@arcor.de>
Date: Mon Dec 31 20:21:30 2007 +0100
Changed copyrights to include year 2008
diff --git a/src/StrKeysym.h b/src/StrKeysym.h
index 35e81ab..04e9719 100644
--- a/src/StrKeysym.h
+++ b/src/StrKeysym.h
@@ -1,3 +1,25 @@
+/*
+ * Copyright 2007-2008 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the names of copyright holders not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission. The copyright holders make no
+ * representations about the suitability of this software for any purpose. It
+ * is provided "as is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
#ifndef _STRKEYSYM_H_INCLUDED_
#define _STRKEYSYM_H_INCLUDED_
diff --git a/src/backend_bsd.c b/src/backend_bsd.c
index 4628c0d..adad977 100644
--- a/src/backend_bsd.c
+++ b/src/backend_bsd.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2007 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>
+ * Copyright 2007-2008 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
diff --git a/src/backend_bsd.h b/src/backend_bsd.h
index 452b206..1d36d61 100644
--- a/src/backend_bsd.h
+++ b/src/backend_bsd.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2007 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>
+ * Copyright 2007-2008 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
diff --git a/src/backend_evdev.c b/src/backend_evdev.c
index aaad342..5f34394 100644
--- a/src/backend_evdev.c
+++ b/src/backend_evdev.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2007 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>
+ * Copyright 2007-2008 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
diff --git a/src/backend_evdev.h b/src/backend_evdev.h
index 9481e5e..c7e3b38 100644
--- a/src/backend_evdev.h
+++ b/src/backend_evdev.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2007 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>
+ * Copyright 2007-2008 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
diff --git a/src/backend_joystick.c b/src/backend_joystick.c
index 2f359e0..6ea75b0 100644
--- a/src/backend_joystick.c
+++ b/src/backend_joystick.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2007 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>
+ * Copyright 2007-2008 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
diff --git a/src/backend_joystick.h b/src/backend_joystick.h
index b23117d..23fa3dc 100644
--- a/src/backend_joystick.h
+++ b/src/backend_joystick.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2007 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>
+ * Copyright 2007-2008 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
diff --git a/src/jstk.c b/src/jstk.c
index 9799ab5..6e0f7c2 100644
--- a/src/jstk.c
+++ b/src/jstk.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2007 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>
+ * Copyright 2007-2008 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>
* Copyright 1995-1999 by Frederic Lepied, France. <Lepied@XFree86.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -299,7 +299,7 @@ jstkReadProc(LocalDevicePtr local)
case MAPPING_NONE:
default:
break;
- } /* switch (priv->axis{number].mapping) */
+ } /* switch (priv->axis[number].mapping) */
} /* if (event == EVENT_AXIS) */
} while (r == 2);
}
diff --git a/src/jstk.h b/src/jstk.h
index 9c9b036..e6c22c0 100644
--- a/src/jstk.h
+++ b/src/jstk.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2007 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>
+ * Copyright 2007-2008 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
diff --git a/src/jstk_axis.c b/src/jstk_axis.c
index ae979f0..f9e2fce 100644
--- a/src/jstk_axis.c
+++ b/src/jstk_axis.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2007 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>
+ * Copyright 2007-2008 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
diff --git a/src/jstk_axis.h b/src/jstk_axis.h
index 4ba45b4..4b91aae 100644
--- a/src/jstk_axis.h
+++ b/src/jstk_axis.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2007 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>
+ * Copyright 2007-2008 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
diff --git a/src/jstk_key.c b/src/jstk_key.c
index a5c5106..42492c4 100644
--- a/src/jstk_key.c
+++ b/src/jstk_key.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2007 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>
+ * Copyright 2007-2008 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>
* Copyright 1995-1999 by Frederic Lepied, France. <Lepied@XFree86.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/src/jstk_key.h b/src/jstk_key.h
index bbc3b59..df19f65 100644
--- a/src/jstk_key.h
+++ b/src/jstk_key.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2007 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>
+ * Copyright 2007-2008 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>
* Copyright 1995-1999 by Frederic Lepied, France. <Lepied@XFree86.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/src/jstk_options.c b/src/jstk_options.c
index f1dfcc8..04d0e5d 100644
--- a/src/jstk_options.c
+++ b/src/jstk_options.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2007 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>
+ * Copyright 2007 - 2008 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
diff --git a/src/jstk_options.h b/src/jstk_options.h
index 7bbbf5b..bb14934 100644
--- a/src/jstk_options.h
+++ b/src/jstk_options.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2007 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>
+ * Copyright 2007-2008 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
commit 4bf88166207c79662fba45773c300f05ae5e00d7
Author: Sascha Hlusiak <saschahlusiak@arcor.de>
Date: Sun Dec 9 19:22:59 2007 +0100
Changed default deadzone in manpage from 1000 to 5000
diff --git a/man/joystick.man b/man/joystick.man
index 5057706..5578caf 100644
--- a/man/joystick.man
+++ b/man/joystick.man
@@ -173,7 +173,7 @@ Sets the unresponsive range of the axis to
.IR <number> .
This can be between
.IR "0" " and " "30000" .
-Default: 1000
+Default: 5000
.RE
.PP
@@ -185,12 +185,12 @@ The default configuration looks like follows:
.BI " Option \*qMapButton3\*q \*q" button=3 \*q
.BI " Option \*qMapButton4\*q \*q" none \*q
\ \ ...
-.BI " Option \*qMapAxis1\*q \*q" "mode=relative axis=+1x deadzone=1000" \*q
-.BI " Option \*qMapAxis2\*q \*q" "mode=relative axis=+1y deadzone=1000" \*q
-.BI " Option \*qMapAxis3\*q \*q" "mode=relative axis=+1zx deadzone=1000" \*q
-.BI " Option \*qMapAxis4\*q \*q" "mode=relative axis=+1zy deadzone=1000" \*q
-.BI " Option \*qMapAxis5\*q \*q" "mode=accelerated axis=+1x deadzone=1000" \*q
-.BI " Option \*qMapAxis6\*q \*q" "mode=accelerated axis=+1y deadzone=1000" \*q
+.BI " Option \*qMapAxis1\*q \*q" "mode=relative axis=+1x deadzone=5000" \*q
+.BI " Option \*qMapAxis2\*q \*q" "mode=relative axis=+1y deadzone=5000" \*q
+.BI " Option \*qMapAxis3\*q \*q" "mode=relative axis=+1zx deadzone=5000" \*q
+.BI " Option \*qMapAxis4\*q \*q" "mode=relative axis=+1zy deadzone=5000" \*q
+.BI " Option \*qMapAxis5\*q \*q" "mode=accelerated axis=+1x deadzone=5000" \*q
+.BI " Option \*qMapAxis6\*q \*q" "mode=accelerated axis=+1y deadzone=5000" \*q
.BI " Option \*qMapAxis7\*q \*q" "mode=none" \*q
\ \ ...
.fi
commit 1f61022d4d08c1dc07717576bcb31ace03d93060
Author: Sascha Hlusiak <saschahlusiak@arcor.de>
Date: Sun Dec 9 18:18:45 2007 +0100
Increased default deadzone from 1000 to 5000
diff --git a/src/jstk.c b/src/jstk.c
index f55405b..9799ab5 100644
--- a/src/jstk.c
+++ b/src/jstk.c
@@ -489,7 +489,7 @@ jstkCorePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
for (i=0; i<MAXAXES; i++) {
priv->axis[i].value = 0;
priv->axis[i].oldvalue = 0;
- priv->axis[i].deadzone = 1000;
+ priv->axis[i].deadzone = 5000;
priv->axis[i].type = TYPE_NONE;
priv->axis[i].mapping = MAPPING_NONE;
priv->axis[i].currentspeed = 0.0f;
commit 847c36e1134e7fe5f9af69f49b8ed12d2aa0cb85
Author: Sascha Hlusiak <saschahlusiak@arcor.de>
Date: Sun Dec 9 11:54:38 2007 +0100
Typo in man page
Last axis of default axis configurations was #3 instead of #7
diff --git a/man/joystick.man b/man/joystick.man
index 8e48883..5057706 100644
--- a/man/joystick.man
+++ b/man/joystick.man
@@ -191,7 +191,7 @@ The default configuration looks like follows:
.BI " Option \*qMapAxis4\*q \*q" "mode=relative axis=+1zy deadzone=1000" \*q
.BI " Option \*qMapAxis5\*q \*q" "mode=accelerated axis=+1x deadzone=1000" \*q
.BI " Option \*qMapAxis6\*q \*q" "mode=accelerated axis=+1y deadzone=1000" \*q
-.BI " Option \*qMapAxis3\*q \*q" "mode=none" \*q
+.BI " Option \*qMapAxis7\*q \*q" "mode=none" \*q
\ \ ...
.fi
Reply to: