From c75b0918d66108a45714b1958a992631afcbc5b1 Mon Sep 17 00:00:00 2001 From: hickert Date: Tue, 24 Feb 2009 11:52:15 +0000 Subject: [PATCH] Applied patches from extern : > * Reorder MouseType and MousePorts array, so autodetection is the first entry > - Type: auto > - Port: /dev/input/mice (combined mouse driver default since Linux 2.6) > * Add "auto" to MouseType for autodetection > * Rename previous MouseType "inheritance" AUTO to use "default" > -> this will map old AUTO => auto, which should almost always work git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@13448 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../systems/goto/class_terminalService.inc | 23 ++++++++++------ .../systems/goto/class_workstationService.inc | 26 ++++++++++++------- 2 files changed, 31 insertions(+), 18 deletions(-) diff --git a/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc b/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc index a19bfe318..12edba01f 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc @@ -145,12 +145,19 @@ class termservice extends plugin /* Additional values will be extracted from CONFIG_DIR.keyboardLayouts */ $this->XKbLayouts = array("de"=> "de","en" =>"en", "es" => "es", "us" =>"us", "fr" => "fr"); $this->XKbVariants= array("nodeadkeys"=>"nodeadkeys", "basic"=>"basic"); - $this->MouseTypes = array("ImPS/2"=>"ImPS/2","PS/2"=>"PS/2", "explorerps/2"=>"explorerps/2", - "Microsoft"=>"Microsoft","Logitech"=>"Logitech"); - $this->MousePorts = array("/dev/ttyS0"=>"/dev/ttyS0", - "/dev/ttyS1"=>"/dev/ttyS1","/dev/psaux"=>"/dev/psaux", - "/dev/input/mice"=>"/dev/input/mice"); - + + $this->MouseTypes= array("auto" => "auto", + "explorerps/2" => "explorerps/2", + "ImPS/2" => "ImPS/2", + "PS/2" => "PS/2", + "Microsoft" => "Microsoft", + "Logitech" => "Logitech",); + + $this->MousePorts= array("/dev/input/mice" => "/dev/input/mice", + "/dev/mouse" => "/dev/mouse", + "/dev/psaux" => "/dev/psaux", + "/dev/ttyS0" => "/dev/ttyS0", + "/dev/ttyS1" => "/dev/ttyS1"); /* Try to read additional keyboard layouts */ @@ -276,10 +283,10 @@ class termservice extends plugin $this->XKbVariants= array('default' => _("inherited").' ['.$attrs[$name][0].']' ) + $this->XKbVariants; break; case 'gotoXMouseType': - $this->MouseTypes= array('AUTO' => _("inherited").' ['.$attrs[$name][0].']' ) + $this->MouseTypes; + $this->MouseTypes= array('default' => _("inherited").' ['.$attrs[$name][0].']' ) + $this->MouseTypes; break; case 'gotoXMouseport': - $this->MousePorts= array('AUTO' => _("inherited").' ['.$attrs[$name][0].']' ) + $this->MousePorts; + $this->MousePorts= array('default' => _("inherited").' ['.$attrs[$name][0].']' ) + $this->MousePorts; break; } } diff --git a/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc b/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc index f0fcff4e4..ff80bbc62 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc @@ -98,12 +98,18 @@ class workservice extends plugin $this->XKbModels[$type] = $type; } - $this->MouseTypes= array("ImPS/2" => "ImPS/2", "PS/2" => "PS/2", "Microsoft" => "Microsoft", - "Logitech" => "Logitech","explorerps/2"=>"explorerps/2",); - - $this->MousePorts= array("/dev/ttyS0" =>"/dev/ttyS0", - "/dev/ttyS1" => "/dev/ttyS1", "/dev/psaux" =>"/dev/psaux", - "/dev/input/mice" => "/dev/input/mice"); + $this->MouseTypes= array("auto" => "auto", + "explorerps/2" => "explorerps/2", + "ImPS/2" => "ImPS/2", + "PS/2" => "PS/2", + "Microsoft" => "Microsoft", + "Logitech" => "Logitech"); + + $this->MousePorts= array("/dev/input/mice" => "/dev/input/mice", + "/dev/mouse" => "/dev/mouse", + "/dev/psaux" => "/dev/psaux", + "/dev/ttyS0" => "/dev/ttyS0", + "/dev/ttyS1" => "/dev/ttyS1"); /* Additional values will be extracted from CONFIG_DIR./keyboardLayouts */ $this->XKbLayouts = array("de"=> "de","en" =>"en", "es" => "es", "us" =>"us", "fr" => "fr"); @@ -203,10 +209,10 @@ class workservice extends plugin $this->XKbVariants= array('default' => _("inherited").' ['.$attrs[$name][0].']' ) + $this->XKbVariants; break; case 'gotoXMouseType': - $this->MouseTypes= array('AUTO' => _("inherited").' ['.$attrs[$name][0].']' ) + $this->MouseTypes; + $this->MouseTypes= array('default' => _("inherited").' ['.$attrs[$name][0].']' ) + $this->MouseTypes; break; case 'gotoXMouseport': - $this->MousePorts= array('AUTO' => _("inherited").' ['.$attrs[$name][0].']' ) + $this->MousePorts; + $this->MousePorts= array('default' => _("inherited").' ['.$attrs[$name][0].']' ) + $this->MousePorts; break; } @@ -222,8 +228,8 @@ class workservice extends plugin $this->XKbModels= array('default' => _("inherited")); $this->XKbLayouts= array('default' => _("inherited")); $this->XKbVariants= array('default' => _("inherited")); - $this->MouseTypes= array('AUTO' => _("inherited")); - $this->MousePorts= array('AUTO' => _("inherited")); + $this->MouseTypes= array('default' => _("inherited")); + $this->MousePorts= array('default' => _("inherited")); } } -- 2.30.2