summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--lib/Xconfig/xfree.pm2
-rw-r--r--lib/mouse.pm8
3 files changed, 4 insertions, 7 deletions
diff --git a/NEWS b/NEWS
index d9e6b43..698bc3f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
- switch from legacy (KOI8-R) 'ru4' keyboard to 'ru'
- display_driver_helper:
o detect grub2 when checking for liveCD/DVD
+- stop installing/configuring vboxmouse (mga#18917)
Version 1.13 - 10 July 2016
diff --git a/lib/Xconfig/xfree.pm b/lib/Xconfig/xfree.pm
index 8c1aeff..100e47e 100644
--- a/lib/Xconfig/xfree.pm
+++ b/lib/Xconfig/xfree.pm
@@ -131,7 +131,7 @@ sub set_mice {
sub _is_mouse {
my ($entry) = @_;
my $Driver = val($entry->{Driver});
- member($Driver, qw(mouse vboxmouse)) || $Driver eq 'evdev' && !val($entry->{XkbLayout});
+ $Driver eq 'mouse' || $Driver eq 'evdev' && !val($entry->{XkbLayout});
}
sub _new_mouse_sections {
my ($raw_X, @Drivers) = @_;
diff --git a/lib/mouse.pm b/lib/mouse.pm
index ecae2ca..ef1d272 100644
--- a/lib/mouse.pm
+++ b/lib/mouse.pm
@@ -86,7 +86,6 @@ sub _all_mice() {
[ [ 7, 'ps/2', 'ExplorerPS/2', N_("Any PS/2 & USB mice") ],
[ 7, 'ps/2', 'ExplorerPS/2', N_("Force evdev") ], #- evdev is magically handled in mouse::select()
if_(detect_devices::is_xbox(), [ 5, 'ps/2', 'IMPS/2', N_("Microsoft Xbox Controller S") ]),
- if_(detect_devices::is_virtualbox(), [ 7, 'ps/2', 'vboxmouse', N_("VirtualBox mouse") ]),
] ],
N_("none") =>
@@ -295,9 +294,7 @@ sub detect {
my @wacom = _probe_usb_wacom_devices();
$modules_conf->get_probeall("usb-interface") and eval { modules::load('usbhid') };
- if (detect_devices::is_virtualbox()) {
- fullname2mouse("Universal|VirtualBox mouse");
- } elsif (my @mice = grep { $_->{Handlers}{mouse} } detect_devices::getInputDevices_and_usb()) {
+ if (my @mice = grep { $_->{Handlers}{mouse} } detect_devices::getInputDevices_and_usb()) {
my @synaptics = map {
{ ALPS => $_->{ALPS} };
} grep { $_->{Synaptics} || $_->{ALPS} } @mice;
@@ -351,7 +348,7 @@ sub set_xfree_conf {
my @mice = map {
{
- ($_->{Protocol} eq 'vboxmouse' ? "Driver" : "Protocol") => $_->{Protocol},
+ Protocol => $_->{Protocol},
Device => devices::make($_->{device}),
if_($_->{Emulate3Buttons} || $_->{EmulateWheel}, Emulate3Buttons => undef, Emulate3Timeout => 50),
if_($_->{EmulateWheel}, EmulateWheel => undef, EmulateWheelButton => 2),
@@ -393,7 +390,6 @@ sub various_xfree_conf {
my $pkgs = [
if_($mouse->{synaptics}, ['x11-driver-input-synaptics', "$inputdrvpath/synaptics_drv.so"]),
if_($mouse->{evdev_mice}, ['x11-driver-input-libinput', "$inputdrvpath/evdev_drv.so"]),
- if_($mouse->{Protocol} eq 'vboxmouse', ['x11-driver-input-vboxmouse', "$inputdrvpath/vboxmouse_drv.so"]),
if_(@{$mouse->{wacom}}, ['x11-driver-input-wacom', "$inputdrvpath/wacom_drv.so"]),
];
$do_pkgs->ensure_files_are_installed($pkgs, 1);