[oe-commits] org.oe.dev xserver-kdrive-common: adapt script to take framebuffer size into account when running on devices that can do both vga and qvga
koen commit
openembedded-commits at lists.openembedded.org
Sat Oct 20 21:04:06 UTC 2007
xserver-kdrive-common: adapt script to take framebuffer size into account when running on devices that can do both vga and qvga
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 2d6f350b08c302c3549a0fc0c9151fc2020a6ca0
ViewMTN: http://monotone.openembedded.org/revision/info/2d6f350b08c302c3549a0fc0c9151fc2020a6ca0
Files:
1
packages/xserver-kdrive-common/xserver-kdrive-common/Xserver
packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
Diffs:
#
# mt diff -re84bc5dbd18b0ae0d5a9baa272007a05d54097bd -r2d6f350b08c302c3549a0fc0c9151fc2020a6ca0
#
#
#
# patch "packages/xserver-kdrive-common/xserver-kdrive-common/Xserver"
# from [6017bd2df863067517e85e25f563e54f38953bf2]
# to [473b6b11c3369931734f425031fc872ae47cc29e]
#
# patch "packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb"
# from [0c59a648e66f9533df4521e253ea75d6030f8c00]
# to [4abf1bd215ad1d5f7d4b8b4c52e6e2d28eb829a4]
#
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common/Xserver 6017bd2df863067517e85e25f563e54f38953bf2
+++ packages/xserver-kdrive-common/xserver-kdrive-common/Xserver 473b6b11c3369931734f425031fc872ae47cc29e
@@ -26,6 +26,13 @@ fallback_screen_arg() {
echo -n "${w}x${h}x${b}"
}
+screen_width() {
+ geom=`fbset | grep geometry`
+ w=`echo $geom | awk '{ print $2 }'`
+ echo -n "${w}"
+}
+
+
module_id() {
## used to read from assets, but sometimes assets is corrupted
# grep "Module ID" /proc/hal/assets | sed "s/.*://"
@@ -36,6 +43,8 @@ export USER=root
export USER=root
+SCREEN_SIZE=`fallback_screen_arg`
+
ARGS=" -br -pn"
# use ucb 1x00 touchscreen if present
@@ -52,9 +61,9 @@ case `module_id` in
# start off server in conventional location.
case `module_id` in
"HP iPAQ H3100" | "HP iPAQ H3800")
- ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240 at 90" ;;
+ ARGS="$ARGS -dpi 100 -rgba vrgb -screen ${SCREEN_SIZE}@90" ;;
"HP iPAQ H3600" | "HP iPAQ H3700" | "HP iPAQ H3900")
- ARGS="$ARGS -dpi 100 -rgba vbgr -screen 320x240 at 270" ;;
+ ARGS="$ARGS -dpi 100 -rgba vbgr -screen ${SCREEN_SIZE}@270" ;;
"HP iPAQ H5400" | "HP iPAQ H2200")
ARGS="$ARGS -dpi 100 -rgba rgb" ;;
"HP iPAQ HX4700")
@@ -63,44 +72,54 @@ case `module_id` in
;;
"Ramses")
# What is this "vt2" in aid of?
- ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240 at 90 vt2" ;;
+ ARGS="$ARGS -dpi 100 -rgba vrgb -screen ${SCREEN_SIZE}@90 vt2" ;;
# both 'Sharp-Collie' and just 'Collie' have been reported
*Poodle)
- ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240 at 270" ;;
+ ARGS="$ARGS -dpi 100 -rgba vrgb -screen ${SCREEN_SIZE}@270" ;;
*Collie)
- ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240 at 270" ;;
+ ARGS="$ARGS -dpi 100 -rgba vrgb -screen ${SCREEN_SIZE}@270" ;;
"SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
- ARGS="$ARGS -dpi 200 -rgba rgb"
+ if [ `screen_width` -gt 330 ] ; then
+ DPI=200
+ else
+ DPI=100
+ fi
+ ARGS="$ARGS -dpi ${DPI} -rgba rgb"
IMAGEON="w100"
;;
"SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi")
- ARGS="$ARGS -dpi 200 -rgba rgb -screen 480x640 at 270" ;;
+ ARGS="$ARGS -dpi 200 -rgba rgb -screen ${SCREEN_SIZE}@270" ;;
"Simpad")
ARGS="$ARGS -dpi 100 -rgba rgb" ;;
"Generic OMAP1510/1610/1710")
ARGS="$ARGS -dpi 220 -mouse /dev/input/event0" ;;
"Cellon C8000 Board")
- ARGS="$ARGS -dpi 100 -screen 240x320,10,1" ;;
+ ARGS="$ARGS -dpi 100 -screen ${SCREEN_SIZE},10,1" ;;
"HTC Magician")
ARGS="$ARGS -dpi 142" ;;
"HTC Universal")
- ARGS="$ARGS -dpi 225 -screen 480x640 at 270" ;;
+ ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE}@270" ;;
"ARM-IntegratorCP" | "ARM-Versatile PB")
ARGS="$ARGS -rgba vrgb" ;;
"Compulab CM-x270")
modprobe mbxfb
ARGS="$ARGS -fb /dev/fb1" ;;
"GTA01" | "GTA02")
- ARGS="$ARGS -dpi 285 -screen 480x640" ;;
+ if [ `screen_width` -gt 330 ] ; then
+ DPI=285
+ else
+ DPI=140
+ fi
+ ARGS="$ARGS -dpi ${DPI} -screen ${SCREEN_SIZE}" ;;
"Nokia N800")
- ARGS="$ARGS -dpi 225 -screen 800x480x16 -mouse tslib" ;;
+ ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} -mouse tslib" ;;
"Motorola Ezx Platform")
- ARGS="$ARGS -dpi 170 -screen 240x320" ;;
+ ARGS="$ARGS -dpi 170 -screen ${SCREEN_SIZE}" ;;
*)
# It is a device we do not know about, in which case we force
# kdrive to use the current framebuffer geometry -- otherwise
# it will default to trying to achieve 1024x768
- S=`fallback_screen_arg`
+ S=${SCREEN_SIZE}
ARGS="$ARGS -screen $S" ;;
esac
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb 0c59a648e66f9533df4521e253ea75d6030f8c00
+++ packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb 4abf1bd215ad1d5f7d4b8b4c52e6e2d28eb829a4
@@ -1,8 +1,8 @@ RDEPENDS_${PN} = "xmodmap libxrandr xdpy
DESCRIPTION = "Common X11 scripts"
LICENSE = "GPL"
SECTION = "x11"
RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit"
-PR = "r20"
+PR = "r21"
SRC_URI = "\
file://Xdefaults \
More information about the Openembedded-commits
mailing list