From 29b806152b054b13c04bfbc6b898afecd6fb8f78 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 1 Aug 2007 14:49:03 +0000
Subject: - internal: add many options as having to be used only once, easing
 their use   and fixing setting them   (eg #31942 where one can't click
 "Options" after setting EXA)

---
 lib/Xconfig/parse.pm   | 2 +-
 lib/Xconfig/various.pm | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/Xconfig/parse.pm b/lib/Xconfig/parse.pm
index 619c059..3ab9de2 100644
--- a/lib/Xconfig/parse.pm
+++ b/lib/Xconfig/parse.pm
@@ -143,7 +143,7 @@ my %kind_names = (
     Mouse    => [ qw(DeviceName Protocol Device AlwaysCore Emulate3Buttons Emulate3Timeout EmulateWheel EmulateWheelButton) ], # Subsection in XInput
     Keyboard => [ qw(Protocol Driver XkbModel XkbLayout XkbDisable) ],
     Monitor  => [ qw(Identifier VendorName ModelName HorizSync VertRefresh) ],
-    Device   => [ qw(Identifier VendorName BoardName Chipset Driver VideoRam Screen BusID DPMS power_saver) ],
+    Device   => [ qw(Identifier VendorName BoardName Chipset Driver VideoRam Screen BusID DPMS power_saver AccelMethod MonitorLayout TwinViewOrientation BIOSHotkeys RenderAccel SWCursor XaaNoOffscreenPixmaps) ],
     Display  => [ qw(Depth Modes Virtual) ], # Subsection in Device
     Screen   => [ qw(Identifier Driver Device Monitor DefaultDepth DefaultColorDepth) ],
     InputDevice => [ qw(Identifier Driver Protocol Device Type Mode XkbModel XkbLayout XkbDisable Emulate3Buttons Emulate3Timeout EmulateWheel EmulateWheelButton) ],
diff --git a/lib/Xconfig/various.pm b/lib/Xconfig/various.pm
index 2bef5c9..ff823a1 100644
--- a/lib/Xconfig/various.pm
+++ b/lib/Xconfig/various.pm
@@ -70,15 +70,15 @@ sub various {
 	if_($::isStandalone, xdm => runlevel() == 5),
 	if_($b_read_existing,
 	    Composite => ($raw_X->get_Section('Extensions') || {})->{Composite},
-	      if_(($card->{Options}{MonitorLayout} || [])->[0] eq '"NONE,CRT+LFP"' ||
-		  ($card->{Options}{TwinViewOrientation} || [])->[0] eq '"Clone"',
+	      if_($card->{Options}{MonitorLayout} eq 'NONE,CRT+LFP' ||
+		  $card->{Options}{TwinViewOrientation} eq 'Clone',
 	    Clone => 1),
-	      if_(($card->{Options}{MonitorLayout} || [])->[0] eq '"LVDS,NONE"',
+	      if_($card->{Options}{MonitorLayout} eq 'LVDS,NONE',
 	    Clone => 0),
 	       if_($card->{Options}{BIOSHotkeys}, 
 	    BIOSHotkeys => 1),
 	      if_($card->{Options}{AccelMethod},
-	    EXA => ($card->{Options}{AccelMethod} || [])->[0] eq '"EXA"'),
+	    EXA => $card->{Options}{AccelMethod} eq 'EXA'),
 	      if_($card->{Driver} eq 'nvidia', 
 	    RenderAccel => !$card->{Options}{RenderAccel},
 	      ),
-- 
cgit v1.2.1