2 files changed, 33 insertions, 6 deletions

diff --git a/meta/packages/matchbox-keyboard/files/80matchboxkeyboard b/meta/packages/matchbox-keyboard/files/80matchboxkeyboard
new file mode 100755
index 0000000000..60d9ff0e5d
--- /dev/null
+++ b/meta/packages/matchbox-keyboard/files/80matchboxkeyboard
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+. /etc/formfactor/config
+
+CMD=""
+
+if [ "$DISPLAY_CAN_ROTATE" = "1" ]; then
+    if [ "$HAVE_KEYBOARD_PORTRAIT" = "1" -a "$HAVE_KEYBOARD_LANDSCAPE" = "0" ]; then
+        CMD="matchbox-keyboard -d -o landscape"
+    elif [ "$HAVE_KEYBOARD_LANDSCAPE" = "1" -a "$HAVE_KEYBOARD_PORTRAIT" = "0" ]; then
+        CMD="matchbox-keyboard -d -o portrait"
+    fi
+elif [ "$HAVE_KEYBOARD" = "1" ]; then
+    # Have a physical keyboard, nothing to do
+    exit
+fi
+                                        
+# Delay to make sure the window manager is active
+
+if [ "$CMD" ]; then
+    (sleep 2 && $CMD) &
+fi
+
diff --git a/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb b/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
index ac03f11e2d..a179883a58 100644
--- a/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
+++ b/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
@@ -1,12 +1,13 @@
 DESCRIPTION = "Matchbox virtual keyboard for X11"
 LICENSE = "GPL"
 DEPENDS = "libfakekey expat libxft gtk+"
+RDEPENDS = "formfactor"
 SECTION = "x11"
 PV = "0.0+svn${SRCDATE}"
-PR="r3"
-
-SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
+PR = "r5"
 
+SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
+           file://80matchboxkeyboard"
 
 S = "${WORKDIR}/${PN}"
 
@@ -17,14 +18,17 @@ EXTRA_OECONF = "--disable-cairo --enable-gtk-im"
 PACKAGES += "matchbox-keyboard-im matchbox-keyboard-im-dbg"
 
 FILES_${PN} = "${bindir}/* \
+               ${sysconfdir} \
                ${datadir}/applications \
                ${datadir}/pixmaps \
                ${datadir}/matchbox-keyboard"
-
 FILES_matchbox-keyboard-im = "${libdir}/gtk-2.0/*/immodules/*.so"
+FILES_matchbox-keyboard-dbg += "${libdir}/gtk-2.0/*/immodules/.debug"
 
-FILES_matchbox-keyboard-dbg = "${libdir}/gtk-2.0/*/immodules/.debug"
-
+do_install_append () {
+        install -d ${D}/${sysconfdir}/X11/Xsession.d/
+        install -m 755 ${WORKDIR}/80matchboxkeyboard ${D}/${sysconfdir}/X11/Xsession.d/
+}
 
 pkg_postinst_matchbox-keyboard-im () {
 if [ "x$D" != "x" ]; then