renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Calculator: don't crash when pressing Enter or FW-select buttons.

Browse Source
This commit is contained in:
Tigran Aivazian
2012-09-14 17:24:38 +01:00
parent 3984355c1c
commit b0febe2d9b
1 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
inputbox.lua
View File

@@ -601,23 +601,27 @@ function InputBox:ModeDependentCommands()
self.commands:add({KEY_FW_PRESS, KEY_ENTER}, nil, "joypad center",
"calculate the result",
function(self)
local s = self:PrepareStringToCalc()
if pcall(function () f = assert(loadstring("r = tostring("..s..")")) end) then
f()
self:clearText()
self.cursor:clear()
for i=1, string.len(r) do
table.insert(self.charlist, string.sub(r,i,i))
end
self.charpos = #self.charlist + 1
self.input_string = r
self:refreshText()
self.cursor:moveHorizontal(#self.charlist*self.fwidth)
self.cursor:draw()
fb:refresh(1, self.input_start_x-5, self.input_start_y-25, self.input_slot_w, self.h-25)
if #self.input_string == 0 then
showInfoMsgWithDelay("No input ", 1000, 1)
else
showInfoMsgWithDelay("Wrong Input! ", 2000, 1)
end -- if pcall
local s = self:PrepareStringToCalc()
if pcall(function () f = assert(loadstring("r = tostring("..s..")")) end) then
f()
self:clearText()
self.cursor:clear()
for i=1, string.len(r) do
table.insert(self.charlist, string.sub(r,i,i))
end
self.charpos = #self.charlist + 1
self.input_string = r
self:refreshText()
self.cursor:moveHorizontal(#self.charlist*self.fwidth)
self.cursor:draw()
fb:refresh(1, self.input_start_x-5, self.input_start_y-25, self.input_slot_w, self.h-25)
else
showInfoMsgWithDelay("Invalid input ", 1000, 1)
end -- if pcall
end
end -- function
)
-- add the calculator help (short list of available functions)