From 3379fc0e5603612de28e61dc4bf38f4a57ee731f Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Sat, 20 Aug 2005 07:45:31 +0000
Subject: Move X scripts which are not GPE specific out of gpe-dm and
 gpe-session-scripts and into x11-common For now I have added patches to the
 makefiles to stop installing of these files but they should be removed from
 those packagse eventually I have also added all of these small scripts to OE
 but these should probably be tarballed somewhere gpe-dm and
 gpe-session-scripts now depend on the new x11-common package Change entrance
 to depend on the new package

---
 packages/e17/entrance_20050810.bb                  |  2 +-
 packages/gpe-dm/files/remove-X-scripts.patch       | 14 +++++
 packages/gpe-dm/gpe-dm_0.47.bb                     |  8 +--
 packages/gpe-session-scripts/files/collie.xmodmap  |  5 --
 packages/gpe-session-scripts/files/keymap.sh       | 20 ------
 .../files/remove-x11-common-files.patch            | 14 +++++
 .../gpe-session-scripts/files/shepherd.xmodmap     | 49 ---------------
 packages/gpe-session-scripts/files/simpad.xmodmap  |  2 -
 packages/gpe-session-scripts/files/zaurus.sh       | 12 ----
 .../gpe-session-scripts_0.63.bb                    | 20 ++----
 packages/x11/x11-common/.mtn2git_empty             |  0
 packages/x11/x11-common/etc/.mtn2git_empty         |  0
 packages/x11/x11-common/etc/X11/.mtn2git_empty     |  0
 packages/x11/x11-common/etc/X11/Xdefaults          |  3 +
 packages/x11/x11-common/etc/X11/Xinit              | 16 +++++
 .../x11/x11-common/etc/X11/Xinit.d/.mtn2git_empty  |  0
 packages/x11/x11-common/etc/X11/Xinit.d/01xrandr   |  4 ++
 packages/x11/x11-common/etc/X11/Xinit.d/11zaurus   | 12 ++++
 packages/x11/x11-common/etc/X11/Xinit.d/12keymap   | 20 ++++++
 .../x11/x11-common/etc/X11/Xinit.d/30xTs_Calibrate |  6 ++
 packages/x11/x11-common/etc/X11/Xinit.d/40xmodmap  |  5 ++
 .../x11/x11-common/etc/X11/Xinit.d/55xScreenSaver  |  4 ++
 .../x11/x11-common/etc/X11/Xinit.d/60xXDefaults    |  3 +
 packages/x11/x11-common/etc/X11/Xserver            | 73 ++++++++++++++++++++++
 packages/x11/x11-common/etc/X11/Xsession           | 47 ++++++++++++++
 .../x11-common/etc/X11/Xsession.d/.mtn2git_empty   |  0
 .../x11/x11-common/etc/X11/Xsession.d/60xXDefaults |  4 ++
 packages/x11/x11-common/etc/X11/collie.xmodmap     |  5 ++
 packages/x11/x11-common/etc/X11/shepherd.xmodmap   | 49 +++++++++++++++
 packages/x11/x11-common/etc/X11/simpad.xmodmap     |  2 +
 packages/x11/x11-common_0.1.bb                     | 14 +++++
 31 files changed, 306 insertions(+), 107 deletions(-)
 create mode 100644 packages/gpe-dm/files/remove-X-scripts.patch
 delete mode 100644 packages/gpe-session-scripts/files/collie.xmodmap
 delete mode 100644 packages/gpe-session-scripts/files/keymap.sh
 create mode 100644 packages/gpe-session-scripts/files/remove-x11-common-files.patch
 delete mode 100644 packages/gpe-session-scripts/files/shepherd.xmodmap
 delete mode 100644 packages/gpe-session-scripts/files/simpad.xmodmap
 delete mode 100644 packages/gpe-session-scripts/files/zaurus.sh
 create mode 100644 packages/x11/x11-common/.mtn2git_empty
 create mode 100644 packages/x11/x11-common/etc/.mtn2git_empty
 create mode 100644 packages/x11/x11-common/etc/X11/.mtn2git_empty
 create mode 100644 packages/x11/x11-common/etc/X11/Xdefaults
 create mode 100644 packages/x11/x11-common/etc/X11/Xinit
 create mode 100644 packages/x11/x11-common/etc/X11/Xinit.d/.mtn2git_empty
 create mode 100644 packages/x11/x11-common/etc/X11/Xinit.d/01xrandr
 create mode 100644 packages/x11/x11-common/etc/X11/Xinit.d/11zaurus
 create mode 100644 packages/x11/x11-common/etc/X11/Xinit.d/12keymap
 create mode 100644 packages/x11/x11-common/etc/X11/Xinit.d/30xTs_Calibrate
 create mode 100644 packages/x11/x11-common/etc/X11/Xinit.d/40xmodmap
 create mode 100644 packages/x11/x11-common/etc/X11/Xinit.d/55xScreenSaver
 create mode 100644 packages/x11/x11-common/etc/X11/Xinit.d/60xXDefaults
 create mode 100644 packages/x11/x11-common/etc/X11/Xserver
 create mode 100644 packages/x11/x11-common/etc/X11/Xsession
 create mode 100644 packages/x11/x11-common/etc/X11/Xsession.d/.mtn2git_empty
 create mode 100644 packages/x11/x11-common/etc/X11/Xsession.d/60xXDefaults
 create mode 100644 packages/x11/x11-common/etc/X11/collie.xmodmap
 create mode 100644 packages/x11/x11-common/etc/X11/shepherd.xmodmap
 create mode 100644 packages/x11/x11-common/etc/X11/simpad.xmodmap
 create mode 100644 packages/x11/x11-common_0.1.bb

