From ba927fe4b51d08f8555c80077a19cda7792d1ea8 Mon Sep 17 00:00:00 2001 From: NiLuJe Date: Thu, 24 Sep 2020 05:05:59 +0200 Subject: [PATCH] Don't grab input devices on Kobo (#6705) * Don't grab input devices on Kobo (... as long as we're started via KFMon/NM. ... and MiniClock is not running ^^). * Bump base (https://github.com/koreader/koreader-base/pull/1197) (https://github.com/koreader/koreader-base/pull/1199) --- base | 2 +- platform/kobo/koreader.sh | 5 +++++ platform/kobo/nickel.sh | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/base b/base index 2ef312502..de01c8a37 160000 --- a/base +++ b/base @@ -1 +1 @@ -Subproject commit 2ef312502979bd8b5b7606cf15d4aa6b8eaa8259 +Subproject commit de01c8a37cf6c938a57cd16fdc0796239ece0244 diff --git a/platform/kobo/koreader.sh b/platform/kobo/koreader.sh index 05381aaa7..4f1c81a25 100755 --- a/platform/kobo/koreader.sh +++ b/platform/kobo/koreader.sh @@ -137,6 +137,11 @@ if [ "${VIA_NICKEL}" = "true" ]; then done # Remove Nickel's FIFO to avoid udev & udhcpc scripts hanging on open() on it... rm -f /tmp/nickel-hardware-status + + # We don't need to grab input devices (unless MiniClock is running, in which case that neatly inhibits it while we run). + if [ ! -d "/tmp/MiniClock" ]; then + export KO_DONT_GRAB_INPUT="true" + fi fi # fallback for old fmon, KFMon and advboot users (-> if no args were passed to the script, start the FM) diff --git a/platform/kobo/nickel.sh b/platform/kobo/nickel.sh index 081c02ac4..6bc9645fe 100755 --- a/platform/kobo/nickel.sh +++ b/platform/kobo/nickel.sh @@ -11,7 +11,7 @@ export LD_LIBRARY_PATH="/usr/local/Kobo" cd / unset OLDPWD unset LC_ALL TESSDATA_PREFIX STARDICT_DATA_DIR EXT_FONT_DIR -unset KOREADER_DIR KO_NO_CBB +unset KOREADER_DIR KO_NO_CBB KO_DONT_GRAB_INPUT # Ensures fmon will restart. Note that we don't have to worry about reaping this, nickel kills on-animator.sh on start. (