From 516a12154c2055e87016ad06fe13bf24242a190a Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sun, 18 Oct 2009 15:21:36 +0200 Subject: [PATCH] Fix virtualbox config, deactivate type1 and freetype module --- debian/changelog | 10 ++++++++++ etc/X11/xorg.conf.example | 8 ++++---- etc/X11/xorg.conf.virtualbox | 18 +++++++++--------- etc/X11/xorg.conf.vmware | 8 ++++---- grml-x | 6 +++--- 5 files changed, 30 insertions(+), 20 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6edd351..9ee14bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +grml-x (0.4.7) unstable; urgency=low + + * xorg.conf.virtualbox: deactivate all Options from "Generic Mouse" + so mouse clicking works in recent X.org versions again. + [Closes: issue740] + * Deactivate type1 and freetype module in all xorg.conf files (they + aren't present on nowadays systems). + + -- Michael Prokop Sun, 18 Oct 2009 15:19:00 +0200 + grml-x (0.4.6) unstable; urgency=low * Add x-window-manager to zsh completion. [Closes: issue716] diff --git a/etc/X11/xorg.conf.example b/etc/X11/xorg.conf.example index 3d869a7..7f923d4 100644 --- a/etc/X11/xorg.conf.example +++ b/etc/X11/xorg.conf.example @@ -62,19 +62,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 diff --git a/etc/X11/xorg.conf.virtualbox b/etc/X11/xorg.conf.virtualbox index 14463de..101afa4 100644 --- a/etc/X11/xorg.conf.virtualbox +++ b/etc/X11/xorg.conf.virtualbox @@ -54,19 +54,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 @@ -97,11 +97,11 @@ Section "InputDevice" Identifier "Generic Mouse" # Driver "mouse" # old one Driver "vboxmouse" # special VirtualBox driver - Option "Device" "/dev/input/mice" - Option "Protocol" "auto" - Option "ZAxisMapping" "4 5" - Option "Buttons" "5" - Option "SendCoreEvents" "true" + # Option "Device" "/dev/input/mice" + # Option "Protocol" "auto" + # Option "ZAxisMapping" "4 5" + # Option "Buttons" "5" + # Option "SendCoreEvents" "true" EndSection Section "Monitor" diff --git a/etc/X11/xorg.conf.vmware b/etc/X11/xorg.conf.vmware index 52d0772..0ba8fe4 100644 --- a/etc/X11/xorg.conf.vmware +++ b/etc/X11/xorg.conf.vmware @@ -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 diff --git a/grml-x b/grml-x index c36b04d..6cf4906 100755 --- a/grml-x +++ b/grml-x @@ -724,16 +724,16 @@ Section "Module" Load "dbe" # double buffer extension Load "dri" # direct rendering Load "glx" # 3D layer / GLX extension - Load "type1" # type1 font module - Load "freetype" # freetype fonts 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 "xtrap" # X Trap extension - # Load "vbe" # Vesa BIOS Extension + # Load "freetype" # freetype fonts rendering # Load "i2c" # I2C bus # Load "int10" # initialize graphics cards via int10 call to the BIOS + # Load "type1" # type1 font module # Load "v4l" # Video for Linux + # Load "vbe" # Vesa BIOS Extension ## Deprecated/unneeded modules with Xorg >=7.0: # Load "speedo" # font module (does not exist anymore) # Load "ddc" # ddc probing of monitor (automatically loaded) -- 2.1.4