From cab1009b08012cc292d9740cf6e3b0f09a29d74f Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Fri, 4 Jun 2010 15:23:37 -0700 Subject: Fixes for Qemu to use VGA and Touch Screen Added usb tablet options to poky-qemu-internal script, and adjusted the xorg.conf script for x86 to use VGA screen and tablet input device Signed-off-by: Saul Wold --- .../xserver-xf86-config/qemux86/xorg.conf | 22 +++++++++++++++++++--- .../xorg-xserver/xserver-xf86-config_0.1.bb | 2 +- 2 files changed, 20 insertions(+), 4 deletions(-) (limited to 'meta') diff --git a/meta/packages/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf b/meta/packages/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf index 50fd7b4797..7f5bfa70ea 100644 --- a/meta/packages/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf +++ b/meta/packages/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf @@ -21,6 +21,14 @@ Section "InputDevice" Option "Emulate3Buttons" "true" EndSection +Section "InputDevice" + Identifier "Qemu Tablet" + Driver "evdev" + Option "CorePointer" + Option "Device" "/dev/input/touchscreen0" + Option "USB" "on" +EndSection + Section "Device" Identifier "Graphics Controller" Driver "vmware" @@ -31,6 +39,14 @@ Section "Monitor" Option "DPMS" # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync + # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz + ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync + # 640x480 @ 72Hz (VESA) hsync: 37.9kHz + ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync + # 640x480 @ 75Hz (VESA) hsync: 37.5kHz + ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync + # 640x480 @ 85Hz (VESA) hsync: 43.3kHz + ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync EndSection Section "Screen" @@ -39,7 +55,7 @@ Section "Screen" Monitor "Generic Monitor" DefaultDepth 24 SubSection "Display" - Modes "1024x600_60.00" + Modes "640x480" EndSubSection EndSection @@ -47,7 +63,7 @@ Section "ServerLayout" Identifier "Default Layout" Screen "Default Screen" InputDevice "Generic Keyboard" - InputDevice "Configured Mouse" + # InputDevice "Configured Mouse" + InputDevice "QEMU Tablet" Option "AllowEmptyInput" "no" EndSection - diff --git a/meta/packages/xorg-xserver/xserver-xf86-config_0.1.bb b/meta/packages/xorg-xserver/xserver-xf86-config_0.1.bb index 80c3a28576..2089e26a63 100644 --- a/meta/packages/xorg-xserver/xserver-xf86-config_0.1.bb +++ b/meta/packages/xorg-xserver/xserver-xf86-config_0.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "X.Org X server configuration file" HOMEPAGE = "http://www.x.org" SECTION = "x11/base" LICENSE = "MIT-X" -PR = "r6" +PR = "r7" SRC_URI = "file://xorg.conf" -- cgit v1.2.3-54-g00ecf