@ -19,42 +19,10 @@ local C = ffi.C
require ( " ffi/posix_h " ) require ( " ffi/posix_h " )
require ( " ffi/linux_input_h " ) require ( " ffi/linux_input_h " )
-- luacheck: push -- EV_KEY values
-- luacheck: ignore local KEY_PRESS = 1
-- key press event values (KEY.value) local KEY_REPEAT = 2
local EVENT_VALUE_KEY_PRESS = 1 local KEY_RELEASE = 0
local EVENT_VALUE_KEY_REPEAT = 2
local EVENT_VALUE_KEY_RELEASE = 0
-- For Kindle Oasis orientation events (ABS.code)
-- the ABS code of orientation event will be adjusted to -24 from 24 (C.ABS_PRESSURE)
-- as C.ABS_PRESSURE is also used to detect touch input in KOBO devices.
local ABS_OASIS_ORIENTATION = - 24
local DEVICE_ORIENTATION_PORTRAIT_LEFT = 15
local DEVICE_ORIENTATION_PORTRAIT_RIGHT = 17
local DEVICE_ORIENTATION_PORTRAIT = 19
local DEVICE_ORIENTATION_PORTRAIT_ROTATED_LEFT = 16
local DEVICE_ORIENTATION_PORTRAIT_ROTATED_RIGHT = 18
local DEVICE_ORIENTATION_PORTRAIT_ROTATED = 20
local DEVICE_ORIENTATION_LANDSCAPE = 21
local DEVICE_ORIENTATION_LANDSCAPE_ROTATED = 22
-- Kindle Oasis 2 & 3 variant
-- c.f., drivers/input/misc/accel/bma2x2.c
local UPWARD_PORTRAIT_UP_INTERRUPT_HAPPENED = 15
local UPWARD_PORTRAIT_DOWN_INTERRUPT_HAPPENED = 16
local UPWARD_LANDSCAPE_LEFT_INTERRUPT_HAPPENED = 17
local UPWARD_LANDSCAPE_RIGHT_INTERRUPT_HAPPENED = 18
-- For the events of the Forma & Libra accelerometers (MSC.value)
-- c.f., drivers/hwmon/mma8x5x.c
local MSC_RAW_GSENSOR_PORTRAIT_DOWN = 0x17
local MSC_RAW_GSENSOR_PORTRAIT_UP = 0x18
local MSC_RAW_GSENSOR_LANDSCAPE_RIGHT = 0x19
local MSC_RAW_GSENSOR_LANDSCAPE_LEFT = 0x1a
-- Not that we care about those, but they are reported, and accurate ;).
local MSC_RAW_GSENSOR_BACK = 0x1b
local MSC_RAW_GSENSOR_FRONT = 0x1c
-- Based on ABS_MT_TOOL_TYPE values on Elan panels -- Based on ABS_MT_TOOL_TYPE values on Elan panels
local TOOL_TYPE_FINGER = 0 local TOOL_TYPE_FINGER = 0
@ -74,7 +42,6 @@ local linux_evdev_type_map = {
[ C.EV_FF ] = " EV_FF " ,
[ C.EV_FF ] = " EV_FF " ,
[ C.EV_PWR ] = " EV_PWR " ,
[ C.EV_PWR ] = " EV_PWR " ,
[ C.EV_FF_STATUS ] = " EV_FF_STATUS " ,
[ C.EV_FF_STATUS ] = " EV_FF_STATUS " ,
[ C.EV_MAX ] = " EV_MAX " ,
[ C.EV_SDL ] = " EV_SDL " ,
[ C.EV_SDL ] = " EV_SDL " ,
} }
@ -122,23 +89,23 @@ local linux_evdev_abs_code_map = {
local linux_evdev_msc_code_map = { local linux_evdev_msc_code_map = {
[ C.MSC_RAW ] = " MSC_RAW " ,
[ C.MSC_RAW ] = " MSC_RAW " ,
[ C.MSC_GYRO ] = " MSC_GYRO " ,
} }
local linux_evdev_rep_code_map = { local linux_evdev_rep_code_map = {
[ C.REP_DELAY ] = " REP_DELAY " ,
[ C.REP_DELAY ] = " REP_DELAY " ,
[ C.REP_PERIOD ] = " REP_PERIOD " ,
[ C.REP_PERIOD ] = " REP_PERIOD " ,
} }
-- luacheck: pop
local _internal_clipboard_text = nil -- holds the last copied text local _internal_clipboard_text = nil -- holds the last copied text
local Input = { local Input = {
-- must point to the device implementation when instantiating
-- must point to the device implementation when instantiating
device = nil ,
device = nil ,
-- this depends on keyboard layout and should be overridden :
-- this depends on keyboard layout and should be overridden
event_map = { } ,
event_map = nil , -- hash
-- adapters are post processing functions that transform a given event to another event
-- adapters are post processing functions that transform a given event to another event
event_map_adapter = { } ,
event_map_adapter = nil , -- hash
-- EV_ABS event to honor for pressure event (if any)
-- EV_ABS event to honor for pressure event (if any)
pressure_event = nil ,
pressure_event = nil ,
@ -193,8 +160,8 @@ local Input = {
UsbDevicePlugOut = { } ,
UsbDevicePlugOut = { } ,
} ,
} ,
-- This might be overloaded or even disabled (post-init) at instance-level , so we don't want any inheritance
-- This might be modified at runtime , so we don't want any inheritance
rotation_map = nil , -- nil or a hash
rotation_map = nil , -- hash
timer_callbacks = nil , -- instance-specific table, because the object may get destroyed & recreated at runtime
timer_callbacks = nil , -- instance-specific table, because the object may get destroyed & recreated at runtime
disable_double_tap = true ,
disable_double_tap = true ,
@ -260,13 +227,20 @@ function Input:init()
input = self ,
input = self ,
}
}
if not self.event_map then
self.event_map = { }
end
if not self.event_map_adapter then
self.event_map_adapter = { }
end
-- NOTE: When looking at the device in Portrait mode, that's assuming PgBack is on TOP, and PgFwd on the BOTTOM
-- NOTE: When looking at the device in Portrait mode, that's assuming PgBack is on TOP, and PgFwd on the BOTTOM
if not self.rotation_map then
if not self.rotation_map then
self.rotation_map = {
self.rotation_map = {
[ framebuffer.ORIENTATION_PORTRAIT ] = { } ,
[ framebuffer. DEVICE_ROTATED_UPRIGHT] = { } ,
[ framebuffer.ORIENTATION_LANDSCAPE ] = { Up = " Right " , Right = " Down " , Down = " Left " , Left = " Up " , LPgBack = " LPgFwd " , LPgFwd = " LPgBack " , RPgBack = " RPgFwd " , RPgFwd = " RPgBack " } ,
[ framebuffer. DEVICE_ROTATED_CLOCKWIS E] = { Up = " Right " , Right = " Down " , Down = " Left " , Left = " Up " , LPgBack = " LPgFwd " , LPgFwd = " LPgBack " , RPgBack = " RPgFwd " , RPgFwd = " RPgBack " } ,
[ framebuffer.ORIENTATION_PORTRAIT_ROTATED ] = { Up = " Down " , Right = " Left " , Down = " Up " , Left = " Right " , LPgFwd = " LPgBack " , LPgBack = " LPgFwd " , RPgFwd = " RPgBack " , RPgBack = " RPgFwd " } ,
[ framebuffer. DEVICE_ROTATED_UPSIDE_DOWN] = { Up = " Down " , Right = " Left " , Down = " Up " , Left = " Right " , LPgFwd = " LPgBack " , LPgBack = " LPgFwd " , RPgFwd = " RPgBack " , RPgBack = " RPgFwd " } ,
[ framebuffer.ORIENTATION_LANDSCAPE_ROTATED ] = { Up = " Left " , Right = " Up " , Down = " Right " , Left = " Down " }
[ framebuffer. DEVICE_ROTATED_COUNTER_CLOCKWISE ] = { Up = " Left " , Right = " Up " , Down = " Right " , Left = " Down " } ,
}
}
end
end
@ -301,6 +275,18 @@ function Input:init()
self._inhibitInputUntil_func = function ( ) self : inhibitInputUntil ( ) end
self._inhibitInputUntil_func = function ( ) self : inhibitInputUntil ( ) end
end end
--[[--
Setup a rotation_map that does nothing ( for platforms where the events we get are already translated ) .
--]]
function Input : disableRotationMap ( )
self.rotation_map = {
[ framebuffer.DEVICE_ROTATED_UPRIGHT ] = { } ,
[ framebuffer.DEVICE_ROTATED_CLOCKWISE ] = { } ,
[ framebuffer.DEVICE_ROTATED_UPSIDE_DOWN ] = { } ,
[ framebuffer.DEVICE_ROTATED_COUNTER_CLOCKWISE ] = { } ,
}
end
--[[-- --[[--
Wrapper for FFI input open . Wrapper for FFI input open .
@ -313,22 +299,35 @@ function Input.open(device, is_emu_events)
end end
--[[-- --[[--
Different device models can implement their own hooks Different device models can implement their own hooks and register them .
and register them .
--]] --]]
function Input : registerEventAdjustHook ( hook , hook_params ) function Input : registerEventAdjustHook ( hook , hook_params )
local old = self.eventAdjustHook
if self.eventAdjustHook == Input.eventAdjustHook then
self.eventAdjustHook = function ( this , ev )
-- First custom hook, skip the default NOP
old ( this , ev )
self.eventAdjustHook = function ( this , ev )
hook ( this , ev , hook_params )
hook ( this , ev , hook_params )
end
else
-- We've already got a custom hook, chain 'em
local old = self.eventAdjustHook
self.eventAdjustHook = function ( this , ev )
old ( this , ev )
hook ( this , ev , hook_params )
end
end
end
end end
function Input : registerGestureAdjustHook ( hook , hook_params ) function Input : registerGestureAdjustHook ( hook , hook_params )
local old = self.gestureAdjustHook
if self.gestureAdjustHook == Input.gestureAdjustHook then
self.gestureAdjustHook = function ( this , ges )
self.gestureAdjustHook = function ( this , ges )
old ( this , ges )
hook ( this , ges , hook_params )
hook ( this , ges , hook_params )
end
else
local old = self.gestureAdjustHook
self.gestureAdjustHook = function ( this , ges )
old ( this , ges )
hook ( this , ges , hook_params )
end
end
end
end end
@ -341,59 +340,77 @@ function Input:gestureAdjustHook(ges)
end end
--- Catalog of predefined hooks. --- Catalog of predefined hooks.
function Input : adjustTouchSwitchXY ( ev ) -- These are *not* usable directly as hooks, they're just building blocks (c.f., Kobo)
if ev.type == C.EV_ABS then
function Input : adjustABS_SwitchXY ( ev )
if ev.code == C.ABS_X then
if ev.code == C.ABS_X then
ev.code = C.ABS_Y
ev.code = C.ABS_Y
elseif ev.code == C.ABS_Y then
elseif ev.code == C.ABS_Y then
ev.code = C.ABS_X
ev.code = C.ABS_X
elseif ev.code == C.ABS_MT_POSITION_X then
elseif ev.code == C.ABS_MT_POSITION_X then
ev.code = C.ABS_MT_POSITION_Y
ev.code = C.ABS_MT_POSITION_Y
elseif ev.code == C.ABS_MT_POSITION_Y then
elseif ev.code == C.ABS_MT_POSITION_Y then
ev.code = C.ABS_MT_POSITION_X
ev.code = C.ABS_MT_POSITION_X
end
end
end
end end
function Input : adjustTouchScale ( ev , by ) function Input : adjustABS_Scale ( ev , by )
if ev.type == C.EV_ABS then
if ev.code == C.ABS_X or ev.code == C.ABS_MT_POSITION_X then
if ev.code == C.ABS_X or ev.code == C.ABS_MT_POSITION_X then
ev.value = by.x * ev.value
ev.value = by.x * ev.value
elseif ev.code == C.ABS_Y or ev.code == C.ABS_MT_POSITION_Y then
end
ev.value = by.y * ev.value
if ev.code == C.ABS_Y or ev.code == C.ABS_MT_POSITION_Y then
ev.value = by.y * ev.value
end
end
end
end end
function Input : adjustTouchMirrorX ( ev , max_x ) function Input : adjustABS_MirrorX ( ev , max_x )
if ev.type == C.EV_ABS
if ev.code == C.ABS_X or ev.code == C.ABS_MT_POSITION_X then
and ( ev.code == C.ABS_X or ev.code == C.ABS_MT_POSITION_X ) then
ev.value = max_x - ev.value
ev.value = max_x - ev.value
end
end
end end
function Input : adjustTouchMirrorY ( ev , max_y ) function Input : adjustABS_MirrorY ( ev , max_y )
if ev.type == C.EV_ABS
if ev.code == C.ABS_Y or ev.code == C.ABS_MT_POSITION_Y then
and ( ev.code == C.ABS_Y or ev.code == C.ABS_MT_POSITION_Y ) then
ev.value = max_y - ev.value
ev.value = max_y - ev.value
end
end
end end
function Input : adjustTouchTranslate ( ev , by ) function Input : adjustABS_SwitchAxesAndMirrorX ( ev , max_x )
if ev.code == C.ABS_X then
ev.code = C.ABS_Y
elseif ev.code == C.ABS_Y then
ev.code = C.ABS_X
ev.value = max_x - ev.value
elseif ev.code == C.ABS_MT_POSITION_X then
ev.code = C.ABS_MT_POSITION_Y
elseif ev.code == C.ABS_MT_POSITION_Y then
ev.code = C.ABS_MT_POSITION_X
ev.value = max_x - ev.value
end
end
function Input : adjustABS_Translate ( ev , by )
if ev.code == C.ABS_X or ev.code == C.ABS_MT_POSITION_X then
ev.value = by.x + ev.value
elseif ev.code == C.ABS_Y or ev.code == C.ABS_MT_POSITION_Y then
ev.value = by.y + ev.value
end
end
-- These *are* usable directly as hooks
function Input : adjustTouchScale ( ev , by )
if ev.type == C.EV_ABS then
if ev.type == C.EV_ABS then
if ev.code == C.ABS_X or ev.code == C.ABS_MT_POSITION_X then
self : adjustABS_Scale ( ev , by )
ev.value = by.x + ev.value
end
end
end
if ev.code == C.ABS_Y or ev.code == C.ABS_MT_POSITION_Y then
ev.value = by.y + ev.value
function Input : adjustTouchSwitchAxesAndMirrorX ( ev , max_x )
end
if ev.type == C.EV_ABS then
self : adjustABS_SwitchAxesAndMirrorX ( ev , max_x )
end
end
end end
function Input : adjustKindleOasisOrientation ( ev ) function Input : adjust TouchTranslate( ev , by )
if ev.type == C.EV_ABS and ev.code == C.ABS_PRESSURE then
if ev.type == C.EV_ABS then
ev.code = ABS_OASIS_ORIENTATION
self: adjustABS_Translate ( ev , by )
end
end
end end
@ -548,11 +565,9 @@ function Input:handleKeyBoardEv(ev)
end
end
-- take device rotation into account
-- take device rotation into account
if self.rotation_map then
local rota = self.device . screen : getRotationMode ( )
local rota = self.device . screen : getRotationMode ( )
if self.rotation_map [ rota ] [ keycode ] then
if self.rotation_map [ rota ] [ keycode ] then
keycode = self.rotation_map [ rota ] [ keycode ]
keycode = self.rotation_map [ rota ] [ keycode ]
end
end
end
if self.fake_event_set [ keycode ] then
if self.fake_event_set [ keycode ] then
@ -573,9 +588,9 @@ function Input:handleKeyBoardEv(ev)
if keycode == " Power " then
if keycode == " Power " then
-- Kobo generates Power keycode only, we need to decide whether it's
-- Kobo generates Power keycode only, we need to decide whether it's
-- power-on or power-off ourselves.
-- power-on or power-off ourselves.
if ev.value == EVENT_VALUE_ KEY_PRESS then
if ev.value == then
return " PowerPress "
return " PowerPress "
elseif ev.value == EVENT_VALUE_ KEY_RELEASE then
elseif ev.value == then
return " PowerRelease "
return " PowerRelease "
end
end
end
end
@ -596,9 +611,9 @@ function Input:handleKeyBoardEv(ev)
-- handle modifier keys
-- handle modifier keys
if self.modifiers [ keycode ] ~= nil then
if self.modifiers [ keycode ] ~= nil then
if ev.value == EVENT_VALUE_ KEY_PRESS then
if ev.value == then
self.modifiers [ keycode ] = true
self.modifiers [ keycode ] = true
elseif ev.value == EVENT_VALUE_ KEY_RELEASE then
elseif ev.value == then
self.modifiers [ keycode ] = false
self.modifiers [ keycode ] = false
end
end
return
return
@ -606,9 +621,9 @@ function Input:handleKeyBoardEv(ev)
local key = Key : new ( keycode , self.modifiers )
local key = Key : new ( keycode , self.modifiers )
if ev.value == EVENT_VALUE_ KEY_PRESS then
if ev.value == then
return Event : new ( " KeyPress " , key )
return Event : new ( " KeyPress " , key )
elseif ev.value == EVENT_VALUE_ KEY_REPEAT then
elseif ev.value == then
-- NOTE: We only care about repeat events from the pageturn buttons...
-- NOTE: We only care about repeat events from the pageturn buttons...
-- And we *definitely* don't want to flood the Event queue with useless SleepCover repeats!
-- And we *definitely* don't want to flood the Event queue with useless SleepCover repeats!
if keycode == " LPgBack "
if keycode == " LPgBack "
@ -629,7 +644,7 @@ function Input:handleKeyBoardEv(ev)
self.repeat_count = 0
self.repeat_count = 0
end
end
end
end
elseif ev.value == EVENT_VALUE_ KEY_RELEASE then
elseif ev.value == then
self.repeat_count = 0
self.repeat_count = 0
return Event : new ( " KeyRelease " , key )
return Event : new ( " KeyRelease " , key )
end
end
@ -662,9 +677,9 @@ function Input:handlePowerManagementOnlyEv(ev)
if keycode == " Power " then
if keycode == " Power " then
-- Kobo generates Power keycode only, we need to decide whether it's
-- Kobo generates Power keycode only, we need to decide whether it's
-- power-on or power-off ourselves.
-- power-on or power-off ourselves.
if ev.value == EVENT_VALUE_ KEY_PRESS then
if ev.value == then
return " PowerPress "
return " PowerPress "
elseif ev.value == EVENT_VALUE_ KEY_RELEASE then
elseif ev.value == then
return " PowerRelease "
return " PowerRelease "
end
end
end
end
@ -684,7 +699,11 @@ function Input:handleGenericEv(ev)
end end
function Input : handleMiscEv ( ev ) function Input : handleMiscEv ( ev )
-- should be handled by a misc event protocol plugin
-- overwritten by device implementation
end
function Input : handleGyroEv ( ev )
-- setup by the Generic device implementation (for proper toggle handling)
end end
function Input : handleSdlEv ( ev ) function Input : handleSdlEv ( ev )
@ -886,92 +905,29 @@ function Input:handleTouchEvLegacy(ev)
end
end
end end
function Input : handleOasisOrientationEv ( ev ) --- Accelerometer, in a platform-agnostic, custom format (EV_MSC:MSC_GYRO).
local rotation_mode , screen_mode
--- (Translation should be done via registerEventAdjustHook in Device implementations).
if self.device : isZelda ( ) then
--- This needs to be called *via handleGyroEv* in a handleMiscEv implementation (c.f., Kobo, Kindle or PocketBook).
if ev.value == UPWARD_PORTRAIT_UP_INTERRUPT_HAPPENED then
function Input : handleMiscGyroEv ( ev )
-- i.e., UR
rotation_mode = framebuffer.ORIENTATION_PORTRAIT
screen_mode = ' portrait '
elseif ev.value == UPWARD_LANDSCAPE_LEFT_INTERRUPT_HAPPENED then
-- i.e., CW
rotation_mode = framebuffer.ORIENTATION_LANDSCAPE
screen_mode = ' landscape '
elseif ev.value == UPWARD_PORTRAIT_DOWN_INTERRUPT_HAPPENED then
-- i.e., UD
rotation_mode = framebuffer.ORIENTATION_PORTRAIT_ROTATED
screen_mode = ' portrait '
elseif ev.value == UPWARD_LANDSCAPE_RIGHT_INTERRUPT_HAPPENED then
-- i.e., CCW
rotation_mode = framebuffer.ORIENTATION_LANDSCAPE_ROTATED
screen_mode = ' landscape '
end
else
if ev.value == DEVICE_ORIENTATION_PORTRAIT
or ev.value == DEVICE_ORIENTATION_PORTRAIT_LEFT
or ev.value == DEVICE_ORIENTATION_PORTRAIT_RIGHT then
-- i.e., UR
rotation_mode = framebuffer.ORIENTATION_PORTRAIT
screen_mode = ' portrait '
elseif ev.value == DEVICE_ORIENTATION_LANDSCAPE then
-- i.e., CW
rotation_mode = framebuffer.ORIENTATION_LANDSCAPE
screen_mode = ' landscape '
elseif ev.value == DEVICE_ORIENTATION_PORTRAIT_ROTATED
or ev.value == DEVICE_ORIENTATION_PORTRAIT_ROTATED_LEFT
or ev.value == DEVICE_ORIENTATION_PORTRAIT_ROTATED_RIGHT then
-- i.e., UD
rotation_mode = framebuffer.ORIENTATION_PORTRAIT_ROTATED
screen_mode = ' portrait '
elseif ev.value == DEVICE_ORIENTATION_LANDSCAPE_ROTATED then
-- i.e., CCW
rotation_mode = framebuffer.ORIENTATION_LANDSCAPE_ROTATED
screen_mode = ' landscape '
end
end
local old_rotation_mode = self.device . screen : getRotationMode ( )
if self.device : isGSensorLocked ( ) then
local old_screen_mode = self.device . screen : getScreenMode ( )
if rotation_mode ~= old_rotation_mode and screen_mode == old_screen_mode then
-- Cheaper than a full SetRotationMode event, as we don't need to re-layout anything.
self.device . screen : setRotationMode ( rotation_mode )
local UIManager = require ( " ui/uimanager " )
UIManager : onRotation ( )
end
else
if rotation_mode ~= old_rotation_mode then
return Event : new ( " SetRotationMode " , rotation_mode )
end
end
end
--- Accelerometer on the Forma/Libra
function Input : handleMiscEvNTX ( ev )
local rotation_mode , screen_mode
local rotation_mode , screen_mode
if ev.code == C.MSC_RAW then
if ev.value == C.DEVICE_ROTATED_UPRIGHT then
if ev.value == MSC_RAW_GSENSOR_PORTRAIT_UP then
-- i.e., UR
-- i.e., UR
rotation_mode = framebuffer.DEVICE_ROTATED_UPRIGHT
rotation_mode = framebuffer.ORIENTATION_PORTRAIT
screen_mode = " portrait "
screen_mode = ' portrait '
elseif ev.value == C.DEVICE_ROTATED_CLOCKWISE then
elseif ev.value == MSC_RAW_GSENSOR_LANDSCAPE_RIGHT then
-- i.e., CW
-- i.e., CW
rotation_mode = framebuffer.DEVICE_ROTATED_CLOCKWISE
rotation_mode = framebuffer.ORIENTATION_LANDSCAPE
screen_mode = " landscape "
screen_mode = ' landscape '
elseif ev.value == C.DEVICE_ROTATED_UPSIDE_DOWN then
elseif ev.value == MSC_RAW_GSENSOR_PORTRAIT_DOWN then
-- i.e., UD
-- i.e., UD
rotation_mode = framebuffer.DEVICE_ROTATED_UPSIDE_DOWN
rotation_mode = framebuffer.ORIENTATION_PORTRAIT_ROTATED
screen_mode = " portrait "
screen_mode = ' portrait '
elseif ev.value == C.DEVICE_ROTATED_COUNTER_CLOCKWISE then
elseif ev.value == MSC_RAW_GSENSOR_LANDSCAPE_LEFT then
-- i.e., CCW
-- i.e., CCW
rotation_mode = framebuffer.DEVICE_ROTATED_COUNTER_CLOCKWISE
rotation_mode = framebuffer.ORIENTATION_LANDSCAPE_ROTATED
screen_mode = " landscape "
screen_mode = ' landscape '
else
-- Discard FRONT/BACK
return
end
else
else
-- Discard unhandled event codes, just to future-proof this ;).
-- Discard FRONT/BACK
return
return
end
end
@ -992,28 +948,24 @@ function Input:handleMiscEvNTX(ev)
end end
--- Allow toggling the accelerometer at runtime. --- Allow toggling the accelerometer at runtime.
function Input : toggle MiscEvNTX ( toggle ) function Input : toggle GyroEvents ( toggle )
if toggle == true then
if toggle == true then
-- Honor Gyro events
-- Honor Gyro events
if not self.isNTXAccelHooked then
if self.handleGyroEv ~= self.handleMiscGyroEv then
self.handleMiscEv = self.handleMiscEvNTX
self.handleGyroEv = self.handleMiscGyroEv
self.isNTXAccelHooked = true
end
end
elseif toggle == false then
elseif toggle == false then
-- Ignore Gyro events
-- Ignore Gyro events
if self.isNTXAccelHooked then
if self.handleGyroEv == self.handleMiscGyroEv then
self.handleMiscEv = self.voidEv
self.handleGyroEv = self.voidEv
self.isNTXAccelHooked = false
end
end
else
else
-- Toggle it
-- Toggle it
if self. isNTXAccelHooked then
if self. handleGyroEv == self.handleMiscGyroEv then
self.handle Misc Ev = self.voidEv
self.handle Gyro Ev = self.voidEv
else
else
self.handle MiscEv = self.handleMiscEvNTX
self.handle GyroEv = self.handleMiscGyroEv
end
end
self.isNTXAccelHooked = not self.isNTXAccelHooked
end
end
end end
@ -1096,15 +1048,15 @@ function Input:setupSlotData(value)
end end
function Input : isEvKeyPress ( ev ) function Input : isEvKeyPress ( ev )
return ev.value == EVENT_VALUE_ KEY_PRESS
return ev.value ==
end end
function Input : isEvKeyRepeat ( ev ) function Input : isEvKeyRepeat ( ev )
return ev.value == EVENT_VALUE_ KEY_REPEAT
return ev.value ==
end end
function Input : isEvKeyRelease ( ev ) function Input : isEvKeyRelease ( ev )
return ev.value == EVENT_VALUE_ KEY_RELEASE
return ev.value ==
end end
@ -1338,11 +1290,6 @@ function Input:waitEvent(now, deadline)
if handled_ev then
if handled_ev then
table.insert ( handled , handled_ev )
table.insert ( handled , handled_ev )
end
end
elseif event.type == C.EV_ABS and event.code == ABS_OASIS_ORIENTATION then
local handled_ev = self : handleOasisOrientationEv ( event )
if handled_ev then
table.insert ( handled , handled_ev )
end
elseif event.type == C.EV_ABS or event.type == C.EV_SYN then
elseif event.type == C.EV_ABS or event.type == C.EV_SYN then
local handled_evs = self : handleTouchEv ( event )
local handled_evs = self : handleTouchEv ( event )
-- handleTouchEv only returns an array of Events once it gets a SYN_REPORT,
-- handleTouchEv only returns an array of Events once it gets a SYN_REPORT,
@ -1393,23 +1340,17 @@ function Input:inhibitInput(toggle)
self.handleKeyBoardEv = self.handlePowerManagementOnlyEv
self.handleKeyBoardEv = self.handlePowerManagementOnlyEv
end
end
-- And send everything else to the void
-- And send everything else to the void
if not self._oasis_ev_handler then
self._oasis_ev_handler = self.handleOasisOrientationEv
self.handleOasisOrientationEv = self.voidEv
end
if not self._abs_ev_handler then
if not self._abs_ev_handler then
self._abs_ev_handler = self.handleTouchEv
self._abs_ev_handler = self.handleTouchEv
self.handleTouchEv = self.voidEv
self.handleTouchEv = self.voidEv
end
end
if not self._msc_ev_handler then
-- NOTE: We leave handleMiscEv alone, as some platforms make extensive use of EV_MSC for critical low-level stuff:
if not self.device : isPocketBook ( ) and not self.device : isAndroid ( ) then
-- e.g., on PocketBook, it is used to handle InkView task management events (i.e., PM);
-- NOTE: PocketBook is a special snowflake, synthetic Power events are sent as EV_MSC.
-- and on Android, for the critical purpose of forwarding Android events to Lua-land.
-- Thankfully, that's all that EV_MSC is used for on that platform.
-- The only thing we might want to skip in there are gyro events anyway, which we'll handle separately.
-- NOTE: Android, on the other hand, handles a *lot* of critical stuff over EV_MSC,
if not self._gyro_ev_handler then
-- as it's used to communicate between Android and Lua land ;).
self._gyro_ev_handler = self.handleGyroEv
self._msc_ev_handler = self.handleMiscEv
self.handleGyroEv = self.voidEv
self.handleMiscEv = self.voidEv
end
end
end
if not self._sdl_ev_handler then
if not self._sdl_ev_handler then
self._sdl_ev_handler = self.handleSdlEv
self._sdl_ev_handler = self.handleSdlEv
@ -1429,17 +1370,13 @@ function Input:inhibitInput(toggle)
self.handleKeyBoardEv = self._key_ev_handler
self.handleKeyBoardEv = self._key_ev_handler
self._key_ev_handler = nil
self._key_ev_handler = nil
end
end
if self._oasis_ev_handler then
self.handleOasisOrientationEv = self._oasis_ev_handler
self._oasis_ev_handler = nil
end
if self._abs_ev_handler then
if self._abs_ev_handler then
self.handleTouchEv = self._abs_ev_handler
self.handleTouchEv = self._abs_ev_handler
self._abs_ev_handler = nil
self._abs_ev_handler = nil
end
end
if self._ msc _ev_handler then
if self._ gyro _ev_handler then
self.handle MiscEv = self._msc _ev_handler
self.handle GyroEv = self._gyro _ev_handler
self._ msc _ev_handler = nil
self._ gyro _ev_handler = nil
end
end
if self._sdl_ev_handler then
if self._sdl_ev_handler then
self.handleSdlEv = self._sdl_ev_handler
self.handleSdlEv = self._sdl_ev_handler
NiLuJe
1 year ago
committed by
GitHub