summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--xf86config.py31
1 files changed, 20 insertions, 11 deletions
diff --git a/xf86config.py b/xf86config.py
index f714acdac..6a6c4c873 100644
--- a/xf86config.py
+++ b/xf86config.py
@@ -706,19 +706,28 @@ class XF86Config:
if laptop:
return laptop
if string.atoi(vidRam) >= 8192:
- modes["8"] = ["640x480", "800x600", "1024x768", "1152x864", "1280x1024", "1400x1050", "1600x1200"]
- modes["16"] = ["640x480", "800x600", "1024x768", "1152x864", "1280x1024", "1400x1050", "1600x1200"]
- modes["32"] = ["640x480", "800x600", "1024x768", "1152x864", "1280x1024", "1400x1050", "1600x1200"]
+ modes["8"] = ["640x480", "800x600", "1024x768","1152x864",
+ "1280x1024", "1400x1050", "1600x1200"]
+ modes["16"] = ["640x480", "800x600", "1024x768", "1152x864",
+ "1280x1024", "1400x1050", "1600x1200"]
+ modes["32"] = ["640x480", "800x600", "1024x768", "1152x864",
+ "1280x1024", "1400x1050", "1600x1200"]
elif string.atoi(vidRam) >= 6144:
- modes["8"] = ["640x480", "800x600", "1024x768", "1152x864", "1280x1024", "1400x1050", "1600x1200"]
- modes["16"] = ["640x480", "800x600", "1024x768", "1152x864", "1280x1024", "1400x1050", "1600x1200"]
- modes["32"] = ["640x480", "800x600", "1024x768", "1152x864", "1280x1024"]
+ modes["8"] = ["640x480", "800x600", "1024x768", "1152x864",
+ "1280x1024", "1400x1050", "1600x1200"]
+ modes["16"] = ["640x480", "800x600", "1024x768", "1152x864",
+ "1280x1024", "1400x1050", "1600x1200"]
+ modes["32"] = ["640x480", "800x600", "1024x768", "1152x864",
+ "1280x1024"]
elif string.atoi(vidRam) >= 4096:
- modes["8"] = ["640x480", "800x600", "1024x768", "1152x864", "1280x1024"]
- modes["16"] = ["640x480", "800x600", "1024x768", "1152x864", "1280x1024"]
+ modes["8"] = ["640x480", "800x600", "1024x768", "1152x864",
+ "1280x1024"]
+ modes["16"] = ["640x480", "800x600", "1024x768", "1152x864",
+ "1280x1024"]
modes["32"] = ["640x480", "800x600", "1024x768", "1152x864"]
elif string.atoi(vidRam) >= 2048:
- modes["8"] = ["640x480", "800x600", "1024x768", "1152x864", "1280x1024"]
+ modes["8"] = ["640x480", "800x600", "1024x768", "1152x864",
+ "1280x1024"]
modes["16"] = ["640x480", "800x600", "1024x768", "1152x864"]
modes["32"] = ["640x480", "800x600"]
elif string.atoi(vidRam) >= 1024:
@@ -942,10 +951,10 @@ class XF86Config:
self.files = """
RgbPath "/usr/X11R6/lib/X11/rgb"
- FontPath "/usr/X11R6/lib/X11/fonts/misc/"
+ FontPath "/usr/X11R6/lib/X11/fonts/misc:unscaled"
FontPath "/usr/X11R6/lib/X11/fonts/Type1/"
FontPath "/usr/X11R6/lib/X11/fonts/Speedo/"
- FontPath "/usr/X11R6/lib/X11/fonts/75dpi/"
+ FontPath "/usr/X11R6/lib/X11/fonts/75dpi:unscaled"
FontPath "/usr/X11R6/lib/X11/fonts/100dpi/"
FontPath "/usr/X11R6/lib/X11/fonts/cyrillic/"
FontPath "/usr/share/fonts/ISO8859-2/misc/"