Kindle4NT improvements

frontend/apps/filemanager/filemanager.lua

@@ -362,7 +362,8 @@ function FileManager:init()
     end
 
     if Device:hasKeys() then
-        self.key_events.Close = { {"Home"}, doc = "Close file manager" }
+        self.key_events.Home = { {"Home"}, doc = "go home" }
+        self.file_chooser.key_events.Close = nil
     end
 
     self:handleEvent(Event:new("SetDimensions", self.dimen))
@@ -788,4 +789,10 @@ function FileManager:moveFile(from, to)
     return util.execute(self.mv_bin, from, to) == 0
 end
 
+function FileManager:onHome()
+    print('go home')
+    return self:goHome()
+
+end
+
 return FileManager

frontend/apps/filemanager/filemanagermenu.lua

@@ -306,7 +306,7 @@ function FileManagerMenu:onShowMenu()
     }
 
     local main_menu
-    if Device:isTouchDevice() then
+    if Device:hasKeys() then
         local TouchMenu = require("ui/widget/touchmenu")
         main_menu = TouchMenu:new{
             width = Screen:getWidth(),

frontend/apps/reader/modules/readermenu.lua

@@ -53,7 +53,6 @@ function ReaderMenu:init()
     self.registered_widgets = {}
 
     if Device:hasKeys() then
-        self.key_events = { Close = { { "Back" }, doc = "close menu" }, }
         if Device:isTouchDevice() then
             self.key_events.TapShowMenu = { { "Menu" }, doc = "show menu", }
         else
@@ -241,7 +240,7 @@ function ReaderMenu:onShowReaderMenu(tab_index)
     }
 
     local main_menu
