X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2FX11%2Fxorg.conf.vmware;h=0ba8fe476ef4654e4e15ca0e36e170794c8cbd39;hb=a4bcdc85adc869268cb07e18671b2e08cb0c16d8;hp=ffa47e829a4c4dbdee09f6b549ce23173bbf543d;hpb=8b6be3ff313ceb1eca238520df1646c98b5c94c9;p=grml-x.git

diff --git a/etc/X11/xorg.conf.vmware b/etc/X11/xorg.conf.vmware
index ffa47e8..0ba8fe4 100644
--- a/etc/X11/xorg.conf.vmware
+++ b/etc/X11/xorg.conf.vmware
@@ -2,7 +2,6 @@
 # Filename:      /etc/X11/xorg.conf.vmware
 # Purpose:       config file for xserver - generated by grml-x
 # Bug-Reports:   see http://grml.org/bugs/
-# Latest change: Son Nov 18 10:04:56 CET 2007 [mika]
 # See also:
 #   /usr/share/doc/xserver-xorg/   and
 #   http://wiki.x.org/wiki/Home    and
@@ -26,12 +25,13 @@ Section "ServerLayout"
         # InputDevice    "PS/2 Mouse"    "CorePointer"
         # No synaptics/alps touchpad present.
         # No serial mouse detected.
+        Option "AutoAddDevices" "off" # do not depend on running dbus/hal
 EndSection
 
 Section "ServerFlags"
         Option "AllowMouseOpenFail"  "true"  # allows the server to start up even if the mouse does not work
         Option "DontVTSwitch"        "false" # allow switching between virtual terminal
-        # Option "DontZap"             "true"  # disable <Crtl><Alt><BS> (server abort)
+        Option "DontZap"             "false" # enable <Crtl><Alt><BS> (server abort)
         # Option "DontZoom"            "true"  # disable <Crtl><Alt><KP_+>/<KP_-> (resolution switching)
 EndSection
 
@@ -55,19 +55,19 @@ Section "Module"
         Load  "dbe"       # double buffer extension
         Load  "dri"       # direct rendering
         Load  "glx"       # 3D layer
-        Load  "type1"     # font module
-        Load  "freetype"  # font rendering
         Load  "extmod"    # some commonly used server extensions (e.g. shape extension)
         Load  "record"    # recording extension
         Load  "evdev"     # generic input handling driver on Linux
-        # Load  "vbe"       # Vesa BIOS Extension
-        # Load  "ddc"       # ddc probing of monitor
         # Load  "bitmap"    # bitmap fonts
+        # Load  "ddc"       # ddc probing of monitor
+        # Load  "freetype"  # font rendering
         # Load  "GLcore"    # render OpenGL in software
         # Load  "i2c"       # I2C bus
         # Load  "int10"     # initialize graphics cards via int10 call to the BIOS
         # Load  "speedo"    # font module
+        # Load  "type1"     # font module
         # Load  "v4l"       # Video for Linux
+        # Load  "vbe"       # Vesa BIOS Extension
 # Valid entries - see /usr/lib/xorg/modules/[extensions/]
 # afb bitmap cfb cfb16 cfb24 cfb32 cw damage dbe ddc dri drm extmod fb
 # fbdevhw freetype GLcore glx i2c int10 int10 layer mfb pcidata rac ramdac
@@ -87,7 +87,7 @@ EndSection
 #         Option      "XkbRules"   "xfree86"
 #         Option      "XkbRules"   "xorg"
 #         Option      "XkbModel"   "pc105"
-#         Option      "XkbLayout"  "us,us"
+#         Option      "XkbLayout"  "us"
 #         Option      "XkbVariant" "nodeadkeys"
 #         # Option      "XkbOptions" "ctrl:swapcaps,grp:alt_shift_toggle,grp_led:scroll,compose:menu"
 # EndSection