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 #1080 from houqp/fix

Browse Source 
fix kobo aura hd input handling
This commit is contained in:
Huang Xin
2014-11-05 15:57:31 +08:00
parent 8babbf4896 8927f901da
commit 62eef02c86
3 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
frontend/device/input.lua
View File

@@ -155,10 +155,15 @@ end
-- catalogue of predefined hooks:
function Input:adjustTouchSwitchXY(ev)
if ev.type == EV_ABS then
if ev.code == ABS_X then ev.code = ABS_Y end
if ev.code == ABS_Y then ev.code = ABS_X end
if ev.code == ABS_MT_POSITION_X then ev.code = ABS_MT_POSITION_Y end
if ev.code == ABS_MT_POSITION_Y then ev.code = ABS_MT_POSITION_X end
if ev.code == ABS_X then
ev.code = ABS_Y
elseif ev.code == ABS_Y then
ev.code = ABS_X
elseif ev.code == ABS_MT_POSITION_X then
ev.code = ABS_MT_POSITION_Y
elseif ev.code == ABS_MT_POSITION_Y then
ev.code = ABS_MT_POSITION_X
end
end
end
function Input:adjustTouchScale(ev, by)
@@ -172,17 +177,15 @@ function Input:adjustTouchScale(ev, by)
end
end
function Input:adjustTouchMirrorX(ev, width)
if ev.type == EV_ABS then
if ev.code == ABS_X or ev.code == ABS_MT_POSITION_X then
ev.value = width - ev.value
end
if ev.type == EV_ABS
and (ev.code == ABS_X or ev.code == ABS_MT_POSITION_X) then
ev.value = width - ev.value
end
end
function Input:adjustTouchMirrorY(ev, height)
if ev.type == EV_ABS then
if ev.code == ABS_Y or ev.code == ABS_MT_POSITION_Y then
ev.value = height - ev.value
end
if ev.type == EV_ABS
and (ev.code == ABS_Y or ev.code == ABS_MT_POSITION_Y) then
ev.value = height - ev.value
end
end
function Input:adjustTouchTranslate(ev, by)

2
frontend/device/kobo/device.lua
View File

@@ -76,7 +76,7 @@ function Kobo:init()
-- it's called KOBO_TOUCH_MIRRORED in defaults.lua, but what it
-- actually did in its original implementation was to switch X/Y.
if self.touch_switch_xy and not KOBO_TOUCH_MIRRORED
if self.touch_switch_xy and not KOBO_TOUCH_MIRRORED
or not self.touch_switch_xy and KOBO_TOUCH_MIRRORED
then
self.input:registerEventAdjustHook(self.input.adjustTouchSwitchXY)

11
frontend/ui/screensaver.lua
View File

@@ -98,12 +98,13 @@ function Screensaver:show()
-- first check book cover image
if KOBO_SCREEN_SAVER_LAST_BOOK then
local lastfile = G_reader_settings:readSetting("lastfile")
local data = DocSettings:open(lastfile)
local exclude = data:readSetting("exclude_screensaver")
if not exclude then
self.suspend_msg = self:getCoverImage(lastfile)
if lastfile then
local data = DocSettings:open(lastfile)
local exclude = data:readSetting("exclude_screensaver")
if not exclude then
self.suspend_msg = self:getCoverImage(lastfile)
end
end
end
-- then screensaver directory or file image
if not self.suspend_msg then