Hello community, here is the log from the commit of package xorg-x11-driver-input for openSUSE:Factory checked in at Thu May 28 23:53:23 CEST 2009. -------- --- xorg-x11-driver-input/xorg-x11-driver-input.changes 2009-05-21 10:37:56.000000000 +0200 +++ xorg-x11-driver-input/xorg-x11-driver-input.changes 2009-05-28 02:52:37.000000000 +0200 @@ -1,0 +2,9 @@ +Thu May 28 02:46:13 CEST 2009 - sndirsch@novell.com + +- xf86-input-synaptics 1.1.2 + * One patch that should have made it into 1.1.1 but didn't. + Jeremy's patch adds model-specific edges for appletouch + touchpads in the same fashion as we already do for ALPS + and synaptics pads. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xf86-input-synaptics-1.1.1.tar.bz2 New: ---- xf86-input-synaptics-1.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-input.spec ++++++ --- /var/tmp/diff_new_pack.y18567/_old 2009-05-28 23:51:48.000000000 +0200 +++ /var/tmp/diff_new_pack.y18567/_new 2009-05-28 23:51:48.000000000 +0200 @@ -24,7 +24,7 @@ BuildRequires: Mesa-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 30 +Release: 31 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -65,7 +65,7 @@ Source26: xf86-input-vmmouse-12.6.4.tar.bz2 Source27: xf86-input-void-1.2.0.tar.bz2 Source28: xf86-input-diamondtouch-0.3.0.tar.bz2 -Source29: xf86-input-synaptics-1.1.1.tar.bz2 +Source29: xf86-input-synaptics-1.1.2.tar.bz2 Source30: xf86-input-evdev-2.2.2.tar.bz2 Source31: 11-x11-synaptics.fdi Source32: 11-mouse.fdi @@ -241,6 +241,12 @@ /usr/share/hal/fdi/policy/20thirdparty/11-mouse.fdi %changelog +* Thu May 28 2009 sndirsch@novell.com +- xf86-input-synaptics 1.1.2 + * One patch that should have made it into 1.1.1 but didn't. + Jeremy's patch adds model-specific edges for appletouch + touchpads in the same fashion as we already do for ALPS + and synaptics pads. * Thu May 21 2009 sndirsch@suse.de - xf86-input-synaptics 1.1.0 * avoiding allocations during the signal handler. ++++++ xf86-input-synaptics-1.1.1.tar.bz2 -> xf86-input-synaptics-1.1.2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-synaptics-1.1.1/configure new/xf86-input-synaptics-1.1.2/configure --- old/xf86-input-synaptics-1.1.1/configure 2009-05-21 08:15:04.000000000 +0200 +++ new/xf86-input-synaptics-1.1.2/configure 2009-05-28 01:10:50.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for xf86-input-synaptics 1.1.1. +# Generated by GNU Autoconf 2.63 for xf86-input-synaptics 1.1.2. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -745,8 +745,8 @@ # Identity of this package. PACKAGE_NAME='xf86-input-synaptics' PACKAGE_TARNAME='xf86-input-synaptics' -PACKAGE_VERSION='1.1.1' -PACKAGE_STRING='xf86-input-synaptics 1.1.1' +PACKAGE_VERSION='1.1.2' +PACKAGE_STRING='xf86-input-synaptics 1.1.2' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_unique_file="Makefile.am" @@ -1514,7 +1514,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xf86-input-synaptics 1.1.1 to adapt to many kinds of systems. +\`configure' configures xf86-input-synaptics 1.1.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1585,7 +1585,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xf86-input-synaptics 1.1.1:";; + short | recursive ) echo "Configuration of xf86-input-synaptics 1.1.2:";; esac cat <<\_ACEOF @@ -1705,7 +1705,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xf86-input-synaptics configure 1.1.1 +xf86-input-synaptics configure 1.1.2 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1719,7 +1719,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xf86-input-synaptics $as_me 1.1.1, which was +It was created by xf86-input-synaptics $as_me 1.1.2, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2437,7 +2437,7 @@ # Define the identity of the package. PACKAGE='xf86-input-synaptics' - VERSION='1.1.1' + VERSION='1.1.2' cat >>confdefs.h <<_ACEOF @@ -13388,7 +13388,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xf86-input-synaptics $as_me 1.1.1, which was +This file was extended by xf86-input-synaptics $as_me 1.1.2, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13451,7 +13451,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -xf86-input-synaptics config.status 1.1.1 +xf86-input-synaptics config.status 1.1.2 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-synaptics-1.1.1/configure.ac new/xf86-input-synaptics-1.1.2/configure.ac --- old/xf86-input-synaptics-1.1.1/configure.ac 2009-05-21 08:14:41.000000000 +0200 +++ new/xf86-input-synaptics-1.1.2/configure.ac 2009-05-28 01:10:43.000000000 +0200 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-synaptics], - 1.1.1, + 1.1.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-synaptics) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-synaptics-1.1.1/src/eventcomm.c new/xf86-input-synaptics-1.1.2/src/eventcomm.c --- old/xf86-input-synaptics-1.1.1/src/eventcomm.c 2009-05-21 08:14:42.000000000 +0200 +++ new/xf86-input-synaptics-1.1.2/src/eventcomm.c 2009-05-28 01:09:49.000000000 +0200 @@ -115,22 +115,37 @@ return TRUE; } +typedef struct { + short vendor; + short product; + enum TouchpadModel model; +} model_lookup_t; +#define PRODUCT_ANY 0x0000 + +static model_lookup_t model_lookup_table[] = { + {0x0002, 0x0007, MODEL_SYNAPTICS}, + {0x0002, 0x0008, MODEL_ALPS}, + {0x05ac, PRODUCT_ANY, MODEL_APPLETOUCH}, + {0x0, 0x0, 0x0} +}; + static void event_query_info(LocalDevicePtr local) { SynapticsPrivate *priv = (SynapticsPrivate *)local->private; short id[4]; int rc; + model_lookup_t *model_lookup; SYSCALL(rc = ioctl(local->fd, EVIOCGID, id)); if (rc < 0) return; - if (id[ID_VENDOR] == 0x2 && id[ID_PRODUCT] == 0x7) - priv->model = MODEL_SYNAPTICS; - else if (id[ID_VENDOR] == 0x2 && id[ID_PRODUCT] == 0x8) - priv->model = MODEL_ALPS; - + for(model_lookup = model_lookup_table; model_lookup->vendor; model_lookup++) { + if(model_lookup->vendor == id[ID_VENDOR] && + (model_lookup->product == id[ID_PRODUCT] || model_lookup->product == PRODUCT_ANY)) + priv->model = model_lookup->model; + } } /* Query device for axis ranges */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-synaptics-1.1.1/src/synaptics.c new/xf86-input-synaptics-1.1.2/src/synaptics.c --- old/xf86-input-synaptics-1.1.1/src/synaptics.c 2009-05-21 08:14:42.000000000 +0200 +++ new/xf86-input-synaptics-1.1.2/src/synaptics.c 2009-05-28 01:09:49.000000000 +0200 @@ -341,10 +341,14 @@ { ewidth = width * .15; eheight = height * .15; + } else if (priv->model == MODEL_APPLETOUCH) + { + ewidth = width * .085; + eheight = height * .085; } else { ewidth = width * .04; - eheight = height * .04; + eheight = height * .054; } l = priv->minx + ewidth; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-synaptics-1.1.1/src/synapticsstr.h new/xf86-input-synaptics-1.1.2/src/synapticsstr.h --- old/xf86-input-synaptics-1.1.1/src/synapticsstr.h 2009-05-21 08:14:42.000000000 +0200 +++ new/xf86-input-synaptics-1.1.2/src/synapticsstr.h 2009-05-28 01:09:49.000000000 +0200 @@ -82,7 +82,8 @@ enum TouchpadModel { MODEL_UNKNOWN = 0, MODEL_SYNAPTICS, - MODEL_ALPS + MODEL_ALPS, + MODEL_APPLETOUCH }; typedef struct _SynapticsPrivateRec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org