Archives
/
koreader
mirror of https://github.com/koreader/koreader
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

mod: rewrite filesearcher with command module

Browse Source
pull/2/merge
Qingping Hou 12 years ago
parent b8b1bc19fd
commit 7f0faa20bb
2 changed files with 183 additions and 125 deletions
Show Stats Download Patch File Download Diff File

257
filesearcher.lua
Unescape Escape View File

@ -85,42 +85,143 @@ function FileSearcher:init(search_path)
else
self:setPath("/mnt/us/documents")
end
self:addAllCommands()
end
function FileSearcher:prevItem()
if self.current == 1 then
if self.page > 1 then
self.current = self.perpage
self.page = self.page - 1
self.pagedirty = true
end
else
self.current = self.current - 1
self.markerdirty = true
end
end
function FileSearcher:choose(ypos, height, keywords)
local perpage = math.floor(height / self.spacing) - 2
local pagedirty = true
local markerdirty = false
function FileSearcher:nextItem()
if self.current == self.perpage then
if self.page < (self.items / self.perpage) then
self.current = 1
self.page = self.page + 1
self.pagedirty = true
end
else
if self.page ~= math.floor(self.items / self.perpage) + 1
or self.current + (self.page-1)*self.perpage < self.items then
self.current = self.current + 1
self.markerdirty = true
end
end
end
function FileSearcher:addAllCommands()
self.commands = Commands:new{}
local prevItem = function ()
if self.current == 1 then
self.commands:add(KEY_FW_UP, nil, "joypad up",
"goto previous item",
function(self)
self:prevItem()
end
)
self.commands:add(KEY_FW_DOWN, nil, "joypad down",
"goto next item",
function(self)
self:nextItem()
end
)
self.commands:add(KEY_PGFWD, nil, ">",
"next page",
function(self)
if self.page < (self.items / self.perpage) then
if self.current + self.page*self.perpage > self.items then
self.current = self.items - self.page*self.perpage
end
self.page = self.page + 1
self.pagedirty = true
else
self.current = self.items - (self.page-1)*self.perpage
self.markerdirty = true
end
end
)
self.commands:add(KEY_PGFWD, nil, "<",
"previous page",
function(self)
if self.page > 1 then
self.current = perpage
self.page = self.page - 1
pagedirty = true
self.pagedirty = true
else
self.current = 1
self.markerdirty = true
end
else
self.current = self.current - 1
markerdirty = true
end
end
local nextItem = function ()
if self.current == perpage then
if self.page < (self.items / perpage) then
self.current = 1
self.page = self.page + 1
pagedirty = true
)
self.commands:add(KEY_S, nil, "S",
"invoke search inputbox",
function(self)
old_keywords = keywords
keywords = InputBox:input(height-100, 100, "Search:", old_keywords)
if keywords then
self:setSearchResult(keywords)
else
keywords = old_keywords
end
else
if self.page ~= math.floor(self.items / perpage) + 1
or self.current + (self.page-1)*perpage < self.items then
self.current = self.current + 1
markerdirty = true
self.pagedirty = true
end
)
self.commands:add(KEY_F, nil, "F",
"font menu",
function(self)
fonts_menu = SelectMenu:new{
menu_title = "Fonts Menu",
item_array = Font.fonts,
}
local re = fonts_menu:choose(0, height)
if re then
Font.cfont = Font.fonts[re]
Font:update()
end
self.pagedirty = true
end
end
)
self.commands:add({KEY_ENTER, KEY_FW_PRESS}, nil, "",
"select item",
function(self)
file_entry = self.result[self.perpage*(self.page-1)+self.current]
file_full_path = file_entry.dir .. "/" .. file_entry.name
-- rotation mode might be changed while reading, so
-- record height_percent here
local height_percent = height/fb.bb:getHeight()
openFile(file_full_path)
--reset height and item index if screen has been rotated
local old_perpage = self.perpage
height = math.floor(fb.bb:getHeight()*height_percent)
self.perpage = math.floor(height / self.spacing) - 2
self.current = (old_perpage * (self.page - 1) +
self.current) % self.perpage
self.page = math.floor(self.items / self.perpage) + 1
self.pagedirty = true
end
)
self.commands:add({KEY_BACK, KEY_HOME}, nil, "",
"back to file browser",
function(self)
return "break"
end
)
end
function FileSearcher:choose(ypos, height, keywords)
self.perpage = math.floor(height / self.spacing) - 2
self.pagedirty = true
self.markerdirty = false
-- if given keywords, set new result according to keywords.
-- Otherwise, display the previous search result.
@ -133,8 +234,8 @@ function FileSearcher:choose(ypos, height, keywords)
local tface, tfhash = Font:getFaceAndHash(25, Font.tfont)
local fface, ffhash = Font:getFaceAndHash(16, Font.ffont)
if pagedirty then
markerdirty = true
if self.pagedirty then
self.markerdirty = true
fb.bb:paintRect(0, ypos, fb.bb:getWidth(), height, 0)
-- draw menu title
@ -149,10 +250,10 @@ function FileSearcher:choose(ypos, height, keywords)
"Sorry, no match found.", true)
renderUtf8Text(fb.bb, 20, y + self.spacing, cface, cfhash,
"Please try a different keyword.", true)
markerdirty = false
self.markerdirty = false
else -- found something, draw it
for c = 1, perpage do
local i = (self.page - 1) * perpage + c
for c = 1, self.perpage do
local i = (self.page - 1) * self.perpage + c
if i <= self.items then
y = ypos + self.title_H + (self.spacing * c)
renderUtf8Text(fb.bb, 50, y, cface, cfhash,
@ -162,15 +263,15 @@ function FileSearcher:choose(ypos, height, keywords)
end
-- draw footer
y = ypos + self.title_H + (self.spacing * perpage) + self.foot_H
y = ypos + self.title_H + (self.spacing * self.perpage) + self.foot_H
x = (fb.bb:getWidth() / 2) - 50
all_page = (math.floor(self.items / perpage)+1)
all_page = (math.floor(self.items / self.perpage)+1)
renderUtf8Text(fb.bb, x, y, fface, ffhash,
"Page "..self.page.." of "..all_page, true)
end
if markerdirty then
if not pagedirty then
if self.markerdirty then
if not self.pagedirty then
if self.oldcurrent > 0 then
y = ypos + self.title_H + (self.spacing * self.oldcurrent) + 10
fb.bb:paintRect(30, y, fb.bb:getWidth() - 60, 3, 0)
@ -180,85 +281,41 @@ function FileSearcher:choose(ypos, height, keywords)
-- draw new marker line
y = ypos + self.title_H + (self.spacing * self.current) + 10
fb.bb:paintRect(30, y, fb.bb:getWidth() - 60, 3, 15)
if not pagedirty then
if not self.pagedirty then
fb:refresh(1, 30, y, fb.bb:getWidth() - 60, 3)
end
self.oldcurrent = self.current
markerdirty = false
self.markerdirty = false
end
if pagedirty then
if self.pagedirty then
fb:refresh(0, 0, ypos, fb.bb:getWidth(), height)
pagedirty = false
self.pagedirty = false
end
local ev = input.waitForEvent()
ev.code = adjustKeyEvents(ev)
if ev.type == EV_KEY and ev.value == EVENT_VALUE_KEY_PRESS then
if ev.code == KEY_FW_UP then
prevItem()
elseif ev.code == KEY_FW_DOWN then
nextItem()
elseif ev.code == KEY_PGFWD then
if self.page < (self.items / perpage) then
if self.current + self.page*perpage > self.items then
self.current = self.items - self.page*perpage
end
self.page = self.page + 1
pagedirty = true
else
self.current = self.items - (self.page-1)*perpage
markerdirty = true
end
elseif ev.code == KEY_PGBCK then
if self.page > 1 then
self.page = self.page - 1
pagedirty = true
else
self.current = 1
markerdirty = true
end
elseif ev.code == KEY_S then
old_keywords = keywords
keywords = InputBox:input(height-100, 100, "Search:", old_keywords)
if keywords then
self:setSearchResult(keywords)
else
keywords = old_keywords
end
pagedirty = true
elseif ev.code == KEY_F then -- invoke fontchooser menu
fonts_menu = SelectMenu:new{
menu_title = "Fonts Menu",
item_array = Font.fonts,
}
local re = fonts_menu:choose(0, height)
if re then
Font.cfont = Font.fonts[re]
Font:update()
end
pagedirty = true
elseif ev.code == KEY_ENTER or ev.code == KEY_FW_PRESS then
file_entry = self.result[perpage*(self.page-1)+self.current]
file_full_path = file_entry.dir .. "/" .. file_entry.name
keydef = Keydef:new(ev.code, getKeyModifier())
print("key pressed: "..tostring(keydef))
-- rotation mode might be changed while reading, so
-- record height_percent here
local height_percent = height/fb.bb:getHeight()
openFile(file_full_path)
command = self.commands:getByKeydef(keydef)
if command ~= nil then
print("command to execute: "..tostring(command))
ret_code = command.func(self, keydef)
else
print("command not found: "..tostring(command))
end
--reset height and item index if screen has been rotated
local old_perpage = perpage
height = math.floor(fb.bb:getHeight()*height_percent)
perpage = math.floor(height / self.spacing) - 2
self.current = (old_perpage * (self.page - 1) +
self.current) % perpage
self.page = math.floor(self.items / perpage) + 1
if ret_code == "break" then
break
end
pagedirty = true
elseif ev.code == KEY_BACK or ev.code == KEY_HOME then
return nil
if self.selected_item ~= nil then
print("# selected "..self.selected_item)
return self.selected_item
end
end
end
end -- EOF if
end -- EOF while
return nil
end

51
selectmenu.lua
Unescape Escape View File

@ -85,8 +85,8 @@ function SelectMenu:addAllCommands()
sm.current = sm.current - 1
sm.markerdirty = true
end
end)
end
)
self.commands:add(KEY_FW_DOWN, nil, "",
"next item",
function(sm)
@ -103,8 +103,8 @@ function SelectMenu:addAllCommands()
sm.markerdirty = true
end
end
end)
end
)
self.commands:add({KEY_PGFWD, KEY_LPGFWD}, nil, "",
"next page",
function(sm)
@ -118,8 +118,8 @@ function SelectMenu:addAllCommands()
sm.current = sm.items - (sm.page - 1) * sm.perpage
sm.markerdirty = true
end
end)
end
)
self.commands:add({KEY_PGBCK, KEY_LPGBCK}, nil, "",
"previous page",
function(sm)
@ -130,8 +130,8 @@ function SelectMenu:addAllCommands()
sm.current = 1
sm.markerdirty = true
end
end)
end
)
self.commands:add(KEY_FW_PRESS, nil, "",
"select menu item",
function(sm)
@ -143,8 +143,8 @@ function SelectMenu:addAllCommands()
+ sm.current)
end
end
end)
end
)
local KEY_Q_to_E = {}
for i = KEY_Q, KEY_P do
table.insert(KEY_Q_to_E, Keydef:new(i, nil, ""))
@ -154,8 +154,8 @@ function SelectMenu:addAllCommands()
function(sm, keydef)
sm.selected_item = sm:getItemIndexByShortCut(
sm.item_shortcuts[ keydef.keycode - KEY_Q + 1 ], sm.perpage)
end)
end
)
local KEY_A_to_L = {}
for i = KEY_A, KEY_L do
table.insert(KEY_A_to_L, Keydef:new(i, nil, ""))
@ -165,8 +165,8 @@ function SelectMenu:addAllCommands()
function(sm, keydef)
sm.selected_item = sm:getItemIndexByShortCut(
sm.item_shortcuts[ keydef.keycode - KEY_A + 11 ], sm.perpage)
end)
end
)
local KEY_Z_to_M = {}
for i = KEY_Z, KEY_M do
table.insert(KEY_Z_to_M, Keydef:new(i, nil, ""))
@ -176,38 +176,39 @@ function SelectMenu:addAllCommands()
function(sm, keydef)
sm.selected_item = sm:getItemIndexByShortCut(
sm.item_shortcuts[ keydef.keycode - KEY_Z + 21 ], sm.perpage)
end)
end
)
self.commands:add(KEY_DEL, nil, "",
"Select menu item with del key as shortcut",
function(sm)
sm.selected_item = sm:getItemIndexByShortCut("Del", sm.perpage)
end)
end
)
self.commands:add(KEY_DOT, nil, "",
"Select menu item with dot key as shortcut",
function(sm)
sm.selected_item = sm:getItemIndexByShortCut(".", sm.perpage)
end)
end
)
self.commands:add({KEY_SYM, KEY_SLASH}, nil, "",
"Select menu item with sym/slash key as shortcut",
function(sm)
-- DXG has slash after dot
sm.selected_item = sm:getItemIndexByShortCut("Sym", sm.perpage)
end)
end
)
self.commands:add(KEY_ENTER, nil, "",
"Select menu item with enter key as shortcut",
function(sm)
sm.selected_item = sm:getItemIndexByShortCut("Ent", sm.perpage)
end)
end
)
self.commands:add(KEY_BACK, nil, "",
"Exit menu",
function(sm)
return "break"
end)
end
)
end
function SelectMenu:clearCommands()

Write Preview
Loading…
Cancel
Save