From 85c566c0a2314376412e878207d04ef43eb2d961 Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau@mandriva.com>
Date: Tue, 22 Sep 2009 14:01:30 +0000
Subject: don't add sections for synaptics devices to xorg.conf

---
 lib/Xconfig/xfree.pm | 52 ----------------------------------------------------
 lib/mouse.pm         |  2 --
 2 files changed, 54 deletions(-)

diff --git a/lib/Xconfig/xfree.pm b/lib/Xconfig/xfree.pm
index 45d61b9..f03bc88 100644
--- a/lib/Xconfig/xfree.pm
+++ b/lib/Xconfig/xfree.pm
@@ -294,58 +294,6 @@ sub set_wacoms {
     } @wacoms;
 }
 
-
-################################################################################
-# synaptics ####################################################################
-################################################################################
-sub set_synaptics {
-    my ($raw_X, @synaptics) = @_;
-    $raw_X->remove_InputDevices('synaptics');
-
-    @synaptics or return;
-
-    my $layout = get_ServerLayout($raw_X)->{InputDevice} ||= [];    
-    each_index {
-	my $synaptics_mouse = $_;
-        my $identifier = "SynapticsMouse" . ($::i + 1);
-        my $h = {
-            Identifier => { val => $identifier },
-            Driver => { val => "synaptics" },
-        };
-        my %opts = (
-            if_($synaptics_mouse->{ALPS},
-                #- from /usr/share/doc/synaptics-0.14.0/README.alps
-                #- and http://qa.mandriva.com/show_bug.cgi?id=14512
-                LeftEdge => 120,
-                RightEdge => 830,
-                TopEdge => 120,
-                BottomEdge => 650,
-                FingerLow => 14,
-                FingerHigh => 15,
-                MaxTapMove => 110,
-                VertScrollDelta => 20,
-                HorizScrollDelta => 20,
-                MinSpeed => '0.8',
-                MaxSpeed => '1.00',
-                AccelFactor => '0.015',
-                EdgeMotionMinSpeed => 200,
-                EdgeMotionMaxSpeed => 200,
-                UpDownScrolling => 1,
-                CircularScrolling => 1,
-                CircScrollTrigger => 2,
-                UpDownScrolling => 0,
-            ), #- use default driver options for non-ALPS
-            SHMConfig => "on",
-        );
-        while (my ($k, $v) = each %opts) {
-            $h->{$k} = { val => $v, Option => 1 };
-        }
-        $raw_X->add_Section('InputDevice', $h);
-        push @$layout, { val => qq("$identifier" "SendCoreEvents") };
-    } @synaptics;
-}
-
-
 ################################################################################
 # monitor ######################################################################
 ################################################################################
diff --git a/lib/mouse.pm b/lib/mouse.pm
index f04b681..bbfc29e 100644
--- a/lib/mouse.pm
+++ b/lib/mouse.pm
@@ -368,8 +368,6 @@ sub set_xfree_conf {
     if (my @wacoms = @{$mouse->{wacom} || []}) {
 	$xfree_conf->set_wacoms(map { { Device => "/dev/$_", USB => to_bool(m|input/by-path/event|) } } @wacoms);
     }
-
-    $xfree_conf->set_synaptics({ ALPS => $mouse->{synaptics}{ALPS} }) if $mouse->{synaptics};
 }
 
 sub various_xfree_conf {
-- 
cgit v1.2.1