From 435368502003eda53d22ce69748a4ba181fce1ad Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Mon, 22 Sep 2008 17:19:02 +0000 Subject: Some fixes for the xorg.conf for xserver-xf86-dri-lite git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5219 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../xorg-xserver/xserver-xf86-dri-lite/xorg.conf | 103 ++++++++++++--------- 1 file changed, 60 insertions(+), 43 deletions(-) (limited to 'meta/packages/xorg-xserver/xserver-xf86-dri-lite') diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/xorg.conf b/meta/packages/xorg-xserver/xserver-xf86-dri-lite/xorg.conf index e3ffbe6ed3..c320612367 100644 --- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/xorg.conf +++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite/xorg.conf @@ -3,71 +3,88 @@ Section "Files" EndSection Section "InputDevice" - Identifier "Synaptics Touchpad" - Driver "synaptics" - Option "SendCoreEvents" "true" - Option "Device" "/dev/psaux" - Option "Protocol" "auto-dev" - Option "HorizEdgeScroll" "0" + Identifier "Generic Keyboard" + Driver "kbd" + Option "CoreKeyboard" + Option "XkbRules" "xorg" + Option "XkbModel" "pc105" + Option "XkbLayout" "us" EndSection Section "InputDevice" - Driver "wacom" - Identifier "stylus" - Option "Device" "/dev/input/wacom" - Option "Type" "stylus" - Option "ForceDevice" "ISDV4" # Tablet PC ONLY + Identifier "Configured Mouse" + Driver "mouse" + Option "CorePointer" + Option "Device" "/dev/input/mice" + Option "Protocol" "ImPS/2" + Option "ZAxisMapping" "4 5" + Option "Emulate3Buttons" "true" EndSection Section "InputDevice" - Driver "wacom" - Identifier "eraser" - Option "Device" "/dev/input/wacom" - Option "Type" "eraser" - Option "ForceDevice" "ISDV4" # Tablet PC ONLY + Identifier "Synaptics Touchpad" + Driver "synaptics" + Option "SendCoreEvents" "true" + Option "Device" "/dev/psaux" + Option "Protocol" "auto-dev" + Option "HorizEdgeScroll" "0" EndSection Section "InputDevice" - Driver "wacom" - Identifier "cursor" - Option "Device" "/dev/input/wacom" - Option "Type" "cursor" - Option "ForceDevice" "ISDV4" # Tablet PC ONLY + Driver "wacom" + Identifier "stylus" + Option "Device" "/dev/input/wacom" + Option "Type" "stylus" + Option "ForceDevice" "ISDV4" # Tablet PC ONLY +EndSection + +Section "InputDevice" + Driver "wacom" + Identifier "eraser" + Option "Device" "/dev/input/wacom" + Option "Type" "eraser" + Option "ForceDevice" "ISDV4" # Tablet PC ONLY +EndSection + +Section "InputDevice" + Driver "wacom" + Identifier "cursor" + Option "Device" "/dev/input/wacom" + Option "Type" "cursor" + Option "ForceDevice" "ISDV4" # Tablet PC ONLY EndSection Section "Device" - Identifier "Intel Corporation Mobile GM965/GL960 Integrated Graphics Controller" - Driver "intel" - BusID "PCI:0:2:0" - Option "AccelMethod" "EXA" + Identifier "Intel Corporation Mobile 915GM/GMS/910GML Express Graphics Controller" + Driver "intel" + BusID "PCI:0:2:0" EndSection Section "Monitor" - Identifier "Generic Monitor" - Option "DPMS" + Identifier "Generic Monitor" + Option "DPMS" EndSection Section "Screen" - Identifier "Default Screen" - Device "Intel Corporation Mobile GM965/GL960 Integrated Graphics Controller" - Monitor "Generic Monitor" - DefaultDepth 24 - SubSection "Display" - Modes "1024x768" "720x400" "640x480" - Virtual 3000 2048 - EndSubSection + Identifier "Default Screen" + Device "Intel Corporation Mobile 915GM/GMS/910GML Express Graphics Controller" + Monitor "Generic Monitor" + DefaultDepth 24 + SubSection "Display" + Modes "800x480" + EndSubSection EndSection Section "ServerLayout" - Identifier "Default Layout" - Screen "Default Screen" - InputDevice "Generic Keyboard" - InputDevice "Configured Mouse" + Identifier "Default Layout" + Screen "Default Screen" + InputDevice "Generic Keyboard" + InputDevice "Configured Mouse" # Uncomment if you have a wacom tablet -# InputDevice "stylus" "SendCoreEvents" -# InputDevice "cursor" "SendCoreEvents" -# InputDevice "eraser" "SendCoreEvents" - InputDevice "Synaptics Touchpad" +# InputDevice "stylus" "SendCoreEvents" +# InputDevice "cursor" "SendCoreEvents" +# InputDevice "eraser" "SendCoreEvents" + InputDevice "Synaptics Touchpad" EndSection -- cgit v1.2.3-54-g00ecf