Changeset 42469 in vbox for trunk/src/VBox/Additions/x11/Installer

Timestamp:

Jul 31, 2012 6:58:12 AM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

79612

Message:

Additions/solaris/installer: run vboxmslnk instead of installing the X.Org vboxmouse driver.

Location:

trunk/src/VBox/Additions/x11/Installer

Files:

• x11config15sol.pl (modified) (5 diffs)
• x11restore.pl (modified) (1 diff)

trunk/src/VBox/Additions/x11/Installer/x11config15sol.pl

@@ -33 +33 @@
         open(TMP, ">$temp") or die "Can't create $TMP: $!\n";
 
-        my $have_mouse = 0;
         my $in_section = 0;
 
@@ -41 +40 @@
             {
                 my $section = lc($1);
-                if (($section eq "inputdevice") || ($section eq "device"))
+                if ($section eq "device")
                 {
                     $in_section = 1;
-                }
-                if ($section eq "serverlayout")
-                {
-                    $in_layout = 1;
                 }
             } else {
@@ -53 +48 @@
                 {
                     $in_section = 0;
-                    $in_layout = 0;
                 }
             }
@@ -59 +53 @@
             if ($in_section)
             {
-                if ($line =~ /^\s*driver\s+\"(?:mouse|vboxmouse)\"/i)
-                {
-                    $line = "    Driver      \"vboxmouse\"\n    Option      \"CorePointer\"\n";
-                    $have_mouse = 1
-                }
-
-                # Other drivers sending events interfere badly with pointer integration
-                if ($line =~ /^\s*option\s+\"(?:alwayscore|sendcoreevents|corepointer)\"/i)
-                {
-                    $line = "";
-                }
-
-                # Solaris specific: Use /dev/vboxguest for Xorg 1.5.3+
-                if ($os_type =~ 'SunOS')
-                {
-                    if ($line =~ /^\s*option\s+\"(?:device)\"\s+\"(?:\/dev\/kdmouse)\"/i)
-                    {
-                        $line = "    Option      \"Device\" \"\/dev\/vboxguest\"\n"
-                    }
-
-                    if ($line =~ /^\s*option\s+\"(?:device)\"\s+\"(?:\/dev\/mouse)\"/i)
-                    {
-                        $line = "    Option      \"Device\" \"\/dev\/vboxguest\"\n"
-                    }
-                }
-
                 if ($line =~ /^\s*driver\s+\"(?:fbdev|vga|vesa|vboxvideo|ChangeMe)\"/i)
                 {
@@ -90 +58 @@
                 }
             }
-            if ($in_layout)
-            {
-                # Other drivers sending events interfere badly with pointer integration
-                if (   $line =~ /^\s*inputdevice.*\"(?:alwayscore|sendcoreevents)\"/i)
-                {
-                    $line = "";
-                }
-            }
             print TMP $line;
         }
 
-        if (!$have_mouse) {
-            print TMP "\n";
-            print TMP "Section \"InputDevice\"\n";
-            print TMP "        Identifier  \"VBoxMouse\"\n";
-            print TMP "        Driver      \"vboxmouse\"\n";
-            if ($os_type eq 'SunOS')
-            {
-                print TMP "        Option      \"Device\"     \"\/dev\/vboxguest\"\n";
-            }
-            print TMP "        Option      \"CorePointer\"\n";
-            print TMP "EndSection\n";
-        }
         close(TMP);
 

trunk/src/VBox/Additions/x11/Installer/x11restore.pl

@@ -26 +26 @@
 
 my $config_count = 0;
-my $vboxpresent = "vboxmouse";
+my $vboxpresent = "vboxvideo";
 
 foreach $cfg (@cfg_files)