@teammates/consolonia 0.7.0 → 0.7.2

package/dist/input/mouse-matcher.d.ts

@@ -1,8 +1,14 @@
 /**
- * Parses SGR extended mouse tracking sequences.
+ * Parses terminal mouse tracking sequences.
  *
- * Format: \x1b[<Cb;Cx;CyM  (press/motion)
- *         \x1b[<Cb;Cx;Cym  (release)
+ * Supported formats:
+ *   SGR:        \x1b[<Cb;Cx;CyM  (press/motion)
+ *               \x1b[<Cb;Cx;Cym  (release)
+ *   SGR-Pixels: \x1b[<Cb;Cx;CyM  (same wire format as SGR, pixel coords)
+ *               \x1b[<Cb;Cx;Cym
+ *   X10:        \x1b[M Cb Cx Cy  (classic xterm byte encoding)
+ *   UTF-8:      \x1b[M Cb Cx Cy  (same prefix as X10, UTF-8 encoded coords)
+ *   URXVT:      \x1b[Cb;Cx;CyM   (decimal params, no < prefix)
  *
  * Cb encodes button and modifiers:
  *   bits 0-1: 0=left, 1=middle, 2=right
@@ -13,15 +19,27 @@
  *   bit 4 (+16): ctrl
  *
  * Cx, Cy are 1-based coordinates.
+ *
+ * Note: UTF-8 mode uses the same \x1b[M prefix as X10 but encodes
+ * coordinates as UTF-8 characters for values > 127. Node.js decodes
+ * UTF-8 stdin automatically, so the X10 parser handles both formats.
+ *
+ * Note: SGR-Pixels mode uses the same wire format as SGR but reports
+ * pixel coordinates instead of cell coordinates. These are passed
+ * through as-is (the caller must convert to cells if needed).
  */
 import { type InputEvent } from "./events.js";
 import { type IMatcher, MatchResult } from "./matcher.js";
 export declare class MouseMatcher implements IMatcher {
     private state;
     private params;
+    private x10Bytes;
+    private urxvtParams;
     private result;
     append(char: string): MatchResult;
     flush(): InputEvent | null;
     reset(): void;
     private finalize;
+    private finalizeUrxvt;
+    private finalizeX10;
 }

package/dist/input/mouse-matcher.js

@@ -1,8 +1,14 @@
 /**
- * Parses SGR extended mouse tracking sequences.
+ * Parses terminal mouse tracking sequences.
  *
- * Format: \x1b[<Cb;Cx;CyM  (press/motion)
- *         \x1b[<Cb;Cx;Cym  (release)
+ * Supported formats:
+ *   SGR:        \x1b[<Cb;Cx;CyM  (press/motion)
+ *               \x1b[<Cb;Cx;Cym  (release)
+ *   SGR-Pixels: \x1b[<Cb;Cx;CyM  (same wire format as SGR, pixel coords)
+ *               \x1b[<Cb;Cx;Cym
+ *   X10:        \x1b[M Cb Cx Cy  (classic xterm byte encoding)
+ *   UTF-8:      \x1b[M Cb Cx Cy  (same prefix as X10, UTF-8 encoded coords)
+ *   URXVT:      \x1b[Cb;Cx;CyM   (decimal params, no < prefix)
  *
  * Cb encodes button and modifiers:
  *   bits 0-1: 0=left, 1=middle, 2=right
@@ -13,6 +19,14 @@
  *   bit 4 (+16): ctrl
  *
  * Cx, Cy are 1-based coordinates.
+ *
+ * Note: UTF-8 mode uses the same \x1b[M prefix as X10 but encodes
+ * coordinates as UTF-8 characters for values > 127. Node.js decodes
+ * UTF-8 stdin automatically, so the X10 parser handles both formats.
+ *
+ * Note: SGR-Pixels mode uses the same wire format as SGR but reports
+ * pixel coordinates instead of cell coordinates. These are passed
+ * through as-is (the caller must convert to cells if needed).
  */
 import { mouseEvent } from "./events.js";
 import { MatchResult } from "./matcher.js";
