X-Git-Url: http://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=etc%2FX11%2Fxorg.conf.vmware;h=52d0772ae97fa2b81060d05bfa240d76b8e0b1aa;hb=3256f1f7cbead262acc175f37e80bbcd8d4225c5;hp=46caae79a4b1f7160de2f439ba4fbc391abdd767;hpb=198fb64a7a392f623d49125e771c000de70cd0d3;p=grml-x.git

diff --git a/etc/X11/xorg.conf.vmware b/etc/X11/xorg.conf.vmware
index 46caae7..52d0772 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 Mai 06 16:27:23 CEST 2007 [mika]
 # See also:
 #   /usr/share/doc/xserver-xorg/   and
 #   http://wiki.x.org/wiki/Home    and
@@ -20,17 +19,19 @@ Section "ServerLayout"
         Identifier     "XServer Configured"
         Screen      0  "Screen0" 0 0
         # InputDevice    "Keyboard0"     "CoreKeyboard"
-        InputDevice    "Generic Mouse" "CorePointer"
+        ## Deactivated temporarly because of problems with vmmouse:
+        # InputDevice    "Generic Mouse" "CorePointer"
         # InputDevice    "USB Mouse"     "CorePointer"
         # 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
 
@@ -49,7 +50,7 @@ Section "Files"
         FontPath     "/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType"
 EndSection
 
-# Modules - see /usr/X11R6/lib/modules/fonts and /usr/X11R6/lib/modules/extensions
+# Modules - see /usr/lib/xorg/modules/fonts and /usr/lib/xorg/modules/extensions
 Section "Module"
         Load  "dbe"       # double buffer extension
         Load  "dri"       # direct rendering
@@ -86,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