1c1
< # File generated by xorgconfig.
---
> # File generated by xf86config.
4c4
< # Copyright 2004 The X.Org Foundation
---
> # Copyright (c) 1999 by The XFree86 Project, Inc.
19c19
< # The X.Org Foundation BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
---
> # THE XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
24c24
< # Except as contained in this notice, the name of The X.Org Foundation shall
---
> # Except as contained in this notice, the name of the XFree86 Project shall
26,27c26,27
< # dealings in this Software without prior written authorization from
< # The X.Org Foundation.
---
> # dealings in this Software without prior written authorization from the
> # XFree86 Project.
31c31
< # Refer to the xorg.conf(5x) man page for details about the format of
---
> # Refer to the XF86Config(4/5) man page for details about the format of
34a35,49
> # NOTE: This is a NEW IMPROVED version of XF86Config-fbdev that uses the vesa
> # driver instead of the fbdev driver. Thanks to Kenneth Fanyo who pointed
> # this out to me.
>
> # This XF86Config file is designed for use with the VESA framebuffer.
> # This generic interface should work with nearly all video cards
> # (although not every card will support every resolution).
>
> # With the new driver, it should no longer be required to have frame buffer
> # support in the kernel, or to run it on the console.
> #
> # Enjoy!
> # --
volkerdi@slackware.com
> #
>
54d68
< # Load "speedo"
56c70
< # Load "xtt"
---
> #Load "speedo"
60,61d73
< # This loads the DRI module
< # Load "dri"
80a93,95
> # If you don't have a floating point coprocessor and emacs, Mosaic or other
> # programs take long to start up, try moving the Type1 and Speedo directory
> # to the end of this list (or comment them out).
82a98
> FontPath "/usr/X11R6/lib/X11/fonts/local/"
84c100,101
< FontPath "/usr/X11R6/lib/X11/fonts/TTF/"
---
> FontPath "/usr/X11R6/lib/X11/fonts/75dpi/:unscaled"
> FontPath "/usr/X11R6/lib/X11/fonts/100dpi/:unscaled"
86a104
> FontPath "/usr/X11R6/lib/X11/fonts/Speedo/"
89,90d106
< FontPath "/usr/X11R6/lib/X11/fonts/local/"
< FontPath "/usr/X11R6/lib/X11/fonts/Speedo/"
93c109,110
< # The module search path. The default path is shown here.
---
> # ModulePath can be used to set a search path for the X server modules.
> # The default path is shown here.
105c122
< # Uncomment this to cause a core dump at the spot where a signal is
---
> # Uncomment this to cause a core dump at the spot where a signal is
109c126
< # Option "NoTrapSignals"
---
> # Option "NoTrapSignals"
115c132
< # Option "DontVTSwitch"
---
> # Option "DontVTSwitch"
120c137
< # Option "DontZap"
---
> # Option "DontZap"
125c142
< # Option "Dont Zoom"
---
> # Option "DontZoom"
132c149
< # Option "DisableVidModeExtension"
---
> # Option "DisableVidModeExtension"
134c151
< # Uncomment this to enable the use of a non-local xvidtune client.
---
> # Uncomment this to enable the use of a non-local xvidtune client.
136c153
< # Option "AllowNonLocalXvidtune"
---
> # Option "AllowNonLocalXvidtune"
139c156
< # (mouse and keyboard) settings.
---
> # (mouse and keyboard) settings.
141c158
< # Option "DisableModInDev"
---
> # Option "DisableModInDev"
146c163,184
< # Option "AllowNonLocalModInDev"
---
> # Option "AllowNonLocalModInDev"
>
> # Set the basic blanking screen saver timeout.
>
> # Option "blank time" "10" # 10 minutes
>
> # Set the DPMS timeouts. These are set here because they are global
> # rather than screen-specific. These settings alone don't enable DPMS.
> # It is enabled per-screen (or per-monitor), and even then only when
> # the driver supports it.
>
> # Option "standby time" "20"
> # Option "suspend time" "30"
> # Option "off time" "60"
>
> # On some platform the server needs to estimate the sizes of PCI
> # memory and pio ranges. This is done by assuming that PCI ranges
> # don't overlap. Some broken BIOSes tend to set ranges of inactive
> # devices wrong. Here one can adjust how aggressive the assumptions
> # should be. Default is 0.
>
> # Option "EstimateSizesAggresively" "0"
162d199
<
169c206,207
< Option "AutoRepeat" "500 30"
---
> # Set the keyboard auto repeat parameters. Not all platforms implement
> # this.
171,172c209
< # Specify which keyboard LEDs can be user-controlled (eg, with xset(1))
< # Option "Xleds" "1 2 3"
---
> # Option "AutoRepeat" "500 5"
174,175c211,217
< # Option "LeftAlt" "Meta"
< # Option "RightAlt" "ModeShift"
---
> # Specifiy which keyboard LEDs can be user-controlled (eg, with xset(1)).
>
> # Option "Xleds" "1 2 3"
>
> # To disable the XKEYBOARD extension, uncomment XkbDisable.
>
> # Option "XkbDisable"
178,182c220,232
< # lines below (which are the defaults). For example, for a non-U.S.
< # keyboard, you will probably want to use:
< # Option "XkbModel" "pc105"
< # If you have a US Microsoft Natural keyboard, you can use:
< # Option "XkbModel" "microsoft"
---
> # lines below (which are the defaults). For example, for a European
> # keyboard, you will probably want to use one of:
> #
> # Option "XkbModel" "pc102"
> # Option "XkbModel" "pc105"
> #
> # If you have a Microsoft Natural keyboard, you can use:
> #
> # Option "XkbModel" "microsoft"
> #
> # If you have a US "windows" keyboard you will want:
> #
> # Option "XkbModel" "pc104"
186c236,238
< # Option "XkbLayout" "de"
---
> #
> # Option "XkbLayout" "de"
> #
188,189c240,242
< # Option "XkbLayout" "de"
< # Option "XkbVariant" "nodeadkeys"
---
> #
> # Option "XkbLayout" "de"
> # Option "XkbVariant" "nodeadkeys"
193c246,247
< # Option "XkbOptions" "ctrl:swapcaps"
---
> #
> # Option "XkbOptions" "ctrl:swapcaps"
195,206c249,256
< # These are the default XKB settings for Xorg
< # Option "XkbRules" "xorg"
< # Option "XkbModel" "pc105"
< # Option "XkbLayout" "us"
< # Option "XkbVariant" ""
< # Option "XkbOptions" ""
<
< # Option "XkbDisable"
<
< Option "XkbRules" "xorg"
< Option "XkbModel" "pc101"
< Option "XkbLayout" "us"
---
>
> # These are the default XKB settings for X.Org
> #
> # Option "XkbRules" "xorg"
> # Option "XkbModel" "pc101"
> # Option "XkbLayout" "us"
> # Option "XkbVariant" ""
> # Option "XkbOptions" ""
220a271,281
>
> # On platforms where PnP mouse detection is supported the following
> # protocol setting can be used when using a newer PnP mouse:
>
> # Option "Protocol" "Auto"
>
> # The available mouse protocols types that you can set below are:
> # Auto BusMouse GlidePoint GlidePointPS/2 IntelliMouse IMPS/2
> # Logitech Microsoft MMHitTab MMSeries Mouseman MouseManPlusPS/2
> # MouseSystems NetMousePS/2 NetScrollPS/2 OSMouse PS/2 SysMouse
> # ThinkingMouse ThinkingMousePS/2 Xqueue
222d282
< Option "Device" "/dev/mouse"
224c284,285
< # Mouse-speed setting for PS/2 mouse.
---
> # The mouse device. The device is normally set to /dev/mouse,
> # which is usually a symbolic link to the real device.
226c287,290
< # Option "Resolution" "256"
---
> Option "Device" "/dev/mouse"
> # Option "Device" "/dev/psaux"
> # Option "Device" "/dev/ttyS0"
> # Option "Device" "/dev/ttyS1"
236c300
< # Option "BaudRate" "9600"
---
> # Option "BaudRate" "9600"
242c306
< Option "Emulate3Buttons"
---
> # Option "Emulate3Buttons"
250a315
> # Some examples of extended input devices
252,265d316
< # **********************************************************************
< # Other input device sections
< # this is optional and is required only if you
< # are using extended input devices. This is for example only. Refer
< # to the xorg.conf man page for a description of the options.
< # **********************************************************************
< #
< # Section "InputDevice"
< # Identifier "Mouse2"
< # Driver "mouse"
< # Option "Protocol" "MouseMan"
< # Option "Device" "/dev/mouse2"
< # EndSection
< #
315c366
< Identifier "MyMonitor"
---
> Identifier "My Monitor"
346,380d396
< # Standard VGA Device:
<
< Section "Device"
< Identifier "Standard VGA"
< VendorName "Unknown"
< BoardName "Unknown"
<
< # The chipset line is optional in most cases. It can be used to override
< # the driver's chipset detection, and should not normally be specified.
<
< # Chipset "generic"
<
< # The Driver line must be present. When using run-time loadable driver
< # modules, this line instructs the server to load the specified driver
< # module. Even when not using loadable driver modules, this line
< # indicates which driver should interpret the information in this section.
<
< Driver "vga"
< # The BusID line is used to specify which of possibly multiple devices
< # this section is intended for. When this line isn't present, a device
< # section can only match up with the primary video device. For PCI
< # devices a line like the following could be used. This line should not
< # normally be included unless there is more than one video device
< # intalled.
<
< # BusID "PCI:0:10:0"
<
< # VideoRam 256
<
< # Clocks 25.2 28.3
<
< EndSection
<
< # Device configured by xorgconfig:
<
382,384c398,400
< Identifier "MyIntelCard"
< Driver "i740"
< #VideoRam 65536
---
> Identifier "VESA Framebuffer"
> Driver "vesa"
> #VideoRam 4096
388d403
<
399,401c414,428
< Device "MyIntelCard"
< Monitor "MyMonitor"
< DefaultDepth 24
---
> Device "VESA Framebuffer"
> Monitor "My Monitor"
>
> # If your card can handle it, a higher default color depth (like 24 or 32)
> # is highly recommended.
>
> # DefaultDepth 8
> # DefaultDepth 16
> DefaultDepth 24
> # DefaultDepth 32
>
> # "1024x768" is also a conservative usable default resolution. If you
> # have a better monitor, feel free to try resolutions such as
> # "1152x864", "1280x1024", "1600x1200", and "1800x1400" (or whatever your
> # card/monitor can produce)
405,406c432
< Modes "1280x1024" "1024x768" "800x600" "640x480"
< ViewPort 0 0
---
> Modes "1024x768" "800x600" "640x480"
410,411c436
< Modes "1280x1024" "1024x768" "800x600" "640x480"
< ViewPort 0 0
---
> Modes "1024x768" "800x600" "640x480"
415,416c440,444
< Modes "1280x1024" "1024x768" "800x600" "640x480"
< ViewPort 0 0
---
> Modes "1024x768" "800x600" "640x480"
> EndSubsection
> Subsection "Display"
> Depth 32
> Modes "1024x768" "800x600" "640x480"
417a446
>
454,457d482
< # Section "DRI"
< # Mode 0666
< # EndSection
<