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

unireader.lua

@@ -562,6 +562,26 @@ function UniReader:inputloop()
 				self:modify_gamma( 1.25 )
 			elseif ev.code == KEY_VMINUS then
 				self:modify_gamma( 0.8 )
+			elseif ev.code == KEY_1 then
+				self:goto(1)
+			elseif ev.code == KEY_2 then
+				self:goto(self.doc:getPages()/90*10)
+			elseif ev.code == KEY_3 then
+				self:goto(self.doc:getPages()/90*20)
+			elseif ev.code == KEY_4 then
+				self:goto(self.doc:getPages()/90*30)
+			elseif ev.code == KEY_5 then
+				self:goto(self.doc:getPages()/90*40)
+			elseif ev.code == KEY_6 then
+				self:goto(self.doc:getPages()/90*50)
+			elseif ev.code == KEY_7 then
+				self:goto(self.doc:getPages()/90*60)
+			elseif ev.code == KEY_8 then
+				self:goto(self.doc:getPages()/90*70)
+			elseif ev.code == KEY_9 then
+				self:goto(self.doc:getPages()/90*80)
+			elseif ev.code == KEY_0 then
+				self:goto(self.doc:getPages())						
 			elseif ev.code == KEY_A then
 				if Keys.shiftmode then
 					self:setglobalzoommode(self.ZOOM_FIT_TO_CONTENT)
@@ -625,6 +645,15 @@ function UniReader:inputloop()
 				self.globalzoommode = self.ZOOM_BY_VALUE
 			end
 
+			-- switch to ZOOM_BY_VALUE to enable panning on fiveway move
+			if ev.code == KEY_FW_LEFT
+			or ev.code == KEY_FW_RIGHT
+			or ev.code == KEY_FW_UP
+			or ev.code == KEY_FW_DOWN
+			then
+				self.globalzoommode = self.ZOOM_BY_VALUE
+			end
+
 			if self.globalzoommode == self.ZOOM_BY_VALUE then
 				local x
 				local y