summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-10-24 12:38:10 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-10-24 12:38:10 +0000
commit1e742db130182eea4c40fad78845f752620374da (patch)
tree4fb8b427bedf1487849762c09337d6bba39cf7f3
parentf9b12148abe8b4d345943366fec19336c700a773 (diff)
downloaddrakx-kbd-mouse-x11-1e742db130182eea4c40fad78845f752620374da.tar
drakx-kbd-mouse-x11-1e742db130182eea4c40fad78845f752620374da.tar.gz
drakx-kbd-mouse-x11-1e742db130182eea4c40fad78845f752620374da.tar.bz2
drakx-kbd-mouse-x11-1e742db130182eea4c40fad78845f752620374da.tar.xz
drakx-kbd-mouse-x11-1e742db130182eea4c40fad78845f752620374da.zip
- mousedrake:
o do not use /dev/mouse symlink (in xorg.conf) o do not propose to test the chosen mice (it doesn't handle evdev/synaptics and so is quite obsolete nowadays)
-rw-r--r--NEWS6
-rw-r--r--lib/mouse.pm14
-rwxr-xr-xtools/mousedrake16
3 files changed, 7 insertions, 29 deletions
diff --git a/NEWS b/NEWS
index 10a789d..b6bff35 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+- mousedrake, XFdrake:
+ o do not use /dev/mouse symlink (in xorg.conf)
+- mousedrake
+ o do not propose to test the chosen mice
+ (it doesn't handle evdev/synaptics and so is quite obsolete nowadays)
+
Version 0.64 - 1 October 2008
- XFdrake:
diff --git a/lib/mouse.pm b/lib/mouse.pm
index 93a06ba..9472415 100644
--- a/lib/mouse.pm
+++ b/lib/mouse.pm
@@ -400,14 +400,12 @@ sub set_xfree_conf {
my @mice = map {
{
($_->{Protocol} eq 'vboxmouse' ? "Driver" : "Protocol") => $_->{Protocol},
- Device => "/dev/mouse",
+ Device => devices::make($_->{device}),
if_($_->{Emulate3Buttons} || $_->{EmulateWheel}, Emulate3Buttons => undef, Emulate3Timeout => 50),
if_($_->{EmulateWheel}, EmulateWheel => undef, EmulateWheelButton => 2),
};
} $mouse;
- devices::symlink_now_and_register($mouse, 'mouse');
-
if ($mouse->{evdev_mice}) {
push @mice, @{$mouse->{evdev_mice}};
} elsif (!$mouse->{synaptics} && $b_keep_auxmouse_unchanged) {
@@ -521,16 +519,6 @@ sub test_mouse_install {
$r;
}
-sub test_mouse_standalone {
- my ($mouse, $hbox) = @_;
- require ugtk2;
- ugtk2->import(qw(:wrappers));
- my $darea = Gtk2::DrawingArea->new;
- $darea->set_events([ 'button_press_mask', 'button_release_mask' ]); #$darea must be unrealized.
- gtkpack($hbox, gtkpack(gtkset_border_width(Gtk2::VBox->new(0, 10), 10), $darea));
- test_mouse($mouse, $darea);
-}
-
sub select {
my ($in, $mouse) = @_;
diff --git a/tools/mousedrake b/tools/mousedrake
index 0531372..dee1592 100755
--- a/tools/mousedrake
+++ b/tools/mousedrake
@@ -35,22 +35,6 @@ if (!$mouse || !$::auto) {
mouse::write_conf($in->do_pkgs, $modules_conf, $mouse, 1);
-if ($in->isa('interactive::gtk') && mouse::change_mouse_live($mouse, \%old)) {
-
- require ugtk2;
- ugtk2->import(qw(:wrappers :create));
- require mygtk2;
- mygtk2->import(qw(gtknew));
- my $w = ugtk2->new(N("Mouse test"));
- gtkadd($w->{window},
- gtknew('VBox', spacing => 5, children_loose => [
- gtknew('Label', text => N("Please test your mouse:")),
- my $test_hbox = gtknew('HBox', spacing => 5),
- $w->create_okcancel]));
- mouse::test_mouse_standalone($mouse, $test_hbox);
- $w->main or goto begin;
-}
-
system('service', 'gpm', 'restart') if -e '/var/lock/subsys/gpm';
$in->exit(0);