diff options
| author | Robert Bragg <bob@openedhand.com> | 2008-09-22 17:19:02 +0000 |
|---|---|---|
| committer | Robert Bragg <bob@openedhand.com> | 2008-09-22 17:19:02 +0000 |
| commit | 435368502003eda53d22ce69748a4ba181fce1ad (patch) | |
| tree | f19892c4509d306a0fa22ee747380236e9065a6c /meta/packages/xorg-xserver/xserver-xf86-dri-lite | |
| parent | 500a9242c9a52b9b2386d2141a1b35e66f25a036 (diff) | |
| download | poky-435368502003eda53d22ce69748a4ba181fce1ad.tar.gz | |
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
Diffstat (limited to 'meta/packages/xorg-xserver/xserver-xf86-dri-lite')
| -rw-r--r-- | meta/packages/xorg-xserver/xserver-xf86-dri-lite/xorg.conf | 103 |
1 files changed, 60 insertions, 43 deletions
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" | |||
| 3 | EndSection | 3 | EndSection |
| 4 | 4 | ||
| 5 | Section "InputDevice" | 5 | Section "InputDevice" |
| 6 | Identifier "Synaptics Touchpad" | 6 | Identifier "Generic Keyboard" |
| 7 | Driver "synaptics" | 7 | Driver "kbd" |
| 8 | Option "SendCoreEvents" "true" | 8 | Option "CoreKeyboard" |
| 9 | Option "Device" "/dev/psaux" | 9 | Option "XkbRules" "xorg" |
| 10 | Option "Protocol" "auto-dev" | 10 | Option "XkbModel" "pc105" |
| 11 | Option "HorizEdgeScroll" "0" | 11 | Option "XkbLayout" "us" |
| 12 | EndSection | 12 | EndSection |
| 13 | 13 | ||
| 14 | Section "InputDevice" | 14 | Section "InputDevice" |
| 15 | Driver "wacom" | 15 | Identifier "Configured Mouse" |
| 16 | Identifier "stylus" | 16 | Driver "mouse" |
| 17 | Option "Device" "/dev/input/wacom" | 17 | Option "CorePointer" |
| 18 | Option "Type" "stylus" | 18 | Option "Device" "/dev/input/mice" |
| 19 | Option "ForceDevice" "ISDV4" # Tablet PC ONLY | 19 | Option "Protocol" "ImPS/2" |
| 20 | Option "ZAxisMapping" "4 5" | ||
| 21 | Option "Emulate3Buttons" "true" | ||
| 20 | EndSection | 22 | EndSection |
| 21 | 23 | ||
| 22 | Section "InputDevice" | 24 | Section "InputDevice" |
| 23 | Driver "wacom" | 25 | Identifier "Synaptics Touchpad" |
| 24 | Identifier "eraser" | 26 | Driver "synaptics" |
| 25 | Option "Device" "/dev/input/wacom" | 27 | Option "SendCoreEvents" "true" |
| 26 | Option "Type" "eraser" | 28 | Option "Device" "/dev/psaux" |
| 27 | Option "ForceDevice" "ISDV4" # Tablet PC ONLY | 29 | Option "Protocol" "auto-dev" |
| 30 | Option "HorizEdgeScroll" "0" | ||
| 28 | EndSection | 31 | EndSection |
| 29 | 32 | ||
| 30 | Section "InputDevice" | 33 | Section "InputDevice" |
| 31 | Driver "wacom" | 34 | Driver "wacom" |
| 32 | Identifier "cursor" | 35 | Identifier "stylus" |
| 33 | Option "Device" "/dev/input/wacom" | 36 | Option "Device" "/dev/input/wacom" |
| 34 | Option "Type" "cursor" | 37 | Option "Type" "stylus" |
| 35 | Option "ForceDevice" "ISDV4" # Tablet PC ONLY | 38 | Option "ForceDevice" "ISDV4" # Tablet PC ONLY |
| 39 | EndSection | ||
| 40 | |||
| 41 | Section "InputDevice" | ||
| 42 | Driver "wacom" | ||
| 43 | Identifier "eraser" | ||
| 44 | Option "Device" "/dev/input/wacom" | ||
| 45 | Option "Type" "eraser" | ||
| 46 | Option "ForceDevice" "ISDV4" # Tablet PC ONLY | ||
| 47 | EndSection | ||
| 48 | |||
| 49 | Section "InputDevice" | ||
| 50 | Driver "wacom" | ||
| 51 | Identifier "cursor" | ||
| 52 | Option "Device" "/dev/input/wacom" | ||
| 53 | Option "Type" "cursor" | ||
| 54 | Option "ForceDevice" "ISDV4" # Tablet PC ONLY | ||
| 36 | EndSection | 55 | EndSection |
| 37 | 56 | ||
| 38 | Section "Device" | 57 | Section "Device" |
| 39 | Identifier "Intel Corporation Mobile GM965/GL960 Integrated Graphics Controller" | 58 | Identifier "Intel Corporation Mobile 915GM/GMS/910GML Express Graphics Controller" |
| 40 | Driver "intel" | 59 | Driver "intel" |
| 41 | BusID "PCI:0:2:0" | 60 | BusID "PCI:0:2:0" |
| 42 | Option "AccelMethod" "EXA" | ||
| 43 | EndSection | 61 | EndSection |
| 44 | 62 | ||
| 45 | Section "Monitor" | 63 | Section "Monitor" |
| 46 | Identifier "Generic Monitor" | 64 | Identifier "Generic Monitor" |
| 47 | Option "DPMS" | 65 | Option "DPMS" |
| 48 | EndSection | 66 | EndSection |
| 49 | 67 | ||
| 50 | Section "Screen" | 68 | Section "Screen" |
| 51 | Identifier "Default Screen" | 69 | Identifier "Default Screen" |
| 52 | Device "Intel Corporation Mobile GM965/GL960 Integrated Graphics Controller" | 70 | Device "Intel Corporation Mobile 915GM/GMS/910GML Express Graphics Controller" |
| 53 | Monitor "Generic Monitor" | 71 | Monitor "Generic Monitor" |
| 54 | DefaultDepth 24 | 72 | DefaultDepth 24 |
| 55 | SubSection "Display" | 73 | SubSection "Display" |
| 56 | Modes "1024x768" "720x400" "640x480" | 74 | Modes "800x480" |
| 57 | Virtual 3000 2048 | 75 | EndSubSection |
| 58 | EndSubSection | ||
| 59 | EndSection | 76 | EndSection |
| 60 | 77 | ||
| 61 | Section "ServerLayout" | 78 | Section "ServerLayout" |
| 62 | Identifier "Default Layout" | 79 | Identifier "Default Layout" |
| 63 | Screen "Default Screen" | 80 | Screen "Default Screen" |
| 64 | InputDevice "Generic Keyboard" | 81 | InputDevice "Generic Keyboard" |
| 65 | InputDevice "Configured Mouse" | 82 | InputDevice "Configured Mouse" |
| 66 | 83 | ||
| 67 | # Uncomment if you have a wacom tablet | 84 | # Uncomment if you have a wacom tablet |
| 68 | # InputDevice "stylus" "SendCoreEvents" | 85 | # InputDevice "stylus" "SendCoreEvents" |
| 69 | # InputDevice "cursor" "SendCoreEvents" | 86 | # InputDevice "cursor" "SendCoreEvents" |
| 70 | # InputDevice "eraser" "SendCoreEvents" | 87 | # InputDevice "eraser" "SendCoreEvents" |
| 71 | InputDevice "Synaptics Touchpad" | 88 | InputDevice "Synaptics Touchpad" |
| 72 | EndSection | 89 | EndSection |
| 73 | 90 | ||