[input] refactor wacom and read max x,y from ioctls to set scaling properly

this makes MT_X_SCALAR and WACOM_X_SCALAR no longer necessary

Author: okay

src/lamp/main.cpy

@@ -25,7 +25,18 @@ rm_version := util::get_remarkable_version()
 #define DISPLAYWIDTH 1404
 #define DISPLAYHEIGHT 1872.0
 
-#ifdef KOBO
+#if defined(REMARKABLE) | defined(DEV)
+#define MTWIDTH 767
+#define MTHEIGHT 1023
+#define WACOMWIDTH 15725.0
+#define WACOMHEIGHT 20967.0
+#define DISPLAYWIDTH 1404
+#define DISPLAYHEIGHT 1872.0
+#define MT_X_SCALAR (float(DISPLAYWIDTH) / float(MTWIDTH))
+#define MT_Y_SCALAR (float(DISPLAYHEIGHT) / float(MTHEIGHT))
+#define WACOM_X_SCALAR (float(DISPLAYWIDTH) / float(WACOMWIDTH))
+#define WACOM_Y_SCALAR (float(DISPLAYHEIGHT) / float(WACOMHEIGHT))
+#elif KOBO
 #define MTWIDTH DISPLAYWIDTH
 #define MTHEIGHT DISPLAYHEIGHT
 #define MT_X_SCALAR 1

src/rmkit/defines.h

@@ -54,9 +54,8 @@
 
 
 // {{{ DISPLAY RELATED DEFINES
-// TODO: move these into individual files for each device type
-// TODO: this should happen alongside refactoring the wacom stylus handling
-#if defined(REMARKABLE) | defined(DEV)
+#ifdef DEV
+// in dev mode, we are assuming we have remarkable settings
 #define MTWIDTH 767
 #define MTHEIGHT 1023
 #define WACOMWIDTH 15725.0
@@ -67,11 +66,6 @@
 #define MT_Y_SCALAR (float(DISPLAYHEIGHT) / float(MTHEIGHT))
 #define WACOM_X_SCALAR (float(DISPLAYWIDTH) / float(WACOMWIDTH))
 #define WACOM_Y_SCALAR (float(DISPLAYHEIGHT) / float(WACOMHEIGHT))
-#elif KOBO
-#undef DISPLAYWIDTH
-#undef DISPLAYHEIGHT
-#define DISPLAYWIDTH 1264
-#define DISPLAYHEIGHT 1680
 #endif
 
 #define TOOLBAR_HEIGHT 50

src/rmkit/fb/fb.cpy

@@ -863,5 +863,4 @@ namespace framebuffer:
     fb_info::width = _FB->width
     fb_info::height = _FB->height
 
-
     return _FB

src/rmkit/input/events.cpy

@@ -5,7 +5,7 @@
 #include "../fb/fb_info.h"
 
 //#define DEBUG_INPUT_EVENT 1
-
+//#define DEBUG_INPUT_INIT 1
 namespace input:
   extern int next_id = 1234
 
@@ -97,13 +97,29 @@ namespace input:
     int slot = 0, left = -1
     bool lifted=false
 
-    float scale_y=1.0, scale_x=1.0
-    int swap_xy=false, invert_x=false, invert_y=false
     static int MAX_SLOTS = 10
     struct Point:
       int x=-1, y=-1, left=-1
     ;
 
+    static float scale_x=1.0
+    static float scale_y=1.0
+    int swap_xy=false, invert_x=false, invert_y=false
+    static void set_extents(int w, h, dw, dh):
+      #ifdef DEV
+      scale_x = MT_X_SCALAR
+      scale_y = MT_Y_SCALAR
+      return
+      #endif
+
+      scale_x = float(dw) / float(w)
+      scale_y = float(dh) / float(h)
+      #ifdef DEBUG_INPUT_INIT
+      debug "TW, TH:", w, h
+      debug "SET SCALING TO", scale_x, scale_y
+      #endif
+
+
     // kobo libra rot0: swap_xy, invert_x
     // kobo libra rot180: swap_xy, invert_y
     // rm1: scale_x, scale_y, invert_x, invert_y
@@ -116,8 +132,6 @@ namespace input:
       // rM1
       invert_y = true
       if not rm2fb::IN_RM2FB_SHIM:
-        scale_x = MT_X_SCALAR
-        scale_y = MT_Y_SCALAR
         invert_x = true
       #elif KOBO
       rotation := util::rotation::get()