(limited to 'packages')

diff --git a/packages/e17/entrance_20050810.bb b/packages/e17/entrance_20050810.bb
index a4395a93cc..cc316c568e 100644
--- a/packages/e17/entrance_20050810.bb
+++ b/packages/e17/entrance_20050810.bb
@@ -3,7 +3,7 @@ SECTION = "e/apps"
 LICENSE = "MIT"
 # can also use pam and crypt
 DEPENDS = "edb evas-x11 ecore-x11 edje esmart"
-RDEPENDS += "bash keylaunch detect-stylus gpe-session-scripts gpe-dm"
+RDEPENDS += "bash keylaunch detect-stylus x11-common"
 HOMEPAGE = "http://www.enlightenment.org"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 CVSDATE = "${PV}"
diff --git a/packages/gpe-dm/files/remove-X-scripts.patch b/packages/gpe-dm/files/remove-X-scripts.patch
new file mode 100644
index 0000000000..b3c85be788
--- /dev/null
+++ b/packages/gpe-dm/files/remove-X-scripts.patch
@@ -0,0 +1,14 @@
+diff -Nur gpe-dm-0.47~/Makefile gpe-dm-0.47/Makefile
+--- gpe-dm-0.47~/Makefile	2005-08-19 18:27:54.000000000 -0700
++++ gpe-dm-0.47/Makefile	2005-08-19 18:28:37.000000000 -0700
+@@ -31,10 +31,6 @@
+ 	install -d $(DESTDIR)/etc/init.d
+ 	install -d $(DESTDIR)/etc/rc2.d
+ 	install gpe-dm.init $(DESTDIR)/etc/init.d/gpe-dm
+-	install -d $(DESTDIR)/etc/X11
+-	install Xsession $(DESTDIR)/etc/X11/Xsession
+-	install Xinit $(DESTDIR)/etc/X11/Xinit
+-	install Xserver $(DESTDIR)/etc/X11/Xserver
+ 
+ clean: clean-po
+ 	rm -f gpe-dm gpe-dm.o
diff --git a/packages/gpe-dm/gpe-dm_0.47.bb b/packages/gpe-dm/gpe-dm_0.47.bb
index b98a235ac5..bc290ebf89 100644
--- a/packages/gpe-dm/gpe-dm_0.47.bb
+++ b/packages/gpe-dm/gpe-dm_0.47.bb
@@ -5,11 +5,11 @@ DESCRIPTION = "GPE Desktop Manager"
 SECTION = "gpe"
 PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "glib-2.0"
-PR = "r4"
+DEPENDS = "glib-2.0 x11-common"
+RDEPENDS_${PN} += "x11-common"
+PR = "r5"
 
 INITSCRIPT_NAME = "gpe-dm"
 INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
 
