Browse Source

[Kindle] Hide the status bar on current FW, too. (#5943)

Via wmctrl
reviewable/pr5962/r2
NiLuJe 2 years ago
committed by GitHub
parent
commit
9ce22f53b9
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      Makefile
  2. 3570
      platform/kindle/BR-2020.02-config
  3. 5
      platform/kindle/CREDITS
  4. 23
      platform/kindle/koreader.sh
  5. BIN
      platform/kindle/wmctrl

1
Makefile

@ -182,6 +182,7 @@ kindleupdate: all
ln -sf ../../$(KINDLE_DIR)/libkohelper.sh $(INSTALL_DIR)/koreader
ln -sf ../../../../../$(KINDLE_DIR)/libkohelper.sh $(INSTALL_DIR)/extensions/koreader/bin
ln -sf ../../$(COMMON_DIR)/spinning_zsync $(INSTALL_DIR)/koreader
ln -sf ../../$(KINDLE_DIR)/wmctrl $(INSTALL_DIR)/koreader
# create new package
cd $(INSTALL_DIR) && pwd && \
zip -9 -r \

3570
platform/kindle/BR-2020.02-config

File diff suppressed because it is too large

5
platform/kindle/CREDITS

@ -0,0 +1,5 @@
wmctrl, Copyright (C) 2003 Tomas Styblo <tripie@cpan.org>,
Licensed under the GNU General Public License version 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html),
(http://sweb.cz/tripie/utils/wmctrl)
See BR-2020.02-config for the BuildRoot 2020.02 config used to build it.

23
platform/kindle/koreader.sh

@ -60,6 +60,7 @@ export AWESOME_STOPPED="no"
export VOLUMD_STOPPED="no"
PILLOW_HARD_DISABLED="no"
PILLOW_SOFT_DISABLED="no"
USED_WMCTRL="no"
PASSCODE_DISABLED="no"
REEXEC_FLAGS=""
@ -237,9 +238,17 @@ if [ "${STOP_FRAMEWORK}" = "no" ] && [ "${INIT_TYPE}" = "upstart" ]; then
lipc-set-prop com.lab126.pillow disableEnablePillow disable
# NOTE: And, oh, joy, on FW >= 5.7.2, this is not enough to prevent the clock from refreshing, so, take the bull by the horns, and SIGSTOP the WM while we run...
if [ "$(version "${FW_VERSION}")" -ge "$(version "5.7.2")" ]; then
logmsg "Stopping awesome . . ."
killall -stop awesome
AWESOME_STOPPED="yes"
# Less drastically, we'll also be "minimizing" (actually, resizing) the title bar manually (c.f., https://www.mobileread.com/forums/showpost.php?p=2449275&postcount=5).
# NOTE: Hiding it "works", but has a nasty side-effect of triggering ligl timeouts in some circumstances (c.f., https://github.com/koreader/koreader/pull/5943#issuecomment-598514376)
logmsg "Hiding the title bar . . ."
TITLEBAR_GEOMETRY="$(./wmctrl -l -G | grep "titleBar" | awk '{print $2,$3,$4,$5,$6}' OFS=',')"
./wmctrl -r titleBar -e "${TITLEBAR_GEOMETRY%,*},1"
USED_WMCTRL="yes"
if [ "${FROM_KUAL}" = "yes" ]; then
logmsg "Stopping awesome . . ."
killall -stop awesome
AWESOME_STOPPED="yes"
fi
fi
else
logmsg "Hiding the status bar . . ."
@ -336,13 +345,11 @@ if [ "${STOP_FRAMEWORK}" = "no" ] && [ "${INIT_TYPE}" = "upstart" ]; then
fi
if [ "${PILLOW_HARD_DISABLED}" = "yes" ]; then
logmsg "Enabling pillow . . ."
lipc-set-prop com.lab126.pillow disableEnablePillow enable
# NOTE: Try to leave the user with a slightly more useful FB content than our own last screen...
cat /var/tmp/koreader-fb.dump >/dev/fb0
rm -f /var/tmp/koreader-fb.dump
lipc-set-prop com.lab126.pillow disableEnablePillow enable
lipc-set-prop com.lab126.appmgrd start app://com.lab126.booklet.home
# NOTE: In case we ever need an extra full flash refresh...
#eips -s w=${SCREEN_X_RES},h=${SCREEN_Y_RES} -f
fi
if [ "${PILLOW_SOFT_DISABLED}" = "yes" ]; then
logmsg "Restoring the status bar . . ."
@ -352,6 +359,10 @@ if [ "${STOP_FRAMEWORK}" = "no" ] && [ "${INIT_TYPE}" = "upstart" ]; then
lipc-set-prop com.lab126.pillow interrogatePillow '{"pillowId": "default_status_bar", "function": "nativeBridge.showMe();"}'
lipc-set-prop com.lab126.appmgrd start app://com.lab126.booklet.home
fi
if [ "${USED_WMCTRL}" = "yes" ]; then
logmsg "Restoring the title bar . . ."
./wmctrl -r titleBar -e "${TITLEBAR_GEOMETRY}"
fi
fi
if [ "${INIT_TYPE}" = "upstart" ] || [ "$(uname -r)" = "2.6.31-rt11-lab126" ]; then

BIN
platform/kindle/wmctrl

Binary file not shown.
Loading…
Cancel
Save