summaryrefslogtreecommitdiff
path: root/packages/xserver-kdrive-common
diff options
context:
space:
mode:
Diffstat (limited to 'packages/xserver-kdrive-common')
-rw-r--r--packages/xserver-kdrive-common/xserver-kdrive-common/30xTs_Calibrate (renamed from packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/30xTs_Calibrate)0
-rw-r--r--packages/xserver-kdrive-common/xserver-kdrive-common/60xXDefaults (renamed from packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/60xXDefaults)0
-rw-r--r--packages/xserver-kdrive-common/xserver-kdrive-common/90xXWindowManager (renamed from packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90xXWindowManager)0
-rw-r--r--packages/xserver-kdrive-common/xserver-kdrive-common/Xdefaults (renamed from packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xdefaults)0
-rw-r--r--packages/xserver-kdrive-common/xserver-kdrive-common/Xinit (renamed from packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit)0
-rw-r--r--packages/xserver-kdrive-common/xserver-kdrive-common/Xserver (renamed from packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver)0
-rw-r--r--packages/xserver-kdrive-common/xserver-kdrive-common/Xsession (renamed from packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession)0
-rw-r--r--packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/.mtn2git_empty0
-rw-r--r--packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver112
-rw-r--r--packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb40
10 files changed, 144 insertions, 8 deletions
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/30xTs_Calibrate b/packages/xserver-kdrive-common/xserver-kdrive-common/30xTs_Calibrate
index 8e6a8b22cb..8e6a8b22cb 100644
--- a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/30xTs_Calibrate
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common/30xTs_Calibrate
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/60xXDefaults b/packages/xserver-kdrive-common/xserver-kdrive-common/60xXDefaults
index d3a284d8da..d3a284d8da 100644
--- a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/60xXDefaults
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common/60xXDefaults
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90xXWindowManager b/packages/xserver-kdrive-common/xserver-kdrive-common/90xXWindowManager
index b2b65a0993..b2b65a0993 100644
--- a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90xXWindowManager
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common/90xXWindowManager
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xdefaults b/packages/xserver-kdrive-common/xserver-kdrive-common/Xdefaults
index f5b69dd516..f5b69dd516 100644
--- a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xdefaults
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common/Xdefaults
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit b/packages/xserver-kdrive-common/xserver-kdrive-common/Xinit
index f566ffe5be..f566ffe5be 100644
--- a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common/Xinit
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver b/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver
index e59460f3b0..e59460f3b0 100644
--- a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession b/packages/xserver-kdrive-common/xserver-kdrive-common/Xsession
index a438e13050..a438e13050 100644
--- a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common/Xsession
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/.mtn2git_empty b/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/.mtn2git_empty
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver b/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
new file mode 100644
index 0000000000..efed60b2ad
--- /dev/null
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
@@ -0,0 +1,112 @@
+#!/bin/sh
+#
+
+# note xinit needs full server path
+XSERVER=/usr/bin/Xipaq
+if [ -f /usr/bin/Xfbdev ]; then
+ XSERVER=/usr/bin/Xfbdev
+fi
+if [ -f /usr/bin/Xepson ]; then
+ XSERVER=/usr/bin/Xepson
+fi
+if [ -f /usr/bin/Xorg ]; then
+ XSERVER=/usr/bin/Xorg
+fi
+if [ -f /usr/bin/Xomap ]; then
+ XSERVER=/usr/bin/Xomap
+fi
+if [ -f /usr/bin/Xw100 ]; then
+ XSERVER=Xw100
+fi
+if [ -f /usr/bin/Ximageon ]; then
+ XSERVER=Ximageon
+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/.*://"
+ ## used to read from /proc/hal/model, but that is removed in 2.6
+ # echo ' iPAQ' `cat /proc/hal/model`
+ awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo
+}
+
+export USER=root
+
+ARGS=" -pn"
+
+# use ucb 1x00 touchscreen if present
+if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then
+ ARGS="$ARGS -mouse /dev/touchscreen/ucb1x00"
+fi
+
+# use usb mouse if present
+# Xorg doesn't support "-mouse" option, and uses /dev/input/mice automatically
+if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ]; then
+ ARGS="$ARGS -mouse /dev/input/mice"
+fi
+
+# start off server in conventional location.
+case `module_id` in
+ "HP iPAQ H3100" | "HP iPAQ H3800")
+ ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@90" ;;
+ "HP iPAQ H3600" | "HP iPAQ H3700" | "HP iPAQ H3900")
+ ARGS="$ARGS -br -dpi 100 -rgba vbgr -screen 320x240@270" ;;
+ "HP iPAQ H5400" | "HP iPAQ H2200")
+ ARGS="$ARGS -br -dpi 100 -rgba rgb" ;;
+ "HP iPAQ HX4700")
+ ARGS="$ARGS -br -dpi 200" ;;
+ "Ramses")
+ # What is this "vt2" in aid of?
+ ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@90 vt2" ;;
+ # both 'Sharp-Collie' and just 'Collie' have been reported
+ *Poodle)
+ ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@270" ;;
+ *Collie)
+ ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@270"
+ ;;
+ "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
+ ARGS="$ARGS -br -dpi 200 -rgba rgb" ;;
+ "SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi")
+ ARGS="$ARGS -br -dpi 200 -rgba rgb -screen 480x640@270" ;;
+ "Simpad")
+ ARGS="$ARGS -br -dpi 100 -rgba rgb" ;;
+ "Generic OMAP1510/1610/1710")
+ ARGS="$ARGS -br -dpi 220 -mouse /dev/input/event0" ;;
+ "Cellon C8000 Board")
+ ARGS="$ARGS -br -dpi 100 -screen 240x320,10,1" ;;
+ "HTC Universal")
+ ARGS="$ARGS -br -dpi 225 -screen 480x640@270" ;;
+ "ARM-IntegratorCP" | "ARM-Versatile PB")
+ ARGS="$ARGS -br -rgba vrgb" ;;
+ "Compulab CM-x270")
+ modprobe mbxfb
+ ARGS="$ARGS -br -fb /dev/fb1"
+ ;;
+ "GTA01" | "GTA02")
+ ARGS="$ARGS -dpi 285 -screen 480x640 -hide-cursor -root-ppm /usr/share/pixmaps/xsplash.ppm" ;;
+ "Nokia N800")
+ ARGS="$ARGS -br -dpi 225 -screen 800x480x16 -mouse tslib" ;;
+ *)
+ # 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'
+
+exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $*
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
index 9d9b577766..64b1046ee9 100644
--- a/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
@@ -2,17 +2,41 @@ DESCRIPTION = "Common X11 scripts"
LICENSE = "GPL"
SECTION = "x11"
RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit"
-PR = "r14"
+PR = "r15"
-SRC_URI = "file://etc"
-S = ${WORKDIR}
+SRC_URI = "\
+ file://Xdefaults \
+ file://Xinit \
+ file://Xserver \
+ file://Xsession \
+ \
+ file://30xTs_Calibrate \
+ file://60xXDefaults \
+ file://90xXWindowManager \
+ "
+
+etcFiles = "\
+ Xdefaults \
+ Xinit \
+ Xserver \
+ Xsession \
+ "
+sessionFiles = "\
+ 30xTs_Calibrate \
+ 60xXDefaults \
+ 90xXWindowManager \
+ "
+
+S = "${WORKDIR}"
PACKAGE_ARCH = "all"
do_install() {
- cp -R ${S}/etc ${D}/etc
- rm -fR ${D}/etc/.svn
- rm -fR ${D}/etc/*/.svn
- rm -fR ${D}/etc/*/*/.svn
- chmod -R 755 ${D}/etc
+ install -d ${D}/${sysconfdir}/X11/Xsession.d
+ for i in ${etcfiles}; do
+ install -m 0755 ${WORKDIR}/$i ${D}/${sysconfdir}/X11/
+ done
+ for i in ${sessionFiles}; do
+ install -m 0755 ${WORKDIR}/$i ${D}/${sysconfdir}/X11/Xsession.d/
+ done
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 01:04:46 +0000