feat: return .ctype from evdev.linux.input

Author: MunifTanjim

evdev/device.lua

@@ -203,7 +203,7 @@ end
 ---@param value_ptr? ffi.cdata*|{ [0]: number }
 ---@return number|nil
 function Device:fetch_event_value(ev_type, code, value_ptr)
-  value_ptr = value_ptr or input.new_int_ptr()
+  value_ptr = value_ptr or input.ctype.int_ptr()
   local rc = evdev.libevdev_fetch_event_value(self.dev, ev_type, code, value_ptr)
   if rc ~= 0 then
     return value_ptr[0]
@@ -222,7 +222,7 @@ end
 ---@param value_ptr? ffi.cdata*|{ [0]: number }
 ---@return number|nil
 function Device:fetch_slot_value(slot, code, value_ptr)
-  value_ptr = value_ptr or input.new_int_ptr()
+  value_ptr = value_ptr or input.ctype.int_ptr()
   local rc = evdev.libevdev_fetch_slot_value(self.dev, slot, code, value_ptr)
   if rc ~= 0 then
     return value_ptr[0]
@@ -258,9 +258,9 @@ end
 function Device:enable_event_code(ev_type, code, data)
   local data_type = type(data)
   if data_type == "number" then
-    data = input.new_int(data)
+    data = input.ctype.int(data)
   elseif data_type == "table" then
-    data = input.new_input_absinfo(data)
+    data = input.ctype.input_absinfo(data)
   end
 
   return evdev.libevdev_enable_event_code(self.dev, ev_type, code, data)

evdev/event.lua

@@ -10,7 +10,7 @@ local function init(class, ev)
   ---@type Event
   local self = setmetatable({}, { __index = class })
 
-  self.ev = ev or input.new_input_event()
+  self.ev = ev or input.ctype.input_event()
 
   return self
 end

evdev/linux/input.lua

@@ -123,15 +123,17 @@ struct ff_effect {
 ---@alias evdev_input_event { time: evdev_timeval, type: number, code: number, value: number }
 ---@alias evdev_input_absinfo { value: number, minimum: number, maximum: number, fuzz: number, flat: number, resolution: number }
 
-local int = ffi.typeof("int")
-local int_ptr = ffi.typeof("int[1]")
-local uint2 = ffi.typeof("unsigned int[2]")
-local input_event = ffi.typeof("struct input_event")
-local input_id = ffi.typeof("struct input_id")
-local input_absinfo = ffi.typeof("struct input_absinfo")
-local input_keymap_entry = ffi.typeof("struct input_keymap_entry")
-local input_mask = ffi.typeof("struct input_mask")
-local ff_effect = ffi.typeof("struct ff_effect")
+local ctype = {
+  int = ffi.typeof("int"),
+  int_ptr = ffi.typeof("int[1]"),
+  uint2 = ffi.typeof("unsigned int[2]"),
+  input_event = ffi.typeof("struct input_event"),
+  input_id = ffi.typeof("struct input_id"),
+  input_absinfo = ffi.typeof("struct input_absinfo"),
+  input_keymap_entry = ffi.typeof("struct input_keymap_entry"),
+  input_mask = ffi.typeof("struct input_mask"),
+  ff_effect = ffi.typeof("struct ff_effect"),
+}
 
 local ioctl = require("evdev.linux.sys.ioctl")
 local _IOC = ioctl._IOC
@@ -143,15 +145,15 @@ local mod = {
   EV_VERSION = 0x010001,
   INPUT_KEYMAP_BY_INDEX = 0x01, -- (1 << 0)
 
-  EVIOCGVERSION = _IOR("E", 0x01, int),
-  EVIOCGID = _IOR("E", 0x02, input_id),
-  EVIOCGREP = _IOR("E", 0x03, uint2),
-  EVIOCSREP = _IOW("E", 0x03, uint2),
+  EVIOCGVERSION = _IOR("E", 0x01, ctype.int),
+  EVIOCGID = _IOR("E", 0x02, ctype.input_id),
+  EVIOCGREP = _IOR("E", 0x03, ctype.uint2),
+  EVIOCSREP = _IOW("E", 0x03, ctype.uint2),
 
-  EVIOCGKEYCODE = _IOR("E", 0x04, uint2),
-  EVIOCGKEYCODE_V2 = _IOR("E", 0x04, input_keymap_entry),
-  EVIOCSKEYCODE = _IOW("E", 0x04, uint2),
-  EVIOCSKEYCODE_V2 = _IOW("E", 0x04, input_keymap_entry),
+  EVIOCGKEYCODE = _IOR("E", 0x04, ctype.uint2),
+  EVIOCGKEYCODE_V2 = _IOR("E", 0x04, ctype.input_keymap_entry),
+  EVIOCSKEYCODE = _IOW("E", 0x04, ctype.uint2),
+  EVIOCSKEYCODE_V2 = _IOW("E", 0x04, ctype.input_keymap_entry),
 
   EVIOCGNAME = function(len)
     return _IOC(_IOC_READ, "E", 0x06, len)
@@ -187,37 +189,27 @@ local mod = {
     return _IOC(_IOC_READ, "E", 0x20 + ev, len)
   end,
   EVIOCGABS = function(abs)
-    return _IOR("E", 0x40 + abs, input_absinfo)
+    return _IOR("E", 0x40 + abs, ctype.input_absinfo)
   end,
   EVIOCSABS = function(abs)
-    return _IOW("E", 0xc0 + abs, input_absinfo)
+    return _IOW("E", 0xc0 + abs, ctype.input_absinfo)
   end,
 
-  EVIOCSFF = _IOW("E", 0x80, ff_effect),
-  EVIOCRMFF = _IOW("E", 0x81, int),
-  EVIOCGEFFECTS = _IOR("E", 0x84, int),
+  EVIOCSFF = _IOW("E", 0x80, ctype.ff_effect),
+  EVIOCRMFF = _IOW("E", 0x81, ctype.int),
+  EVIOCGEFFECTS = _IOR("E", 0x84, ctype.int),
 
-  EVIOCGRAB = _IOW("E", 0x90, int),
-  EVIOCREVOKE = _IOW("E", 0x91, int),
+  EVIOCGRAB = _IOW("E", 0x90, ctype.int),
+  EVIOCREVOKE = _IOW("E", 0x91, ctype.int),
 
-  EVIOCGMASK = _IOR("E", 0x92, input_mask),
+  EVIOCGMASK = _IOR("E", 0x92, ctype.input_mask),
 
-  EVIOCSMASK = _IOW("E", 0x93, input_mask),
+  EVIOCSMASK = _IOW("E", 0x93, ctype.input_mask),
 
-  EVIOCSCLOCKID = _IOW("E", 0xa0, int),
+  EVIOCSCLOCKID = _IOW("E", 0xa0, ctype.int),
 }
 
----@type fun(init: number|nil): ffi.ctype*
-mod.new_int = int
-
----@type fun(): ffi.ctype*|{ [0]: number }
-mod.new_int_ptr = int_ptr
-
----@type fun(): ffi.ctype*|evdev_input_event
-mod.new_input_event = input_event
-
----@type fun(init: evdev_input_absinfo|nil): ffi.ctype*|evdev_input_absinfo
-mod.new_input_absinfo = input_absinfo
+mod.ctype = ctype
 
 local const = require("evdev.linux.input-constant")