@@ -24,12 +38,18 @@ var State;
     State[State["GotEsc"] = 1] = "GotEsc";
     /** Got \x1b[ */
     State[State["GotBracket"] = 2] = "GotBracket";
-    /** Got \x1b[< — now reading params until M or m */
+    /** Got \x1b[< — now reading SGR/SGR-Pixels params until M or m */
     State[State["Reading"] = 3] = "Reading";
+    /** Got \x1b[M — now reading three encoded bytes (X10 or UTF-8) */
+    State[State["ReadingX10"] = 4] = "ReadingX10";
+    /** Got \x1b[ followed by a digit — reading URXVT decimal params until M */
+    State[State["ReadingUrxvt"] = 5] = "ReadingUrxvt";
 })(State || (State = {}));
 export class MouseMatcher {
     state = State.Idle;
     params = "";
+    x10Bytes = [];
+    urxvtParams = "";
     result = null;
     append(char) {
         switch (this.state) {
@@ -52,6 +72,17 @@ export class MouseMatcher {
                     this.params = "";
                     return MatchResult.Partial;
                 }
+                if (char === "M") {
+                    this.state = State.ReadingX10;
+                    this.x10Bytes = [];
+                    return MatchResult.Partial;
+                }
+                // URXVT: \x1b[ followed by a digit starts decimal param reading
+                if (char >= "0" && char <= "9") {
+                    this.state = State.ReadingUrxvt;
+                    this.urxvtParams = char;
+                    return MatchResult.Partial;
+                }
                 this.state = State.Idle;
                 return MatchResult.NoMatch;
             case State.Reading: {
@@ -69,6 +100,26 @@ export class MouseMatcher {
                 this.params = "";
                 return MatchResult.NoMatch;
             }
+            case State.ReadingX10:
+                this.x10Bytes.push(char);
+                if (this.x10Bytes.length < 3) {
+                    return MatchResult.Partial;
+                }
+                return this.finalizeX10();
+            case State.ReadingUrxvt: {
+                if (char === "M") {
+                    return this.finalizeUrxvt();
+                }
+                const c = char.charCodeAt(0);
+                if ((c >= 0x30 && c <= 0x39) || char === ";") {
+                    this.urxvtParams += char;
+                    return MatchResult.Partial;
+                }
+                // Not a valid URXVT sequence — bail out
+                this.state = State.Idle;
+                this.urxvtParams = "";
+                return MatchResult.NoMatch;
+            }
             default:
                 return MatchResult.NoMatch;
         }
@@ -81,6 +132,8 @@ export class MouseMatcher {
     reset() {
         this.state = State.Idle;
         this.params = "";
+        this.x10Bytes = [];
+        this.urxvtParams = "";
         this.result = null;
     }
     finalize(isRelease) {
@@ -96,37 +149,77 @@ export class MouseMatcher {
         if (Number.isNaN(cb) || Number.isNaN(cx) || Number.isNaN(cy)) {
             return MatchResult.NoMatch;
         }
-        // Decode modifiers from cb
-        const shift = (cb & 4) !== 0;
-        const alt = (cb & 8) !== 0;
-        const ctrl = (cb & 16) !== 0;
-        const isMotion = (cb & 32) !== 0;
-        // Decode button from low bits (masking out modifier/motion bits)
-        const buttonBits = cb & 3;
-        const highBits = cb & (64 | 128);
-        let button;
-        let type;
-        if (highBits === 64) {
-            // Wheel events
-            button = "none";
-            type = buttonBits === 0 ? "wheelup" : "wheeldown";
+        if (isRelease) {
+            const shift = (cb & 4) !== 0;
+            const alt = (cb & 8) !== 0;
+            const ctrl = (cb & 16) !== 0;
+            this.result = mouseEvent(cx - 1, cy - 1, decodeButton(cb & 3), "release", shift, ctrl, alt);
+            return MatchResult.Complete;
         }
-        else if (isRelease) {
-            button = decodeButton(buttonBits);
-            type = "release";
+        this.result = decodeMouseEvent(cb, cx, cy, true);
+        return this.result ? MatchResult.Complete : MatchResult.NoMatch;
+    }
+    finalizeUrxvt() {
+        this.state = State.Idle;
+        const parts = this.urxvtParams.split(";");
+        this.urxvtParams = "";
+        if (parts.length !== 3) {
+            return MatchResult.NoMatch;
+        }
+        const cb = parseInt(parts[0], 10);
+        const cx = parseInt(parts[1], 10);
+        const cy = parseInt(parts[2], 10);
+        if (Number.isNaN(cb) || Number.isNaN(cx) || Number.isNaN(cy)) {
+            return MatchResult.NoMatch;
         }
-        else if (isMotion) {
-            button = buttonBits === 3 ? "none" : decodeButton(buttonBits);
-            type = "move";
+        // URXVT uses the same button encoding as X10 (button 3 = release)
+        this.result = decodeMouseEvent(cb, cx, cy, true);
+        return this.result ? MatchResult.Complete : MatchResult.NoMatch;
+    }
+    finalizeX10() {
+        this.state = State.Idle;
+        if (this.x10Bytes.length !== 3) {
+            this.x10Bytes = [];
+            return MatchResult.NoMatch;
         }
-        else {
-            button = decodeButton(buttonBits);
-            type = "press";
+        const [cbChar, cxChar, cyChar] = this.x10Bytes;
+        this.x10Bytes = [];
+        const cb = cbChar.charCodeAt(0) - 32;
+        const cx = cxChar.charCodeAt(0) - 32;
+        const cy = cyChar.charCodeAt(0) - 32;
+        if (cb < 0 || cx <= 0 || cy <= 0) {
+            return MatchResult.NoMatch;
         }
-        // Convert from 1-based to 0-based coordinates
-        this.result = mouseEvent(cx - 1, cy - 1, button, type, shift, ctrl, alt);
-        return MatchResult.Complete;
+        this.result = decodeMouseEvent(cb, cx, cy, true);
+        return this.result ? MatchResult.Complete : MatchResult.NoMatch;
+    }
+}
+function decodeMouseEvent(cb, cx, cy, x10ReleaseUsesButton3) {
+    const shift = (cb & 4) !== 0;
+    const alt = (cb & 8) !== 0;
+    const ctrl = (cb & 16) !== 0;
+    const isMotion = (cb & 32) !== 0;
+    const buttonBits = cb & 3;
+    const highBits = cb & (64 | 128);
+    let button;
+    let type;
+    if (highBits === 64) {
+        button = "none";
+        type = buttonBits === 0 ? "wheelup" : "wheeldown";
+    }
+    else if (x10ReleaseUsesButton3 && !isMotion && buttonBits === 3) {
+        button = "none";
+        type = "release";
+    }
+    else if (isMotion) {
+        button = buttonBits === 3 ? "none" : decodeButton(buttonBits);
+        type = "move";
+    }
+    else {
+        button = decodeButton(buttonBits);
+        type = "press";
     }
+    return mouseEvent(cx - 1, cy - 1, button, type, shift, ctrl, alt);
 }
 function decodeButton(bits) {
     switch (bits) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teammates/consolonia",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "description": "Terminal UI rendering engine inspired by Consolonia. Pixel-level compositing with ANSI output.",
   "type": "module",
   "main": "dist/index.js",
@@ -41,5 +41,8 @@
   },
   "dependencies": {
     "marked": "^17.0.4"
+  },
+  "optionalDependencies": {
+    "koffi": "^2.9.0"
   }
 }