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

Merge branch 'master' of https://github.com/hwhw/kindlepdfviewer

Browse Source 
Conflicts:
	pdfreader.lua
pull/2/merge
Qingping Hou 12 years ago
parent 53d4016c64 6698cf157c
commit aa5806accd
4 changed files with 72 additions and 25 deletions
Show Stats Download Patch File Download Diff File

8
Makefile
Unescape Escape View File

@ -90,9 +90,11 @@ lfs.o: $(LFSDIR)/src/lfs.c
$(CC) -c $(CFLAGS) -I$(LUADIR)/src -I$(LFSDIR)/src $(LFSDIR)/src/lfs.c -o $@
fetchthirdparty:
-rmdir mupdf
-rmdir lua
-rm lua
-rm -Rf mupdf
-rm -Rf lua lua-5.1.4*
-rm -Rf lsqlite3_svn08*
-rm -Rf sqlite-amalgamation-3070900*
-rm -Rf luafilesystem*
git clone git://git.ghostscript.com/mupdf.git
( cd mupdf ; wget http://www.mupdf.com/download/mupdf-thirdparty.zip && unzip mupdf-thirdparty.zip )
wget http://www.lua.org/ftp/lua-5.1.4.tar.gz && tar xvzf lua-5.1.4.tar.gz && ln -s lua-5.1.4 lua

9
filechooser.lua
Unescape Escape View File

@ -170,14 +170,7 @@ function FileChooser:choose(ypos, height)
elseif ev.code == KEY_S then -- invoke search input
keywords = InputBox:input(height-100, 100, "Search:")
if keywords then -- display search result according to keywords
--[[
----------------------------------------------------------------
|| uncomment following line and set the correct path if you want
|| to test search feature in EMU mode
----------------------------------------------------------------
--]]
--FileSearcher:init("/home/dave/documents/kindle/backup/documents")
FileSearcher:init()
FileSearcher:init( self.path )
file = FileSearcher:choose(ypos, height, keywords)
if file then
return file

2
keys.lua
Unescape Escape View File

@ -120,7 +120,7 @@ function set_emu_keycodes()
KEY_FW_DOWN = 116
KEY_FW_LEFT = 113
KEY_FW_RIGHT = 114
KEY_FW_PRESS = 36 -- enter for now
KEY_FW_PRESS = 115 -- end for now (above arrows)
KEY_SPACE = 65
KEY_ENTER = 36

78
pdfreader.lua
Unescape Escape View File

@ -12,6 +12,7 @@ PDFReader = {
ZOOM_FIT_TO_CONTENT = -4,
ZOOM_FIT_TO_CONTENT_WIDTH = -5,
ZOOM_FIT_TO_CONTENT_HEIGHT = -6,
ZOOM_FIT_TO_CONTENT_HALF_WIDTH = -7,
GAMMA_NO_GAMMA = 1.0,
@ -40,6 +41,9 @@ PDFReader = {
shift_x = 100,
shift_y = 50,
pan_by_page = false, -- using shift_[xy] or width/height
pan_x = 0, -- top-left offset of page when pan activated
pan_y = 0,
pan_margin = 20,
-- keep track of input state:
shiftmode = false, -- shift pressed
@ -189,6 +193,18 @@ function PDFReader:setzoom(page)
self.offset_x = -1 * x0 * self.globalzoom + (width - (self.globalzoom * (x1 - x0))) / 2
self.offset_y = -1 * y0 * self.globalzoom
end
elseif self.globalzoommode == self.ZOOM_FIT_TO_CONTENT_HALF_WIDTH then
local x0, y0, x1, y1 = page:getUsedBBox()
self.globalzoom = width / (x1 - x0 + self.pan_margin)
self.offset_x = -1 * x0 * self.globalzoom * 2 + self.pan_margin
self.globalzoom = height / (y1 - y0)
self.offset_y = -1 * y0 * self.globalzoom * 2 + self.pan_margin
self.globalzoom = width / (x1 - x0 + self.pan_margin) * 2
print("column mode offset:"..self.offset_x.."*"..self.offset_y.." zoom:"..self.globalzoom);
self.globalzoommode = self.ZOOM_BY_VALUE -- enable pan mode
self.pan_x = self.offset_x
self.pan_y = self.offset_y
self.pan_by_page = true
end
dc:setZoom(self.globalzoom)
dc:setRotate(self.globalrotate);
@ -354,25 +370,34 @@ function PDFReader:inputloop()
while 1 do
local ev = input.waitForEvent()
if ev.type == EV_KEY and ev.value == EVENT_VALUE_KEY_PRESS then
ev.code = adjustFWKey(ev.code)
local secs, usecs = util.gettime()
if ev.code == KEY_SHIFT then
Keys.shiftmode = true
elseif ev.code == KEY_ALT then
Keys.altmode = true
elseif ev.code == KEY_PGFWD or ev.code == KEY_LPGFWD then
if Keys.shiftmode then
self:setglobalzoom(self.globalzoom*1.2)
elseif Keys.altmode then
self:setglobalzoom(self.globalzoom*1.1)
if self.shiftmode then
self:setglobalzoom(self.globalzoom+0.2)
elseif self.altmode then
self:setglobalzoom(self.globalzoom+0.1)
else
if self.pan_by_page then
self.offset_x = self.pan_x
self.offset_y = self.pan_y
end
self:goto(self.pageno + 1)
end
elseif ev.code == KEY_PGBCK or ev.code == KEY_LPGBCK then
if Keys.shiftmode then
self:setglobalzoom(self.globalzoom*0.8)
elseif Keys.altmode then
self:setglobalzoom(self.globalzoom*0.9)
if self.shiftmode then
self:setglobalzoom(self.globalzoom-0.2)
elseif self.altmode then
self:setglobalzoom(self.globalzoom-0.1)
else
if self.pan_by_page then
self.offset_x = self.pan_x
self.offset_y = self.pan_y
end
self:goto(self.pageno - 1)
end
elseif ev.code == KEY_BACK then
@ -416,6 +441,8 @@ function PDFReader:inputloop()
else
self:setglobalzoommode(self.ZOOM_FIT_TO_PAGE_HEIGHT)
end
elseif ev.code == KEY_F then
self:setglobalzoommode(self.ZOOM_FIT_TO_CONTENT_HALF_WIDTH)
elseif ev.code == KEY_T then
self:showTOC()
elseif ev.code == KEY_B then
@ -437,8 +464,8 @@ function PDFReader:inputloop()
x = self.shift_x / 5
y = self.shift_y / 5
elseif self.pan_by_page then
x = self.width - 5; -- small overlap when moving by page
y = self.height - 5;
x = width;
y = height - self.pan_margin; -- overlap for lines which didn't fit
else
x = self.shift_x
y = self.shift_y
@ -452,11 +479,27 @@ function PDFReader:inputloop()
self.offset_x = self.offset_x + x
if self.offset_x > 0 then
self.offset_x = 0
if self.pan_by_page and self.pageno > 1 then
self.offset_x = self.pan_x
self.offset_y = self.min_offset_y -- bottom
self:goto(self.pageno - 1)
end
end
if self.pan_by_page then
self.offset_y = self.min_offset_y
end
elseif ev.code == KEY_FW_RIGHT then
self.offset_x = self.offset_x - x
if self.offset_x < self.min_offset_x then
self.offset_x = self.min_offset_x
if self.pan_by_page and self.pageno < self.doc:getPages() then
self.offset_x = self.pan_x
self.offset_y = self.pan_y
self:goto(self.pageno + 1)
end
end
if self.pan_by_page then
self.offset_y = self.pan_y
end
elseif ev.code == KEY_FW_UP then
self.offset_y = self.offset_y + y
@ -469,11 +512,20 @@ function PDFReader:inputloop()
self.offset_y = self.min_offset_y
end
elseif ev.code == KEY_FW_PRESS then
if Keys.shiftmode then
self.offset_x = 0
self.offset_y = 0
if self.shiftmode then
if self.pan_by_page then
self.offset_x = self.pan_x
self.offset_y = self.pan_y
else
self.offset_x = 0
self.offset_y = 0
end
else
self.pan_by_page = not self.pan_by_page
if self.pan_by_page then
self.pan_x = self.offset_x
self.pan_y = self.offset_y
end
end
end
if old_offset_x ~= self.offset_x

Write Preview
Loading…
Cancel
Save