From b1f94f9afaec4ceab102f0b094f7512c332dbe6c Mon Sep 17 00:00:00 2001
From: Qingping Hou <dave2008713@gmail.com>
Date: Sat, 27 Oct 2018 00:58:43 -0700
Subject: [PATCH] decouple device from credocument

---
 frontend/document/credocument.lua | 10 +++++-----
 frontend/document/document.lua    |  1 +
 frontend/runtimectl.lua           |  1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/frontend/document/credocument.lua b/frontend/document/credocument.lua
index 25aea39e3..c80cc4cf7 100644
--- a/frontend/document/credocument.lua
+++ b/frontend/document/credocument.lua
@@ -4,7 +4,7 @@ local Document = require("document/document")
 local Font = require("ui/font")
 local Geom = require("ui/geometry")
 local RenderImage = require("ui/renderimage")
-local Screen = require("device").screen
+local Runtimectl = require("runtimectl")
 local ffi = require("ffi")
 local C = ffi.C
 local lfs = require("libs/libkoreader-lfs")
@@ -116,7 +116,7 @@ function CreDocument:init()
     self._view_mode = DCREREADER_VIEW_MODE == "scroll" and self.SCROLL_VIEW_MODE or self.PAGE_VIEW_MODE
 
     local ok
-    ok, self._document = pcall(cre.newDocView, Screen:getWidth(), Screen:getHeight(), self._view_mode)
+    ok, self._document = pcall(cre.newDocView, Runtimectl:getRenderWidth(), Runtimectl:getRenderHeight(), self._view_mode)
     if not ok then
         error(self._document)  -- will contain error message
     end
@@ -163,8 +163,8 @@ function CreDocument:setupDefaultView()
     self._document:setStringProperty("crengine.font.fallback.face",
         G_reader_settings:readSetting("fallback_font") or self.fallback_font)
 
-    -- adjust font sizes according to screen dpi
-    self._document:adjustFontSizes(Screen:getDPI())
+    -- adjust font sizes according to dpi set in runtime
+    self._document:adjustFontSizes(Runtimectl:getRenderDPI())
 
     -- set top status bar font size
     if G_reader_settings:readSetting("cre_header_status_font_size") then
@@ -191,7 +191,7 @@ function CreDocument:render()
     -- load document before rendering
     self:loadDocument()
     -- set visible page count in landscape
-    if math.max(Screen:getWidth(), Screen:getHeight()) / Screen:getDPI()
+    if math.max(Runtimectl:getRenderWidth(), Runtimectl:getRenderHeight()) / Runtimectl:getRenderDPI()
         < DCREREADER_TWO_PAGE_THRESHOLD then
         self:setVisiblePageCount(1)
     end
diff --git a/frontend/document/document.lua b/frontend/document/document.lua
index 0b0b4c9c1..7de98ccfd 100644
--- a/frontend/document/document.lua
+++ b/frontend/document/document.lua
@@ -3,6 +3,7 @@ local Cache = require("cache")
 local CacheItem = require("cacheitem")
 local Configurable = require("configurable")
 local DrawContext = require("ffi/drawcontext")
+local Runtimectl = require("runtimectl")
 local Geom = require("ui/geometry")
 local Math = require("optmath")
 local TileCacheItem = require("document/tilecacheitem")
diff --git a/frontend/runtimectl.lua b/frontend/runtimectl.lua
index d9a9a1153..ffc88406a 100644
--- a/frontend/runtimectl.lua
+++ b/frontend/runtimectl.lua
@@ -7,6 +7,7 @@ local Runtimectl = {
 }
 
 function Runtimectl:setDevice(device)
+    self.screen = device.screen
     self.isAndroid = device.isAndroid
     self.isKindle = device.isKindle