-SRC_URI += "file://collie-suspend-hack.patch;patch=1 \
-	    file://Xserver-cxk.patch;patch=1"
+SRC_URI += "file://remove-X-scripts.patch;patch=1"
diff --git a/packages/gpe-session-scripts/files/collie.xmodmap b/packages/gpe-session-scripts/files/collie.xmodmap
deleted file mode 100644
index 5c0b39dc88..0000000000
--- a/packages/gpe-session-scripts/files/collie.xmodmap
+++ /dev/null
@@ -1,5 +0,0 @@
-keycode 96 = XF86Calendar
-keycode 97 = telephone
-keycode 48 = XF86Start
-keycode 98 = XF86Mail
-keycode 117 = XF86PowerDown
diff --git a/packages/gpe-session-scripts/files/keymap.sh b/packages/gpe-session-scripts/files/keymap.sh
deleted file mode 100644
index 0e64aac9f4..0000000000
--- a/packages/gpe-session-scripts/files/keymap.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-MACHINE=`awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo`
-
-case $MACHINE in
-	"SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
-		case `uname -r` in
-			2.4*)
-				xmodmap - < /etc/X11/shepherd.xmodmap
-				;;
-			esac
-		;;
-        "Sharp-Collie")
-                xmodmap - < /etc/X11/collie.xmodmap
-                ;;
-	"Simpad")
-		xmodmap - < /etc/X11/simpad.xmodmap
-		;;
-esac
-
diff --git a/packages/gpe-session-scripts/files/remove-x11-common-files.patch b/packages/gpe-session-scripts/files/remove-x11-common-files.patch
new file mode 100644
index 0000000000..1bf896923d
--- /dev/null
+++ b/packages/gpe-session-scripts/files/remove-x11-common-files.patch
@@ -0,0 +1,14 @@
+diff -Nur gpe-session-scripts-0.63~/Makefile gpe-session-scripts-0.63/Makefile
+--- gpe-session-scripts-0.63~/Makefile	2005-08-19 18:32:17.000000000 -0700
++++ gpe-session-scripts-0.63/Makefile	2005-08-19 18:35:46.000000000 -0700
+@@ -23,7 +23,9 @@
+ all:
+ 
+ install-program: gpe-logout.desktop
+-	for i in X11/Xsession.d X11/Xinit.d; do install -d $(DESTDIR)/etc/$$i; FILES=`echo $$i/* | sed "s:$$i/CVS::"`; install -m 755 $$FILES $(DESTDIR)/etc/$$i/; done
++	install -d $(DESTDIR)/etc/X11/Xsession.d
++	install -m 755 X11/Xsession.d/99xWindowManager $(DESTDIR)/etc/X11/Xsession.d
++	install -m 755 X11/Xsession.d/98standard-apps $(DESTDIR)/etc/X11/Xsession.d
+ 	install -d $(DESTDIR)$(PREFIX)/bin
+ 	install -m 755 gpe-xcalibrate.sh $(DESTDIR)$(PREFIX)/bin/gpe-xcalibrate.sh
+ 	install -d $(DESTDIR)/etc/gpe
diff --git a/packages/gpe-session-scripts/files/shepherd.xmodmap b/packages/gpe-session-scripts/files/shepherd.xmodmap
deleted file mode 100644
index 0a03b4f426..0000000000
--- a/packages/gpe-session-scripts/files/shepherd.xmodmap
+++ /dev/null
@@ -1,49 +0,0 @@
-keycode 38 = Mode_switch
-keycode 31 = w W caret
-keycode 13 = e E equal
-keycode 26 = r R plus
-keycode 28 = t T bracketleft
-keycode 33 = y y bracketright
-keycode 29 = u U braceleft
-keycode 17 = i I braceright
-!keycode 73 = Tab Tab Caps_Lock
-keycode 12 = d D periodcentered
-keycode 14 = f F backslash
-keycode 15 = g G semicolon
-keycode 16 = h H colon
-keycode 18 = j J asterisk
-keycode 19 = k K currency
-keycode 20 = l L bar
-keycode 10 = b B underscore
-keycode 66 = minus minus at
-keycode 71 = comma slash less
-keycode 72 = period question greater
-
-! Side keys
-keycode 134 = Down
-keycode 133 = Up
-keycode 131 = Return
-keycode 132 = Escape
-
-!Special keys
-!keycode 96 = XF86Calendar
-!keycode 97 = telephone
-!keycode 98 = XF86Mail
-!keycode 48 = XF86HomePage
-!keycode 37 = XF86Start
-
-clear Shift
-clear Lock
-clear Control
-clear Mod1
-clear Mod2
-clear Mod3
-clear Mod4
-clear Mod5
-
-add Shift   = Shift_L Shift_R
-!add Lock    = Caps_Lock
-add Control = Control_L Control_R
-add Mod1    = Alt_L Alt_R
-add Mod2 = Mode_switch
-
diff --git a/packages/gpe-session-scripts/files/simpad.xmodmap b/packages/gpe-session-scripts/files/simpad.xmodmap
deleted file mode 100644
index d8b73b207f..0000000000
--- a/packages/gpe-session-scripts/files/simpad.xmodmap
+++ /dev/null
@@ -1,2 +0,0 @@
-keycode 102 = XF86PowerDown
-
diff --git a/packages/gpe-session-scripts/files/zaurus.sh b/packages/gpe-session-scripts/files/zaurus.sh
deleted file mode 100644
index 61ca84b595..0000000000
--- a/packages/gpe-session-scripts/files/zaurus.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-if [ -z "`which chkhinge`" ]; then
-   # probably not a clamshell zaurus
-   exit 0
-fi
-
-chkhinge -e
-if [ $? = 12 ]; then
-   xrandr -o right
-fi
-
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.63.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.63.bb
index 454325d2a2..19b6608e2f 100644
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.63.bb
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.63.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPL"
-PR = "r14"
+PR = "r15"
 
 inherit gpe
 
