diff --git a/commands.lua b/commands.lua index 83e2381cf..89c8b0f37 100644 --- a/commands.lua +++ b/commands.lua @@ -56,7 +56,7 @@ function Command:new(keydef, func, help, keygroup, order) obj.help = help obj.keygroup = keygroup obj.order = order - --debug("creating command: ["..tostring(keydef).."] keygroup:["..(keygroup or "").."] help:"..help) + --Debug("creating command: ["..tostring(keydef).."] keygroup:["..(keygroup or "").."] help:"..help) return obj end diff --git a/crereader.lua b/crereader.lua index 6ce3e111c..9f48b7c9e 100644 --- a/crereader.lua +++ b/crereader.lua @@ -29,7 +29,7 @@ function CREReader:init() for _k, _v in ipairs(fonts) do local ok, err = pcall(cre.registerFont, Font.fontdir..'/'.._v) if not ok then - debug(err) + Debug(err) end end @@ -180,7 +180,7 @@ function CREReader:goto(pos, is_ignore_jump, pos_type) self.doc:drawCurrentPage(self.nulldc, fb.bb) - debug("## self.show_overlap "..self.show_overlap) + Debug("## self.show_overlap "..self.show_overlap) if self.show_overlap < 0 then fb.bb:dimRect(0,0, width, -self.show_overlap) elseif self.show_overlap > 0 then @@ -189,11 +189,11 @@ function CREReader:goto(pos, is_ignore_jump, pos_type) self.show_overlap = 0 if self.rcount >= self.rcountmax then - debug("full refresh") + Debug("full refresh") self.rcount = 0 fb:refresh(0) else - debug("partial refresh") + Debug("partial refresh") self.rcount = self.rcount + 1 fb:refresh(1) end @@ -409,7 +409,7 @@ function CREReader:adjustCreReaderCommands() self.line_space_percent = math.min(self.line_space_percent, 200) end InfoMessage:show("line spacing "..self.line_space_percent.."%", 0) - debug("line spacing set to", self.line_space_percent) + Debug("line spacing set to", self.line_space_percent) -- NuPogodi, 15.05.12: storing old document height self.old_doc_height = self.doc:getFullHeight() -- end of changes (NuPogodi) @@ -426,7 +426,7 @@ function CREReader:adjustCreReaderCommands() self.commands:addGroup("[1..0]", numeric_keydefs, "jump to *10% of document", function(self, keydef) - debug('jump to position: '.. + Debug('jump to position: '.. math.floor(self.doc:getFullHeight()*(keydef.keycode-KEY_1)/9).. '/'..self.doc:getFullHeight()) self:goto(math.floor(self.doc:getFullHeight()*(keydef.keycode-KEY_1)/9)) @@ -466,7 +466,7 @@ function CREReader:adjustCreReaderCommands() } item_no = nil item_no = fonts_menu:choose(0, G_height) - debug(face_list[item_no]) + Debug(face_list[item_no]) -- NuPogodi, 15.05.12: storing old document height self.old_doc_height = self.doc:getFullHeight() -- end of changes (NuPogodi) diff --git a/dialog.lua b/dialog.lua index 023136ae8..4c3f0b1e9 100644 --- a/dialog.lua +++ b/dialog.lua @@ -6,7 +6,7 @@ InfoMessage = { } function InfoMessage:show(text,refresh_mode) - debug("# InfoMessage ", text, refresh_mode) + Debug("# InfoMessage ", text, refresh_mode) local dialog = CenterContainer:new({ dimen = { w = G_width, h = G_height }, FrameContainer:new({ diff --git a/filechooser.lua b/filechooser.lua index 7dc91bac7..858e176a6 100644 --- a/filechooser.lua +++ b/filechooser.lua @@ -133,7 +133,7 @@ function getAbsolutePath(aPath) abs_path = lfs.currentdir() lfs.chdir(curr_dir) end - --debug("rel: '"..aPath.."' abs:'"..abs_path.."'") + --Debug("rel: '"..aPath.."' abs:'"..abs_path.."'") end return abs_path end @@ -163,7 +163,7 @@ function FileChooser:setPath(newPath) self.path = getAbsolutePath(newPath) local readdir_ok, exc = pcall(self.readDir,self) if(not readdir_ok) then - debug("readDir error: "..tostring(exc)) + Debug("readDir error: "..tostring(exc)) self.exception_message = exc return self:setPath(curr_path) else @@ -237,24 +237,24 @@ function FileChooser:choose(ypos, height) end local ev = input.saveWaitForEvent() - --debug("key code:"..ev.code) + --Debug("key code:"..ev.code) ev.code = adjustKeyEvents(ev) if ev.type == EV_KEY and ev.value ~= EVENT_VALUE_KEY_RELEASE then keydef = Keydef:new(ev.code, getKeyModifier()) - debug("key pressed: "..tostring(keydef)) + Debug("key pressed: "..tostring(keydef)) command = self.commands:getByKeydef(keydef) if command ~= nil then - debug("command to execute: "..tostring(command)) + Debug("command to execute: "..tostring(command)) ret_code = command.func(self, keydef) else - debug("command not found: "..tostring(command)) + Debug("command not found: "..tostring(command)) end if ret_code == "break" then break end if self.selected_item ~= nil then - debug("# selected "..self.selected_item) + Debug("# selected "..self.selected_item) return self.selected_item end end -- if ev.type == diff --git a/filehistory.lua b/filehistory.lua index 0748588da..840362da7 100644 --- a/filehistory.lua +++ b/filehistory.lua @@ -364,14 +364,14 @@ function FileHistory:choose(keywords) ev.code = adjustKeyEvents(ev) if ev.type == EV_KEY and ev.value ~= EVENT_VALUE_KEY_RELEASE then keydef = Keydef:new(ev.code, getKeyModifier()) - debug("key pressed: "..tostring(keydef)) + Debug("key pressed: "..tostring(keydef)) command = self.commands:getByKeydef(keydef) if command ~= nil then - debug("command to execute: "..tostring(command)) + Debug("command to execute: "..tostring(command)) ret_code = command.func(self, keydef) else - debug("command not found: "..tostring(command)) + Debug("command not found: "..tostring(command)) end if ret_code == "break" then @@ -379,7 +379,7 @@ function FileHistory:choose(keywords) end if self.selected_item ~= nil then - debug("# selected "..self.selected_item) + Debug("# selected "..self.selected_item) return self.selected_item end end -- if diff --git a/fileinfo.lua b/fileinfo.lua index e00556f94..a4726b649 100644 --- a/fileinfo.lua +++ b/fileinfo.lua @@ -164,20 +164,20 @@ function FileInfo:show(path,name) ev.code = adjustKeyEvents(ev) if ev.type == EV_KEY and ev.value ~= EVENT_VALUE_KEY_RELEASE then keydef = Keydef:new(ev.code, getKeyModifier()) - debug("key pressed: "..tostring(keydef)) + Debug("key pressed: "..tostring(keydef)) command = self.commands:getByKeydef(keydef) if command ~= nil then - debug("command to execute: "..tostring(command)) + Debug("command to execute: "..tostring(command)) ret_code = command.func(self, keydef) else - debug("command not found: "..tostring(command)) + Debug("command not found: "..tostring(command)) end if ret_code == "break" then break end if self.selected_item ~= nil then - debug("# selected "..self.selected_item) + Debug("# selected "..self.selected_item) return self.selected_item end end -- if diff --git a/filesearcher.lua b/filesearcher.lua index b0be72237..e32d75962 100644 --- a/filesearcher.lua +++ b/filesearcher.lua @@ -41,7 +41,7 @@ function FileSearcher:readDir() elseif ext:getReader(file_type) then file_entry = {dir=d, name=f,} table.insert(self.files, file_entry) - --debug("file:"..d.."/"..f) + --Debug("file:"..d.."/"..f) end end end @@ -370,14 +370,14 @@ function FileSearcher:choose(keywords) ev.code = adjustKeyEvents(ev) if ev.type == EV_KEY and ev.value ~= EVENT_VALUE_KEY_RELEASE then keydef = Keydef:new(ev.code, getKeyModifier()) - debug("key pressed: "..tostring(keydef)) + Debug("key pressed: "..tostring(keydef)) command = self.commands:getByKeydef(keydef) if command ~= nil then - debug("command to execute: "..tostring(command)) + Debug("command to execute: "..tostring(command)) ret_code = command.func(self, keydef) else - debug("command not found: "..tostring(command)) + Debug("command not found: "..tostring(command)) end if ret_code == "break" then @@ -385,7 +385,7 @@ function FileSearcher:choose(keywords) end if self.selected_item ~= nil then - debug("# selected "..self.selected_item) + Debug("# selected "..self.selected_item) return self.selected_item end end -- if diff --git a/font.lua b/font.lua index 50348b288..d3d0b24d4 100644 --- a/font.lua +++ b/font.lua @@ -4,7 +4,7 @@ Font = { -- default font for menu contents cfont = "droid/DroidSans.ttf", -- default font for title - tfont = "droid/DroidSansBold.ttf", + tfont = "droid/DroidSans.ttf", -- default font for footer ffont = "droid/DroidSans.ttf", @@ -53,11 +53,11 @@ function Font:getFace(font, size) realname = self.fontdir.."/"..realname ok, face = pcall(freetype.newFace, realname, size) if not ok then - debug("#! Font "..font.." ("..realname..") not supported: "..face) + Debug("#! Font "..font.." ("..realname..") not supported: "..face) return nil end self.faces[font..size] = face - --debug("getFace, found: "..realname.." size:"..size) + --Debug("getFace, found: "..realname.." size:"..size) end return { size = size, ftface = face, hash = font..size } end diff --git a/helppage.lua b/helppage.lua index ec223549a..e9d5cad2c 100644 --- a/helppage.lua +++ b/helppage.lua @@ -47,7 +47,7 @@ function HelpPage:show(ypos, height, commands) local keys = {} for k,v in pairs(commands.map) do local key = v.keygroup or v.keydef:display() - --debug("order: "..v.order.." command: "..tostring(v.keydef).." - keygroup:"..(v.keygroup or "nil").." -keys[key]:"..(keys[key] or "nil")) + --Debug("order: "..v.order.." command: "..tostring(v.keydef).." - keygroup:"..(v.keygroup or "nil").." -keys[key]:"..(keys[key] or "nil")) if keys[key] == nil then keys[key] = 1 table.insert(self.commands,{shortcut=key,help=v.help,order=v.order}) @@ -59,8 +59,8 @@ function HelpPage:show(ypos, height, commands) local face_height, face_ascender = self.face.ftface:getHeightAndAscender() --local hface_height, hface_ascender = self.hface.ftface:getHeightAndAscender() local fface_height, fface_ascender = self.fface.ftface:getHeightAndAscender() - --debug(face_height.."-"..face_ascender) - --debug(fface_height.."-"..fface_ascender) + --Debug(face_height.."-"..face_ascender) + --Debug(fface_height.."-"..fface_ascender) face_height = math.ceil(face_height) face_ascender = math.ceil(face_ascender) fface_height = math.ceil(fface_height) @@ -86,7 +86,7 @@ function HelpPage:show(ypos, height, commands) local key = self.commands[i].shortcut for _k,aMod in pairs(MOD_TABLE) do local modStart, modEnd = key:find(aMod.v) - debug("key:"..key.." v:"..aMod.v.." d:"..aMod.d.." modstart:"..(modStart or "nil")) + Debug("key:"..key.." v:"..aMod.v.." d:"..aMod.d.." modstart:"..(modStart or "nil")) if(modStart ~= nil) then key = key:sub(1,modStart-1)..key:sub(modEnd+1) local box = sizeUtf8Text( x, fb.bb:getWidth(), self.face, aMod.d, true) @@ -96,7 +96,7 @@ function HelpPage:show(ypos, height, commands) max_x = math.max(max_x, pen_x) end end - debug("key:"..key) + Debug("key:"..key) local box = sizeUtf8Text( x, fb.bb:getWidth(), self.face, key , true) fb.bb:paintRect(x, ypos + spacing*c - box.y_top + vert_S, box.x, box.y_top + box.y_bottom, self.bg_color) local pen_x = renderUtf8Text(fb.bb, x, ypos + spacing*c + vert_S, self.face, key, true) @@ -121,7 +121,7 @@ function HelpPage:show(ypos, height, commands) end local ev = input.saveWaitForEvent() - --debug("key code:"..ev.code) + --Debug("key code:"..ev.code) ev.code = adjustKeyEvents(ev) if ev.type == EV_KEY and ev.value == EVENT_VALUE_KEY_PRESS then if ev.code == KEY_PGFWD or ev.code == KEY_LPGFWD then diff --git a/inputbox.lua b/inputbox.lua index 518cf5327..54628606d 100644 --- a/inputbox.lua +++ b/inputbox.lua @@ -161,13 +161,13 @@ function InputBox:input(ypos, height, title, d_text, is_hint) ev.code = adjustKeyEvents(ev) if ev.type == EV_KEY and ev.value ~= EVENT_VALUE_KEY_RELEASE then keydef = Keydef:new(ev.code, getKeyModifier()) - debug("key pressed: "..tostring(keydef)) + Debug("key pressed: "..tostring(keydef)) command = self.commands:getByKeydef(keydef) if command ~= nil then - debug("command to execute: "..tostring(command)) + Debug("command to execute: "..tostring(command)) ret_code = command.func(self, keydef) else - debug("command not found: "..tostring(command)) + Debug("command not found: "..tostring(command)) end if ret_code == "break" then ret_code = nil diff --git a/keys.lua b/keys.lua index 749cf9b43..137605261 100644 --- a/keys.lua +++ b/keys.lua @@ -257,7 +257,7 @@ function adjustKeyEvents(ev) end end -- This should not happen. - debug("# Unrecognizable rotation mode "..Screen.cur_rotation_mode.."!") + Debug("# Unrecognizable rotation mode "..Screen.cur_rotation_mode.."!") return nil end @@ -267,7 +267,7 @@ function input.saveWaitForEvent(timeout) while retry do local ok, ev = pcall(input.waitForEvent, timeout) if not ok then - debug("got error waiting for events:", ev) + Debug("got error waiting for events:", ev) if ev == "Waiting for input failed: 4\n" then -- EINTR, we got interrupted. Try and restart retry = true diff --git a/pdfreader.lua b/pdfreader.lua index 4d8ab1142..b14d0a94a 100644 --- a/pdfreader.lua +++ b/pdfreader.lua @@ -41,7 +41,7 @@ function PDFReader:getText(pageno) return nil end local text = page:getPageText() - --debug("## page:getPageText "..dump(text)) -- performance impact on device + --Debug("## page:getPageText "..dump(text)) -- performance impact on device page:close() return text end diff --git a/reader.lua b/reader.lua index ed8013732..e8bf4fbff 100755 --- a/reader.lua +++ b/reader.lua @@ -16,6 +16,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . ]]-- +local v = require("luajit/lib/v") +v.on() require "alt_getopt" require "pdfreader" diff --git a/rendertext.lua b/rendertext.lua index c63d15381..3d0c87817 100644 --- a/rendertext.lua +++ b/rendertext.lua @@ -48,7 +48,7 @@ end function sizeUtf8Text(x, width, face, text, kerning) if text == nil then - debug("sizeUtf8Text called without text"); + Debug("sizeUtf8Text called without text"); return end -- may still need more adaptive pen placement when kerning, @@ -64,14 +64,14 @@ function sizeUtf8Text(x, width, face, text, kerning) if kerning and prevcharcode then local kern = face.ftface:getKerning(prevcharcode, charcode) pen_x = pen_x + kern - --debug("prev:"..string.char(prevcharcode).." curr:"..string.char(charcode).." kern:"..kern) + --Debug("prev:"..string.char(prevcharcode).." curr:"..string.char(charcode).." kern:"..kern) else - --debug("curr:"..string.char(charcode)) + --Debug("curr:"..string.char(charcode)) end pen_x = pen_x + glyph.ax pen_y_top = math.max(pen_y_top, glyph.t) pen_y_bottom = math.max(pen_y_bottom, glyph.bb:getHeight() - glyph.t) - --debug("ax:"..glyph.ax.." t:"..glyph.t.." r:"..glyph.r.." h:"..glyph.bb:getHeight().." w:"..glyph.bb:getWidth().." yt:"..pen_y_top.." yb:"..pen_y_bottom) + --Debug("ax:"..glyph.ax.." t:"..glyph.t.." r:"..glyph.r.." h:"..glyph.bb:getHeight().." w:"..glyph.bb:getWidth().." yt:"..pen_y_top.." yb:"..pen_y_bottom) prevcharcode = charcode end end @@ -80,7 +80,7 @@ end function renderUtf8Text(buffer, x, y, face, text, kerning) if text == nil then - debug("renderUtf8Text called without text"); + Debug("renderUtf8Text called without text"); return 0 end -- may still need more adaptive pen placement when kerning, @@ -94,10 +94,10 @@ function renderUtf8Text(buffer, x, y, face, text, kerning) if kerning and prevcharcode then local kern = face.ftface:getKerning(prevcharcode, charcode) pen_x = pen_x + kern - --debug("prev:"..string.char(prevcharcode).." curr:"..string.char(charcode).." pen_x:"..pen_x.." kern:"..kern) + --Debug("prev:"..string.char(prevcharcode).." curr:"..string.char(charcode).." pen_x:"..pen_x.." kern:"..kern) buffer:addblitFrom(glyph.bb, x + pen_x + glyph.l, y - glyph.t, 0, 0, glyph.bb:getWidth(), glyph.bb:getHeight()) else - --debug(" curr:"..string.char(charcode)) + --Debug(" curr:"..string.char(charcode)) buffer:blitFrom(glyph.bb, x + pen_x + glyph.l, y - glyph.t, 0, 0, glyph.bb:getWidth(), glyph.bb:getHeight()) end pen_x = pen_x + glyph.ax @@ -112,7 +112,7 @@ end function renderUtf8TextWidth(buffer, x, y, face, text, kerning, w) if text == nil then - debug("renderUtf8Text called without text"); + Debug("renderUtf8Text called without text"); return nil end local pen_x = 0 @@ -125,10 +125,10 @@ function renderUtf8TextWidth(buffer, x, y, face, text, kerning, w) if kerning and prevcharcode then local kern = face.ftface:getKerning(prevcharcode, charcode) pen_x = pen_x + kern - --debug("prev:"..string.char(prevcharcode).." curr:"..string.char(charcode).." pen_x:"..pen_x.." kern:"..kern) + --Debug("prev:"..string.char(prevcharcode).." curr:"..string.char(charcode).." pen_x:"..pen_x.." kern:"..kern) buffer:addblitFrom(glyph.bb, x + pen_x + glyph.l, y - glyph.t, 0, 0, glyph.bb:getWidth(), glyph.bb:getHeight()) else - --debug(" curr:"..string.char(charcode)) + --Debug(" curr:"..string.char(charcode)) buffer:blitFrom(glyph.bb, x + pen_x + glyph.l, y - glyph.t, 0, 0, glyph.bb:getWidth(), glyph.bb:getHeight()) end pen_x = pen_x + glyph.ax diff --git a/screen.lua b/screen.lua index 8c25fa96a..46a951d1f 100644 --- a/screen.lua +++ b/screen.lua @@ -103,7 +103,7 @@ function Screen:restoreFromBB(bb) if bb then fb.bb:blitFullFrom(bb) else - debug("Got nil bb in restoreFromSavedBB!") + Debug("Got nil bb in restoreFromSavedBB!") end end diff --git a/selectmenu.lua b/selectmenu.lua index b137119ef..d3af37bd4 100644 --- a/selectmenu.lua +++ b/selectmenu.lua @@ -343,14 +343,14 @@ function SelectMenu:choose(ypos, height) ev.code = adjustKeyEvents(ev) if ev.type == EV_KEY and ev.value ~= EVENT_VALUE_KEY_RELEASE then keydef = Keydef:new(ev.code, getKeyModifier()) - debug("key pressed: "..tostring(keydef)) + Debug("key pressed: "..tostring(keydef)) command = self.commands:getByKeydef(keydef) if command ~= nil then - debug("command to execute: "..tostring(command)) + Debug("command to execute: "..tostring(command)) ret_code = command.func(self, keydef) else - debug("command not found: "..tostring(command)) + Debug("command not found: "..tostring(command)) end if ret_code == "break" then @@ -358,7 +358,7 @@ function SelectMenu:choose(ypos, height) end if self.selected_item ~= nil then - debug("# selected "..self.selected_item) + Debug("# selected "..self.selected_item) return self.selected_item, self.item_array[self.selected_item] end end -- EOF if diff --git a/settings.lua b/settings.lua index bd2bd4c69..3374f3136 100644 --- a/settings.lua +++ b/settings.lua @@ -42,7 +42,7 @@ function DocSettings:open(docfile) end if stored.version < 2012.05 then - debug("settings", docfile, stored) + Debug("settings", docfile, stored) if stored.jumpstack ~= nil then stored.jump_history = stored.jumpstack stored.jumpstack = nil @@ -64,7 +64,7 @@ function DocSettings:open(docfile) end end stored.version = 2012.05 - debug("upgraded", stored) + Debug("upgraded", stored) end new.data = stored @@ -90,8 +90,9 @@ function dump(data) return table.concat(out) end -function debug(...) +function Debug(...) local line = "" + local arg = {...} for i,v in ipairs(arg) do if type(v) == "table" then line = line .. " " .. dump(v) diff --git a/settings.reader.lua b/settings.reader.lua new file mode 100644 index 000000000..36143afac --- /dev/null +++ b/settings.reader.lua @@ -0,0 +1,16 @@ +-- we can read Lua syntax here! +return { + ["lastfile"] = "/home/hw/devel/kindlepdfviewer/testsuite/cbz/samplebook.cbz", + ["fontmap"] = { + ["hfont"] = "droid/DroidSans.ttf", + ["infont"] = "droid/DroidSansMono.ttf", + ["scfont"] = "droid/DroidSansMono.ttf", + ["hpkfont"] = "droid/DroidSansMono.ttf", + ["infofont"] = "droid/DroidSans.ttf", + ["tfont"] = "droid/DroidSans.ttf", + ["ffont"] = "droid/DroidSans.ttf", + ["cfont"] = "droid/DroidSans.ttf", + ["pgfont"] = "droid/DroidSans.ttf", + ["rifont"] = "droid/DroidSans.ttf" + } +} diff --git a/unireader.lua b/unireader.lua index 60e60d5a5..feb39f167 100644 --- a/unireader.lua +++ b/unireader.lua @@ -132,7 +132,7 @@ function UniReader:screenOffset() if self.offset_y < 0 then y = y + self.offset_y end - debug("screenOffset", x, y) + Debug("screenOffset", x, y) return x,y end @@ -159,7 +159,7 @@ function UniReader:screenToPageTransform(x, y) local x_p,y_p = ( x - x_o ) / self.globalzoom, ( y - y_o ) / self.globalzoom - debug("screenToPage", x,y, "offset", x_o,y_o, "page", x_p,y_p) + Debug("screenToPage", x,y, "offset", x_o,y_o, "page", x_p,y_p) return x_p, y_p end @@ -326,7 +326,7 @@ function UniReader:_toggleWordHighLight(t, l, w) end function UniReader:_toggleTextHighLight(t, l0, w0, l1, w1) - debug("_toggleTextHighLight range", l0, w0, l1, w1) + Debug("_toggleTextHighLight range", l0, w0, l1, w1) -- make sure (l0, w0) is smaller than (l1, w1) if l0 > l1 then l0, l1 = l1, l0 @@ -384,7 +384,7 @@ function UniReader:startHighLightMode() end showInfoMsgWithDelay("No visible text for highlight", 2000, 1); - debug("_findFirstWordInView none found in", t) + Debug("_findFirstWordInView none found in", t) return nil end @@ -539,7 +539,7 @@ function UniReader:startHighLightMode() l.start, w.start = _findFirstWordInView(t) if not l.start then - debug("no text in current view!") + Debug("no text in current view!") -- InfoMessage about reason already shown return end @@ -707,7 +707,7 @@ function UniReader:startHighLightMode() l.cur, w.cur = l.new, w.new end end -- while running - debug("start", l.cur, w.cur, l.start, w.start) + Debug("start", l.cur, w.cur, l.start, w.start) -- two helper functions for highlight local function _togglePrevWordHighLight(t, l, w) @@ -999,12 +999,12 @@ function UniReader:loadSettings(filename) end end end - debug(self.highlight) + Debug(self.highlight) self.highlight.to_fix = nil end local bbox = self.settings:readSetting("bbox") - debug("bbox loaded ", bbox) + Debug("bbox loaded ", bbox) self.bbox = bbox self.globalzoom = self.settings:readSetting("globalzoom") or 1.0 @@ -1135,7 +1135,7 @@ function UniReader:drawOrCache(no, preCache) end else if not preCache then - debug("ERROR not enough memory in cache left, probably a bug.") + Debug("ERROR not enough memory in cache left, probably a bug.") end return nil end @@ -1151,7 +1151,7 @@ function UniReader:drawOrCache(no, preCache) } --debug ("# new biltbuffer:"..dump(self.cache[pagehash])) dc:setOffset(-tile.x, -tile.y) - debug("rendering page", no) + Debug("rendering page", no) page:draw(dc, self.cache[pagehash].bb, 0, 0) page:close() @@ -1175,7 +1175,7 @@ function UniReader:setzoom(page, preCache) local dc = DrawContext.new() local pwidth, pheight = page:getSize(self.nulldc) local width, height = G_width, G_height - debug("page::getSize",pwidth,pheight) + Debug("page::getSize",pwidth,pheight) local x0, y0, x1, y1 = page:getUsedBBox() if x0 == 0.01 and y0 == 0.01 and x1 == -0.01 and y1 == -0.01 then x0 = 0 @@ -1192,22 +1192,22 @@ function UniReader:setzoom(page, preCache) if y1 > pheight then y1 = pheight end if self.bbox.enabled then - debug("ORIGINAL page::getUsedBBox", x0,y0, x1,y1 ) + Debug("ORIGINAL page::getUsedBBox", x0,y0, x1,y1 ) local bbox = self.bbox[self.pageno] -- exact local oddEven = self:oddEven(self.pageno) if bbox ~= nil then - debug("bbox from", self.pageno) + Debug("bbox from", self.pageno) else bbox = self.bbox[oddEven] -- odd/even end if bbox ~= nil then -- last used up to this page - debug("bbox from", oddEven) + Debug("bbox from", oddEven) else for i = 0,self.pageno do bbox = self.bbox[ self.pageno - i ] if bbox ~= nil then - debug("bbox from", self.pageno - i) + Debug("bbox from", self.pageno - i) break end end @@ -1220,7 +1220,7 @@ function UniReader:setzoom(page, preCache) end end - debug("page::getUsedBBox", x0, y0, x1, y1 ) + Debug("page::getUsedBBox", x0, y0, x1, y1 ) if self.globalzoom_mode == self.ZOOM_FIT_TO_PAGE or self.globalzoom_mode == self.ZOOM_FIT_TO_CONTENT then @@ -1292,7 +1292,7 @@ function UniReader:setzoom(page, preCache) self.globalzoom = height / (y1 - y0 + margin) self.offset_y = -1 * y0 * self.globalzoom * 2 + margin self.globalzoom = width / (x1 - x0 + margin) * 2 - debug("column mode offset:", self.offset_x, self.offset_y, " zoom:", self.globalzoom); + Debug("column mode offset:", self.offset_x, self.offset_y, " zoom:", self.globalzoom); self.globalzoom_mode = self.ZOOM_BY_VALUE -- enable pan mode self.pan_x = self.offset_x self.pan_y = self.offset_y @@ -1314,7 +1314,7 @@ function UniReader:setzoom(page, preCache) ["x1"] = x1, ["y1"] = y1, } - debug("cur_bbox", self.cur_bbox) + Debug("cur_bbox", self.cur_bbox) end self.min_offset_x = fb.bb:getWidth() - self.fullwidth @@ -1326,11 +1326,11 @@ function UniReader:setzoom(page, preCache) self.min_offset_y = 0 end - debug("Reader:setZoom globalzoom:", self.globalzoom, " globalrotate:", self.globalrotate, " offset:", self.offset_x, self.offset_y, " pagesize:", self.fullwidth, self.fullheight, " min_offset:", self.min_offset_x, self.min_offset_y) + Debug("Reader:setZoom globalzoom:", self.globalzoom, " globalrotate:", self.globalrotate, " offset:", self.offset_x, self.offset_y, " pagesize:", self.fullwidth, self.fullheight, " min_offset:", self.min_offset_x, self.min_offset_y) -- set gamma here, we don't have any other good place for this right now: if self.globalgamma ~= self.GAMMA_NO_GAMMA then - debug("gamma correction: ", self.globalgamma) + Debug("gamma correction: ", self.globalgamma) dc:setGamma(self.globalgamma) end return dc @@ -1367,12 +1367,12 @@ function UniReader:show(no) if self.dest_x or self.dest_y then fb.bb:paintRect(0, 0, width, height, 8) end - debug("blitFrom dest_off:", self.dest_x, self.dest_y, + Debug("blitFrom dest_off:", self.dest_x, self.dest_y, "src_off:", offset_x, offset_y, "width:", width, "height:", height) fb.bb:blitFrom(bb, self.dest_x, self.dest_y, offset_x, offset_y, width, height) - debug("self.show_overlap", self.show_overlap) + Debug("self.show_overlap", self.show_overlap) if self.show_overlap < 0 then fb.bb:dimRect(0,0, width, self.dest_y - self.show_overlap) elseif self.show_overlap > 0 then @@ -1386,11 +1386,11 @@ function UniReader:show(no) end if self.rcount >= self.rcountmax then - debug("full refresh") + Debug("full refresh") self.rcount = 0 fb:refresh(0) else - debug("partial refresh") + Debug("partial refresh") self.rcount = self.rcount + 1 fb:refresh(1) end @@ -1557,7 +1557,7 @@ end -- adjust global gamma setting function UniReader:modifyGamma(factor) - debug("modifyGamma, gamma=", self.globalgamma, " factor=", factor) + Debug("modifyGamma, gamma=", self.globalgamma, " factor=", factor) self.globalgamma = self.globalgamma * factor; self:redrawCurrentPage() end @@ -1808,7 +1808,7 @@ function UniReader:showMenu() end function UniReader:oddEven(number) - debug("oddEven", number) + Debug("oddEven", number) if number % 2 == 1 then return "odd" else @@ -1825,28 +1825,28 @@ function UniReader:inputLoop() if ev.type == EV_KEY and ev.value ~= EVENT_VALUE_KEY_RELEASE then local secs, usecs = util.gettime() keydef = Keydef:new(ev.code, getKeyModifier()) - debug("key pressed:", tostring(keydef)) + Debug("key pressed:", tostring(keydef)) command = self.commands:getByKeydef(keydef) if command ~= nil then - debug("command to execute:", tostring(command)) + Debug("command to execute:", tostring(command)) ret_code = command.func(self,keydef) if ret_code == "break" then break; end else - debug("command not found:", tostring(command)) + Debug("command not found:", tostring(command)) end local nsecs, nusecs = util.gettime() local dur = (nsecs - secs) * 1000000 + nusecs - usecs - debug("E: T="..ev.type, " V="..ev.value, " C="..ev.code, " DUR=", dur) + Debug("E: T="..ev.type, " V="..ev.value, " C="..ev.code, " DUR=", dur) if ev.value == EVENT_VALUE_KEY_REPEAT then self.rcount = 0 - debug("prevent full screen refresh", self.rcount) + Debug("prevent full screen refresh", self.rcount) end else - debug("ignored ev ",ev) + Debug("ignored ev ",ev) end end @@ -1958,7 +1958,7 @@ function UniReader:addAllCommands() self.commands:addGroup("[1, 2 .. 9, 0]",numeric_keydefs, "jump to 10%, 20% .. 90%, 100% of document", function(unireader,keydef) - debug('jump to page:', math.max(math.floor(unireader.doc:getPages()*(keydef.keycode-KEY_1)/9),1), '/', unireader.doc:getPages()) + Debug('jump to page:', math.max(math.floor(unireader.doc:getPages()*(keydef.keycode-KEY_1)/9),1), '/', unireader.doc:getPages()) unireader:goto(math.max(math.floor(unireader.doc:getPages()*(keydef.keycode-KEY_1)/9),1)) end) -- end numeric keys @@ -2102,7 +2102,7 @@ function UniReader:addAllCommands() unireader.bbox[unireader.pageno] = bbox unireader.bbox[unireader:oddEven(unireader.pageno)] = bbox unireader.bbox.enabled = true - debug("bbox", unireader.pageno, unireader.bbox) + Debug("bbox", unireader.pageno, unireader.bbox) unireader.globalzoom_mode = unireader.ZOOM_FIT_TO_CONTENT -- use bbox showInfoMsgWithDelay("Manual crop setting saved.", 2000, 1) end) @@ -2111,7 +2111,7 @@ function UniReader:addAllCommands() function(unireader) unireader.bbox[unireader.pageno] = nil; showInfoMsgWithDelay("Manual crop setting removed.", 2000, 1) - debug("bbox remove", unireader.pageno, unireader.bbox); + Debug("bbox remove", unireader.pageno, unireader.bbox); end) self.commands:add(KEY_Z,MOD_ALT,"Z", "toggle crop mode", @@ -2122,15 +2122,15 @@ function UniReader:addAllCommands() else showInfoMsgWithDelay("Manual crop disabled.", 2000, 1) end - debug("bbox override", unireader.bbox.enabled); + Debug("bbox override", unireader.bbox.enabled); end) self.commands:add(KEY_X,nil,"X", "invert page bbox", function(unireader) local bbox = unireader.cur_bbox - debug("bbox", bbox) + Debug("bbox", bbox) x,y,w,h = unireader:getRectInScreen( bbox["x0"], bbox["y0"], bbox["x1"], bbox["y1"] ) - debug("inxertRect",x,y,w,h) + Debug("inxertRect",x,y,w,h) fb.bb:invertRect( x,y, w,h ) fb:refresh(1) end) @@ -2138,9 +2138,9 @@ function UniReader:addAllCommands() "modify page bbox", function(unireader) local bbox = unireader.cur_bbox - debug("bbox", bbox) + Debug("bbox", bbox) x,y,w,h = unireader:getRectInScreen( bbox["x0"], bbox["y0"], bbox["x1"], bbox["y1"] ) - debug("getRectInScreen",x,y,w,h) + Debug("getRectInScreen",x,y,w,h) local new_bbox = bbox local x_s, y_s = x,y @@ -2157,7 +2157,7 @@ function UniReader:addAllCommands() while running_corner do local ev = input.saveWaitForEvent() - debug("ev",ev) + Debug("ev",ev) ev.code = adjustKeyEvents(ev) if ev.type == EV_KEY and ev.value ~= EVENT_VALUE_KEY_RELEASE then @@ -2182,7 +2182,7 @@ function UniReader:addAllCommands() if running_corner == "top-left" then new_bbox["x0"] = p_x new_bbox["y0"] = p_y - debug("change top-left", bbox, "to", new_bbox) + Debug("change top-left", bbox, "to", new_bbox) running_corner = "bottom-right" Screen:restoreFromSavedBB() InfoMessage:show(running_corner.." bbox") @@ -2198,7 +2198,7 @@ function UniReader:addAllCommands() factor = ev.code - KEY_Q + 1 x_direction = last_direction["x"] y_direction = last_direction["y"] - debug("factor",factor,"deltas",x_direction,y_direction) + Debug("factor",factor,"deltas",x_direction,y_direction) elseif ev.code >= KEY_A and ev.code <= KEY_L then factor = ev.code - KEY_A + 11 x_direction = last_direction["x"] @@ -2211,12 +2211,12 @@ function UniReader:addAllCommands() running_corner = false end - debug("factor",factor,"deltas",x_direction,y_direction) + Debug("factor",factor,"deltas",x_direction,y_direction) if running_corner then local x_o = x_direction * step * factor local y_o = y_direction * step * factor - debug("move slider",x_o,y_o) + Debug("move slider",x_o,y_o) if x_s+x_o >= 0 and x_s+x_o <= G_width then x_s = x_s + x_o end if y_s+y_o >= 0 and y_s+y_o <= G_height then y_s = y_s + y_o end @@ -2229,7 +2229,7 @@ function UniReader:addAllCommands() if x_direction or y_direction then last_direction = { x = x_direction, y = y_direction } - debug("last_direction",last_direction) + Debug("last_direction",last_direction) -- FIXME partial duplicate of SelectMenu.item_shortcuts local keys = { @@ -2261,7 +2261,7 @@ function UniReader:addAllCommands() local tick = i * step * x_direction if x_direction ~= 0 then local tick = i * step * x_direction - debug("x tick",i,tick,key) + Debug("x tick",i,tick,key) if running_corner == "top-left" then -- ticks must be inside page fb.bb:invertRect( x_s+tick, y_s, 1, math.abs(tick)) else @@ -2272,7 +2272,7 @@ function UniReader:addAllCommands() renderUtf8Text(fb.bb, x_s+tick+2, y_s+4, face, key) else local tick = i * step * y_direction - debug("y tick",i,tick,key) + Debug("y tick",i,tick,key) if running_corner == "top-left" then -- ticks must be inside page fb.bb:invertRect( x_s, y_s+tick, math.abs(tick),1) else @@ -2294,7 +2294,7 @@ function UniReader:addAllCommands() unireader.bbox[unireader.pageno] = new_bbox unireader.bbox[unireader:oddEven(unireader.pageno)] = new_bbox unireader.bbox.enabled = true - debug("crop bbox", bbox, "to", new_bbox) + Debug("crop bbox", bbox, "to", new_bbox) Screen:restoreFromSavedBB() x,y,w,h = unireader:getRectInScreen( new_bbox["x0"], new_bbox["y0"], new_bbox["x1"], new_bbox["y1"] ) @@ -2338,12 +2338,12 @@ function UniReader:addAllCommands() y = unireader.shift_y end - debug("offset", unireader.offset_x, unireader.offset_x, " shift", x, y, " globalzoom", unireader.globalzoom) + Debug("offset", unireader.offset_x, unireader.offset_x, " shift", x, y, " globalzoom", unireader.globalzoom) local old_offset_x = unireader.offset_x local old_offset_y = unireader.offset_y if keydef.keycode == KEY_FW_LEFT then - debug("KEY_FW_LEFT", unireader.offset_x, "+", x, "> 0"); + Debug("KEY_FW_LEFT", unireader.offset_x, "+", x, "> 0"); unireader.offset_x = unireader.offset_x + x if unireader.pan_by_page then if unireader.offset_x > 0 and unireader.pageno > 1 then @@ -2358,7 +2358,7 @@ function UniReader:addAllCommands() unireader.offset_x = 0 end elseif keydef.keycode == KEY_FW_RIGHT then - debug("KEY_FW_RIGHT", unireader.offset_x, "-", x, "<", unireader.min_offset_x, "-", unireader.pan_margin); + Debug("KEY_FW_RIGHT", unireader.offset_x, "-", x, "<", unireader.min_offset_x, "-", unireader.pan_margin); unireader.offset_x = unireader.offset_x - x if unireader.pan_by_page then if unireader.offset_x < unireader.min_offset_x - unireader.pan_margin and unireader.pageno < unireader.doc:getPages() then @@ -2438,5 +2438,5 @@ function UniReader:addAllCommands() end ) -- commands.map is very large, impacts startup performance on device - --debug("defined commands "..dump(self.commands.map)) + --Debug("defined commands "..dump(self.commands.map)) end