From 39b37bca6251eb6d9475a793d1603d5c739311b6 Mon Sep 17 00:00:00 2001 From: SomeGuy <97603719+Commodore64user@users.noreply.github.com> Date: Fri, 3 May 2024 23:01:46 +0100 Subject: [PATCH 1/7] hasPageUpDownKeys added --- frontend/device/generic/device.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/device/generic/device.lua b/frontend/device/generic/device.lua index a2f24426c..79b0e24b1 100644 --- a/frontend/device/generic/device.lua +++ b/frontend/device/generic/device.lua @@ -41,6 +41,7 @@ local Device = { hasAuxBattery = no, hasKeyboard = no, hasKeys = no, + hasPageUpDownKeys = no, canKeyRepeat = no, hasDPad = no, hasExitOptions = yes, From ca49d82717ef07838521520473daee496e3f1e14 Mon Sep 17 00:00:00 2001 From: SomeGuy <97603719+Commodore64user@users.noreply.github.com> Date: Fri, 3 May 2024 23:07:16 +0100 Subject: [PATCH 2/7] hasPageUpDownKeys = yes for kindles --- frontend/device/kindle/device.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/frontend/device/kindle/device.lua b/frontend/device/kindle/device.lua index f93bb17f7..ef2d1a6f5 100644 --- a/frontend/device/kindle/device.lua +++ b/frontend/device/kindle/device.lua @@ -458,6 +458,7 @@ local Kindle2 = Kindle:extend{ isREAGL = no, hasKeyboard = yes, hasKeys = yes, + hasPageUpDownKeys = yes, hasDPad = yes, canHWInvert = no, canModifyFBInfo = no, @@ -471,6 +472,7 @@ local KindleDXG = Kindle:extend{ isREAGL = no, hasKeyboard = yes, hasKeys = yes, + hasPageUpDownKeys = yes, hasDPad = yes, canHWInvert = no, canModifyFBInfo = no, @@ -484,6 +486,7 @@ local Kindle3 = Kindle:extend{ isREAGL = no, hasKeyboard = yes, hasKeys = yes, + hasPageUpDownKeys = yes, hasDPad = yes, canHWInvert = no, canModifyFBInfo = no, @@ -495,6 +498,7 @@ local Kindle4 = Kindle:extend{ model = "Kindle4", isREAGL = no, hasKeys = yes, + hasPageUpDownKeys = yes, hasDPad = yes, canHWInvert = no, canModifyFBInfo = no, @@ -543,6 +547,7 @@ local KindleVoyage = Kindle:extend{ canTurnFrontlightOff = no, hasLightSensor = yes, hasKeys = yes, + hasPageUpDownKeys = yes, display_dpi = 300, touch_dev = "/dev/input/event1", } @@ -561,6 +566,7 @@ local KindleOasis = Kindle:extend{ isTouchDevice = yes, hasFrontlight = yes, hasKeys = yes, + hasPageUpDownKeys = yes, hasGSensor = yes, display_dpi = 300, --[[ @@ -579,6 +585,7 @@ local KindleOasis2 = Kindle:extend{ hasFrontlight = yes, hasLightSensor = yes, hasKeys = yes, + hasPageUpDownKeys = yes, hasGSensor = yes, display_dpi = 300, touch_dev = "/dev/input/by-path/platform-30a30000.i2c-event", @@ -593,6 +600,7 @@ local KindleOasis3 = Kindle:extend{ hasNaturalLightMixer = yes, hasLightSensor = yes, hasKeys = yes, + hasPageUpDownKeys = yes, hasGSensor = yes, display_dpi = 300, touch_dev = "/dev/input/by-path/platform-30a30000.i2c-event", From b87c59b2cb349f98d5df2310301a95acfcc2c72b Mon Sep 17 00:00:00 2001 From: SomeGuy <97603719+Commodore64user@users.noreply.github.com> Date: Fri, 3 May 2024 23:19:03 +0100 Subject: [PATCH 3/7] Update readerrolling.lua --- .../apps/reader/modules/readerrolling.lua | 36 +++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/frontend/apps/reader/modules/readerrolling.lua b/frontend/apps/reader/modules/readerrolling.lua index 205c72cff..7ff38bccb 100644 --- a/frontend/apps/reader/modules/readerrolling.lua +++ b/frontend/apps/reader/modules/readerrolling.lua @@ -116,7 +116,18 @@ end function ReaderRolling:onGesture() end function ReaderRolling:registerKeyEvents() - if Device:hasKeys() then + if Device:hasPageUpDownKeys() and Device:hasDPad() then + self.key_events.GotoNextView = { + { { "RPgFwd", "LPgFwd" } }, + event = "GotoViewRel", + args = 1, + } + self.key_events.GotoPrevView = { + { { "RPgBack", "LPgBack" } }, + event = "GotoViewRel", + args = -1, + } + elseif Device:hasKeys() then self.key_events.GotoNextView = { { { "RPgFwd", "LPgFwd", "Right" } }, event = "GotoViewRel", @@ -128,7 +139,28 @@ function ReaderRolling:registerKeyEvents() args = -1, } end - if Device:hasDPad() then + if Device:hasDPad() and Device:hasPageUpDownKeys() then + self.key_events.MoveUp = { + { "Up" }, + event = "Panning", + args = {0, -1}, + } + self.key_events.MoveDown = { + { "Down" }, + event = "Panning", + args = {0, 1}, + } + self.key_events.GotoNextChapter = { + { "Right" }, + event = "GotoNextChapter", + args = 1, + } + self.key_events.GotoPrevChapter = { + { "Left" }, + event = "GotoPrevChapter", + args = -1, + } + elseif Device:hasDPad() then self.key_events.MoveUp = { { "Up" }, event = "Panning", From 93b2e27abe1079d1a1758f528851b61ce64dbbd6 Mon Sep 17 00:00:00 2001 From: SomeGuy <97603719+Commodore64user@users.noreply.github.com> Date: Fri, 3 May 2024 23:37:41 +0100 Subject: [PATCH 4/7] Update readerpaging.lua --- frontend/apps/reader/modules/readerpaging.lua | 33 ++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/frontend/apps/reader/modules/readerpaging.lua b/frontend/apps/reader/modules/readerpaging.lua index 3bf67199e..6e010ee7f 100644 --- a/frontend/apps/reader/modules/readerpaging.lua +++ b/frontend/apps/reader/modules/readerpaging.lua @@ -51,7 +51,38 @@ end function ReaderPaging:onGesture() end function ReaderPaging:registerKeyEvents() - if Device:hasKeys() then + if Device:hasPageUpDownKeys() and Device:hasDPad() then + self.key_events.GotoNextPage = { + { { "RPgFwd", "LPgFwd" } }, + event = "GotoViewRel", + args = 1, + } + self.key_events.GotoPrevPage = { + { { "RPgBack", "LPgBack" } }, + event = "GotoViewRel", + args = -1, + } + self.key_events.GotoNextPos = { + { "Down" }, + event = "GotoPosRel", + args = 1, + } + self.key_events.GotoPrevPos = { + { "Up" }, + event = "GotoPosRel", + args = -1, + } + self.key_events.GotoNextChapter = { + { "Right" }, + event = "GotoNextChapter", + args = 1, + } + self.key_events.GotoPrevChapter = { + { "Left" }, + event = "GotoPrevChapter", + args = -1, + } + elseif Device:hasKeys() then self.key_events.GotoNextPage = { { { "RPgFwd", "LPgFwd", not Device:hasFewKeys() and "Right" } }, event = "GotoViewRel", From 0c10bd9e0c30354a7336558229f4bfa880e3c48d Mon Sep 17 00:00:00 2001 From: SomeGuy <97603719+Commodore64user@users.noreply.github.com> Date: Sat, 4 May 2024 12:32:34 +0100 Subject: [PATCH 5/7] content selection mapped to up/down --- frontend/apps/reader/modules/readerrolling.lua | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/frontend/apps/reader/modules/readerrolling.lua b/frontend/apps/reader/modules/readerrolling.lua index 7ff38bccb..ae7b6daba 100644 --- a/frontend/apps/reader/modules/readerrolling.lua +++ b/frontend/apps/reader/modules/readerrolling.lua @@ -140,15 +140,9 @@ function ReaderRolling:registerKeyEvents() } end if Device:hasDPad() and Device:hasPageUpDownKeys() then - self.key_events.MoveUp = { - { "Up" }, - event = "Panning", - args = {0, -1}, - } - self.key_events.MoveDown = { - { "Down" }, - event = "Panning", - args = {0, 1}, + self.key_events.ContentSelection = { + { { "Up", "Down" } }, + event = "ContentSelection", } self.key_events.GotoNextChapter = { { "Right" }, @@ -812,6 +806,10 @@ function ReaderRolling:onGotoPrevChapter() return true end +function ReaderRolling:onContentSelection() + return self.ui.highlight:onStartHighlightIndicator() +end + function ReaderRolling:onNotCharging() self:updateBatteryState() end From dc0ba58ebf6d815331b4c684626e73da93c71925 Mon Sep 17 00:00:00 2001 From: SomeGuy <97603719+Commodore64user@users.noreply.github.com> Date: Sat, 4 May 2024 22:25:05 +0100 Subject: [PATCH 6/7] greppability fix --- frontend/apps/reader/modules/readerrolling.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/apps/reader/modules/readerrolling.lua b/frontend/apps/reader/modules/readerrolling.lua index ae7b6daba..bfed552fe 100644 --- a/frontend/apps/reader/modules/readerrolling.lua +++ b/frontend/apps/reader/modules/readerrolling.lua @@ -139,7 +139,7 @@ function ReaderRolling:registerKeyEvents() args = -1, } end - if Device:hasDPad() and Device:hasPageUpDownKeys() then + if Device:hasPageUpDownKeys() and Device:hasDPad() then self.key_events.ContentSelection = { { { "Up", "Down" } }, event = "ContentSelection", From 9e84bc653ecae7fff991a59a568aa9e190c9546d Mon Sep 17 00:00:00 2001 From: SomeGuy <97603719+Commodore64user@users.noreply.github.com> Date: Sun, 5 May 2024 00:37:17 +0100 Subject: [PATCH 7/7] readertoc mapped to "ScreenKB" key --- frontend/apps/reader/modules/readertoc.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frontend/apps/reader/modules/readertoc.lua b/frontend/apps/reader/modules/readertoc.lua index a77619e49..40b4c67b3 100644 --- a/frontend/apps/reader/modules/readertoc.lua +++ b/frontend/apps/reader/modules/readertoc.lua @@ -62,6 +62,8 @@ function ReaderToc:onGesture() end function ReaderToc:registerKeyEvents() if Device:hasKeyboard() then self.key_events.ShowToc = { { "T" } } + elseif Device:hasPageUpDownKeys() and Device:hasDPad() then + self.key_events.ShowToc = { { "ScreenKB" } } end end