add touchpad support

Author: antheas

src/hhd/contrib/dev.py

@@ -13,7 +13,7 @@ def B(b: str):
     def RV(type: int, code: int):
         if (type, code) not in cache:
             v = ecodes.bytype[type][code]
-            if isinstance(v, list):
+            if isinstance(v, list) or isinstance(v, tuple):
                 v = v[0]
             cache[(type, code)] = v
         else:

src/hhd/controller/base.py

@@ -325,6 +325,7 @@ class TouchpadCorrection(NamedTuple):
     "left",
     "right",
     "center",
+    "legos",
     "disabled",
 ]
 
@@ -354,7 +355,7 @@ def correct_touchpad(
                     y_mult=new_height,
                     y_ofs=(height - new_height),
                 )
-        case "right":
+        case "right" | "legos":
             if ratio > 2:
                 new_width = width / ratio
                 return TouchpadCorrection(
@@ -474,6 +475,8 @@ def correct_touchpad(
                 )
         case "stretch" | "disabled":
             return TouchpadCorrection(x_mult=width, y_mult=height)
+        # case "legos":
+        #     return TouchpadCorrection(x_mult=800, y_mult=800, x_ofs=1055, y_ofs=140)
 
     logger.error(f"Touchpad correction method '{method}' not found.")
     return TouchpadCorrection(x_mult=width, y_mult=height)

src/hhd/controller/physical/evdev.py

@@ -282,8 +282,12 @@ def open(self) -> Sequence[int]:
                     if cap_id not in dev_cap:
                         matches = False
                         break
+                    if cap_id != B("EV_ABS"):
+                        dev_caps = dev_cap[cap_id]
+                    else:
+                        dev_caps = [c[0] for c in dev_cap[cap_id]]  # type: ignore
                     for cap in caps:
-                        if cap not in dev_cap[cap_id]:
+                        if cap not in dev_caps:
                             matches = False
                         break
                 if not matches:

src/hhd/device/legion_go/slim/base.py

@@ -17,9 +17,12 @@
     GOS_INTERFACE_AXIS_MAP,
     GOS_INTERFACE_BTN_ESSENTIALS,
     GOS_INTERFACE_BTN_MAP,
+    GOS_TOUCHPAD_BUTTON_MAP,
+    GOS_TOUCHPAD_AXIS_MAP,
 )
 from .hid import LegionHidraw, LegionHidrawTs, rgb_callback
 
+
 FIND_DELAY = 0.1
 ERROR_DELAY = 0.5
 LONGER_ERROR_DELAY = 3
