summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-05-29 19:02:03 +0000
committerRichard Purdie <richard@openedhand.com>2007-05-29 19:02:03 +0000
commit25152eb8e7e5da2268fef8397bd5abad7c255d91 (patch)
treed5067722d20faf3ed8c60468cc97b74fa8c6cde8
parent12a09987de4356cb507cf4e31ac4d1a7294d4772 (diff)
downloadpoky-25152eb8e7e5da2268fef8397bd5abad7c255d91.tar.gz
matchbox-keyboard: Add session script to handle startup (linked to formfactor)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1809 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rwxr-xr-xmeta/packages/matchbox-keyboard/files/80matchboxkeyboard23
-rw-r--r--meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb16
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 @@
1#!/bin/sh
2
3. /etc/formfactor/config
4
5CMD=""
6
7if [ "$DISPLAY_CAN_ROTATE" = "1" ]; then
8 if [ "$HAVE_KEYBOARD_PORTRAIT" = "1" -a "$HAVE_KEYBOARD_LANDSCAPE" = "0" ]; then
9 CMD="matchbox-keyboard -d -o landscape"
10 elif [ "$HAVE_KEYBOARD_LANDSCAPE" = "1" -a "$HAVE_KEYBOARD_PORTRAIT" = "0" ]; then
11 CMD="matchbox-keyboard -d -o portrait"
12 fi
13elif [ "$HAVE_KEYBOARD" = "1" ]; then
14 # Have a physical keyboard, nothing to do
15 exit
16fi
17
18# Delay to make sure the window manager is active
19
20if [ "$CMD" ]; then
21 (sleep 2 && $CMD) &
22fi
23
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 @@
1DESCRIPTION = "Matchbox virtual keyboard for X11" 1DESCRIPTION = "Matchbox virtual keyboard for X11"
2LICENSE = "GPL" 2LICENSE = "GPL"
3DEPENDS = "libfakekey expat libxft gtk+" 3DEPENDS = "libfakekey expat libxft gtk+"
4RDEPENDS = "formfactor"
4SECTION = "x11" 5SECTION = "x11"
5PV = "0.0+svn${SRCDATE}" 6PV = "0.0+svn${SRCDATE}"
6PR="r3" 7PR = "r5"
7
8SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
9 8
9SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
10 file://80matchboxkeyboard"
10 11
11S = "${WORKDIR}/${PN}" 12S = "${WORKDIR}/${PN}"
12 13
@@ -17,14 +18,17 @@ EXTRA_OECONF = "--disable-cairo --enable-gtk-im"
17PACKAGES += "matchbox-keyboard-im matchbox-keyboard-im-dbg" 18PACKAGES += "matchbox-keyboard-im matchbox-keyboard-im-dbg"
18 19
19FILES_${PN} = "${bindir}/* \ 20FILES_${PN} = "${bindir}/* \
21 ${sysconfdir} \
20 ${datadir}/applications \ 22 ${datadir}/applications \
21 ${datadir}/pixmaps \ 23 ${datadir}/pixmaps \
22 ${datadir}/matchbox-keyboard" 24 ${datadir}/matchbox-keyboard"
23
24FILES_matchbox-keyboard-im = "${libdir}/gtk-2.0/*/immodules/*.so" 25FILES_matchbox-keyboard-im = "${libdir}/gtk-2.0/*/immodules/*.so"
26FILES_matchbox-keyboard-dbg += "${libdir}/gtk-2.0/*/immodules/.debug"
25 27
26FILES_matchbox-keyboard-dbg = "${libdir}/gtk-2.0/*/immodules/.debug" 28do_install_append () {
27 29 install -d ${D}/${sysconfdir}/X11/Xsession.d/
30 install -m 755 ${WORKDIR}/80matchboxkeyboard ${D}/${sysconfdir}/X11/Xsession.d/
31}
28 32
29pkg_postinst_matchbox-keyboard-im () { 33pkg_postinst_matchbox-keyboard-im () {
30if [ "x$D" != "x" ]; then 34if [ "x$D" != "x" ]; then