Hello community, here is the log from the commit of package sax2 checked in at Sat Aug 23 02:03:27 CEST 2008. -------- --- sax2/sax2.changes 2008-08-13 12:10:26.000000000 +0200 +++ sax2/sax2.changes 2008-08-22 22:11:31.000000000 +0200 @@ -1,0 +2,34 @@ +Fri Aug 22 22:11:03 CEST 2008 - sndirsch@suse.de + +- Extended existing serial 'Wacom ISDV4 TabletPC' entry with Touch + device. Added new generic entry for TabletPCs based on internal + Wacom USB devices. + (Danny Kukawka) + +------------------------------------------------------------------- +Fri Aug 22 22:09:04 CEST 2008 - sndirsch@suse.de + +- Added new entries for TabletPCs with internal WACOM USB Tablet + devices from ASUS (R1E and R1F). + (Danny Kukawka) + +------------------------------------------------------------------- +Fri Aug 22 22:05:08 CEST 2008 - sndirsch@suse.de + +- This patch allows to use for Tablets (as also TabletPCs) devices + which are not /dev/input/event* as e.g.: + * /dev/input/wacom + * /dev/input/by-id/* + * /dev/input/by-path/* + This allows to use persistend device names as e.g. needed for + new Wacom USB based TabletPC devices. + (Danny Kukawka) + +------------------------------------------------------------------- +Fri Aug 22 22:02:23 CEST 2008 - sndirsch@suse.de + +- Fixed handling of serial tablet ports in the SaX2 GUI. Solved + problem that ttyS1 and ttyS2 was mapped both to ttyS1. + (Danny Kukawka) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sax2.spec ++++++ --- /var/tmp/diff_new_pack.RL3925/_old 2008-08-23 02:02:32.000000000 +0200 +++ /var/tmp/diff_new_pack.RL3925/_new 2008-08-23 02:02:32.000000000 +0200 @@ -47,7 +47,7 @@ PreReq: /bin/rm /bin/mkdir /usr/bin/chroot %fillup_prereq %insserv_prereq Summary: SuSE advanced X Window System-configuration Version: 8.1 -Release: 491 +Release: 496 Group: System/X11/Utilities License: GPL v2 or later Source: sax2.tar.bz2 @@ -522,6 +522,28 @@ %endif %changelog +* Sat Aug 23 2008 sndirsch@suse.de +- Extended existing serial 'Wacom ISDV4 TabletPC' entry with Touch + device. Added new generic entry for TabletPCs based on internal + Wacom USB devices. + (Danny Kukawka) +* Sat Aug 23 2008 sndirsch@suse.de +- Added new entries for TabletPCs with internal WACOM USB Tablet + devices from ASUS (R1E and R1F). + (Danny Kukawka) +* Sat Aug 23 2008 sndirsch@suse.de +- This patch allows to use for Tablets (as also TabletPCs) devices + which are not /dev/input/event* as e.g.: + * /dev/input/wacom + * /dev/input/by-id/* + * /dev/input/by-path/* + This allows to use persistend device names as e.g. needed for + new Wacom USB based TabletPC devices. + (Danny Kukawka) +* Sat Aug 23 2008 sndirsch@suse.de +- Fixed handling of serial tablet ports in the SaX2 GUI. Solved + problem that ttyS1 and ttyS2 was mapped both to ttyS1. + (Danny Kukawka) * Wed Aug 13 2008 sndirsch@suse.de - alps-macbook profile: * no longer set *Edge values; these are now detected and set by ++++++ sax2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/api/data/cdb/Pens new/sax/api/data/cdb/Pens --- old/sax/api/data/cdb/Pens 2008-07-31 16:40:12.000000000 +0200 +++ new/sax/api/data/cdb/Pens 2008-08-22 22:10:59.000000000 +0200 @@ -285,7 +285,6 @@ RawOption = "ForceDevice" "ISDV4" } - #-------------------------------------------# # TABLET PCs: Wacom ISDV4 TabletPC Stylus # #-------------------------------------------# @@ -298,3 +297,95 @@ RawOption = "ForceDevice" "ISDV4" } +#-------------------------------------------# +# TABLET PCs: Wacom ISDV4 TabletPC Touch # +#-------------------------------------------# +TABLET PCs:ISDV4 TABLET PC Touch (SERIAL) { + Device = /dev/ttyS0 + TabletMode = Absolute + Driver = wacom + Protocol = Auto + TabletType = touch + RawOption = "ForceDevice" "ISDV4" +} + + +#------------------------------------------------# +# TABLET PCs: Wacom ISDV4 TabletPC Eraser (USB) # +#------------------------------------------------# +TABLET PCs:ISDV4 TABLET PC Eraser (USB) { + Device = /dev/input/by-id/usb-Tablet_ISD-V4-event-mouse + Option = USB + TabletMode = Absolute + Driver = wacom + Protocol = Auto + TabletType = eraser + RawOption = "ForceDevice" "ISDV4" +} + +#------------------------------------------------# +# TABLET PCs: Wacom ISDV4 TabletPC Stylus (USB) # +#------------------------------------------------# +TABLET PCs:ISDV4 TABLET PC Stylus (USB) { + Device = /dev/input/by-id/usb-Tablet_ISD-V4-event-mouse + Option = USB + TabletMode = Absolute + Driver = wacom + Protocol = Auto + TabletType = stylus + RawOption = "ForceDevice" "ISDV4" +} +#-------------------------------------------# +# TABLET PCs: ASUS R1E Eraser (USB) # +#-------------------------------------------# +TABLET PCs:ASUS R1E Eraser (USB) { + Device = /dev/input/by-id/usb-Tablet_ISD-V4-event-mouse + Option = USB + TabletMode = Absolute + Driver = wacom + Protocol = Auto + TabletType = eraser + RawOption = "ForceDevice" "ISDV4" +} + +#-------------------------------------------# +# TABLET PCs: ASUS R1E Stylus (USB) # +#-------------------------------------------# +TABLET PCs:ASUS R1E Stylus (USB) { + Device = /dev/input/by-id/usb-Tablet_ISD-V4-event-mouse + Option = USB + TabletMode = Absolute + Driver = wacom + Protocol = Auto + TabletType = stylus + RawOption = "ForceDevice" "ISDV4","BottomX" "26365","BottomY" "16488","TopX" "0","TopY" "0" +} + + +#-------------------------------------------# +# TABLET PCs: ASUS R1F Eraser (USB) # +#-------------------------------------------# +TABLET PCs:ASUS R1F Eraser (USB) { + Device = /dev/input/by-id/usb-Tablet_ISD-V4-event-mouse + Option = USB + TabletMode = Absolute + Driver = wacom + Protocol = Auto + TabletType = eraser + RawOption = "ForceDevice" "ISDV4" +} + +#-------------------------------------------# +# TABLET PCs: ASUS R1F Stylus (USB) # +#-------------------------------------------# +TABLET PCs:ASUS R1F Stylus (USB) { + Device = /dev/input/by-id/usb-Tablet_ISD-V4-event-mouse + Option = USB + TabletMode = Absolute + Driver = wacom + Protocol = Auto + TabletType = stylus + RawOption = "ForceDevice" "ISDV4","BottomX" "28606","BottomY" "17876","TopX" "0","TopY" "0" +} + + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/api/data/cdb/Tablets new/sax/api/data/cdb/Tablets --- old/sax/api/data/cdb/Tablets 2008-07-31 16:40:12.000000000 +0200 +++ new/sax/api/data/cdb/Tablets 2008-08-22 22:10:59.000000000 +0200 @@ -262,8 +262,25 @@ RawOption = "ForceDevice" "ISDV4" StylusLink = ISDV4 TABLET PC Stylus (SERIAL) EraserLink = ISDV4 TABLET PC Eraser (SERIAL) + TouchLink = ISDV4 TABLET PC Touch (SERIAL) } +#----------------------------------# +# TABLET PCs: Wacom ISDV4 USB # +#----------------------------------# +TABLET PCs:Wacom ISDV4 TABLET PC (USB) { + Driver = wacom + Device = /dev/input/by-id/usb-Tablet_ISD-V4-event-mouse + Option = USB + SendCoreEvents = on + TabletType = cursor + TabletMode = Absolute + RawOption = "ForceDevice" "ISDV4" + StylusLink = ISDV4 TABLET PC Stylus (USB) + EraserLink = ISDV4 TABLET PC Eraser (USB) +} + + #-------------------------------# # FinePoint Tablet GateWay # #-------------------------------# @@ -275,4 +292,33 @@ RawOption = "MaximumXPosition" "12550","MaximumYPosition" "7650","MinimumXPosition" "400","MinimumYPosition" "400","BaudRate" "19200" } +#----------------------------------# +# TABLET PCs: ASUS R1E (USB) # +#----------------------------------# +TABLET PCs:ASUS R1E (USB) { + Driver = wacom + Device = /dev/input/by-id/usb-Tablet_ISD-V4-event-mouse + Option = USB + SendCoreEvents = on + TabletType = cursor + TabletMode = Absolute + RawOption = "ForceDevice" "ISDV4" + StylusLink = ASUS R1E Stylus (USB) + EraserLink = ASUS R1E Eraser (USB) +} + +#----------------------------------# +# TABLET PCs: ASUS R1F (USB) # +#----------------------------------# +TABLET PCs:ASUS R1F (USB) { + Driver = wacom + Device = /dev/input/by-id/usb-Tablet_ISD-V4-event-mouse + Option = USB + SendCoreEvents = on + TabletType = cursor + TabletMode = Absolute + RawOption = "ForceDevice" "ISDV4" + StylusLink = ASUS R1F Stylus (USB) + EraserLink = ASUS R1F Eraser (USB) +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/api/tablet/tabletconnection.cpp new/sax/api/tablet/tabletconnection.cpp --- old/sax/api/tablet/tabletconnection.cpp 2008-06-24 03:20:56.000000000 +0200 +++ new/sax/api/tablet/tabletconnection.cpp 2008-08-22 22:05:02.000000000 +0200 @@ -167,7 +167,7 @@ // setPort //------------------------------------ void SCCTabletConnection::setPort ( const QString& device ) { - QRegExp identifier ("/dev/input/event"); + QRegExp identifier ("/dev/input/(by-id|by-path|event|wacom)"); if (identifier.search (device) >= 0) { mPortBox -> setCurrentItem ( 0 ); } @@ -178,10 +178,10 @@ mPortBox -> setCurrentItem ( 2 ); } if (device == "/dev/ttyS2") { - mPortBox -> setCurrentItem ( 2 ); + mPortBox -> setCurrentItem ( 3 ); } if (device == "/dev/ttyS3") { - mPortBox -> setCurrentItem ( 3 ); + mPortBox -> setCurrentItem ( 4 ); } } //==================================== @@ -329,7 +329,7 @@ if (device == "AUTO") { mPortGroup -> setDisabled ( true ); } - QRegExp identifier ("/dev/input/event"); + QRegExp identifier ("/dev/input/(by-id|by-path|event|wacom)"); if (identifier.search (device) >= 0) { mPortBox -> setCurrentItem ( 0 ); } @@ -340,10 +340,10 @@ mPortBox -> setCurrentItem ( 2 ); } if (device == "/dev/ttyS2") { - mPortBox -> setCurrentItem ( 2 ); + mPortBox -> setCurrentItem ( 3 ); } if (device == "/dev/ttyS3") { - mPortBox -> setCurrentItem ( 3 ); + mPortBox -> setCurrentItem ( 4 ); } } //==================================== diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/api/tablet.cpp new/sax/api/tablet.cpp --- old/sax/api/tablet.cpp 2008-07-31 16:40:12.000000000 +0200 +++ new/sax/api/tablet.cpp 2008-08-22 22:05:02.000000000 +0200 @@ -231,15 +231,21 @@ saxTablet.setDevice ( "/dev/ttyS3" ); } if (port.contains ("USB")) { - Q3Process* proc = new Q3Process (); - proc -> addArgument ( USB_PORT ); - if (proc -> start()) { - while (proc->isRunning()) { - usleep (1000); + QString _device = *tabletDict["Device"]; + if (! _device.isEmpty()) { + saxTablet.setDevice ( _device ); + } else { + + Q3Process* proc = new Q3Process (); + proc -> addArgument ( USB_PORT ); + if (proc -> start()) { + while (proc->isRunning()) { + usleep (1000); + } + QByteArray data = proc->readStdout(); + QStringList lines = QStringList::split ("\n",data); + saxTablet.setDevice ( lines.first() ); } - QByteArray data = proc->readStdout(); - QStringList lines = QStringList::split ("\n",data); - saxTablet.setDevice ( lines.first() ); } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/modules/ImportAPI.pm new/sax/modules/ImportAPI.pm --- old/sax/modules/ImportAPI.pm 2008-06-24 03:20:42.000000000 +0200 +++ new/sax/modules/ImportAPI.pm 2008-08-22 22:05:02.000000000 +0200 @@ -1228,7 +1228,9 @@ my $inputf = $api{Mouse}{"$count InputFashion"}; if ( (! defined $entity{$driver}{$device}) || - ($device =~ /ttyS/) || ($device =~ /\/dev\/input\/event/) + ($device =~ /ttyS/) || ($device =~ /\/dev\/input\/event/) || + ($device =~ /\/dev\/input\/by-id\//) || ($device =~ /\/dev\/input\/by-path\//) || + ($device =~ /\/dev\/input\/wacom/) ) { my $l = "ServerLayout"; $var{$l}{all}{InputDevice}{$count}{id} = $list[$i]; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/svnbuild new/sax/svnbuild --- old/sax/svnbuild 2008-08-13 12:12:29.000000000 +0200 +++ new/sax/svnbuild 2008-08-22 22:13:37.000000000 +0200 @@ -1 +1 @@ -1681 +1685 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org