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

Merge pull request #704 from NiLuJe/master

Browse Source 
Some Kindle screen refresh experiments (bis)...
This commit is contained in:
Qingping Hou
2014-07-07 14:38:42 -04:00
parent 1c2b53bec9 d45efd81d8
commit 550e86cc8e
4 changed files with 43 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/ui/device/basepowerd.lua
View File

@@ -4,7 +4,7 @@ local BasePowerD = {
flIntensity = nil, -- frontlight intensity
battCapacity = nil, -- battery capacity
model = nil, -- device model
capacity_pulled_count = 0,
capacity_cached_count = 10,
}
@@ -49,11 +49,11 @@ end
function BasePowerD:getCapacity()
if capacity_pulled_count == capacity_cached_count then
capacity_pulled_count = 0
if self.capacity_pulled_count == self.capacity_cached_count then
self.capacity_pulled_count = 0
return self:getCapacityHW()
else
capacity_pulled_count = capacity_pulled_count + 1
self.capacity_pulled_count = self.capacity_pulled_count + 1
return self.battCapacity or self:getCapacityHW()
end
end

45
frontend/ui/uimanager.lua
View File

@@ -19,6 +19,12 @@ local WAVEFORM_MODE_GC16_FAST = 0x3 -- Medium fidelity
local WAVEFORM_MODE_A2 = 0x4 -- Faster but even lower fidelity
local WAVEFORM_MODE_GL16 = 0x5 -- High fidelity from white transition
local WAVEFORM_MODE_GL16_FAST = 0x6 -- Medium fidelity from white transition
-- Kindle FW >= 5.3
local WAVEFORM_MODE_DU4 = 0x7 -- Medium fidelity 4 level of gray direct update
-- Kindle PW2
local WAVEFORM_MODE_REAGL = 0x8 -- Ghost compensation waveform
local WAVEFORM_MODE_REAGLD = 0x9 -- Ghost compensation waveform with dithering
local WAVEFORM_MODE_AUTO = 0x101
-- there is only one instance of this
@@ -32,9 +38,9 @@ local UIManager = {
-- force to do full refresh, will be reset to false
-- after each ui loop
full_refresh = false,
-- force to do patial refresh, will be reset to false
-- force to do partial refresh, will be reset to false
-- after each ui loop
patial_refresh = false,
partial_refresh = false,
-- trigger a full refresh when counter reaches FULL_REFRESH_COUNT
FULL_REFRESH_COUNT = DRCOUNTMAX,
refresh_count = 0,
@@ -305,7 +311,7 @@ function UIManager:run()
local dirty = false
local request_full_refresh = false
local force_full_refresh = false
local force_patial_refresh = false
local force_partial_refresh = false
local force_fast_refresh = false
for _, widget in ipairs(self._window_stack) do
if self.repaint_all or self._dirty[widget.widget] then
@@ -319,7 +325,7 @@ function UIManager:run()
force_full_refresh = true
end
if self._dirty[widget.widget] == "partial" then
force_patial_refresh = true
force_partial_refresh = true
end
if self._dirty[widget.widget] == "fast" then
force_fast_refresh = true
@@ -336,23 +342,44 @@ function UIManager:run()
force_full_refresh = true
end
if self.patial_refresh then
if self.partial_refresh then
dirty = true
force_patial_refresh = true
force_partial_refresh = true
end
self.repaint_all = false
self.full_refresh = false
self.patial_refresh = false
self.partial_refresh = false
local refresh_type = self.default_refresh_type
local waveform_mode = self.default_waveform_mode
if dirty then
if force_patial_refresh or force_fast_refresh then
if force_partial_refresh or force_fast_refresh then
refresh_type = 0
elseif force_full_refresh or self.refresh_count == self.FULL_REFRESH_COUNT - 1 then
refresh_type = 1
end
-- Emulate the Kindle behavior...
if Device:isKindle() then
-- NOTE: For ref, on a Touch (debugPaint is my new best friend):
-- UI: gc16_fast
-- Reader: When flash: if to/from img: gc16, else gc16_fast; when non-flash: auto (seems to prefer gl16_fast); Waiting for marker only on flash
-- On a PW2:
-- Same as Touch, except reader uses reagl on non-flash, non-flash lasts longer (12 pgs); Always waits for marker
if refresh_type == 1 then
-- We don't really have an easy way to know if we're refreshing the UI, or a page, or if said page contains an image, so go with the highest fidelity option
waveform_mode = WAVEFORM_MODE_GC16
else
-- We spend much more time in the reader than the UI, and our UI isn't very graphic anyway, so go with the reader behavior
if Device:getModel() == "KindlePaperWhite2" then
waveform_mode = WAVEFORM_MODE_REAGL
else
waveform_mode = WAVEFORM_MODE_GL16_FAST
-- NOTE: Or we could go back to what KOReader did before fa55acc in koreader-base, which was also use WAVEFORM_MODE_AUTO ;). I have *no* idea how the driver makes its choice though...
--waveform_mode = WAVEFORM_MODE_AUTO
end
end
end
if force_fast_refresh then
waveform_mode = self.fast_waveform_mode
end
@@ -367,7 +394,7 @@ function UIManager:run()
end
if self.refresh_type == 1 then
self.refresh_count = 0
elseif not force_patial_refresh and not force_full_refresh then
elseif not force_partial_refresh and not force_full_refresh then
self.refresh_count = (self.refresh_count + 1)%self.FULL_REFRESH_COUNT
end
self.update_region_func = nil

3
frontend/ui/widget/touchmenu.lua
View File

@@ -7,6 +7,7 @@ local Font = require("ui/font")
local TextWidget = require("ui/widget/textwidget")
local LineWidget = require("ui/widget/linewidget")
local Screen = require("ui/screen")
local Device = require("ui/device")
local GestureRange = require("ui/gesturerange")
local HorizontalGroup = require("ui/widget/horizontalgroup")
local VerticalGroup = require("ui/widget/verticalgroup")
@@ -428,7 +429,7 @@ function TouchMenu:updateItems()
self.page_info_right_chev:showHide(self.page_num > 1)
self.page_info_left_chev:enableDisable(self.page > 1)
self.page_info_right_chev:enableDisable(self.page < self.page_num)
self.time_info.text = os.date("%H:%M")
self.time_info.text = os.date("%H:%M").." @ "..Device:getPowerDevice():getCapacity().."%"
-- FIXME: this is a dirty hack to clear previous menus
-- refert to issue #664
UIManager.repaint_all = true

2
koreader-base

Submodule koreader-base updated: a6bdb7cd75...2ba492e57d