wok-stable rev 12352

xorg-xf86-input-evdev: fix X keyboard switcher (move XkbOptions from 40-evdev.conf to 40-Keyboard.conf (slitaz-tools/tinyutils/tazx))
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sat Nov 03 02:17:56 2012 +0000 (2012-11-03)
parents 93554284dc62
children 28ba3ac5e889
files xorg-xf86-input-evdev/stuff/40-evdev.conf
line diff
     1.1 --- a/xorg-xf86-input-evdev/stuff/40-evdev.conf	Fri Nov 02 07:14:00 2012 +0200
     1.2 +++ b/xorg-xf86-input-evdev/stuff/40-evdev.conf	Sat Nov 03 02:17:56 2012 +0000
     1.3 @@ -4,52 +4,51 @@
     1.4  # matches everything.
     1.5  
     1.6  Section "InputClass"
     1.7 -        Identifier "evdev pointer catchall"
     1.8 -        MatchIsPointer "on"
     1.9 -        MatchDevicePath "/dev/input/event*"
    1.10 -        Driver "evdev"
    1.11 +	Identifier "evdev pointer catchall"
    1.12 +	MatchIsPointer "on"
    1.13 +	MatchDevicePath "/dev/input/event*"
    1.14 +	Driver "evdev"
    1.15  EndSection
    1.16  
    1.17  Section "InputClass"
    1.18 -        Identifier "evdev keyboard catchall"
    1.19 -        MatchIsKeyboard "on"
    1.20 -        MatchDevicePath "/dev/input/event*"
    1.21 -        Driver "evdev"
    1.22 -	Option "XkbOptions" "terminate:ctrl_alt_bksp"
    1.23 +	Identifier "evdev keyboard catchall"
    1.24 +	MatchIsKeyboard "on"
    1.25 +	MatchDevicePath "/dev/input/event*"
    1.26 +	Driver "evdev"
    1.27  EndSection
    1.28  
    1.29  Section "InputClass"
    1.30 -        Identifier "evdev touchpad catchall"
    1.31 -        MatchIsTouchpad "on"
    1.32 -        MatchDevicePath "/dev/input/event*"
    1.33 -        Driver "evdev"
    1.34 +	Identifier "evdev touchpad catchall"
    1.35 +	MatchIsTouchpad "on"
    1.36 +	MatchDevicePath "/dev/input/event*"
    1.37 +	Driver "evdev"
    1.38  EndSection
    1.39  
    1.40  Section "InputClass"
    1.41 -        Identifier "evdev tablet catchall"
    1.42 -        MatchIsTablet "on"
    1.43 -        MatchDevicePath "/dev/input/event*"
    1.44 -        Driver "evdev"
    1.45 +	Identifier "evdev tablet catchall"
    1.46 +	MatchIsTablet "on"
    1.47 +	MatchDevicePath "/dev/input/event*"
    1.48 +	Driver "evdev"
    1.49  EndSection
    1.50  
    1.51  Section "InputClass"
    1.52 -        Identifier "evdev touchscreen catchall"
    1.53 -        MatchIsTouchscreen "on"
    1.54 -        MatchDevicePath "/dev/input/event*"
    1.55 -        Driver "evdev"
    1.56 +	Identifier "evdev touchscreen catchall"
    1.57 +	MatchIsTouchscreen "on"
    1.58 +	MatchDevicePath "/dev/input/event*"
    1.59 +	Driver "evdev"
    1.60  EndSection
    1.61  
    1.62  Section "InputClass"
    1.63 -        Identifier "evdev joystick catchall"
    1.64 -        MatchIsJoystick "on"
    1.65 -        MatchDevicePath "/dev/input/event*"
    1.66 -        Driver "evdev"
    1.67 +	Identifier "evdev joystick catchall"
    1.68 +	MatchIsJoystick "on"
    1.69 +	MatchDevicePath "/dev/input/event*"
    1.70 +	Driver "evdev"
    1.71  EndSection
    1.72  
    1.73  # Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable
    1.74  # http://bugs.freedesktop.org/show_bug.cgi?id=22442 
    1.75  Section "InputClass"
    1.76 -        Identifier "ThinkPad HDAPS accelerometer blacklist"
    1.77 -        MatchProduct "ThinkPad HDAPS accelerometer data"
    1.78 -        Option "Ignore" "on"
    1.79 +	Identifier "ThinkPad HDAPS accelerometer blacklist"
    1.80 +	MatchProduct "ThinkPad HDAPS accelerometer data"
    1.81 +	Option "Ignore" "on"
    1.82  EndSection