Add Xsession.d file for window manager. Make server DPI more truthful in Xserver

git-svn-id: https://svn.o-hand.com/repos/poky@39 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 16 insertions, 8 deletions

diff --git a/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver b/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver
index 8492bfe214..49ee0cf580 100644
--- a/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver
+++ b/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver
@@ -27,7 +27,7 @@ module_id() {
 
 export USER=root
 
-ARGS="-dpi 100 -br -pn"
+ARGS=" -br -pn"
 
 # use ucb 1x00 touchscreen if present
 if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then
@@ -43,27 +43,27 @@ fi
 # start off server in conventional location.
 case `module_id` in
         "HP iPAQ H3100" | "HP iPAQ H3800")
-                ARGS="$ARGS -screen 320x240@90 -rgba vrgb" ;;
+                ARGS="$ARGS -dpi 100 -screen 320x240@90 -rgba vrgb" ;;
         "HP iPAQ H3600" | "HP iPAQ H3700" | "HP iPAQ H3900")
-                ARGS="$ARGS -screen 320x240@270 -rgba vbgr" ;;
+                ARGS="$ARGS -dpi 100 -screen 320x240@270 -rgba vbgr" ;;
         "HP iPAQ H5400" | "HP iPAQ H2200")
-                ARGS="$ARGS -rgba rgb" ;;
+                ARGS="$ARGS -dpi 100 -rgba rgb" ;;
         "Ramses")
                 # What is this "vt2" in aid of?
-                ARGS="$ARGS -screen 320x240@90 -rgba vrgb vt2" ;;
+                ARGS="$ARGS -dpi 100 -screen 320x240@90 -rgba vrgb vt2" ;;
         # both 'Sharp-Collie' and just 'Collie' have been reported
         *Poodle)
                 ARGS="$ARGS -screen 320x240@270 -rgba vrgb" ;;
         *Collie)
-                ARGS="$ARGS -screen 320x240@270 -rgba vrgb"
+                ARGS="$ARGS -dpi 100 -screen 320x240@270 -rgba vrgb"
                 # Horrible hack required to enable resuming after suspend
                 rm -f /dev/apm_bios
                 killall -9 apmd
                 ;;
         "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
-                ARGS="$ARGS -rgba rgb" ;;
+                ARGS="$ARGS -dpi 150 -rgba rgb" ;;
         "SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi")
-                ARGS="$ARGS -rgba rgb -screen 480x640@270" ;;
+                ARGS="$ARGS -dpi 150 -rgba rgb -screen 480x640@270" ;;
         "Simpad")
                 ARGS="$ARGS -rgba rgb" ;;
         "Generic OMAP1510/1610/1710")
diff --git a/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90xXWindowManager b/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90xXWindowManager
new file mode 100644
index 0000000000..baf50d1abe
--- /dev/null
+++ b/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90xXWindowManager
@@ -0,0 +1,8 @@
+#!/bin/sh
+if [ -x $HOME/.Xsession ]; then
+    exec $HOME/.Xsession
+else
+    exec /usr/win/x-window-manager
+fi
+
+