@@ -228,6 +242,29 @@ namespace input:
     int btn_touch = -1
     int eraser = -1
 
+    // rM has swapped axis and inverted y by default
+    static float scale_x=1.0
+    static float scale_y=1.0
+    int swap_xy=false, invert_x=false, invert_y=false
+    static void set_extents(int w, h, dw, dh):
+      #ifdef DEV
+      scale_x = WACOM_X_SCALAR
+      scale_y = WACOM_Y_SCALAR
+      return
+      #endif
+      scale_x = float(dw) / float(w)
+      scale_y = float(dh) / float(h)
+      #ifdef DEBUG_INPUT_INIT
+      debug "WW, WH:", w, h
+      debug "SET SCALING TO", scale_x, scale_y
+      #endif
+
+    WacomEvent():
+      #if defined(REMARKABLE) | defined(DEV)
+      swap_xy = true
+      invert_y = true
+      #endif
+
     def marshal():
       SynMotionEvent syn_ev;
       syn_ev.x = self.x
@@ -256,12 +293,24 @@ namespace input:
 
     handle_abs(input_event data):
       #if defined(REMARKABLE) | defined(DEV)
+      if swap_xy:
+        if data.code == ABS_X:
+          data.code = ABS_Y
+        else if data.code == ABS_Y:
+          data.code = ABS_X
+
       switch data.code:
         case ABS_Y:
-          self.x = data.value * WACOM_X_SCALAR
+          if invert_y:
+            self.y = framebuffer::fb_info::display_height - data.value * scale_y
+          else:
+            self.y = data.value * scale_y
           break
         case ABS_X:
-          self.y = (WACOMHEIGHT - data.value) * WACOM_Y_SCALAR
+          if invert_x:
+            self.x = framebuffer::fb_info::display_width - data.value * scale_x
+          else:
+            self.x = data.value * scale_x
           break
         case ABS_TILT_X:
           self.tilt_x = data.value

src/rmkit/input/input.cpy

@@ -7,6 +7,7 @@
 #include <sys/ioctl.h>
 
 #include "../defines.h"
+#include "../fb/fb_info.h"
 #include "events.h"
 #include "gestures.h"
 #include "device_id.h"
@@ -28,7 +29,6 @@ namespace input:
     T prev_ev, event
     vector<T> events
 
-
     InputClass():
       pass
 
@@ -113,6 +113,7 @@ namespace input:
         socketpair(AF_UNIX, SOCK_STREAM, 0, ipc_fd)
 
       self.monitor(input::ipc_fd[0])
+      self.set_scaling(framebuffer::fb_info::display_width, framebuffer::fb_info::display_height)
       return
 
 
@@ -148,6 +149,36 @@ namespace input:
 
       self.monitor(fd)
 
+    // adapted from https://www.linuxjournal.com/files/linuxjournal.com/linuxjournal/articles/064/6429/6429l17.html
+    // NOTE: we assume that we only need max value from here and its anchored at 0,
+    // this may not be true in the future
+    tuple<struct input_absinfo, struct input_absinfo> read_extents(int fd, x_id, y_id):
+      uint8_t abs_b[ABS_MAX/8 + 1]
+      struct input_absinfo abs_feat
+      abs_bit := EVIOCGBIT(EV_ABS, sizeof(abs_b))
+      ioctl(fd, abs_bit, abs_b)
+
+      struct input_absinfo x_feat, y_feat
+      if (ioctl(fd, EVIOCGABS(x_id), &x_feat)):
+        perror("evdev EVIOCGABS ioctl");
+      if (ioctl(fd, EVIOCGABS(y_id), &y_feat)):
+        perror("evdev EVIOCGABS ioctl");
+
+      if x_feat.maximum < y_feat.maximum:
+        return x_feat, y_feat
+      return y_feat, x_feat
+
+    void set_scaling(int display_width, int display_height):
+      if self.wacom.fd > 0:
+        xf, yf := self.read_extents(self.wacom.fd, ABS_X, ABS_Y)
+        WacomEvent::set_extents(xf.maximum, yf.maximum, display_width, display_height)
+
+      if self.touch.fd > 0:
+        xf, yf := self.read_extents(self.touch.fd, ABS_MT_POSITION_X, ABS_MT_POSITION_Y)
+        TouchEvent::set_extents(xf.maximum, yf.maximum, display_width, display_height)
+      return
+
+
     void reset_events():
       self.wacom.clear()
       self.touch.clear()