Author: arekm Date: Thu Oct 4 16:17:25 2007 GMT Module: SOURCES Tag: HEAD ---- Log message: - update to git version
---- Files affected: SOURCES: xorg-app-synaptics-git.patch (NONE -> 1.1) (NEW), xorg-app-synaptics-input-api.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: SOURCES/xorg-app-synaptics-git.patch diff -u /dev/null SOURCES/xorg-app-synaptics-git.patch:1.1 --- /dev/null Thu Oct 4 18:17:25 2007 +++ SOURCES/xorg-app-synaptics-git.patch Thu Oct 4 18:17:20 2007 @@ -0,0 +1,2316 @@ +diff --git a/COMPATIBILITY b/COMPATIBILITY +index 1943af3..c71fc34 100644 +--- a/COMPATIBILITY ++++ b/COMPATIBILITY +@@ -1,5 +1,4 @@ + Acer 661 LCi +-Acer 8104 WLMi + Acer Aspire 1353LC + Acer Aspire 1353XC + Acer Aspire 1511 LMi +@@ -10,7 +9,9 @@ Acer Aspire 2010 + Acer Aspire 2020 + Acer Aspire 3003WLMi + Acer Aspire 3023 ++Acer Aspire 5670 + Acer Aspire 5672 ++Acer Aspire 9301AWSMi + Acer Extensa 3001 WLMi + Acer Ferrari 3000LMi + Acer Ferrari 3200 +@@ -36,6 +37,7 @@ Acer TravelMate 630 + Acer TravelMate 634LCi + Acer TravelMate 739TL + Acer TravelMate 800LCI ++Acer TravelMate 8104 WLMi + Airis Diamond 630 + Airis Pragma 750 + Aopen Openbook 1545/1545D +@@ -48,6 +50,7 @@ ASUS A3500L + ASUS A6000G + ASUS A6Km-Q010H + ASUS A6VA ++ASUS A7F + ASUS B1500 + ASUS Degatto D1 + ASUS L2000B +@@ -64,6 +67,7 @@ ASUS M5N + ASUS M6700N + ASUS S1300 + ASUS S5200N ++ASUS Z62J + ASUS Z71V + BenQ JoyBook 2100E + Clevo 5600P +@@ -100,8 +104,10 @@ COMPAQ Presario 711EA + COMPAQ Presario 912RSH + COMPAQ Presario 915US + COMPAQ Presario R3000 (ALPS touchpad) ++Compaq Presario V5204NR + DELL Inspiron 1100 + DELL Inspiron 2100 ++DELL Inspiron 2200 + DELL Inspiron 2500 + DELL Inspiron 2600 + DELL Inspiron 2650 +@@ -115,6 +121,7 @@ DELL Inspiron 5000 + DELL Inspiron 500m (ALPS touchpad) + DELL Inspiron 5100 + DELL Inspiron 5150 ++DELL Inspiron 6000 (ALPS touchpad) + DELL Inspiron 7000 + DELL Inspiron 7500 + DELL Inspiron 8000 +@@ -163,6 +170,7 @@ Fujitsu-Siemens AMILO Si1520 + Fujitsu-Siemens LIFEBOOK C-1010 and C-1020 + Fujitsu-Siemens LIFEBOOK E7010 (ALPS touchpad) + Fujitsu-Siemens LIFEBOOK P7010D ++Fujitsu-Siemens LIFEBOOK P7120D + Fujitsu-Siemens LIFEBOOK S-2020 (ALPS touchpad) + Fujitsu-Siemens LIFEBOOK S-4572 (ALPS touchpad) + Gateway 200X +@@ -223,6 +231,7 @@ IBM ThinkPad T42 + INote 88EPS + IPC Powernote S + Jewel Saffier 1500 ++Lenovo 3000 C100 + LG LM50 + Los Alamos LUP4SA2 + MAXDATA Pro 5000X +@@ -264,6 +273,8 @@ SONY VAIO PCG-NV105 (ALPS touchpad) + SONY VAIO PCG-TR1A (ALPS touchpad) + SONY VAIO VGN-A115S (ALPS touchpad) + Sony VAIO VGN-S4XP (ALPS touchpad) ++SONY VAIO VGN-SZ72B (ALPS touchpad) ++SONY VAIO VGN-UX50 (ALPS dualpoint touchpad) + SONY VAIO Z1 (ALPS touchpad) + SONY VAIO Z505SX (ALPS touchpad) + Sotec 3120X +@@ -274,9 +285,10 @@ Toshiba 1410-303 (ALPS touchpad) + Toshiba A20 (ALPS touchpad) + Toshiba A25 (ALPS touchpad) + Toshiba EX1/524CDET (ALPS touchpad) +-Toshiba Portege A100 + Toshiba Portege 2000 (ALPS touchpad) + Toshiba Portege 3500 (ALPS touchpad) ++Toshiba Portege A100 ++Toshiba Portege R200 (ALPS touchpad) + Toshiba Qosmio E-15 (ALPS touchpad) + Toshiba Satellite 1130-Z23 (ALPS touchpad) + Toshiba Satellite 1400-103 (ALPS touchpad) +@@ -289,7 +301,9 @@ Toshiba Satellite A75-S209 (ALPS touchpad) + Toshiba Satellite M30 + Toshiba Satellite P25-607 + Toshiba Satellite Pro 2100 (ALPS touchpad) ++Toshiba Satellite S3000-514 (ALPS touchpad) + Toshiba Tecra A3 (ALPS touchpad) + Toshiba Tecra A4 ++Toshiba Tecra A8 + Toshiba Tecra M2 (ALPS touchpad) + Vobis Highscreen XI 14-C1200 (Same as Yakumo Q5M 1.2GHz) +diff --git a/FILES b/FILES +index a8db79b..d3d0624 100644 +--- a/FILES ++++ b/FILES +@@ -9,5 +9,5 @@ script/usbmouse script for shutting the touchpad down if + an external USB-mouse is attached + syndaemon.c A user space program that disables the touchpad + when the keyboard is used. +-alps.patch Patch for 2.6 kernels that makes it possible to ++alps.patch Patch for older 2.6 kernels that makes it possible to + use the driver with an ALPS GlidePoint device. +diff --git a/INSTALL b/INSTALL +index 8fcf919..900b8c5 100644 +--- a/INSTALL ++++ b/INSTALL +@@ -49,24 +49,28 @@ EndSection + following lines: + + Section "InputDevice" +- Identifier "Synaptics Mouse" +- Driver "synaptics" +- Option "Device" "/dev/psaux" +- Option "Protocol" "auto-dev" +- Option "LeftEdge" "1700" +- Option "RightEdge" "5300" +- Option "TopEdge" "1700" +- Option "BottomEdge" "4200" +- Option "FingerLow" "25" +- Option "FingerHigh" "30" +- Option "MaxTapTime" "180" +- Option "MaxTapMove" "220" +- Option "VertScrollDelta" "100" +- Option "MinSpeed" "0.09" +- Option "MaxSpeed" "0.18" +- Option "AccelFactor" "0.0015" +- Option "SHMConfig" "on" +-# Option "Repeater" "/dev/ps2mouse" ++ Identifier "Synaptics Mouse" ++ Driver "synaptics" ++ Option "Device" "/dev/psaux" ++ Option "Protocol" "auto-dev" ++# enable SHMConfig if you want to enable synclient ++# NB: enabling SHMConfig is insecure, since any user can invoke it ++# Option "SHMConfig" "on" ++ Option "LeftEdge" "1700" ++ Option "RightEdge" "5300" ++ Option "TopEdge" "1700" ++ Option "BottomEdge" "4200" ++ Option "FingerLow" "25" ++ Option "FingerHigh" "30" ++ Option "MaxTapTime" "180" ++ Option "MaxTapMove" "220" ++ Option "VertScrollDelta" "100" ++ Option "CornerCoasting" "1" ++ Option "CoastingSpeed" "3" ++ Option "MinSpeed" "0.09" ++ Option "MaxSpeed" "0.18" ++ Option "AccelFactor" "0.0015" ++# Option "Repeater" "/dev/ps2mouse" + EndSection + + Change the Identifier to the same name as in the ServerLayout section. +diff --git a/README b/README +index b17ce51..d45133a 100644 +--- a/README ++++ b/README +@@ -28,6 +28,7 @@ advanced features of the touchpad becomes available, such as: + for right button events. (Needs hardware support. Not all models + implement this feature.) + - Pressure dependent motion speed. ++- Trackstick emulation. + - Run-time configuration using shared memory. This means you can + change parameter settings without restarting the X server. + +diff --git a/README.alps b/README.alps +index 1b63cb0..d89b38b 100644 +--- a/README.alps ++++ b/README.alps +@@ -1,7 +1,8 @@ + It is possible to use this driver with an ALPS Glidepoint device. If +-you use a 2.6 linux kernel, you need to apply the ALPS kernel patch +-in the alps.patch file. See http://www.kernelnewbies.org/faq/ for +-information about how to apply kernel patches and compile kernels. ++you use an older 2.6 linux kernel which has no ALPS input driver, you ++need to apply the ALPS kernel patch in the alps.patch file. See ++http://www.kernelnewbies.org/faq/ for information about how to apply ++kernel patches and compile kernels. + + Note! If you use kernel 2.6.11 or later, the alps patch is already + included, so you don't have to patch your kernel. +@@ -11,10 +12,13 @@ touchpads, you probably have to change some parameter values. Here is + an example InputDevice section for the X configuration file. + + Section "InputDevice" +- Driver "synaptics" +- Identifier "Mouse[1]" +- Option "Device" "/dev/psaux" ++ Driver "synaptics" ++ Identifier "Mouse[1]" ++ Option "Device" "/dev/psaux" + Option "Protocol" "auto-dev" ++# enable SHMConfig if you want to enable synclient ++# NB: enabling SHMConfig is insecure, since any user can invoke it ++# Option "SHMConfig" "on" + Option "LeftEdge" "120" + Option "RightEdge" "830" + Option "TopEdge" "120" +@@ -26,6 +30,8 @@ Section "InputDevice" + Option "EmulateMidButtonTime" "75" + Option "VertScrollDelta" "20" + Option "HorizScrollDelta" "20" ++ Option "CornerCoasting" "1" ++ Option "CoastingSpeed" "3" + Option "MinSpeed" "0.3" + Option "MaxSpeed" "0.75" + Option "AccelFactor" "0.015" +@@ -38,7 +44,7 @@ Section "InputDevice" + EndSection + + If you use a 2.4 linux kernel, you don't need to patch the kernel, but +-you should instead set "Device" and "Protocol" like this: ++you should instead set "Protocol" like this: + + Option "Protocol" "alps" + +diff --git a/alpscomm.c b/alpscomm.c +index e315c1c..89d2a4a 100644 +--- a/alpscomm.c ++++ b/alpscomm.c +@@ -1,7 +1,7 @@ + /* Copyright (C) 2001 Stefan Gmeiner <[EMAIL PROTECTED]> + * + * Copyright (c) 2003 Neil Brown <[EMAIL PROTECTED]> +- * Copyright (c) 2003-2004 Peter Osterlund <[EMAIL PROTECTED]> ++ * Copyright (c) 2003-2005,2007 Peter Osterlund <[EMAIL PROTECTED]> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License +@@ -72,7 +72,7 @@ ALPS_initialize(int fd) + } + + static void +-ALPSDeviceOnHook(LocalDevicePtr local) ++ALPSDeviceOnHook(LocalDevicePtr local, SynapticsSHM *para) + { + } + +diff --git a/docs/tapndrag.dia b/docs/tapndrag.dia +index b50acb3..a411572 100644 +--- a/docs/tapndrag.dia ++++ b/docs/tapndrag.dia +@@ -79,6 +79,12 @@ + <dia:attribute name="elem_height"> + <dia:real val="2"/> + </dia:attribute> ++ <dia:attribute name="line_colour"> ++ <dia:color val="#000000"/> ++ </dia:attribute> ++ <dia:attribute name="fill_colour"> ++ <dia:color val="#ffffff"/> ++ </dia:attribute> + <dia:attribute name="text_outside"> + <dia:boolean val="false"/> + </dia:attribute> +@@ -97,7 +103,7 @@ + <dia:real val="0.8"/> + </dia:attribute> + <dia:attribute name="pos"> +- <dia:point val="12.0013,7.89119"/> ++ <dia:point val="12.0013,7.94119"/> + </dia:attribute> + <dia:attribute name="color"> + <dia:color val="#000000"/> +@@ -124,6 +130,12 @@ + <dia:attribute name="elem_height"> + <dia:real val="2"/> + </dia:attribute> ++ <dia:attribute name="line_colour"> ++ <dia:color val="#000000"/> ++ </dia:attribute> ++ <dia:attribute name="fill_colour"> ++ <dia:color val="#ffffff"/> ++ </dia:attribute> + <dia:attribute name="text_outside"> + <dia:boolean val="false"/> + </dia:attribute> +@@ -142,7 +154,7 @@ + <dia:real val="0.8"/> + </dia:attribute> + <dia:attribute name="pos"> +- <dia:point val="12.0013,14.3985"/> ++ <dia:point val="12.0013,14.4485"/> + </dia:attribute> + <dia:attribute name="color"> + <dia:color val="#000000"/> +@@ -169,6 +181,12 @@ + <dia:attribute name="elem_height"> + <dia:real val="2"/> + </dia:attribute> ++ <dia:attribute name="line_colour"> ++ <dia:color val="#000000"/> ++ </dia:attribute> ++ <dia:attribute name="fill_colour"> ++ <dia:color val="#ffffff"/> ++ </dia:attribute> + <dia:attribute name="text_outside"> + <dia:boolean val="false"/> + </dia:attribute> +@@ -187,7 +205,7 @@ + <dia:real val="0.8"/> + </dia:attribute> + <dia:attribute name="pos"> +- <dia:point val="5.44128,20.8385"/> ++ <dia:point val="5.44128,20.8885"/> + </dia:attribute> + <dia:attribute name="color"> + <dia:color val="#000000"/> +@@ -214,6 +232,12 @@ + <dia:attribute name="elem_height"> + <dia:real val="2"/> + </dia:attribute> ++ <dia:attribute name="line_colour"> ++ <dia:color val="#000000"/> ++ </dia:attribute> ++ <dia:attribute name="fill_colour"> ++ <dia:color val="#ffffff"/> ++ </dia:attribute> + <dia:attribute name="text_outside"> + <dia:boolean val="false"/> + </dia:attribute> +@@ -232,7 +256,7 @@ + <dia:real val="0.8"/> + </dia:attribute> + <dia:attribute name="pos"> +- <dia:point val="12.0013,27.993"/> ++ <dia:point val="12.0013,28.043"/> + </dia:attribute> + <dia:attribute name="color"> + <dia:color val="#000000"/> +@@ -259,6 +283,12 @@ + <dia:attribute name="elem_height"> + <dia:real val="2"/> + </dia:attribute> ++ <dia:attribute name="line_colour"> ++ <dia:color val="#000000"/> ++ </dia:attribute> ++ <dia:attribute name="fill_colour"> ++ <dia:color val="#ffffff"/> ++ </dia:attribute> + <dia:attribute name="text_outside"> + <dia:boolean val="false"/> + </dia:attribute> +@@ -277,7 +307,7 @@ + <dia:real val="0.8"/> + </dia:attribute> + <dia:attribute name="pos"> +- <dia:point val="21.3937,14.3985"/> ++ <dia:point val="21.3937,14.4485"/> + </dia:attribute> + <dia:attribute name="color"> + <dia:color val="#000000"/> +@@ -304,6 +334,12 @@ + <dia:attribute name="elem_height"> + <dia:real val="2"/> + </dia:attribute> ++ <dia:attribute name="line_colour"> ++ <dia:color val="#000000"/> ++ </dia:attribute> ++ <dia:attribute name="fill_colour"> ++ <dia:color val="#ffffff"/> ++ </dia:attribute> + <dia:attribute name="text_outside"> + <dia:boolean val="false"/> + </dia:attribute> +@@ -322,7 +358,7 @@ + <dia:real val="0.8"/> + </dia:attribute> + <dia:attribute name="pos"> +- <dia:point val="21.3937,27.993"/> ++ <dia:point val="21.3937,28.043"/> + </dia:attribute> + <dia:attribute name="color"> + <dia:color val="#000000"/> +@@ -571,7 +607,7 @@ + <dia:point val="5.49118,39.4412"/> + </dia:attribute> + <dia:attribute name="obj_bb"> +- <dia:rectangle val="5.44118,39.3912;17.2912,48.3912"/> ++ <dia:rectangle val="5.44118,39.3912;17.2912,49.9912"/> + </dia:attribute> + <dia:attribute name="elem_corner"> + <dia:point val="5.49118,39.4412"/> +@@ -580,7 +616,13 @@ + <dia:real val="11.75"/> + </dia:attribute> + <dia:attribute name="elem_height"> +- <dia:real val="8.9"/> ++ <dia:real val="10.5"/> ++ </dia:attribute> ++ <dia:attribute name="line_colour"> ++ <dia:color val="#000000"/> ++ </dia:attribute> ++ <dia:attribute name="fill_colour"> ++ <dia:color val="#ffffff"/> + </dia:attribute> + <dia:attribute name="text"> + <dia:composite type="text"> +@@ -591,6 +633,7 @@ TO : Tap Timeout + TO2: Mouse click timeout + TO3: Double tap timeout + TO4: Single tap timeout ++TO5: Locked drag timeout + M : Finger movement + [U]: Generate button up event + [D]: Generate button down event +@@ -604,7 +647,7 @@ F : Fast taps enabled#</dia:string> + <dia:real val="0.8"/> + </dia:attribute> + <dia:attribute name="pos"> +- <dia:point val="5.84118,40.7412"/> ++ <dia:point val="5.84118,40.6912"/> + </dia:attribute> + <dia:attribute name="color"> + <dia:color val="#000000"/> +@@ -615,12 +658,12 @@ F : Fast taps enabled#</dia:string> + </dia:composite> + </dia:attribute> + </dia:object> +- <dia:object type="Standard - Text" version="0" id="O15"> ++ <dia:object type="Standard - Text" version="1" id="O15"> + <dia:attribute name="obj_pos"> + <dia:point val="11.23,10.8357"/> + </dia:attribute> + <dia:attribute name="obj_bb"> +- <dia:rectangle val="11.055,10.1857;11.405,11.1857"/> ++ <dia:rectangle val="11.055,10.2357;11.405,11.1857"/> + </dia:attribute> + <dia:attribute name="text"> + <dia:composite type="text"> +@@ -644,13 +687,16 @@ F : Fast taps enabled#</dia:string> + </dia:attribute> + </dia:composite> + </dia:attribute> ++ <dia:attribute name="valign"> ++ <dia:enum val="3"/> ++ </dia:attribute> + </dia:object> +- <dia:object type="Standard - Text" version="0" id="O16"> ++ <dia:object type="Standard - Text" version="1" id="O16"> + <dia:attribute name="obj_pos"> + <dia:point val="8.4912,23.1912"/> + </dia:attribute> + <dia:attribute name="obj_bb"> +- <dia:rectangle val="7.9662,22.5412;9.0162,24.3412"/> ++ <dia:rectangle val="7.9662,22.5912;9.0162,24.3412"/> + </dia:attribute> + <dia:attribute name="text"> + <dia:composite type="text"> +@@ -675,13 +721,16 @@ F : Fast taps enabled#</dia:string> + </dia:attribute> + </dia:composite> + </dia:attribute> ++ <dia:attribute name="valign"> ++ <dia:enum val="3"/> ++ </dia:attribute> + </dia:object> +- <dia:object type="Standard - Text" version="0" id="O17"> ++ <dia:object type="Standard - Text" version="1" id="O17"> + <dia:attribute name="obj_pos"> + <dia:point val="17.0662,11.0357"/> + </dia:attribute> + <dia:attribute name="obj_bb"> +- <dia:rectangle val="16.8912,10.3857;17.2412,11.3857"/> ++ <dia:rectangle val="16.8912,10.4357;17.2412,11.3857"/> + </dia:attribute> + <dia:attribute name="text"> + <dia:composite type="text"> +@@ -705,6 +754,9 @@ F : Fast taps enabled#</dia:string> + </dia:attribute> + </dia:composite> + </dia:attribute> ++ <dia:attribute name="valign"> ++ <dia:enum val="3"/> ++ </dia:attribute> + </dia:object> + <dia:object type="Standard - Line" version="0" id="O18"> + <dia:attribute name="obj_pos"> +@@ -734,12 +786,12 @@ F : Fast taps enabled#</dia:string> + <dia:connection handle="1" to="O5" connection="3"/> + </dia:connections> + </dia:object> +- <dia:object type="Standard - Text" version="0" id="O19"> ++ <dia:object type="Standard - Text" version="1" id="O19"> + <dia:attribute name="obj_pos"> + <dia:point val="13.73,17.0857"/> + </dia:attribute> + <dia:attribute name="obj_bb"> +- <dia:rectangle val="12.3087,16.4145;15.13,18.2782"/> ++ <dia:rectangle val="12.33,16.4857;15.13,18.2357"/> + </dia:attribute> + <dia:attribute name="text"> + <dia:composite type="text"> +@@ -764,13 +816,16 @@ F : Fast taps enabled#</dia:string> + </dia:attribute> + </dia:composite> + </dia:attribute> ++ <dia:attribute name="valign"> ++ <dia:enum val="3"/> ++ </dia:attribute> + </dia:object> +- <dia:object type="Standard - Text" version="0" id="O20"> ++ <dia:object type="Standard - Text" version="1" id="O20"> + <dia:attribute name="obj_pos"> + <dia:point val="5.32686,26.1857"/> + </dia:attribute> + <dia:attribute name="obj_bb"> +- <dia:rectangle val="4.80186,25.5357;5.85186,27.3357"/> ++ <dia:rectangle val="4.80186,25.5857;5.85186,27.3357"/> + </dia:attribute> + <dia:attribute name="text"> + <dia:composite type="text"> +@@ -795,13 +850,16 @@ F : Fast taps enabled#</dia:string> + </dia:attribute> + </dia:composite> + </dia:attribute> ++ <dia:attribute name="valign"> ++ <dia:enum val="3"/> ++ </dia:attribute> + </dia:object> +- <dia:object type="Standard - Text" version="0" id="O21"> ++ <dia:object type="Standard - Text" version="1" id="O21"> + <dia:attribute name="obj_pos"> + <dia:point val="16.3912,13.6912"/> + </dia:attribute> + <dia:attribute name="obj_bb"> +- <dia:rectangle val="15.1662,13.0412;17.6162,14.0412"/> ++ <dia:rectangle val="15.1662,13.0912;17.6162,14.0412"/> + </dia:attribute> + <dia:attribute name="text"> + <dia:composite type="text"> +@@ -825,13 +883,16 @@ F : Fast taps enabled#</dia:string> + </dia:attribute> + </dia:composite> + </dia:attribute> ++ <dia:attribute name="valign"> ++ <dia:enum val="3"/> ++ </dia:attribute> + </dia:object> +- <dia:object type="Standard - Text" version="0" id="O22"> ++ <dia:object type="Standard - Text" version="1" id="O22"> + <dia:attribute name="obj_pos"> + <dia:point val="16.517,27.1577"/> + </dia:attribute> + <dia:attribute name="obj_bb"> +- <dia:rectangle val="15.292,26.5077;17.742,27.5077"/> ++ <dia:rectangle val="15.292,26.5577;17.742,27.5077"/> + </dia:attribute> + <dia:attribute name="text"> + <dia:composite type="text"> +@@ -855,13 +916,16 @@ F : Fast taps enabled#</dia:string> + </dia:attribute> + </dia:composite> + </dia:attribute> ++ <dia:attribute name="valign"> ++ <dia:enum val="3"/> ++ </dia:attribute> + </dia:object> +- <dia:object type="Standard - Text" version="0" id="O23"> ++ <dia:object type="Standard - Text" version="1" id="O23"> + <dia:attribute name="obj_pos"> + <dia:point val="1.24118,9.9412"/> + </dia:attribute> + <dia:attribute name="obj_bb"> +- <dia:rectangle val="0.36618,9.2912;2.11618,11.0912"/> ++ <dia:rectangle val="0.36618,9.3412;2.11618,11.0912"/> + </dia:attribute> + <dia:attribute name="text"> + <dia:composite type="text"> +@@ -886,13 +950,16 @@ F : Fast taps enabled#</dia:string> + </dia:attribute> + </dia:composite> <<Diff was trimmed, longer than 597 lines>> _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
