ChangeLog | 55 +++++++++++++++++++ configure.ac | 2 debian/changelog | 14 ++++ debian/control | 2 src/void.c | 155 ++++--------------------------------------------------- 5 files changed, 84 insertions(+), 144 deletions(-)
New commits: commit ee7152265256ef3f5a4c360bdb53f7479ed9a7bf Author: Cyril Brulebois <[email protected]> Date: Wed May 4 01:37:49 2011 +0200 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index da85611..43a09b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-input-void (1:1.3.1-3) UNRELEASED; urgency=low +xserver-xorg-input-void (1:1.3.1-3) unstable; urgency=low * Merge upstream up to cb8d19b8ac: - unifdef XFree86LOADER @@ -10,7 +10,7 @@ xserver-xorg-input-void (1:1.3.1-3) UNRELEASED; urgency=low * Bump xserver-xorg-dev build-dep, since pre-1.10 servers are no longer supported. - -- Cyril Brulebois <[email protected]> Wed, 04 May 2011 01:16:38 +0200 + -- Cyril Brulebois <[email protected]> Wed, 04 May 2011 01:25:08 +0200 xserver-xorg-input-void (1:1.3.1-2) unstable; urgency=low commit bdc90be9e31cd37d502afa4bf9afdfc231425de0 Author: Cyril Brulebois <[email protected]> Date: Wed May 4 01:37:38 2011 +0200 Bump xserver-xorg-dev build-dep, since pre-1.10 servers are no longer supported. diff --git a/debian/changelog b/debian/changelog index 144eeac..da85611 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ xserver-xorg-input-void (1:1.3.1-3) UNRELEASED; urgency=low - Add mode field to xf86InitValuatorAxisStruct. - Fix PreInit for ABI 12. * This fixes the FTBFS with Xserver 1.10 (Closes: #624920). + * Bump xserver-xorg-dev build-dep, since pre-1.10 servers are no longer + supported. -- Cyril Brulebois <[email protected]> Wed, 04 May 2011 01:16:38 +0200 diff --git a/debian/control b/debian/control index 50c9917..f666dd3 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: dh-autoreconf, quilt, pkg-config, - xserver-xorg-dev (>= 2:1.9.4), + xserver-xorg-dev (>= 2:1.9.99.1), x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev, commit 6980f16e777747df990cb5f86ff964a2da2d6f86 Author: Cyril Brulebois <[email protected]> Date: Wed May 4 01:37:23 2011 +0200 Bump changelogs (Closes: #624920). diff --git a/ChangeLog b/ChangeLog index 350f860..df06ab2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,58 @@ +commit cb8d19b8ac433d5292502e032f6210ee5151d6e2 +Author: Peter Hutterer <[email protected]> +Date: Thu Nov 25 12:48:22 2010 +1000 + + Fix PreInit for ABI 12. + + Require an xserver 1.9.99.1 or higher and put an ifdef in for ABI 12. + + Signed-off-by: Peter Hutterer <[email protected]> + Reviewed-by: Matt Turner <[email protected]> + Reviewed-by: Adam Jackson <[email protected]> + +commit 7456467a0453677b9e5bca914c9274a305f35586 +Author: Peter Hutterer <[email protected]> +Date: Thu Nov 25 12:45:27 2010 +1000 + + Add mode field to xf86InitValuatorAxisStruct. + + Signed-off-by: Peter Hutterer <[email protected]> + Reviewed-by: Matt Turner <[email protected]> + Reviewed-by: Adam Jackson <[email protected]> + +commit 86084d219f856e420cd1984ebe0320739248eeb4 +Author: Peter Hutterer <[email protected]> +Date: Thu Nov 25 12:52:15 2010 +1000 + + Label the axes as absolute, not relative. + + Not that it matters for this driver, but the axes are set up as absolute, so + label them accordingly. + + Signed-off-by: Peter Hutterer <[email protected]> + Reviewed-by: Matt Turner <[email protected]> + Reviewed-by: Adam Jackson <[email protected]> + +commit 17f94b5f0f69988058c606ab92d12d394ac6fa5f +Author: Peter Hutterer <[email protected]> +Date: Thu Nov 25 11:41:11 2010 +1000 + + Require xserver 1.9 + + Signed-off-by: Peter Hutterer <[email protected]> + Reviewed-by: Matt Turner <[email protected]> + Reviewed-by: Adam Jackson <[email protected]> + +commit 93daeb169d177fd245d6ca8469e7c7a6de53647a +Author: Peter Hutterer <[email protected]> +Date: Thu Nov 25 11:43:37 2010 +1000 + + unifdef XFree86LOADER + + Signed-off-by: Peter Hutterer <[email protected]> + Reviewed-by: Matt Turner <[email protected]> + Reviewed-by: Adam Jackson <[email protected]> + commit baf55a08ee006d43f5a2e3d72b10da800ab03afd Author: Alan Coopersmith <[email protected]> Date: Sat Oct 30 09:25:57 2010 -0700 diff --git a/debian/changelog b/debian/changelog index 5e7eea2..144eeac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +xserver-xorg-input-void (1:1.3.1-3) UNRELEASED; urgency=low + + * Merge upstream up to cb8d19b8ac: + - unifdef XFree86LOADER + - Require xserver 1.9 + - Label the axes as absolute, not relative. + - Add mode field to xf86InitValuatorAxisStruct. + - Fix PreInit for ABI 12. + * This fixes the FTBFS with Xserver 1.10 (Closes: #624920). + + -- Cyril Brulebois <[email protected]> Wed, 04 May 2011 01:16:38 +0200 + xserver-xorg-input-void (1:1.3.1-2) unstable; urgency=low * Switch to dh: commit cb8d19b8ac433d5292502e032f6210ee5151d6e2 Author: Peter Hutterer <[email protected]> Date: Thu Nov 25 12:48:22 2010 +1000 Fix PreInit for ABI 12. Require an xserver 1.9.99.1 or higher and put an ifdef in for ABI 12. Signed-off-by: Peter Hutterer <[email protected]> Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Adam Jackson <[email protected]> diff --git a/configure.ac b/configure.ac index ed755c2..4271b5a 100644 --- a/configure.ac +++ b/configure.ac @@ -59,7 +59,7 @@ inputdir=${moduledir}/input AC_SUBST(inputdir) # Checks for pkg-config packages -PKG_CHECK_MODULES(XORG, [xorg-server >= 1.9.0] xproto) +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.9.99.1] xproto) CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src' AC_SUBST([CFLAGS]) diff --git a/src/void.c b/src/void.c index 404b8d7..0184893 100644 --- a/src/void.c +++ b/src/void.c @@ -48,14 +48,13 @@ #define MAXBUTTONS 3 +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 +#error "XINPUT ABI 12 required." +#endif /****************************************************************************** * Function/Macro keys variables *****************************************************************************/ -static const char *DEFAULTS[] = { - NULL -}; - static void BellProc( int percent, @@ -194,42 +193,20 @@ xf86VoidUninit(InputDriverPtr drv, * * called when the module subsection is found in XF86Config */ -static InputInfoPtr +static int xf86VoidInit(InputDriverPtr drv, - IDevPtr dev, + InputInfoPtr pInfo, int flags) { - InputInfoPtr pInfo; - - if (!(pInfo = xf86AllocateInput(drv, 0))) - return NULL; - /* Initialise the InputInfoRec. */ - pInfo->name = dev->identifier; pInfo->type_name = "Void"; - pInfo->flags = XI86_KEYBOARD_CAPABLE | XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS; pInfo->device_control = xf86VoidControlProc; pInfo->read_input = NULL; pInfo->control_proc = NULL; - pInfo->close_proc = NULL; pInfo->switch_mode = NULL; - pInfo->conversion_proc = NULL; - pInfo->reverse_conversion_proc = NULL; pInfo->fd = -1; - pInfo->dev = NULL; - pInfo->private_flags = 0; - pInfo->always_core_feedback = NULL; - pInfo->conf_idev = dev; - /* Collect the options, and process the common options. */ - xf86CollectInputOptions(pInfo, DEFAULTS, NULL); - xf86ProcessCommonOptions(pInfo, pInfo->options); - - /* Mark the device configured */ - pInfo->flags |= XI86_CONFIGURED; - - /* Return the configured device */ - return (pInfo); + return Success; } _X_EXPORT InputDriverRec VOID = { commit 7456467a0453677b9e5bca914c9274a305f35586 Author: Peter Hutterer <[email protected]> Date: Thu Nov 25 12:45:27 2010 +1000 Add mode field to xf86InitValuatorAxisStruct. Signed-off-by: Peter Hutterer <[email protected]> Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Adam Jackson <[email protected]> diff --git a/src/void.c b/src/void.c index c0feca8..404b8d7 100644 --- a/src/void.c +++ b/src/void.c @@ -141,14 +141,16 @@ xf86VoidControlProc(DeviceIntPtr device, int what) 0, /* min val */1, /* max val */ 1, /* resolution */ 0, /* min_res */ - 1); /* max_res */ + 1, /* max_res */ + Absolute); InitValuatorAxisStruct(device, 1, axes_labels[1], 0, /* min val */1, /* max val */ 1, /* resolution */ 0, /* min_res */ - 1); /* max_res */ + 1, /* max_res */ + Absolute); ErrorF("unable to allocate Valuator class device\n"); return !Success; } commit 86084d219f856e420cd1984ebe0320739248eeb4 Author: Peter Hutterer <[email protected]> Date: Thu Nov 25 12:52:15 2010 +1000 Label the axes as absolute, not relative. Not that it matters for this driver, but the axes are set up as absolute, so label them accordingly. Signed-off-by: Peter Hutterer <[email protected]> Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Adam Jackson <[email protected]> diff --git a/src/void.c b/src/void.c index d94ce15..c0feca8 100644 --- a/src/void.c +++ b/src/void.c @@ -97,8 +97,8 @@ xf86VoidControlProc(DeviceIntPtr device, int what) Atom btn_labels[MAXBUTTONS] = {0}; Atom axes_labels[2] = {0}; - axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X); - axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y); + axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_X); + axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_Y); btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT); btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE); commit 17f94b5f0f69988058c606ab92d12d394ac6fa5f Author: Peter Hutterer <[email protected]> Date: Thu Nov 25 11:41:11 2010 +1000 Require xserver 1.9 Signed-off-by: Peter Hutterer <[email protected]> Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Adam Jackson <[email protected]> diff --git a/configure.ac b/configure.ac index 671ebc5..ed755c2 100644 --- a/configure.ac +++ b/configure.ac @@ -59,7 +59,7 @@ inputdir=${moduledir}/input AC_SUBST(inputdir) # Checks for pkg-config packages -PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto) +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.9.0] xproto) CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src' AC_SUBST([CFLAGS]) diff --git a/src/void.c b/src/void.c index f55110a..d94ce15 100644 --- a/src/void.c +++ b/src/void.c @@ -43,91 +43,14 @@ #include <xf86Module.h> -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 #include <X11/Xatom.h> #include <xserver-properties.h> -#endif #define MAXBUTTONS 3 /****************************************************************************** * Function/Macro keys variables *****************************************************************************/ -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 5 -static KeySym void_map[] = -{ - NoSymbol, NoSymbol, NoSymbol, NoSymbol, - NoSymbol, NoSymbol, NoSymbol, NoSymbol, - XK_BackSpace, XK_Tab, XK_Linefeed, NoSymbol, - NoSymbol, NoSymbol, NoSymbol, NoSymbol, - NoSymbol, NoSymbol, NoSymbol, NoSymbol, - NoSymbol, NoSymbol, NoSymbol, NoSymbol, - NoSymbol, NoSymbol, NoSymbol, XK_Escape, - NoSymbol, NoSymbol, NoSymbol, NoSymbol, - XK_space, XK_exclam, XK_quotedbl, XK_numbersign, - XK_dollar, XK_percent, XK_ampersand, XK_apostrophe, - XK_parenleft, XK_parenright, XK_asterisk, XK_plus, - XK_comma, XK_minus, XK_period, XK_slash, - XK_0, XK_1, XK_2, XK_3, - XK_4, XK_5, XK_6, XK_7, - XK_8, XK_9, XK_colon, XK_semicolon, - XK_less, XK_equal, XK_greater, XK_question, - XK_at, XK_A, XK_B, XK_C, - XK_D, XK_E, XK_F, XK_G, - XK_H, XK_I, XK_J, XK_K, - XK_L, XK_M, XK_N, XK_O, - XK_P, XK_Q, XK_R, XK_S, - XK_T, XK_U, XK_V, XK_W, - XK_X, XK_Y, XK_Z, XK_bracketleft, - XK_backslash, XK_bracketright,XK_asciicircum, XK_underscore, - XK_grave, XK_a, XK_b, XK_c, - XK_d, XK_e, XK_f, XK_g, - XK_h, XK_i, XK_j, XK_k, - XK_l, XK_m, XK_n, XK_o, - XK_p, XK_q, XK_r, XK_s, - XK_t, XK_u, XK_v, XK_w, - XK_x, XK_y, XK_z, XK_braceleft, - XK_bar, XK_braceright, XK_asciitilde, XK_BackSpace, - NoSymbol, NoSymbol, NoSymbol, NoSymbol, - NoSymbol, NoSymbol, NoSymbol, NoSymbol, - NoSymbol, NoSymbol, NoSymbol, NoSymbol, - NoSymbol, NoSymbol, NoSymbol, NoSymbol, - NoSymbol, NoSymbol, NoSymbol, NoSymbol, - NoSymbol, NoSymbol, NoSymbol, NoSymbol, - NoSymbol, NoSymbol, NoSymbol, NoSymbol, - NoSymbol, NoSymbol, NoSymbol, NoSymbol, - XK_nobreakspace,XK_exclamdown, XK_cent, XK_sterling, - XK_currency, XK_yen, XK_brokenbar, XK_section, - XK_diaeresis, XK_copyright, XK_ordfeminine, XK_guillemotleft, - XK_notsign, XK_hyphen, XK_registered, XK_macron, - XK_degree, XK_plusminus, XK_twosuperior, XK_threesuperior, - XK_acute, XK_mu, XK_paragraph, XK_periodcentered, - XK_cedilla, XK_onesuperior, XK_masculine, XK_guillemotright, - XK_onequarter, XK_onehalf, XK_threequarters,XK_questiondown, - XK_Agrave, XK_Aacute, XK_Acircumflex, XK_Atilde, - XK_Adiaeresis, XK_Aring, XK_AE, XK_Ccedilla, - XK_Egrave, XK_Eacute, XK_Ecircumflex, XK_Ediaeresis, - XK_Igrave, XK_Iacute, XK_Icircumflex, XK_Idiaeresis, - XK_ETH, XK_Ntilde, XK_Ograve, XK_Oacute, - XK_Ocircumflex, XK_Otilde, XK_Odiaeresis, XK_multiply, - XK_Ooblique, XK_Ugrave, XK_Uacute, XK_Ucircumflex, - XK_Udiaeresis, XK_Yacute, XK_THORN, XK_ssharp, - XK_agrave, XK_aacute, XK_acircumflex, XK_atilde, - XK_adiaeresis, XK_aring, XK_ae, XK_ccedilla, - XK_egrave, XK_eacute, XK_ecircumflex, XK_ediaeresis, - XK_igrave, XK_iacute, XK_icircumflex, XK_idiaeresis, - XK_eth, XK_ntilde, XK_ograve, XK_oacute, - XK_ocircumflex, XK_otilde, XK_odiaeresis, XK_division, - XK_oslash, XK_ugrave, XK_uacute, XK_ucircumflex, - XK_udiaeresis, XK_yacute, XK_thorn, XK_ydiaeresis -}; - -/* minKeyCode = 8 because this is the min legal key code */ -static KeySymsRec void_keysyms = { - /* map minKeyCode maxKeyCode width */ - void_map, 8, 255, 1 -}; -#endif /* GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 5 */ static const char *DEFAULTS[] = { NULL @@ -171,7 +94,6 @@ xf86VoidControlProc(DeviceIntPtr device, int what) unsigned char map[MAXBUTTONS + 1]; int i; Bool result; -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 Atom btn_labels[MAXBUTTONS] = {0}; Atom axes_labels[2] = {0}; @@ -181,7 +103,6 @@ xf86VoidControlProc(DeviceIntPtr device, int what) btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT); btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE); btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT); -#endif pInfo = device->public.devicePrivate; @@ -196,50 +117,34 @@ xf86VoidControlProc(DeviceIntPtr device, int what) if (InitButtonClassDeviceStruct(device, MAXBUTTONS, -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 btn_labels, -#endif map) == FALSE) { ErrorF("unable to allocate Button class device\n"); return !Success; } -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5 result = InitKeyboardDeviceStruct(device, NULL, BellProc, KeyControlProc); -#else - result = InitKeyboardDeviceStruct((DevicePtr)device, &void_keysyms, - NULL, BellProc, KeyControlProc); -#endif if (!result) { ErrorF("unable to init keyboard device\n"); return !Success; } - if (InitValuatorClassDeviceStruct(device, + if (InitValuatorClassDeviceStruct(device, 2, -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 axes_labels, -#endif -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 - xf86GetMotionEvents, -#endif 0, Absolute) == FALSE) { InitValuatorAxisStruct(device, 0, -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 axes_labels[0], -#endif 0, /* min val */1, /* max val */ 1, /* resolution */ 0, /* min_res */ 1); /* max_res */ InitValuatorAxisStruct(device, 1, -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 axes_labels[1], -#endif 0, /* min val */1, /* max val */ 1, /* resolution */ 0, /* min_res */ @@ -303,10 +208,6 @@ xf86VoidInit(InputDriverPtr drv, pInfo->flags = XI86_KEYBOARD_CAPABLE | XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS; pInfo->device_control = xf86VoidControlProc; pInfo->read_input = NULL; -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 - pInfo->motion_history_proc = xf86GetMotionEvents; - pInfo->history_size = 0; -#endif pInfo->control_proc = NULL; pInfo->close_proc = NULL; pInfo->switch_mode = NULL; commit 93daeb169d177fd245d6ca8469e7c7a6de53647a Author: Peter Hutterer <[email protected]> Date: Thu Nov 25 11:43:37 2010 +1000 unifdef XFree86LOADER Signed-off-by: Peter Hutterer <[email protected]> Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Adam Jackson <[email protected]> diff --git a/src/void.c b/src/void.c index df973fa..f55110a 100644 --- a/src/void.c +++ b/src/void.c @@ -29,11 +29,6 @@ #include "config.h" #endif -#ifndef XFree86LOADER -#include <unistd.h> -#include <errno.h> -#endif - #include <misc.h> #include <xf86.h> #define NEED_XF86_TYPES 1 @@ -46,9 +41,7 @@ #include <X11/keysym.h> #include <mipointer.h> -#ifdef XFree86LOADER #include <xf86Module.h> -#endif #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 #include <X11/Xatom.h> @@ -352,7 +345,6 @@ _X_EXPORT InputDriverRec VOID = { * *************************************************************************** */ -#ifdef XFree86LOADER /* * xf86VoidUnplug -- * @@ -400,4 +392,3 @@ _X_EXPORT XF86ModuleData voidModuleData = { xf86VoidUnplug }; -#endif /* XFree86LOADER */ -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
