* [PATCH 0/3] Matchbox Keyboard fixes
@ 2013-02-18 16:54 Ross Burton
2013-02-18 16:54 ` [PATCH 1/3] matchbox-keyboard: general clean up Ross Burton
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Ross Burton @ 2013-02-18 16:54 UTC (permalink / raw)
To: openembedded-core
Hi,
Some fixes to improve the usability of the virtual keyboard, mainly if the
formfactor says we don't have a keyboard then add the keyboard applet to the
panel so that it can be forced on and off.
Not ideal, but the keyboard/toolkit bridge is (currently) GTK+ 2 specific.
Ross
The following changes since commit c7b23ab68aafc04d9830ef318015912e5d4f0672:
maintainers.inc: update ownership of recipes (2013-02-17 22:33:30 +0000)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib ross/keyboard
for you to fetch changes up to 2ee6d593467cf4ab49bf8a51f35550be5bf0360e:
matchbox-session-sato: start the keyboard applet if we have no keyboard (2013-02-18 11:04:49 +0000)
----------------------------------------------------------------
Ross Burton (3):
matchbox-keyboard: general clean up
matchbox-keyboard: add RRECOMMENDS to matchbox-keyboard-applet
matchbox-session-sato: start the keyboard applet if we have no keyboard
.../matchbox-keyboard/matchbox-keyboard_git.bb | 21 +++++++++++---------
.../matchbox-sato/matchbox-session-sato/session | 9 ++++++++-
2 files changed, 20 insertions(+), 10 deletions(-)
Ross Burton (3):
matchbox-keyboard: general clean up
matchbox-keyboard: add RRECOMMENDS to matchbox-keyboard-applet
matchbox-session-sato: start the keyboard applet if we have no
keyboard
.../matchbox-keyboard/matchbox-keyboard_git.bb | 21 +++++++++++---------
.../matchbox-sato/matchbox-session-sato/session | 9 ++++++++-
2 files changed, 20 insertions(+), 10 deletions(-)
--
1.7.10.4
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/3] matchbox-keyboard: general clean up
2013-02-18 16:54 [PATCH 0/3] Matchbox Keyboard fixes Ross Burton
@ 2013-02-18 16:54 ` Ross Burton
2013-02-18 16:54 ` [PATCH 2/3] matchbox-keyboard: add RRECOMMENDS to matchbox-keyboard-applet Ross Burton
2013-02-18 16:54 ` [PATCH 3/3] matchbox-session-sato: start the keyboard applet if we have no keyboard Ross Burton
2 siblings, 0 replies; 4+ messages in thread
From: Ross Burton @ 2013-02-18 16:54 UTC (permalink / raw)
To: openembedded-core
Re-order variables, use $PN more, and merge the -dbg packages together.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
.../matchbox-keyboard/matchbox-keyboard_git.bb | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
index a7091d2..6841596 100644
--- a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
+++ b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
@@ -1,6 +1,7 @@
DESCRIPTION = "Matchbox virtual keyboard for X11"
HOMEPAGE = "http://matchbox-project.org"
BUGTRACKER = "http://bugzilla.openedhand.com/"
+SECTION = "x11"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
@@ -8,8 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://applet/applet.c;endline=20;md5=e9201b3efa0a81a160b88d6feb5cf75b"
DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2"
-RDEPENDS_${PN} = "formfactor dbus-wait"
-SECTION = "x11"
+
SRCREV = "b38f24036cff3be6c2fbcf9ca9881803e69003ac"
PV = "0.0+git${SRCPV}"
PR = "r4"
@@ -26,20 +26,20 @@ inherit autotools pkgconfig gettext gtk-immodules-cache
EXTRA_OECONF = "--disable-cairo --enable-gtk-im --enable-applet"
-PACKAGES += "matchbox-keyboard-im matchbox-keyboard-im-dbg \
- matchbox-keyboard-applet matchbox-keyboard-applet-dbg"
+PACKAGES += "${PN}-im ${PN}-applet"
-FILES_${PN} = "${bindir}/* \
+FILES_${PN} = "${bindir}/ \
${sysconfdir} \
${datadir}/applications \
${datadir}/pixmaps \
${datadir}/matchbox-keyboard"
-FILES_matchbox-keyboard-im = "${libdir}/gtk-2.0/*/immodules/*.so"
-FILES_matchbox-keyboard-im-dbg += "${libdir}/gtk-2.0/*/immodules/.debug"
+FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/immodules/.debug"
+
+FILES_${PN}-im = "${libdir}/gtk-2.0/*/immodules/*.so"
+
+FILES_${PN}-applet = "${libdir}/matchbox-panel/*.so"
-FILES_matchbox-keyboard-applet = "${libdir}/matchbox-panel/*.so"
-FILES_matchbox-keyboard-applet-dbg += "${libdir}/matchbox-panel/.debug"
do_install_append () {
install -d ${D}/${sysconfdir}/X11/Xsession.d/
@@ -50,3 +50,5 @@ do_install_append () {
}
GTKIMMODULES_PACKAGES = "${PN}-im"
+
+RDEPENDS_${PN} = "formfactor dbus-wait"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/3] matchbox-keyboard: add RRECOMMENDS to matchbox-keyboard-applet
2013-02-18 16:54 [PATCH 0/3] Matchbox Keyboard fixes Ross Burton
2013-02-18 16:54 ` [PATCH 1/3] matchbox-keyboard: general clean up Ross Burton
@ 2013-02-18 16:54 ` Ross Burton
2013-02-18 16:54 ` [PATCH 3/3] matchbox-session-sato: start the keyboard applet if we have no keyboard Ross Burton
2 siblings, 0 replies; 4+ messages in thread
From: Ross Burton @ 2013-02-18 16:54 UTC (permalink / raw)
To: openembedded-core
The keyboard is more useful with the applet, as it means that you can hide it.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
index 6841596..6944a07 100644
--- a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
+++ b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
@@ -52,3 +52,4 @@ do_install_append () {
GTKIMMODULES_PACKAGES = "${PN}-im"
RDEPENDS_${PN} = "formfactor dbus-wait"
+RRECOMMENDS_${PN} = "${PN}-applet"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 3/3] matchbox-session-sato: start the keyboard applet if we have no keyboard
2013-02-18 16:54 [PATCH 0/3] Matchbox Keyboard fixes Ross Burton
2013-02-18 16:54 ` [PATCH 1/3] matchbox-keyboard: general clean up Ross Burton
2013-02-18 16:54 ` [PATCH 2/3] matchbox-keyboard: add RRECOMMENDS to matchbox-keyboard-applet Ross Burton
@ 2013-02-18 16:54 ` Ross Burton
2 siblings, 0 replies; 4+ messages in thread
From: Ross Burton @ 2013-02-18 16:54 UTC (permalink / raw)
To: openembedded-core
If the formfactor says we have no physical keyboard, add the keyboard applet so
the user can force the keyboard to show/hide on demand.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-sato/matchbox-sato/matchbox-session-sato/session | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session b/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session
index 1a7e99c..a3138b6 100644
--- a/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session
+++ b/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session
@@ -8,13 +8,20 @@ else
SHOWCURSOR="yes"
fi
+if [ "$HAVE_KEYBOARD" = "1" ]; then
+ KEYBOARD_APPLET=""
+else
+ KEYBOARD_APPLET="keyboard"
+fi
+
+
matchbox-desktop &
# Lines containing feature-[foo] are removed at build time if the machine
# doesn't have the feature "foo".
START_APPLETS=showdesktop,windowselector
-END_APPLETS=clock,battery,systray,startup-notify,notify
+END_APPLETS=clock,battery,$KEYBOARD_APPLET,systray,startup-notify,notify
END_APPLETS=openmoko-panel-gsm,$END_APPLETS # feature-phone
matchbox-panel --titlebar --start-applets $START_APPLETS --end-applets $END_APPLETS &
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-02-18 17:13 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-02-18 16:54 [PATCH 0/3] Matchbox Keyboard fixes Ross Burton
2013-02-18 16:54 ` [PATCH 1/3] matchbox-keyboard: general clean up Ross Burton
2013-02-18 16:54 ` [PATCH 2/3] matchbox-keyboard: add RRECOMMENDS to matchbox-keyboard-applet Ross Burton
2013-02-18 16:54 ` [PATCH 3/3] matchbox-session-sato: start the keyboard applet if we have no keyboard Ross Burton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.