summaryrefslogtreecommitdiff
path: root/recipes/xorg-xserver
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@no-log.org>2010-07-13 12:24:41 +0200
committerDenis 'GNUtoo' Carikli <GNUtoo@no-log.org>2010-07-16 16:24:20 +0200
commit78773f79b6e96a86e389e7eb16ff49e7e8534606 (patch)
treedb5ab97dfc3e1018bed4f280cfa064571a23a9d8 /recipes/xorg-xserver
parent098fdd2516376187580f413c96780ce879d673e3 (diff)
xserver-xorg-conf: add new htcdream's xorg.conf
The new xorg.conf is needed because of the switch from tslib to evdev
Diffstat (limited to 'recipes/xorg-xserver')
-rw-r--r--recipes/xorg-xserver/xserver-xorg-conf/htcdream/xorg.conf51
-rw-r--r--recipes/xorg-xserver/xserver-xorg-conf_0.1.bb2
2 files changed, 22 insertions, 31 deletions
diff --git a/recipes/xorg-xserver/xserver-xorg-conf/htcdream/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/htcdream/xorg.conf
index 8d07550677..27a4cfdcd7 100644
--- a/recipes/xorg-xserver/xserver-xorg-conf/htcdream/xorg.conf
+++ b/recipes/xorg-xserver/xserver-xorg-conf/htcdream/xorg.conf
@@ -8,29 +8,15 @@ Section "Monitor"
EndMode
EndSection
-
-
Section "Device"
Identifier "fbdev"
Driver "fbdev"
Option "ShadowFB" "on"
- #Option "Rotate" "CW"
+ Option "Rotate" "CW" # comment for disabling rotation
EndSection
-
-Section "Screen"
- Identifier "Framebuffer"
- Device "fbdev"
- Monitor "Monitor"
- DefaultFbBpp 16
- SubSection "Display"
- Depth 16
- Modes "320x480"
- EndSubSection
-EndSection
-
Section "Screen"
- Identifier "320x480x16"
+ Identifier "Framebuffer"
Device "fbdev"
Monitor "Monitor"
DefaultFbBpp 16
@@ -44,9 +30,9 @@ EndSection
Section "ServerLayout"
Identifier "Builtin Default Layout"
Screen "Framebuffer"
- #InputDevice "Trackball" "CorePointer"
- InputDevice "Touchscreen" "CorePointer"
- InputDevice "Keyboard" "CoreKeyboard"
+ InputDevice "Trackball"
+ InputDevice "Touchscreen"
+ InputDevice "Keyboard"
EndSection
Section "InputDevice"
@@ -54,24 +40,23 @@ Section "InputDevice"
Driver "evdev"
Option "Device" "/dev/input/event2"
Option "ScreenNumber" "0"
- Option "ReportingMode" "Raw"
+ Option "ReportingMode" "Raw"
#Option "ReportingMode" "Scaled"
#Option "ButtonNumber" "1"
#Option "SendCoreEvents"
+ Option "SwapAxes" "True"
+ Option "InvertY" "True"
EndSection
+
Section "InputDevice"
Identifier "Touchscreen"
- Driver "tslib"
- Option "Device" "/dev/input/event1"
- Option "ScreenNumber" "0"
- Option "CorePointer" "true"
- Option "SendCoreEvents" "true"
- Option "Protocol" "Auto"
- Option "Width" "320"
- Option "Height" "480"
- Option "EmulateRightButton" "1"
- Option "CorePointer" "true"
+ Driver "evdev"
+ Option "Device" "/dev/input/event1"
+ Option "SwapAxes" "True" # comment for disabling rotation
+ Option "InvertY" "True" # comment for disabling rotation
+ Option "ReportingMode" "Raw"
+ Option "Calibration" "63 5371 110 3473" #comment for disabling rotation
EndSection
Section "InputDevice"
@@ -79,3 +64,9 @@ Section "InputDevice"
Driver "kbd"
Option "XkbLayout" "en_US"
EndSection
+
+
+Section "ServerFlags"
+ Option "AutoAddDevices" "false"
+EndSection
+
diff --git a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb
index 4194b5730c..f8ce48c1a3 100644
--- a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb
+++ b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Machine specific xorg.conf files"
-PR = "r27"
+PR = "r28"
SRC_URI = "file://xorg.conf"