@@ -224,12 +227,13 @@ def controller_loop_xinput(
     debug = DEBUG_MODE
 
     # Output
-
+    touchpad_enable = conf.get("touchpad", "disabled")
     d_producers, d_outs, d_params = get_outputs(
         conf["xinput"],
         None,
         conf["imu"].to(bool),
         emit=emit,
+        touchpad_enable=touchpad_enable,  # type: ignore
         rgb_modes={
             "disabled": [],
             "solid": ["color"],
@@ -263,6 +267,20 @@ def controller_loop_xinput(
         )
     )
 
+    uses_touch = d_params.get("uses_touch", False)
+    d_touch = GenericGamepadEvdev(
+        vid=[GOS_VID],
+        pid=list(GOS_PIDS),
+        capabilities={
+            EC("EV_KEY"): [EC("BTN_LEFT")],
+            EC("EV_ABS"): [EC("ABS_MT_POSITION_Y")],
+        },
+        btn_map=GOS_TOUCHPAD_BUTTON_MAP,
+        axis_map=GOS_TOUCHPAD_AXIS_MAP,
+        aspect_ratio=1,
+        required=True,
+    )
+
     freq = conf.get("freq", None)
     os = conf.get("mapping.mode", None)
     d_cfg = LegionHidraw(
@@ -279,6 +297,7 @@ def controller_loop_xinput(
         os=os,
         turbo=conf.get("mapping.windows.turbo", None) if os == "windows" else None,
         freq=freq,
+        touchpad="absolute" if uses_touch else "relative",
     )
 
     # Mute keyboard shortcuts, mute
@@ -322,6 +341,8 @@ def prepare(m):
     try:
         prepare(d_xinput)
         prepare(d_shortcuts)
+        if uses_touch:
+            prepare(d_touch)
         prepare(d_cfg)
         prepare(d_raw)
         for d in d_producers:

src/hhd/device/legion_go/slim/const.py

@@ -58,3 +58,17 @@
     "gyro_z": AM(22 << 3, "i16", scale=0.0005325, order="little"),
     "gyro_y": AM(24 << 3, "i16", scale=-0.0005325, order="little"),
 }
+
+GOS_TOUCHPAD_BUTTON_MAP: dict[int, Button] = to_map(
+    {
+        "touchpad_touch": [B("BTN_TOOL_FINGER")],  # also BTN_TOUCH
+        "touchpad_left": [B("BTN_LEFT")],
+    }
+)
+
+GOS_TOUCHPAD_AXIS_MAP: dict[int, Axis] = to_map(
+    {
+        "touchpad_x": [B("ABS_X")],  # also ABS_MT_POSITION_X
+        "touchpad_y": [B("ABS_Y")],  # also ABS_MT_POSITION_Y
+    }
+)

src/hhd/device/legion_go/slim/controller.yml

@@ -57,17 +57,17 @@ children:
         hint: >-
           SteamOS style mapping.
 
-  # touchpad:
-  #   type: multiple
-  #   title: Touchpad Emulation
-  #   default: disabled
-  #   tags: [ non-essential, ordinal ]
-  #   hint: >-
-  #     Passthrough the touchpad to the controller (Dualsense only).
-  #   options:
-  #     disabled: Disabled
-  #     gamemode: Gamemode
-  #     always: Always
+  touchpad:
+    type: multiple
+    title: Touchpad Emulation
+    default: disabled
+    tags: [ non-essential, ordinal ]
+    hint: >-
+      Passthrough the touchpad to the controller (Dualsense only).
+    options:
+      disabled: Disabled
+      gamemode: Gamemode
+      always: Always
 
   freq:
     type: multiple

src/hhd/device/legion_go/slim/hid.py

@@ -283,6 +283,7 @@ def open(self):
         cmds.extend(config_device(self.os, self.turbo, self.touchpad, self.freq))  # type: ignore
 
         for r in cmds:
+            # logger.info(f"Sending command: {r.hex()}")
             self.dev.write(r)
 
         return out

src/hhd/plugins/outputs.py

@@ -38,6 +38,7 @@ def get_outputs(
     rgb_modes: Mapping[RgbMode, Sequence[RgbSettings]] | None = None,
     rgb_zones: RgbZones = "mono",
     controller_disabled: bool = False,
+    touchpad_enable: Literal["disabled", "gamemode", "always"] | None = None,
 ) -> tuple[Sequence[Producer], Sequence[Consumer], Mapping[str, Any]]:
     producers = []
     consumers = []
@@ -50,6 +51,10 @@ def get_outputs(
         correction = touch_conf["controller.correction"].to(TouchpadCorrectionType)
         if touchpad in ("emulation", "controller"):
             desktop_disable = touch_conf[touchpad]["desktop_disable"].to(bool)
+    elif touchpad_enable:
+        touchpad = "disabled" if touchpad_enable == "disabled" else "controller"
+        correction = "legos"  # todo: make generic
+        desktop_disable = touchpad_enable == "gamemode"
     else:
         touchpad = "controller"
         correction = "stretch"

sync.sh

@@ -5,7 +5,7 @@ fi
 
 HOST=$1
 RSYNC="rsync -rv --exclude .git --exclude venv --exclude __pycache__'"
-USER=${USER:-bazzite}
+USER=${2:-bazzite}
 
 # python -m venv --system-site-packages ~/hhd-dev/hhd/venv
 # ~/hhd-dev/hhd/venv/bin/pip install -e ~/hhd-dev/adjustor