From b3ac4c97cb5d6be2655b07ccfe60f22691fc5d57 Mon Sep 17 00:00:00 2001
From: Giorgio Micotti <giorgiomicotti@gmail.com>
Date: Fri, 22 Nov 2013 21:02:30 +0100
Subject: [PATCH] Fix input for kobo phoenix, second iteration.

---
 frontend/ui/input.lua | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/frontend/ui/input.lua b/frontend/ui/input.lua
index 6afd11aac..0c9955523 100644
--- a/frontend/ui/input.lua
+++ b/frontend/ui/input.lua
@@ -321,13 +321,26 @@ function Input:init()
 			input.open("/dev/input/event0") -- Light button and sleep slider
 			print(_("Auto-detected Kobo"))
 			self:adjustKoboEventMap()
-			if dev_mod ~= 'Kobo_trilogy' and dev_mod ~= 'Kobo_phoenix' then
+			if dev_mod ~= 'Kobo_trilogy' then
 				function Input:eventAdjustHook(ev)
 					if ev.type == EV_ABS then
 						if ev.code == ABS_X then
 							ev.code = ABS_Y
 						elseif ev.code == ABS_Y then
-							ev.code = ABS_X						
+							ev.code = ABS_X
+							-- We always have to substract from the physical x,
+							-- regardless of the orientation
+							if (Screen.width<Screen.height) then
+								ev.value = Screen.width - ev.value
+							else
+								ev.value = Screen.height - ev.value
+							end
+						end
+						-- same thing for multitouch events (phoenix)
+						if 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
 							-- We always have to substract from the physical x,
 							-- regardless of the orientation
 							if (Screen.width<Screen.height) then
@@ -339,7 +352,9 @@ function Input:init()
 					end
 					return ev
 				end
-			else
+			else -- kobo touch (trilogy)
+				-- FIXME some touch models should be treated as the other models,
+				-- depending on board revision
 				function Input:eventAdjustHook(ev)
 					if ev.code == ABS_X then
 						-- We always have to substract from the physical x,