From 49283b8e003a06ba99d91b1e819d2739dcfd4299 Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Mon, 16 Apr 2012 21:12:00 +0200 Subject: [PATCH 01/10] comment out ImageWidget until it gets fixed #112 --- dialog.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dialog.lua b/dialog.lua index 855650a4d..e97163ced 100644 --- a/dialog.lua +++ b/dialog.lua @@ -13,9 +13,9 @@ function InfoMessage:show(text) background = 0, HorizontalGroup:new({ align = "center", - ImageWidget:new({ - file = "resources/info-i.png" - }), +-- ImageWidget:new({ +-- file = "resources/info-i.png" +-- }), Widget:new({ dimen = { w = 10, h = 0 } }), From 76c58d601f5be53e93fd334b59f1ca500e3af070 Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Mon, 16 Apr 2012 21:18:17 +0200 Subject: [PATCH 02/10] added InfoMessage "Reading filenames..." --- filesearcher.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/filesearcher.lua b/filesearcher.lua index c0426029c..bdc3ab9dd 100644 --- a/filesearcher.lua +++ b/filesearcher.lua @@ -51,6 +51,8 @@ function FileSearcher:readDir() end function FileSearcher:setPath(newPath) + InfoMessage:show("Reading filenames...") + fb:refresh(0) self.path = newPath self:readDir() self.items = #self.files From c07090383f1f50c29980740b7cbe8d44fa8862ea Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Mon, 16 Apr 2012 21:29:58 +0200 Subject: [PATCH 03/10] added (optional) refresh_mode to InfoMessage:show --- dialog.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dialog.lua b/dialog.lua index e97163ced..548bd4478 100644 --- a/dialog.lua +++ b/dialog.lua @@ -5,7 +5,7 @@ InfoMessage = { face = Font:getFace("infofont", 25) } -function InfoMessage:show(text) +function InfoMessage:show(text,refresh_mode) local dialog = CenterContainer:new({ dimen = { w = G_width, h = G_height }, FrameContainer:new({ @@ -28,6 +28,9 @@ function InfoMessage:show(text) }) dialog:paintTo(fb.bb, 0, 0) dialog:free() + if refresh_mode ~= nil then + fb:refresh(refresh_mode) + end end function showInfoMsgWithDelay(text, msec, refresh_mode) From d672436c8e7447d3639c8eb0dd9c8c434350dd9b Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Mon, 16 Apr 2012 21:30:27 +0200 Subject: [PATCH 04/10] show line spacing in CREReader This might be very slow operation on device because it seems to invoke whole reflow of document --- crereader.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/crereader.lua b/crereader.lua index dab931cec..2afeee77e 100644 --- a/crereader.lua +++ b/crereader.lua @@ -274,6 +274,7 @@ function CREReader:adjustCreReaderCommands() if self.line_space_percent > 200 then self.line_space_percent = 200 end + InfoMessage:show("line spacing "..self.line_space_percent.."%", 0) print("line spacing set to", self.line_space_percent) cr.doc:setDefaultInterlineSpace(self.line_space_percent) cr:redrawCurrentPage() @@ -286,6 +287,7 @@ function CREReader:adjustCreReaderCommands() if self.line_space_percent < 100 then self.line_space_percent = 100 end + InfoMessage:show("line spacing "..self.line_space_percent.."%", 0) print("line spacing set to", self.line_space_percent) cr.doc:setDefaultInterlineSpace(self.line_space_percent) cr:redrawCurrentPage() From 0f487650b5f644f4acecbd2cf4e154ea6195453e Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Mon, 16 Apr 2012 21:31:53 +0200 Subject: [PATCH 05/10] use new refresh_mode arg --- filesearcher.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/filesearcher.lua b/filesearcher.lua index bdc3ab9dd..9339ae516 100644 --- a/filesearcher.lua +++ b/filesearcher.lua @@ -51,8 +51,7 @@ function FileSearcher:readDir() end function FileSearcher:setPath(newPath) - InfoMessage:show("Reading filenames...") - fb:refresh(0) + InfoMessage:show("Reading filenames...",0) self.path = newPath self:readDir() self.items = #self.files From 4604f75ac0a5e5a7e8fb530736145e5a8e8705a4 Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Mon, 16 Apr 2012 21:37:56 +0200 Subject: [PATCH 06/10] word "click" seems to me somehow wrong here --- helppage.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helppage.lua b/helppage.lua index fb868de9a..7cd8269d4 100644 --- a/helppage.lua +++ b/helppage.lua @@ -99,7 +99,7 @@ function HelpPage:show(ypos, height, commands) end end renderUtf8Text(fb.bb, 5, height - fface_height + fface_ascender - 5, self.fface, - "Page "..self.page.." of "..math.ceil(self.items / perpage).." - click Back to close this page", true) + "Page "..self.page.." of "..math.ceil(self.items / perpage).." - Back to close this page", true) end if is_pagedirty then fb:refresh(0, 0, ypos, fb.bb:getWidth(), height) From 43a776ddbb50e53c1cb2149403cf2b10c0ac6634 Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Mon, 16 Apr 2012 21:52:55 +0200 Subject: [PATCH 07/10] print debug line --- dialog.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/dialog.lua b/dialog.lua index 548bd4478..f333c5e0e 100644 --- a/dialog.lua +++ b/dialog.lua @@ -6,6 +6,7 @@ InfoMessage = { } function InfoMessage:show(text,refresh_mode) + print("# InfoMessage ", text, refresh_mode) local dialog = CenterContainer:new({ dimen = { w = G_width, h = G_height }, FrameContainer:new({ From 065d68c3a5d4c27f9398031c691dd2f5644f58c6 Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Mon, 16 Apr 2012 21:54:22 +0200 Subject: [PATCH 08/10] use refresh_mode --- reader.lua | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/reader.lua b/reader.lua index f1aed3f34..abce5bd8b 100755 --- a/reader.lua +++ b/reader.lua @@ -48,8 +48,7 @@ function openFile(filename) reader = CREReader end if reader then - InfoMessage:show("Opening document, please wait... ") - fb:refresh(0) + InfoMessage:show("Opening document, please wait... ", 0) local ok, err = reader:open(filename) if ok then reader:loadSettings(filename) @@ -58,8 +57,7 @@ function openFile(filename) reader_settings:savesetting("lastfile", filename) return reader:inputLoop() else - InfoMessage:show("Error opening document.") - fb:refresh(0) + InfoMessage:show("Error opening document.", 0) util.sleep(2) end end From e387c87dccbbbbae7ecd97cda2c12f276eb77162 Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Mon, 16 Apr 2012 21:56:16 +0200 Subject: [PATCH 09/10] Change font message to keep time passing by faster --- crereader.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/crereader.lua b/crereader.lua index 2afeee77e..f89d10cac 100644 --- a/crereader.lua +++ b/crereader.lua @@ -307,8 +307,10 @@ function CREReader:adjustCreReaderCommands() end ) self.commands:add(KEY_F, nil, "F", - "invoke font menu", + "change document font", function(cr) + Screen:saveCurrentBB() + local face_list = cre.getFontFaces() local fonts_menu = SelectMenu:new{ @@ -322,6 +324,8 @@ function CREReader:adjustCreReaderCommands() cr.doc:setFontFace(face_list[item_no]) self.font_face = face_list[item_no] end + Screen:restoreFromSavedBB() + InfoMessage:show("Redrawing with "..face_list[item_no], 0) cr:redrawCurrentPage() end ) From e106ad75073211d2823b321b80460baeacb908ee Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Mon, 16 Apr 2012 22:13:21 +0200 Subject: [PATCH 10/10] added shortcut to start reader without Amazon framework This was inspired by conversation on forum about memory usage on DXG http://www.mobileread.com/forums/showthread.php?p=2044347#post2044347 --- launchpad/kpdf.ini | 2 ++ launchpad/kpdf.sh | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/launchpad/kpdf.ini b/launchpad/kpdf.ini index 4ad186020..316cf7853 100755 --- a/launchpad/kpdf.ini +++ b/launchpad/kpdf.ini @@ -3,5 +3,7 @@ P D = !/mnt/us/launchpad/kpdf.sh /mnt/us/documents # start kindlepdfviewer with last document P P = !/mnt/us/launchpad/kpdf.sh +# start kindlepdfviewer without framework +P K = !/mnt/us/launchpad/kpdf.sh /mnt/us/documents framework_stop # restart amazon framework - when it got irritated P R = !/etc/init.d/framework restart diff --git a/launchpad/kpdf.sh b/launchpad/kpdf.sh index 5c0611f2e..1cd6dc63a 100755 --- a/launchpad/kpdf.sh +++ b/launchpad/kpdf.sh @@ -8,9 +8,15 @@ cd /mnt/us/kindlepdfviewer/ grep /mnt/us/kindlepdfviewer/fonts/host /proc/mounts || mount -o bind /usr/java/lib/fonts /mnt/us/kindlepdfviewer/fonts/host +test "$2" == "framework_stop" && /etc/init.d/framework stop + ./reader.lua "$1" 2> /mnt/us/kindlepdfviewer/crash.log || cat /mnt/us/kindlepdfviewer/crash.log grep /mnt/us/kindlepdfviewer/fonts/host /proc/mounts && umount /mnt/us/kindlepdfviewer/fonts/host -killall -cont cvm -echo 1 > /proc/eink_fb/update_display +# always try to continue cvm +killall -cont cvm || /etc/init.d/framework start + +# cleanup hanging process +killall lipc-wait-event +