-    if Device:isTouchDevice() then
+    if Device:hasKeys() then
         local TouchMenu = require("ui/widget/touchmenu")
         main_menu = TouchMenu:new{
             width = Screen:getWidth(),

frontend/apps/reader/readerui.lua

@@ -54,8 +54,8 @@ local ReaderUI = InputContainer:new{
     name = "ReaderUI",
 
     key_events = {
-        Close = { { "Home" },
-            doc = "close document", event = "Close" },
+        Home = { { "Home" },
+            doc = "open file browser", event = "Home" },
     },
     active_widgets = {},
 
@@ -97,12 +97,6 @@ function ReaderUI:init()
         self.dialog = self
     end
 
-    if Device:hasKeys() then
-        self.key_events.Back = {
-            { "Back" }, doc = "close document",
-            event = "Close" }
-    end
-
     self.doc_settings = DocSettings:open(self.document.file)
 
     -- a view container (so it must be child #1!)
@@ -622,4 +616,9 @@ function ReaderUI:dealWithLoadDocumentFailure()
     error("crengine failed recognizing or parsing this file: unsupported or invalid document")
 end
 
+function ReaderUI:onHome()
+    print("go home2")
+    return self:showFileManager()
+end
+
 return ReaderUI

frontend/device/kindle/device.lua

@@ -317,6 +317,7 @@ function Kindle4:init()
     }
     self.input.open("/dev/input/event0")
     self.input.open("/dev/input/event1")
+    self.input.open("fake_events")
     Kindle.init(self)
 end
 

frontend/ui/widget/bookstatuswidget.lua

@@ -27,6 +27,8 @@ local util = require("util")
 local _ = require("gettext")
 local Screen = require("device").screen
 local template = require("ffi/util").template
+local Device = require("device")
+
 
 local stats_book = {}
 
@@ -82,6 +84,14 @@ function BookStatusWidget:init()
         show_parent = self,
         readonly = self.readonly,
     }
+
+    if Device:hasKeys() then
+    self.key_events = {
+        AnyKeyPressed = { { Device.input.group.Any },
+            seqtext = "any key", doc = "close dialog" }
+        }
+    end
+
     local screen_size = Screen:getSize()
     self[1] = FrameContainer:new{
         width = screen_size.w,

frontend/ui/widget/focusmanager.lua

@@ -57,56 +57,52 @@ function FocusManager:onFocusMove(args)
     end
     local current_item = self.layout[self.selected.y][self.selected.x]
     while true do
-        if self.selected.x + dx > #self.layout[self.selected.y]
-        or self.selected.x + dx < 1 then
-            break  -- abort when we run into horizontal borders
-        end
 
-        -- call widget wrap callbacks in vertical direction
-        if self.selected.y + dy > #self.layout then
-            if not self:onWrapLast() then
-                break
-            end
-        elseif self.selected.y + dy < 1 then
-            if not self:onWrapFirst() then
+        if not self.layout[self.selected.y + dy] then
+            --vertical borders, try to wraparound
+            if not self:warpAround(dy) then
                 break
             end
         else
             self.selected.y = self.selected.y + dy
-            if #self.layout[self.selected.y] == 0 then -- horizontal separator
-                self.selected.y = self.selected.y + dy -- skip it
-            end
         end
-        self.selected.x = self.selected.x + dx
-        if self.selected.x > #self.layout[self.selected.y] then
-            -- smaller nb of items on new row than on prev row
-            self.selected.x = #self.layout[self.selected.y]
+
+        if not self.layout[self.selected.y][self.selected.x + dx] then
+                --vertical border, no wraparound
+            break
+        else
+            self.selected.x = self.selected.x + dx
         end
 
         if self.layout[self.selected.y][self.selected.x] ~= current_item
         or not self.layout[self.selected.y][self.selected.x].is_inactive then
             -- we found a different object to focus
             current_item:handleEvent(Event:new("Unfocus"))
             self.layout[self.selected.y][self.selected.x]:handleEvent(Event:new("Focus"))
-            -- trigger a repaint (we need to be the registered widget!)
+            -- trigger a fast repaint, this seem to not count toward a fullscreen eink resfresh
             -- TODO: is this really needed?
-            UIManager:setDirty(self.show_parent or self, "partial")
+            UIManager:setDirty(self.show_parent or self, "fast")
             break
         end
     end
 
     return true
 end
-
-function FocusManager:onWrapFirst()
-    self.selected.y = #self.layout
-    return true
+function FocusManager:warpAround(dy)
+    --go to the last valid item directly above or below the current item
+    --return false if none could be found
+	local y = self.selected.y
+	while self.layout[y - dy] and self.layout[y - dy][self.selected.x] do
+        y = y - dy
+    end
+    if y ~= self.selected.y then
+        self.selected.y = y
+        return true
+    else
+        return false
+    end
 end
 
-function FocusManager:onWrapLast()
-    self.selected.y = 1
-    return true
-end
 
 function FocusManager:getFocusItem()
     return self.layout[self.selected.y][self.selected.x]

frontend/ui/widget/iconbutton.lua

@@ -124,4 +124,21 @@ function IconButton:onHoldIconButton()
     return true
 end
 
+
+function IconButton:onFocus()
+   --quick and dirty, need better way to show focus
+     self.image.invert=true
+     return true
+end
+
+function IconButton:onUnfocus()
+      self.image.invert=false
+      return true
+end
+
+function IconButton:onTapSelect()
+        self:onTapIconButton()
+    end
+
+
 return IconButton

frontend/ui/widget/inputtext.lua

@@ -88,6 +88,12 @@ if Device.isTouchDevice() then
             end)
         end
     end
+
+
+elseif not Device.hasKeyboard() then
+        Keyboard = require("ui/widget/virtualkeyboard")
+        function InputText:initEventListener() end --do nothing but doesnt crash for now
+
 else
     Keyboard = require("ui/widget/physicalkeyboard")
     function InputText:initEventListener() end

frontend/ui/widget/touchmenu.lua

@@ -26,6 +26,10 @@ local util = require("ffi/util")
 local _ = require("gettext")
 local Screen = Device.screen
 local getMenuText = require("util").getMenuText
+local FocusManager = require("ui/widget/focusmanager")
+local Event = require("ui/event")
+local Input = Device.input
+local UnderlineContainer = require("ui/widget/container/underlinecontainer")
 
 --[[
 TouchMenuItem widget
@@ -97,7 +101,32 @@ function TouchMenuItem:init()
             },
         },
     }
