Changeset 38777 in vbox for trunk/src/VBox

Timestamp:

Sep 16, 2011 1:14:34 PM (13 years ago)

Author:

vboxsync

Message:

Reverted r73986: Additions/linux: use the kernel input driver for X.Org Server 1.3 and later

Location:

trunk/src/VBox/Additions

Files:

• linux/installer/70-xorg-vboxmouse.rules (modified) (1 diff)
• linux/installer/vboxadd-x11.sh (modified) (2 diffs)
• x11/Installer/x11config.sh (modified) (1 diff)

trunk/src/VBox/Additions/linux/installer/70-xorg-vboxmouse.rules

@@ -1 @@
-KERNEL=="event*",DRIVER=="vboxguest",SYMLINK+="input/vboxevent"
-KERNEL=="event*",DRIVERS=="vboxguest",SYMLINK+="input/vboxevent"
-
+KERNEL=="vboxguest",ENV{ID_INPUT}="1"

trunk/src/VBox/Additions/linux/installer/vboxadd-x11.sh

@@ -286 +286 @@
     # But not to install the configuration file into xorg.conf.d
     doxorgconfd=""
-    # Or to install the udev rule to symlink our kernel event device
-    # to a stable device name
+    # But without the workaround for SUSE 11.1 not doing input auto-detection
     newmouse=""
     # By default we want to use hal/udev/whatever for auto-loading the mouse driver
@@ -482 +481 @@
                 rm -r /var/cache/hald/fdi-cache 2> /dev/null
             fi
-        # Install a udev rule for symlinking our event device node to
-        # something stable (dev/input/vboxevent)
-        if test -d /etc/udev/rules.d -a -n "$newmouse"
-        then
-            install -o 0 -g 0 -m 0644 "$share_dir/70-xorg-vboxmouse.rules" /etc/udev/rules.d
-            # Create the /dev/input/vboxevent symlink manually straight
-            # after installation
-            device=`find -L /sys/class/input/event* -name vboxguest \
-                -maxdepth 5 2>/dev/null \
-                | sed 's/.*\(event[0-9]*\).*/\1/'`
-            case "$device" in ?*)
-                ln -sf "$device" /dev/input/vboxevent;;
-            esac
-        fi
         if test -n "$doxorgconfd"
         then
+            if test -d /etc/udev/rules.d
+            then
+                install -o 0 -g 0 -m 0644 "$share_dir/70-xorg-vboxmouse.rules" /etc/udev/rules.d
+                # This is normally silent.  I have purposely not redirected
+                # error output as I want to know if something goes wrong,
+                # particularly if the command syntax ever changes.
+                udevadm trigger --action=change --subsystem-match=misc
+            fi
             test -d /usr/share/X11/xorg.conf.d &&
                 install -o 0 -g 0 -m 0644 "$share_dir/50-vboxmouse.conf" /usr/share/X11/xorg.conf.d

trunk/src/VBox/Additions/x11/Installer/x11config.sh

@@ -112 +112 @@
 
 Section "InputDevice"
-  Driver       "evdev"
+  Driver       "vboxmouse"
   Identifier   "Mouse[2]"
-  Option       "Device" "/dev/input/vboxevent"
-  Option       "Name" "VirtualBox mouse integration"
+  Option       "Device" "/dev/vboxguest"
+  Option       "Name" "VirtualBox Mouse"
   Option       "Vendor" "Oracle Corporation"
   Option       "SendCoreEvents"