Hello community, here is the log from the commit of package sax2 checked in at Mon Mar 10 18:37:45 CET 2008. -------- --- sax2/sax2.changes 2008-03-07 18:03:52.000000000 +0100 +++ /mounts/work_src_done/STABLE/sax2/sax2.changes 2008-03-10 17:25:07.753331000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 10 15:01:42 CET 2008 - ms@suse.de + +- fixed synaptics device detection due to id changes (bnc #368640) +- fixed duplicate InputDevice entries (bnc #368589) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sax2.spec ++++++ --- /var/tmp/diff_new_pack.j32529/_old 2008-03-10 18:35:21.000000000 +0100 +++ /var/tmp/diff_new_pack.j32529/_new 2008-03-10 18:35:21.000000000 +0100 @@ -40,7 +40,7 @@ PreReq: /bin/rm /bin/mkdir /usr/bin/chroot %fillup_prereq %insserv_prereq Summary: SuSE advanced X Window System-configuration Version: 8.1 -Release: 372 +Release: 373 Group: System/X11/Utilities License: GPL v2 or later Source: sax2.tar.bz2 @@ -454,6 +454,9 @@ %endif %changelog +* Mon Mar 10 2008 ms@suse.de +- fixed synaptics device detection due to id changes (bnc #368640) +- fixed duplicate InputDevice entries (bnc #368589) * Fri Mar 07 2008 ms@suse.de - fixed libsax::addItem() function (bnc #351627) * Fri Mar 07 2008 ms@suse.de ++++++ sax2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/svnbuild new/sax/svnbuild --- old/sax/svnbuild 2008-03-07 18:04:22.000000000 +0100 +++ new/sax/svnbuild 2008-03-10 17:26:56.000000000 +0100 @@ -1 +1 @@ -1544 +1548 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/sysp/maps/Input.map new/sax/sysp/maps/Input.map --- old/sax/sysp/maps/Input.map 2008-03-04 11:26:19.000000000 +0100 +++ new/sax/sysp/maps/Input.map 2008-03-10 17:09:18.000000000 +0100 @@ -6,6 +6,7 @@ # Mice 0x0212 : 0x0002 : alps 0x0212 : 0x0001 : synaptics +0x0002 : 0x0007 : synaptics 0x046d : 0xc705 : logitech-MX900 0x046d : 0xc50e : logitech-MediaPlay 0x046d : 0xc508 : logitech-TrackManOptical @@ -15,6 +16,7 @@ 0x045e : 0x0095 : microsoft-IntelliMouse-Explorer 0x046d : 0xc040 : logitech-optical 0x0210 : 0x0003 : ibm-trackpoint +0x0002 : 0x000a : ibm-trackpoint 0x056a : 0x0013 : wacom 0x05ac : 0x030b : alps 0x1943 : 0x5000 : fujitsu diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/sysp/sysp.c new/sax/sysp/sysp.c --- old/sax/sysp/sysp.c 2007-09-28 16:50:16.000000000 +0200 +++ new/sax/sysp/sysp.c 2008-03-10 17:09:18.000000000 +0100 @@ -504,7 +504,6 @@ void PrintMouseData(ScanMouse m) { MouseData data; int mouse = 0; - int buttonCount = -1; int devices[m.Count()]; if (m.Count() == 1) { //============================================ @@ -526,18 +525,56 @@ //============================================ // sort out special profiled pointers //-------------------------------------------- + // ... + // these are devices which use another driver than the mouse + // driver and therefore always needs a seperate InputDevice + // section + // --- for (int i = m.Count()-1; i >= 0; i--) { data = m.Pop(); if (devices[i] == 0) { + if (strcmp(data.profile,"alps") == 0) { + devices[i] = 1; + } + if (strcmp(data.profile,"fujitsu") == 0) { + devices[i] = 1; + } + if (strcmp(data.profile,"hp-mouse") == 0) { + devices[i] = 1; + } + if (strcmp(data.profile,"logitech-Gaming") == 0) { + devices[i] = 1; + } + if (strcmp(data.profile,"logitech-MediaPlay") == 0) { + devices[i] = 1; + } + if (strcmp(data.profile,"logitech-mxlaser") == 0) { + devices[i] = 1; + } + if (strcmp(data.profile,"logitech-optical") == 0) { + devices[i] = 1; + } + if (strcmp(data.profile,"microsoft-IntelliMouse-Explorer") == 0) { + devices[i] = 1; + } + if (strcmp(data.profile,"microsoft-natural") == 0) { + devices[i] = 1; + } if (strcmp(data.profile,"synaptics") == 0) { devices[i] = 1; } - if (strcmp(data.profile,"alps") == 0) { + if (strcmp(data.profile,"vbox-mouse") == 0) { + devices[i] = 1; + } + if (strcmp(data.profile,"vmware-mouse") == 0) { devices[i] = 1; } if (strcmp(data.profile,"wacom") == 0) { devices[i] = 1; } + if (strcmp(data.profile,"xen-mouse") == 0) { + devices[i] = 1; + } } } m.Reset(); @@ -546,24 +583,21 @@ //-------------------------------------------- for (int i = m.Count()-1; i >= 0; i--) { data = m.Pop(); + // ... + // sort out device which has a profile set except those + // profiles which use the standard mouse driver + // --- if (devices[i] == 0) { - if (data.buttons > buttonCount) { - buttonCount = data.buttons; - } - } - } - m.Reset(); - for (int i = m.Count()-1; i >= 0; i--) { - data = m.Pop(); - if (devices[i] == 0) { - if (strcmp(data.profile,"<undefined>") != 0) { - devices[i] = 1; - break; - } - if (data.buttons == buttonCount) { - devices[i] = 1; - break; - } + if ( + (strcmp(data.profile,"<undefined>") != 0) && + (strcmp(data.profile,"ibm-trackpoint") != 0) && + (strcmp(data.profile,"logitech-MX310") != 0) && + (strcmp(data.profile,"logitech-MX900") != 0) && + (strcmp(data.profile,"logitech-TrackManOptical") != 0) + ) { + devices[i] = 1; + break; + } } } m.Reset(); @@ -573,14 +607,29 @@ //-------------------------------------------- bool haveStandardMouse = false; for (int i = m.Count()-1; i >= 0; i--) { + // ... + // check for the standard mouse which use /dev/input/mice and + // the standard mouse pointer. If there is no such mouse + // left we will add a default section at the end + // --- data = m.Pop(); if ( (strcmp(data.device,"/dev/input/mice") == 0) && ( - (strcmp(data.profile,"<undefined>") == 0) || ( - (strcmp(data.profile,"alps") != 0) && - (strcmp(data.profile,"synaptics") != 0) && - (strcmp(data.profile,"wacom") != 0) - ) + (strcmp(data.profile,"<undefined>") == 0) || + // core conflict for alps driver + (strcmp(data.profile,"alps") == 0) || + // core conflict for synaptics driver + (strcmp(data.profile,"synaptics") == 0) || + // core conflict for wacom driver + (strcmp(data.profile,"wacom") == 0) || + // uses mouse driver + (strcmp(data.profile,"ibm-trackpoint") == 0) || + // uses mouse driver + (strcmp(data.profile,"logitech-MX310") == 0) || + // uses mouse driver + (strcmp(data.profile,"logitech-MX900") == 0) || + // uses mouse driver + (strcmp(data.profile,"logitech-TrackManOptical") == 0) ) ) { haveStandardMouse = true; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org