frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update sample xorg.conf file

This commit is contained in:
Alan Coopersmith 2008-12-02 14:35:45 -08:00
parent c1db925d10
commit 4a61ad427c
2 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/xfree86/Makefile.am
View File

@ -95,6 +95,7 @@ optionsdir = $(libdir)/X11
dist_options_DATA = Options dist_options_DATA = Options
CPP_FILES_FLAGS = \ CPP_FILES_FLAGS = \
$(MANDEFS) \
-DLOCALFONTPATH="\"$(BASE_FONT_PATH)/local\"" \ -DLOCALFONTPATH="\"$(BASE_FONT_PATH)/local\"" \
-DMISCFONTPATH="\"$(BASE_FONT_PATH)/misc\"" \ -DMISCFONTPATH="\"$(BASE_FONT_PATH)/misc\"" \
-DT1FONTPATH="\"$(BASE_FONT_PATH)/Type1\"" \ -DT1FONTPATH="\"$(BASE_FONT_PATH)/Type1\"" \

31
hw/xfree86/xorgconf.cpp
View File

@ -1,4 +1,3 @@
XCOMM $XdotOrg$
XCOMM XCOMM
XCOMM Copyright (c) 1994-1998 by The XFree86 Project, Inc. XCOMM Copyright (c) 1994-1998 by The XFree86 Project, Inc.
XCOMM XCOMM
@ -29,15 +28,15 @@ XCOMM $XConsortium: XF86Conf.cpp /main/22 1996/10/23 11:43:51 kaleb $
XCOMM ********************************************************************** XCOMM **********************************************************************
XCOMM This is a sample configuration file only, intended to illustrate XCOMM This is a sample configuration file only, intended to illustrate
XCOMM what a config file might look like. Refer to the XF86Config(4/5) XCOMM what a config file might look like. Refer to the __xconfigfile__(__filemansuffix__)
XCOMM man page for details about the format of this file. This man page XCOMM man page for details about the format of this file.
XCOMM is installed as MANPAGE
XCOMM ********************************************************************** XCOMM **********************************************************************
XCOMM The ordering of sections is not important in version 4.0 and later. XCOMM The ordering of sections is not important in XFree86 4.0 and later,
XCOMM nor in any Xorg release.
XCOMM ********************************************************************** XCOMM **********************************************************************
XCOMM Files section. This allows default font and rgb paths to be set XCOMM Files section. This allows default font and module paths to be set
XCOMM ********************************************************************** XCOMM **********************************************************************
Section "Files" Section "Files"
@ -98,18 +97,18 @@ XCOMM provide a better stack trace in the core dump to aid in debugging
XCOMM Option "NoTrapSignals" XCOMM Option "NoTrapSignals"
XCOMM Uncomment this to disable the <Crtl><Alt><Fn> VT switch sequence XCOMM Uncomment this to disable the <Ctrl><Alt><Fn> VT switch sequence
XCOMM (where n is 1 through 12). This allows clients to receive these key XCOMM (where n is 1 through 12). This allows clients to receive these key
XCOMM events. XCOMM events.
XCOMM Option "DontVTSwitch" XCOMM Option "DontVTSwitch"
XCOMM Uncomment this to disable the <Crtl><Alt><BS> server abort sequence XCOMM Uncomment this to enable the <Ctrl><Alt><BS> server abort sequence
XCOMM This allows clients to receive this key event. XCOMM The default allows clients to receive this key event.
XCOMM Option "DontZap" XCOMM Option "DontZap" "false"
XCOMM Uncomment this to disable the <Crtl><Alt><KP_+>/<KP_-> mode switching XCOMM Uncomment this to disable the <Ctrl><Alt><KP_+>/<KP_-> mode switching
XCOMM sequences. This allows clients to receive these key events. XCOMM sequences. This allows clients to receive these key events.
XCOMM Option "DontZoom" XCOMM Option "DontZoom"
@ -148,14 +147,6 @@ XCOMM the driver supports it.
Option "suspend time" "30" Option "suspend time" "30"
Option "off time" "60" Option "off time" "60"
XCOMM On some platform the server needs to estimate the sizes of PCI
XCOMM memory and pio ranges. This is done by assuming that PCI ranges
XCOMM don't overlap. Some broken BIOSes tend to set ranges of inactive
XCOMM devices wrong. Here one can adjust how aggressive the assumptions
XCOMM should be. Default is 0.
XCOMM Option "EstimateSizesAggresively" "0"
EndSection EndSection
XCOMM ********************************************************************** XCOMM **********************************************************************
@ -218,7 +209,7 @@ XCOMM Option "XkbOptions" "ctrl:swapcaps"
XCOMM These are the default XKB settings for xorg XCOMM These are the default XKB settings for xorg
XCOMM XCOMM
XCOMM Option "XkbRules" "xorg" XCOMM Option "XkbRules" "xorg"
XCOMM Option "XkbModel" "pc101" XCOMM Option "XkbModel" "pc105"
XCOMM Option "XkbLayout" "us" XCOMM Option "XkbLayout" "us"
XCOMM Option "XkbVariant" "" XCOMM Option "XkbVariant" ""
XCOMM Option "XkbOptions" "" XCOMM Option "XkbOptions" ""