summaryrefslogtreecommitdiffstats
path: root/meta/packages/matchbox-keyboard
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-02-11 14:22:23 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-02-11 14:22:23 +0000
commitd0e95b34f8a526797d9979abfeb3c85d166c1c80 (patch)
tree8ed4d8247f457bb92c58557da5d0981ca183cd38 /meta/packages/matchbox-keyboard
parent150b9517d4acc57a1350abec62d2773443f73617 (diff)
downloadpoky-d0e95b34f8a526797d9979abfeb3c85d166c1c80.tar.gz
matchbox-keyboard: autostart keyboard on keyboardless devices
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3744 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/matchbox-keyboard')
-rwxr-xr-xmeta/packages/matchbox-keyboard/files/80matchboxkeyboard6
-rw-r--r--meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb1
2 files changed, 4 insertions, 3 deletions
diff --git a/meta/packages/matchbox-keyboard/files/80matchboxkeyboard b/meta/packages/matchbox-keyboard/files/80matchboxkeyboard
index 8af3bd59a5..06d45bb9c0 100755
--- a/meta/packages/matchbox-keyboard/files/80matchboxkeyboard
+++ b/meta/packages/matchbox-keyboard/files/80matchboxkeyboard
@@ -4,14 +4,14 @@
4 4
5CMD="" 5CMD=""
6 6
7if [ "$DISPLAY_CAN_ROTATE" = "1" ]; then 7if [ "$HAVE_KEYBOARD" = "0" ]; then
8 CMD="matchbox-keyboard -d"
9elif [ "$DISPLAY_CAN_ROTATE" = "1" ]; then
8 if [ "$HAVE_KEYBOARD_PORTRAIT" = "1" -a "$HAVE_KEYBOARD_LANDSCAPE" = "0" ]; then 10 if [ "$HAVE_KEYBOARD_PORTRAIT" = "1" -a "$HAVE_KEYBOARD_LANDSCAPE" = "0" ]; then
9 CMD="matchbox-keyboard -d -o landscape" 11 CMD="matchbox-keyboard -d -o landscape"
10 elif [ "$HAVE_KEYBOARD_LANDSCAPE" = "1" -a "$HAVE_KEYBOARD_PORTRAIT" = "0" ]; then 12 elif [ "$HAVE_KEYBOARD_LANDSCAPE" = "1" -a "$HAVE_KEYBOARD_PORTRAIT" = "0" ]; then
11 CMD="matchbox-keyboard -d -o portrait" 13 CMD="matchbox-keyboard -d -o portrait"
12 fi 14 fi
13elif [ "$HAVE_KEYBOARD" = "0" ]; then
14 CMD="matchbox-keyboard -d"
15fi 15fi
16 16
17# Delay to make sure the window manager is active 17# Delay to make sure the window manager is active
diff --git a/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb b/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
index 400e16ace4..205c0fc0d3 100644
--- a/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
+++ b/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
@@ -4,6 +4,7 @@ DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2"
4RDEPENDS = "formfactor" 4RDEPENDS = "formfactor"
5SECTION = "x11" 5SECTION = "x11"
6PV = "0.0+svnr${SRCREV}" 6PV = "0.0+svnr${SRCREV}"
7PR = "r1"
7 8
8SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ 9SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
9 file://configure_fix.patch;patch=1;maxrev=1819 \ 10 file://configure_fix.patch;patch=1;maxrev=1819 \