From: Michael Prokop Date: Sun, 6 May 2007 14:28:03 +0000 (+0200) Subject: Update /etc/X11/xorg.conf.vmware X-Git-Tag: 0.3.24 X-Git-Url: http://git.grml.org/?p=grml-x.git;a=commitdiff_plain;h=198fb64a7a392f623d49125e771c000de70cd0d3 Update /etc/X11/xorg.conf.vmware --- diff --git a/debian/changelog b/debian/changelog index fe244e3..b9369b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +grml-x (0.3.24) unstable; urgency=low + + * Update /etc/X11/xorg.conf.vmware, allowing higher resolutions + by default and use evdev. + + -- Michael Prokop Sun, 6 May 2007 16:27:34 +0200 + grml-x (0.3.23) unstable; urgency=low * Add grml-shlib to depends as we use one function from diff --git a/etc/X11/xorg.conf.vmware b/etc/X11/xorg.conf.vmware index de8b3e7..46caae7 100644 --- a/etc/X11/xorg.conf.vmware +++ b/etc/X11/xorg.conf.vmware @@ -2,22 +2,29 @@ # Filename: /etc/X11/xorg.conf.vmware # Purpose: config file for xserver - generated by grml-x # Bug-Reports: see http://grml.org/bugs/ -# Latest change: Don Okt 26 00:41:18 CEST 2006 [mika] +# 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 # http://ftp.x.org/pub/X11R7.0/doc/html/index.html for information on Xorg -# /usr/share/doc/xfree86-common/ for information on XFree86 # Refer to the xorg.conf man page and to # http://ftp.x.org/pub/X11R7.0/doc/html/xorg.conf.5.html # for details about the format of this file. +# +# If you would like this file to be automatically reconfigured by debian, +# run the following command: +# sudo dpkg-reconfigure -phigh xserver-xorg ################################################################################ Section "ServerLayout" Identifier "XServer Configured" Screen 0 "Screen0" 0 0 - InputDevice "Keyboard0" "CoreKeyboard" - InputDevice "PS/2 Mouse" "CorePointer" + # InputDevice "Keyboard0" "CoreKeyboard" + InputDevice "Generic Mouse" "CorePointer" + # InputDevice "USB Mouse" "CorePointer" + # InputDevice "PS/2 Mouse" "CorePointer" + # No synaptics/alps touchpad present. + # No serial mouse detected. EndSection Section "ServerFlags" @@ -28,26 +35,15 @@ Section "ServerFlags" EndSection Section "Files" -# RgbPath "/usr/X11R6/lib/X11/rgb" -# ModulePath "/usr/X11R6/lib/modules" -# More information: http://ftp.x.org/pub/X11R7.0/doc/html/fonts.html + # More information: http://ftp.x.org/pub/X11R7.0/doc/html/fonts.html FontPath "/usr/share/fonts/X11/misc" - FontPath "/usr/share/fonts/X11/cyrillic" FontPath "/usr/share/fonts/X11/100dpi/:unscaled" FontPath "/usr/share/fonts/X11/75dpi/:unscaled" FontPath "/usr/share/fonts/X11/Type1" FontPath "/usr/share/fonts/X11/100dpi" FontPath "/usr/share/fonts/X11/75dpi" - FontPath "/usr/X11R6/lib/X11/fonts/misc:unscaled" - FontPath "/usr/X11R6/lib/X11/fonts/misc" - FontPath "/usr/X11R6/lib/X11/fonts/75dpi:unscaled" - FontPath "/usr/X11R6/lib/X11/fonts/75dpi" - FontPath "/usr/X11R6/lib/X11/fonts/100dpi:unscaled" - FontPath "/usr/X11R6/lib/X11/fonts/100dpi" -# True type and type1 fonts are also handled via xftlib, see /etc/X11/XftConfig! - FontPath "/usr/X11R6/lib/X11/fonts/Type1" - FontPath "/usr/share/fonts/ttf/western" - FontPath "/usr/share/fonts/ttf/decoratives" + # FontPath "/usr/share/fonts/ttf/western" + # FontPath "/usr/share/fonts/ttf/decoratives" FontPath "/usr/share/fonts/truetype/ttf-bitstream-vera" FontPath "/usr/share/fonts/latex-ttf-fonts" FontPath "/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType" @@ -62,6 +58,7 @@ Section "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 @@ -70,7 +67,6 @@ Section "Module" # Load "int10" # initialize graphics cards via int10 call to the BIOS # Load "speedo" # font module # Load "v4l" # Video for Linux - # Load "evdev" # generic input handling driver on Linux # 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 @@ -83,27 +79,29 @@ EndSection # Or if you just want both to be control, use: # Option "XkbOptions" "ctrl:nocaps" # More information: http://ftp.x.org/pub/X11R7.0/doc/html/XKB-Config.html -Section "InputDevice" - Identifier "Keyboard0" - Option "CoreKeyboard" - Driver "kbd" - #Option "XkbRules" "xfree86" - Option "XkbRules" "xorg" - Option "XkbModel" "pc105" - Option "XkbLayout" "us" - #Option "XkbVariant" "nodeadkeys" -EndSection +# Section "InputDevice" +# Identifier "Keyboard0" +# Option "CoreKeyboard" +# # Driver "kbd" +# Option "XkbRules" "xfree86" +# Option "XkbRules" "xorg" +# Option "XkbModel" "pc105" +# Option "XkbLayout" "us,us" +# Option "XkbVariant" "nodeadkeys" +# # Option "XkbOptions" "ctrl:swapcaps,grp:alt_shift_toggle,grp_led:scroll,compose:menu" +# EndSection -# More information: http://ftp.x.org/pub/X11R6.9.0/doc/html/mouse.html +# More information: http://ftp.x.org/pub/X11R7.0/doc/html/mouse.html Section "InputDevice" - Identifier "PS/2 Mouse" + Identifier "Generic Mouse" # Driver "mouse" # old one Driver "vmmouse" # see 'man vmmouse' - Option "Device" "/dev/input/mice" - Option "Protocol" "explorerps/2" - Option "Buttons" "5" - Option "ZAxisMapping" "4 5" + Option "Device" "/dev/input/mice" + Option "Protocol" "auto" + Option "ZAxisMapping" "4 5" + Option "Buttons" "5" + Option "SendCoreEvents" "true" EndSection Section "Monitor" @@ -114,7 +112,6 @@ Section "Monitor" EndSection Section "Device" - # Option "RenderAccel" "true" Identifier "Card0" Driver "vmware" VendorName "All" @@ -129,36 +126,42 @@ Section "Screen" DefaultColorDepth 16 SubSection "Display" Depth 1 - Modes "1024x768" "800x600" "640x480" + Modes "1024x768" "800x600" "640x480" "1600x1200" "1280x1024" "1280x960" EndSubSection SubSection "Display" Depth 4 - Modes "1024x768" "800x600" "640x480" + Modes "1024x768" "800x600" "640x480" "1600x1200" "1280x1024" "1280x960" EndSubSection SubSection "Display" Depth 8 - Modes "1024x768" "800x600" "640x480" + Modes "1024x768" "800x600" "640x480" "1600x1200" "1280x1024" "1280x960" EndSubSection SubSection "Display" Depth 15 - Modes "1024x768" "800x600" "640x480" + Modes "1024x768" "800x600" "640x480" "1600x1200" "1280x1024" "1280x960" EndSubSection SubSection "Display" Depth 16 - Modes "1024x768" "800x600" "640x480" + Modes "1024x768" "800x600" "640x480" "1600x1200" "1280x1024" "1280x960" EndSubSection SubSection "Display" Depth 24 - Modes "1024x768" "800x600" "640x480" + Modes "1024x768" "800x600" "640x480" "1600x1200" "1280x1024" "1280x960" EndSubSection SubSection "Display" Depth 32 - Modes "1024x768" "800x600" "640x480" + Modes "1024x768" "800x600" "640x480" "1600x1200" "1280x1024" "1280x960" EndSubSection EndSection +# Make sure you have the relevant Debian packages on your system +# to be able to use DRI (libgl1-mesa-dri for example) Section "DRI" Mode 0666 EndSection +#Section "Extensions" +# Option "Composite" "Enable" +#EndSection + ## END OF FILE #################################################################