From 8341462161703e2bda2e4b728933972b5a021395 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Tue, 20 Sep 2016 16:14:43 +0200 Subject: [PATCH] matchbox-session-sato: synchronize with matchbox 'session' file in poky This file has not been synchronized with the one in Poky since previous versions of DEY. Not much has changed, but sync it anyway. Also: * Get SHOWCURSOR from formfactor config files, but fallback to one value depending on HAVE_TOUCHSCREEN if it was not configured. * Rename the bbappend to the version generic '_%.bbappend' https://jira.digi.com/browse/DEL-3046 Signed-off-by: Javier Viguera --- .../matchbox-session-sato/session | 18 ++++++++++++------ ...append => matchbox-session-sato_%.bbappend} | 0 2 files changed, 12 insertions(+), 6 deletions(-) rename meta-digi-dey/recipes-sato/matchbox-sato/{matchbox-session-sato_0.1.bbappend => matchbox-session-sato_%.bbappend} (100%) diff --git a/meta-digi-dey/recipes-sato/matchbox-sato/matchbox-session-sato/session b/meta-digi-dey/recipes-sato/matchbox-sato/matchbox-session-sato/session index 9b7c7a927..d85b82c28 100644 --- a/meta-digi-dey/recipes-sato/matchbox-sato/matchbox-session-sato/session +++ b/meta-digi-dey/recipes-sato/matchbox-sato/matchbox-session-sato/session @@ -2,12 +2,14 @@ . /etc/formfactor/config -## Use SHOWCURSOR from formfactor config files instaed of hardcoding it -# if [ "$HAVE_TOUCHSCREEN" = "1" ]; then -# SHOWCURSOR="no" -# else -# SHOWCURSOR="yes" -# fi +## Use first SHOWCURSOR from formfactor config files (fallback to set it depending on HAVE_TOUCHSCREEN) +if [ -z "${SHOWCURSOR}" ]; then + if [ "$HAVE_TOUCHSCREEN" = "1" ]; then + SHOWCURSOR="no" + else + SHOWCURSOR="yes" + fi +fi if [ "$HAVE_KEYBOARD" = "1" ]; then KEYBOARD_APPLET="" @@ -15,6 +17,10 @@ else KEYBOARD_APPLET="keyboard" fi +# Tell GTK+3 we really want server side decorations, even with +# GtkHeaderBar using applications: Without that mb-panel will render +# on top of the client side decorations. +export GTK_CSD=0 matchbox-desktop & diff --git a/meta-digi-dey/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bbappend b/meta-digi-dey/recipes-sato/matchbox-sato/matchbox-session-sato_%.bbappend similarity index 100% rename from meta-digi-dey/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bbappend rename to meta-digi-dey/recipes-sato/matchbox-sato/matchbox-session-sato_%.bbappend