@@ -7,23 +7,15 @@ DESCRIPTION = "GPE session startup scripts"
 SECTION = "gpe"
 PRIORITY = "optional"
 MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-RDEPENDS_${PN} = "matchbox gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo"
+RDEPENDS_${PN} = "matchbox gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo x11-common"
 # more rdepends: keylaunch ipaq-sleep apmd blueprobe
-DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo"
+DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo x11-common"
 
-SRC_URI += "file://zaurus.sh \
-	file://keymap.sh \
-	file://matchbox-session \
-	file://shepherd.xmodmap file://simpad.xmodmap \
-	file://collie.xmodmap \
-	file://disable-composite.xsettings"
+SRC_URI += "file://matchbox-session \
+	file://disable-composite.xsettings \
+        file://remove-x11-common-files.patch;patch=1"
 
 do_install_append() {
-	install ${WORKDIR}/zaurus.sh ${D}${sysconfdir}/X11/Xinit.d/11zaurus
-	install ${WORKDIR}/keymap.sh ${D}${sysconfdir}/X11/Xinit.d/12keymap
-	for m in simpad shepherd collie; do
-		install -m 0644 ${WORKDIR}/$m.xmodmap ${D}${sysconfdir}/X11/
-	done
 	install -d ${D}${sysconfdir}/gpe/xsettings-default.d
 	if [ "${GUI_MACHINE_CLASS}" != "bigscreen" ]; then
 		echo "Gtk/ToolbarStyle:S:icons" > ${D}${sysconfdir}/gpe/xsettings-default.d/toolbar
diff --git a/packages/x11/x11-common/.mtn2git_empty b/packages/x11/x11-common/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/x11/x11-common/etc/.mtn2git_empty b/packages/x11/x11-common/etc/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/x11/x11-common/etc/X11/.mtn2git_empty b/packages/x11/x11-common/etc/X11/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/x11/x11-common/etc/X11/Xdefaults b/packages/x11/x11-common/etc/X11/Xdefaults
new file mode 100644
index 0000000000..f5b69dd516
--- /dev/null
+++ b/packages/x11/x11-common/etc/X11/Xdefaults
@@ -0,0 +1,3 @@
+Rxvt*scrollBar_right: true
+Rxvt*font: xft:Mono:pixelsize=9
+
diff --git a/packages/x11/x11-common/etc/X11/Xinit b/packages/x11/x11-common/etc/X11/Xinit
new file mode 100644
index 0000000000..f566ffe5be
--- /dev/null
+++ b/packages/x11/x11-common/etc/X11/Xinit
@@ -0,0 +1,16 @@
+#!/bin/sh
+# 
+
+export USER=root
+export HOME=/home/root
+if [ ! -d $HOME ] && [ -d /root ]; then
+  HOME=/root
+fi
+export XAPPLRESDIR=/usr/X11R6/lib/app-defaults
+export XFILESEARCHPATH=./%N%S%C.ad:/usr/X11R6/lib/X11/%L/%T/%N%S%C:/usr/X11R6/lib/X11/%l/%T/%N%S%C:/usr/X11R6/lib/X11/%T/%N%S%C:./%N%S.ad:/usr/X11R6/lib/X11/%L/%T/%N%S:/usr/X11R6/lib/X11/%l/%T/%N%S:/usr/X11R6/lib/X11/%T/%N%S:/usr/local/lib/X11/app-defaults/%N%S%C.ad
+
+export PATH=$PATH:/usr/X11R6/bin
+
+SYSSESSIONDIR=/etc/X11/Xinit.d
+
+exec run-parts $SYSSESSIONDIR
diff --git a/packages/x11/x11-common/etc/X11/Xinit.d/.mtn2git_empty b/packages/x11/x11-common/etc/X11/Xinit.d/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/x11/x11-common/etc/X11/Xinit.d/01xrandr b/packages/x11/x11-common/etc/X11/Xinit.d/01xrandr
new file mode 100644
index 0000000000..abde87d53c
--- /dev/null
+++ b/packages/x11/x11-common/etc/X11/Xinit.d/01xrandr
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+xrandr -o normal
+
diff --git a/packages/x11/x11-common/etc/X11/Xinit.d/11zaurus b/packages/x11/x11-common/etc/X11/Xinit.d/11zaurus
new file mode 100644
index 0000000000..61ca84b595
--- /dev/null
+++ b/packages/x11/x11-common/etc/X11/Xinit.d/11zaurus
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+if [ -z "`which chkhinge`" ]; then
+   # probably not a clamshell zaurus
+   exit 0
+fi
+
+chkhinge -e
+if [ $? = 12 ]; then
+   xrandr -o right
+fi
+
diff --git a/packages/x11/x11-common/etc/X11/Xinit.d/12keymap b/packages/x11/x11-common/etc/X11/Xinit.d/12keymap
new file mode 100644
index 0000000000..0e64aac9f4
--- /dev/null
+++ b/packages/x11/x11-common/etc/X11/Xinit.d/12keymap
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+MACHINE=`awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo`
+
+case $MACHINE in
+	"SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
+		case `uname -r` in
+			2.4*)
+				xmodmap - < /etc/X11/shepherd.xmodmap
+				;;
+			esac
+		;;
+        "Sharp-Collie")
+                xmodmap - < /etc/X11/collie.xmodmap
+                ;;
+	"Simpad")
+		xmodmap - < /etc/X11/simpad.xmodmap
+		;;
+esac
+
diff --git a/packages/x11/x11-common/etc/X11/Xinit.d/30xTs_Calibrate b/packages/x11/x11-common/etc/X11/Xinit.d/30xTs_Calibrate
new file mode 100644
index 0000000000..de47b871a2
--- /dev/null
+++ b/packages/x11/x11-common/etc/X11/Xinit.d/30xTs_Calibrate
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if [ ! -f /etc/pointercal ]; then
+    /usr/bin/xtscal
+fi
+
diff --git a/packages/x11/x11-common/etc/X11/Xinit.d/40xmodmap b/packages/x11/x11-common/etc/X11/Xinit.d/40xmodmap
new file mode 100644
index 0000000000..7ae3b58860
--- /dev/null
+++ b/packages/x11/x11-common/etc/X11/Xinit.d/40xmodmap
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+if [ -f /proc/hal/model ]; then
+  xmodmap -e 'keycode 104 = Return'
+fi
diff --git a/packages/x11/x11-common/etc/X11/Xinit.d/55xScreenSaver b/packages/x11/x11-common/etc/X11/Xinit.d/55xScreenSaver
new file mode 100644
index 0000000000..5f6d0dae5d
--- /dev/null
+++ b/packages/x11/x11-common/etc/X11/Xinit.d/55xScreenSaver
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+xset s 30 180
+xset s off
diff --git a/packages/x11/x11-common/etc/X11/Xinit.d/60xXDefaults b/packages/x11/x11-common/etc/X11/Xinit.d/60xXDefaults
new file mode 100644
index 0000000000..6b35e0357c
--- /dev/null
+++ b/packages/x11/x11-common/etc/X11/Xinit.d/60xXDefaults
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+xrdb -load -nocpp < /etc/X11/Xdefaults
diff --git a/packages/x11/x11-common/etc/X11/Xserver b/packages/x11/x11-common/etc/X11/Xserver
new file mode 100644
index 0000000000..e7e6dd1ddb
--- /dev/null
+++ b/packages/x11/x11-common/etc/X11/Xserver
@@ -0,0 +1,73 @@
+#!/bin/sh
+#
+
+XSERVER=Xipaq
+if [ -f /usr/bin/Xfbdev ]; then
+  XSERVER=Xfbdev
+fi
+if [ -f /usr/bin/Xepson ]; then
+  XSERVER=Xepson
+fi
+if [ -f /usr/bin/Xorg ]; then
+  XSERVER=Xorg
+fi
+if [ -f /usr/bin/Xomap ]; then
+  XSERVER=Xomap
+fi
+
+. /etc/profile
+
+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="-dpi 100 -br -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 -screen 320x240@90 -rgba vrgb" ;;
+	"HP iPAQ H3600" | "HP iPAQ H3700" | "HP iPAQ H3900")
+		ARGS="$ARGS -screen 320x240@270 -rgba vbgr" ;;
+	"HP iPAQ H5400" | "HP iPAQ H2200")
+		ARGS="$ARGS -rgba rgb" ;;
+	"Ramses")
+		# What is this "vt2" in aid of?
+		ARGS="$ARGS -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"
+		# 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" ;;
+	"SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi")
+		ARGS="$ARGS -rgba rgb -screen 640x480@270" ;;
+	"Simpad")
+		ARGS="$ARGS -rgba rgb" ;;
+	"Generic OMAP1510/1610/1710")
+		ARGS="$ARGS -mouse /dev/input/event0" ;;
+esac
+
+exec $XSERVER $ARGS $*
diff --git a/packages/x11/x11-common/etc/X11/Xsession b/packages/x11/x11-common/etc/X11/Xsession
new file mode 100644
index 0000000000..cfa3a9a6e3
--- /dev/null
+++ b/packages/x11/x11-common/etc/X11/Xsession
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+# this location MUST be consistent with /etc/X11/gpe-login.pre-session
+HOME_VOLATILE=/home/$USER/ramdisk
+export HOME_VOLATILE
+
+if [ -f /usr/bin/dbus-launch ]; then
+  ## test for an existing bus daemon, just to be safe
+  if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
+     ## if not found, launch a new one
+     eval `dbus-launch --auto-syntax --exit-with-session`
+     echo "D-BUS per-session daemon address is: $DBUS_SESSION_BUS_ADDRESS"
+  fi
+fi
+
+. /etc/profile
+
+if [ -f $HOME/.profile ]; then
+ . $HOME/.profile
+fi
+
+SYSSESSIONDIR=/etc/X11/Xsession-gpe.d
+
+if [ ! -d $SYSSESSIONDIR ]; then
+  SYSSESSIONDIR=/etc/X11/Xsession.d
+fi
+
+# Use run-parts to source every file in the session directory; we source
+# instead of executing so that the variables and functions defined above
+# are available to the scripts, and so that they can pass variables to each
+# other.
+
+# Can't use run-parts like this, busybox doesn't support it. Use ls instead
+#SESSIONFILES=$(run-parts --list $SYSSESSIONDIR)
+
+SESSIONFILES=`ls -X $SYSSESSIONDIR`
+if [ -n "$SESSIONFILES" ]; then
+  for SESSIONFILE in $SESSIONFILES; do
+  # Test if script is executable first before sourcing it
+    if [ -x "$SYSSESSIONDIR/$SESSIONFILE" ]; then
+      . $SYSSESSIONDIR/$SESSIONFILE
+    fi
+  done
+fi
+
+exit 0
+
diff --git a/packages/x11/x11-common/etc/X11/Xsession.d/.mtn2git_empty b/packages/x11/x11-common/etc/X11/Xsession.d/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/x11/x11-common/etc/X11/Xsession.d/60xXDefaults b/packages/x11/x11-common/etc/X11/Xsession.d/60xXDefaults
new file mode 100644
index 0000000000..d3a284d8da
--- /dev/null
+++ b/packages/x11/x11-common/etc/X11/Xsession.d/60xXDefaults
@@ -0,0 +1,4 @@
+#!/bin/sh
+if [ -e $HOME/.Xdefaults ]; then
+    xrdb -merge -nocpp < $HOME/.Xdefaults
+fi
diff --git a/packages/x11/x11-common/etc/X11/collie.xmodmap b/packages/x11/x11-common/etc/X11/collie.xmodmap
new file mode 100644
index 0000000000..5c0b39dc88
--- /dev/null
+++ b/packages/x11/x11-common/etc/X11/collie.xmodmap
@@ -0,0 +1,5 @@
+keycode 96 = XF86Calendar
+keycode 97 = telephone
+keycode 48 = XF86Start
+keycode 98 = XF86Mail
+keycode 117 = XF86PowerDown
diff --git a/packages/x11/x11-common/etc/X11/shepherd.xmodmap b/packages/x11/x11-common/etc/X11/shepherd.xmodmap
new file mode 100644
index 0000000000..0a03b4f426
--- /dev/null
+++ b/packages/x11/x11-common/etc/X11/shepherd.xmodmap
@@ -0,0 +1,49 @@
+keycode 38 = Mode_switch
+keycode 31 = w W caret
+keycode 13 = e E equal
+keycode 26 = r R plus
+keycode 28 = t T bracketleft
+keycode 33 = y y bracketright
+keycode 29 = u U braceleft
+keycode 17 = i I braceright
+!keycode 73 = Tab Tab Caps_Lock
+keycode 12 = d D periodcentered
+keycode 14 = f F backslash
+keycode 15 = g G semicolon
+keycode 16 = h H colon
+keycode 18 = j J asterisk
+keycode 19 = k K currency
+keycode 20 = l L bar
+keycode 10 = b B underscore
+keycode 66 = minus minus at
+keycode 71 = comma slash less
+keycode 72 = period question greater
+
+! Side keys
+keycode 134 = Down
+keycode 133 = Up
+keycode 131 = Return
+keycode 132 = Escape
+
+!Special keys
+!keycode 96 = XF86Calendar
+!keycode 97 = telephone
+!keycode 98 = XF86Mail
+!keycode 48 = XF86HomePage
+!keycode 37 = XF86Start
+
+clear Shift
+clear Lock
+clear Control
+clear Mod1
+clear Mod2
+clear Mod3
+clear Mod4
+clear Mod5
+
+add Shift   = Shift_L Shift_R
+!add Lock    = Caps_Lock
+add Control = Control_L Control_R
+add Mod1    = Alt_L Alt_R
+add Mod2 = Mode_switch
+
diff --git a/packages/x11/x11-common/etc/X11/simpad.xmodmap b/packages/x11/x11-common/etc/X11/simpad.xmodmap
new file mode 100644
index 0000000000..d8b73b207f
--- /dev/null
+++ b/packages/x11/x11-common/etc/X11/simpad.xmodmap
@@ -0,0 +1,2 @@
+keycode 102 = XF86PowerDown
+
diff --git a/packages/x11/x11-common_0.1.bb b/packages/x11/x11-common_0.1.bb
new file mode 100644
index 0000000000..707c766555
--- /dev/null
+++ b/packages/x11/x11-common_0.1.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Common X11 scripts"
+LICENSE = "GPL"
+SECTION = "x11"
+DEPENDS = "xmodmap xrandr xdpyinfo xtscal"
+RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
+PR = "r0"
+
+SRC_URI = "file://etc"
+S = ${WORKDIR}
+
+do_install() {
+	cp -R ${S}/etc ${D}/etc
+	chmod -R 755 ${D}/etc
+}
\ No newline at end of file
-- 
cgit v1.2.3