summaryrefslogtreecommitdiffstats
path: root/xf86config.py
diff options
context:
space:
mode:
authorMike Fulbright <msf@redhat.com>2002-06-17 21:41:29 +0000
committerMike Fulbright <msf@redhat.com>2002-06-17 21:41:29 +0000
commit0d2fbd63d1edadfd086719b69daf6fbbe9f5f820 (patch)
tree04e0c9998920a3b6c0118e30e65e78ef6c8673ab /xf86config.py
parent635734af93c73f660ca969618554359f9d94b9d3 (diff)
downloadanaconda-0d2fbd63d1edadfd086719b69daf6fbbe9f5f820.tar.gz
anaconda-0d2fbd63d1edadfd086719b69daf6fbbe9f5f820.tar.xz
anaconda-0d2fbd63d1edadfd086719b69daf6fbbe9f5f820.zip
turn off XFree86 3.x config writing and add 1280x960 to available modes
Diffstat (limited to 'xf86config.py')
-rw-r--r--xf86config.py22
1 files changed, 16 insertions, 6 deletions
diff --git a/xf86config.py b/xf86config.py
index b72326b75..7bdc92c63 100644
--- a/xf86config.py
+++ b/xf86config.py
@@ -727,39 +727,46 @@ class XF86Config:
return modes
if string.atoi(vidRam) >= 10240:
modes["8"] = ["640x480", "800x600", "1024x768","1152x864",
+ "1280x960",
"1280x1024", "1400x1050", "1600x1200",
"1920x1440", "2048x1536"]
modes["16"] = ["640x480", "800x600", "1024x768", "1152x864",
+ "1280x960",
"1280x1024", "1400x1050", "1600x1200",
"1920x1440", "2048x1536"]
modes["32"] = ["640x480", "800x600", "1024x768", "1152x864",
+ "1280x960",
"1280x1024", "1400x1050", "1600x1200",
"1920x1440", "2048x1536"]
elif string.atoi(vidRam) >= 8192:
modes["8"] = ["640x480", "800x600", "1024x768","1152x864",
+ "1280x960",
"1280x1024", "1400x1050", "1600x1200",
"1920x1440", "2048x1536"]
modes["16"] = ["640x480", "800x600", "1024x768", "1152x864",
+ "1280x960",
"1280x1024", "1400x1050", "1600x1200",
"1920x1440", "2048x1536"]
modes["32"] = ["640x480", "800x600", "1024x768", "1152x864",
+ "1280x960",
"1280x1024", "1400x1050", "1600x1200"]
elif string.atoi(vidRam) >= 6144:
modes["8"] = ["640x480", "800x600", "1024x768", "1152x864",
"1280x1024", "1400x1050", "1600x1200"]
modes["16"] = ["640x480", "800x600", "1024x768", "1152x864",
+ "1280x960",
"1280x1024", "1400x1050", "1600x1200"]
modes["32"] = ["640x480", "800x600", "1024x768", "1152x864",
"1280x1024"]
elif string.atoi(vidRam) >= 4096:
modes["8"] = ["640x480", "800x600", "1024x768", "1152x864",
- "1280x1024"]
+ "1280x960", "1280x1024"]
modes["16"] = ["640x480", "800x600", "1024x768", "1152x864",
- "1280x1024"]
+ "1280x960", "1280x1024"]
modes["32"] = ["640x480", "800x600", "1024x768", "1152x864"]
elif string.atoi(vidRam) >= 2048:
modes["8"] = ["640x480", "800x600", "1024x768", "1152x864",
- "1280x1024"]
+ "1280x960", "1280x1024"]
modes["16"] = ["640x480", "800x600", "1024x768", "1152x864"]
modes["32"] = ["640x480", "800x600"]
elif string.atoi(vidRam) >= 1024:
@@ -871,9 +878,12 @@ class XF86Config:
# end of potentially unused code
def write (self, path):
- config = open (path + "/XF86Config", 'w')
- config.write (self.Version3Config ())
- config.close ()
+#
+# XXX - don't write XFree86 3.x configs any more
+#
+# config = open (path + "/XF86Config", 'w')
+# config.write (self.Version3Config ())
+# config.close ()
try:
config4 = self.Version4Config (self.videocard)
except RuntimeError: