From 6553a20a49bf3c380c95a9bfccf4e1ebe10ed847 Mon Sep 17 00:00:00 2001
From: Matthew Allum <mallum@openedhand.com>
Date: Tue, 3 Oct 2006 10:39:24 +0000
Subject: Add XServer fallback settings for unknown machine

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@786 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../xserver-kdrive-common/etc/X11/Xserver                 | 15 +++++++++++++++
 .../xserver-kdrive-common/xserver-kdrive-common_0.1.bb    |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

(limited to 'meta/packages/xserver-kdrive-common')

diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver
index ad0535335..8828f6043 100644
--- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver
+++ b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver
@@ -18,6 +18,14 @@ fi
 
 . /etc/profile
 
+fallback_screen_arg() {
+    geom=`fbset | grep geometry`
+    w=`echo $geom | awk '{ print $2 }'`
+    h=`echo $geom | awk '{ print $3 }'`
+    b=`echo $geom | awk '{ print $6 }'`
+    echo -n "${w}x${h}x${b}"
+} 
+
 module_id() {
     ## used to read from assets, but sometimes assets is corrupted
     # grep "Module ID" /proc/hal/assets | sed "s/.*://"
@@ -75,6 +83,13 @@ case `module_id` in
                 modprobe mbxfb
 	        ARGS="$ARGS -fb /dev/fb1"
                 ;;
+        *)
+		# Its a device we dont know about - in which case force
+                # kdrive to use the current framebuffer geometry otherwise
+		# it will defualt to trying to achieve 1024x768 
+		S=`fallback_screen_arg`
+		ARGS="$ARGS -screen $S"
+		;;
 esac
 
 DISPLAY=':0'
diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
index bccd58a22..c076a3435 100644
--- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
+++ b/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit"
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "file://etc"
 S = ${WORKDIR}
-- 
cgit v1.2.3