summaryrefslogtreecommitdiffstats
path: root/xf86config.py
diff options
context:
space:
mode:
authorMatt Wilson <msw@redhat.com>2000-05-12 20:46:54 +0000
committerMatt Wilson <msw@redhat.com>2000-05-12 20:46:54 +0000
commit7f702e764505b33e4ab0ac2ff60aa8a4827093f4 (patch)
treec36e6a3537aec2cc04b6305d74cfc8d86f61df3a /xf86config.py
parentcc9639a6a0ea047008ad82160f38fab3d1352df4 (diff)
downloadanaconda-7f702e764505b33e4ab0ac2ff60aa8a4827093f4.tar.gz
anaconda-7f702e764505b33e4ab0ac2ff60aa8a4827093f4.tar.xz
anaconda-7f702e764505b33e4ab0ac2ff60aa8a4827093f4.zip
xf86config.py
Diffstat (limited to 'xf86config.py')
-rw-r--r--xf86config.py40
1 files changed, 18 insertions, 22 deletions
diff --git a/xf86config.py b/xf86config.py
index 63c41ba30..f022dc191 100644
--- a/xf86config.py
+++ b/xf86config.py
@@ -474,24 +474,7 @@ Section "Screen"
Identifier "Screen0"
Device "%(cardID)s"
Monitor "Monitor0"
- SubSection "Display"
- Depth 1
- EndSubSection
- SubSection "Display"
- Depth 4
- EndSubSection
- SubSection "Display"
- Depth 8
- EndSubSection
- SubSection "Display"
- Depth 15
- EndSubSection
- SubSection "Display"
- Depth 16
- EndSubSection
- SubSection "Display"
- Depth 24
- EndSubSection
+%(screenModes)s
EndSection
Section "DRI"
@@ -975,7 +958,7 @@ Section "Screen"
"XkbOptions" : self.keyOptions,
"monitorID" : self.monID,
"monitorHoriz" : self.monHoriz,
- "monitorVert" : self.monHoriz,
+ "monitorVert" : self.monVert,
"files" : self.files }
if iutil.getArch() == "sparc":
info["autorepeat"] = "# AutoRepeat 200 20"
@@ -985,6 +968,18 @@ Section "Screen"
return XF86Config_template % info
def Version4Config(self):
+ screens = ""
+ for depth in self.modes.keys ():
+ if not self.modes[depth]: continue
+ screens = screens + """
+ Subsection "Display"
+ Depth %s
+ Modes """ % depth
+ for res in self.modes[depth]:
+ screens = screens + '"' + res + '" '
+ screens = screens + """
+ EndSubsection
+"""
data = { "mouseProto" : self.mouse.info['XMOUSETYPE'],
"mouseDevice" : self.mouse.device,
"cardsOptions" :
@@ -993,9 +988,10 @@ Section "Screen"
"cardID" : self.vidCards[self.primary]["NAME"],
"cardVendor" : self.vidCards[self.primary]["NAME"],
"cardBoardName": self.vidCards[self.primary]["NAME"],
- "monitorHoriz" : self.monHoriz,
- "monitorVert" : self.monHoriz,
- "files" : self.files
+ "monitorHoriz" : self.monHoriz,
+ "monitorVert" : self.monVert,
+ "files" : self.files,
+ "screenModes" : screens
}
# self.vidCards[self.primary]["DRIVER"] = "vga"
if self.vidCards[self.primary].has_key ("DRIVER"):