-    self[1] = self.item_frame
+
+
+    self._underline_container = UnderlineContainer:new{
+        vertical_align = "center",
+        dimen =self.dimen,
+        self.item_frame
+    }
+
+
+    self[1] = self._underline_container
+
+    function self:isEnabled()
+        return item_enabled ~= false and true
+    end
+
+end
+
+
+function TouchMenuItem:onFocus()
+    self._underline_container.color = Blitbuffer.COLOR_BLACK
+    return true
+end
+
+function TouchMenuItem:onUnfocus()
+       self._underline_container.color = Blitbuffer.COLOR_WHITE
+    return true
 end
 
 function TouchMenuItem:onTapSelect(arg, ges)
@@ -202,9 +231,11 @@ function TouchMenuBar:init()
             callback = nil,
             padding_left = icon_padding,
             padding_right = icon_padding,
+            menu = self.menu,
         }
 
         table.insert(self.icon_widgets, ib)
+        table.insert(self.menu.layout, ib) -- for the focusmanager
 
         -- we have to use local variable here for closure callback
         local _start_seg = end_seg + icon_sep_width
@@ -319,7 +350,7 @@ end
 --[[
 TouchMenu widget for hierarchical menus
 --]]
-local TouchMenu = InputContainer:new{
+local TouchMenu = FocusManager:new{
     tab_item_table = {},
     -- for returnning in multi-level menus
     item_table_stack = nil,
@@ -351,6 +382,8 @@ function TouchMenu:init()
         end
     end
 
+    self.layout = {}
+
     self.ges_events.TapCloseAllMenus = {
         GestureRange:new{
             ges = "tap",
@@ -368,7 +401,10 @@ function TouchMenu:init()
         }
     }
 
-    self.key_events.Close = { {"Back"}, doc = "close touch menu" }
+    self.key_events.Prec = { {"Back"}, doc = "back" }
+    self.key_events.NextPage = { {Input.group.PgFwd}, doc = "next page" }
+    self.key_events.PrevPage = { {Input.group.PgBack}, doc = "previous page" }
+    self.key_events.Press = { {"Press"}, doc = "chose selected item" }
 
     local icons = {}
     for _,v in ipairs(self.tab_item_table) do
@@ -509,7 +545,9 @@ function TouchMenu:updateItems()
     local old_dimen = self.dimen and self.dimen:copy()
     self:_recalculatePageLayout()
     self.item_group:clear()
+    self.layout = {} --aurel
     table.insert(self.item_group, self.bar)
+    table.insert(self.layout, self.bar.icon_widgets) --for the focusmanager
 
     for c = 1, self.perpage do
         -- calculate index in item_table
@@ -526,6 +564,9 @@ function TouchMenu:updateItems()
                 show_parent = self.show_parent,
             }
             table.insert(self.item_group, item_tmp)
+            if item_tmp:isEnabled() then
+                table.insert(self.layout, {[self.cur_tab] = item_tmp}) --for the focusmanager
+            end
             if item.separator and c ~= self.perpage then
                 -- insert split line
                 table.insert(self.item_group, self.split_line)
@@ -553,6 +594,7 @@ function TouchMenu:updateItems()
     -- recalculate dimen based on new layout
     self.dimen.w = self.width
     self.dimen.h = self.item_group:getSize().h + self.bordersize*2 + self.padding*2
+    self.selected = { x = self.cur_tab, y = 1 } --reset the position of the focusmanager
 
     UIManager:setDirty("all", function()
         local refresh_dimen =
@@ -706,5 +748,12 @@ end
 function TouchMenu:onClose()
     self:closeMenu()
 end
+function TouchMenu:onPrec()
+    self:backToUpperMenu()
+end
+function TouchMenu:onPress()
+    self:getFocusItem():handleEvent(Event:new("TapSelect"))
+
+end
 
 return TouchMenu