From 66eb939936acb070f5d78d8ef7e6ac1c5bafa676 Mon Sep 17 00:00:00 2001
From: Cali-Co <rezaarifandee@gmail.com>
Date: Mon, 18 Jan 2021 17:59:04 +0700
Subject: [PATCH] [feat] Add skimming support for Non-Touch devices (#7163)

Fixes #6866.
Replace InputContainer with FocusManager for easier DPad Handling.
Add ProgressBar jump via key Q to P, corresponds with 0% to 100%.

Tested on K3 and SDL. Should be safe for devices with touch.
---
 frontend/apps/reader/skimtowidget.lua | 47 +++++++++++++++++++++++----
 1 file changed, 41 insertions(+), 6 deletions(-)

diff --git a/frontend/apps/reader/skimtowidget.lua b/frontend/apps/reader/skimtowidget.lua
index f351108ea..c32d6e6d1 100644
--- a/frontend/apps/reader/skimtowidget.lua
+++ b/frontend/apps/reader/skimtowidget.lua
@@ -7,11 +7,11 @@ local Device = require("device")
 local Event = require("ui/event")
 local Font = require("ui/font")
 local FrameContainer = require("ui/widget/container/framecontainer")
+local FocusManager = require("ui/widget/focusmanager")
 local Geom = require("ui/geometry")
 local GestureRange = require("ui/gesturerange")
 local HorizontalGroup = require("ui/widget/horizontalgroup")
 local HorizontalSpan = require("ui/widget/horizontalspan")
-local InputContainer = require("ui/widget/container/inputcontainer")
 local LineWidget = require("ui/widget/linewidget")
 local Math = require("optmath")
 local MovableContainer = require("ui/widget/container/movablecontainer")
@@ -26,13 +26,15 @@ local WidgetContainer = require("ui/widget/container/widgetcontainer")
 local _ = require("gettext")
 local Screen = Device.screen
 
-local SkimToWidget = InputContainer:new{
+local SkimToWidget = FocusManager:new{
     title_face = Font:getFace("x_smalltfont"),
     width = nil,
     height = nil,
 }
 
 function SkimToWidget:init()
+    self.buttons_layout = {}
+    self.selected = { x = 1, y = 2 }
     self.medium_font_face = Font:getFace("ffont")
     self.screen_width = Screen:getWidth()
     self.screen_height = Screen:getHeight()
@@ -44,9 +46,7 @@ function SkimToWidget:init()
     self.button_margin = self.button_bordersize
     self.button_width = math.floor(self.screen_width * 0.16) - (2*self.button_margin)
     if Device:hasKeys() then
-        self.key_events = {
-            Close = { {"Back"}, doc = "close skimto page" }
-        }
+        self.key_events.Close = { { "Back" }, doc = "close skimto page" }
     end
     if Device:isTouchDevice() then
         self.ges_events = {
@@ -266,7 +266,7 @@ function SkimToWidget:init()
     }
 
     local horizontal_span_up = HorizontalSpan:new{ width = math.floor(self.screen_width * 0.2) }
-       local button_table_up = HorizontalGroup:new{
+    local button_table_up = HorizontalGroup:new{
         align = "center",
         button_chapter_prev,
         button_bookmark_prev,
@@ -328,6 +328,28 @@ function SkimToWidget:init()
             self.skimto_frame,
         }
     }
+
+    if Device:hasDPad() then
+        self.buttons_layout = {
+            { button_chapter_prev, button_bookmark_prev, button_bookmark_next, button_chapter_next },
+            { button_minus, button_minus_ten, button_plus_ten, button_plus },
+        }
+        self.layout = self.buttons_layout
+        self.layout[2][1]:onFocus()
+        self.key_events.SelectByKeyPress = { { "Press" }, doc = "select focused item" }
+    end
+    if Device:hasKeyboard() then
+        self.key_events.QKey = { { "Q" }, event = "FirstRowKeyPress", args =    0 }
+        self.key_events.WKey = { { "W" }, event = "FirstRowKeyPress", args = 0.11 }
+        self.key_events.EKey = { { "E" }, event = "FirstRowKeyPress", args = 0.22 }
+        self.key_events.RKey = { { "R" }, event = "FirstRowKeyPress", args = 0.33 }
+        self.key_events.TKey = { { "T" }, event = "FirstRowKeyPress", args = 0.44 }
+        self.key_events.YKey = { { "Y" }, event = "FirstRowKeyPress", args = 0.55 }
+        self.key_events.UKey = { { "U" }, event = "FirstRowKeyPress", args = 0.66 }
+        self.key_events.IKey = { { "I" }, event = "FirstRowKeyPress", args = 0.77 }
+        self.key_events.OKey = { { "O" }, event = "FirstRowKeyPress", args = 0.88 }
+        self.key_events.PKey = { { "P" }, event = "FirstRowKeyPress", args =    1 }
+    end
 end
 
 function SkimToWidget:update()
@@ -399,6 +421,19 @@ function SkimToWidget:onAnyKeyPressed()
     return true
 end
 
+function SkimToWidget:onSelectByKeyPress()
+    local item = self:getFocusItem()
+    item.callback()
+end
+
+function SkimToWidget:onFirstRowKeyPress(percent)
+    local page = Math.round(percent * self.page_count)
+    self:addOriginToLocationStack()
+    self.ui:handleEvent(Event:new("GotoPage", page ))
+    self.curr_page = page
+    self:update()
+end
+
 function SkimToWidget:onTapProgress(arg, ges_ev)
     if ges_ev.pos:intersectWith(self.progress_bar.dimen) then
         local perc = self.progress_bar:getPercentageFromPosition(ges_ev.pos)