Ticket #2662: xterm-276-urxvt-mouse-mode.patch

button.c

@@ -176 +176 @@
 static unsigned
 EmitMousePosition(TScreen * screen, Char line[], unsigned count, int value)
 {
-    int mouse_limit = (screen->ext_mode_mouse
+    int mouse_limit = (screen->urxvt_ext_mode_mouse
+                       ? -1
+                       : screen->ext_mode_mouse
                        ? EXT_MOUSE_LIMIT
                        : MOUSE_LIMIT);
 
@@ -192 +194 @@
      */
     if (value == mouse_limit) {
         line[count++] = CharOf(0);
+    } else if (screen->urxvt_ext_mode_mouse) {
+        count += sprintf(line + count, "%d", value + 1);
     } else if (!screen->ext_mode_mouse || value < EXT_MOUSE_START) {
         line[count++] = CharOf(' ' + value + 1);
     } else {
@@ -202 +206 @@
     return count;
 }
 
+static unsigned
+EmitMousePositionSeparator(TScreen * screen, Char line[], unsigned count)
+{
+    if (screen->urxvt_ext_mode_mouse) {
+        line[count++] = ';';
+    }
+    return count;
+}
+
 Bool
 SendMousePosition(XtermWidget xw, XEvent * event)
 {
@@ -2242 +2255 @@
     CELL cell;
     unsigned count;
     TScreen *screen = TScreenOf(xw);
-    Char line[20];
+    Char line[64];
 
     if (use_cursor_loc) {
         cell = screen->cursorp;
@@ -2264 +2277 @@
             if (isSameCELL(&(screen->rawPos), &(screen->startSel))
                 && isSameCELL(&cell, &(screen->endSel))) {
                 /* Use short-form emacs select */
-                line[count++] = 't';
+                if (!screen->urxvt_ext_mode_mouse) {
+                    line[count++] = 't';
+                }
                 count = EmitMousePosition(screen, line, count, screen->endSel.col);
+                count = EmitMousePositionSeparator(screen, line, count);
                 count = EmitMousePosition(screen, line, count, screen->endSel.row);
+                if (screen->urxvt_ext_mode_mouse) {
+                    line[count++] = 't';
+                }
             } else {
                 /* long-form, specify everything */
-                line[count++] = 'T';
+                if (!screen->urxvt_ext_mode_mouse) {
+                    line[count++] = 'T';
+                }
                 count = EmitMousePosition(screen, line, count, screen->startSel.col);
+                count = EmitMousePositionSeparator(screen, line, count);
                 count = EmitMousePosition(screen, line, count, screen->startSel.row);
+                count = EmitMousePositionSeparator(screen, line, count);
                 count = EmitMousePosition(screen, line, count, screen->endSel.col);
+                count = EmitMousePositionSeparator(screen, line, count);
                 count = EmitMousePosition(screen, line, count, screen->endSel.row);
+                count = EmitMousePositionSeparator(screen, line, count);
                 count = EmitMousePosition(screen, line, count, cell.col);
+                count = EmitMousePositionSeparator(screen, line, count);
                 count = EmitMousePosition(screen, line, count, cell.row);
+                if (screen->urxvt_ext_mode_mouse) {
+                    line[count++] = 'T';
+                }
             }
             v_write(screen->respond, line, count);
             TrackText(xw, &zeroCELL, &zeroCELL);
@@ -4066 +4095 @@
 }
 
 static unsigned
-EmitButtonCode(TScreen * screen, Char * line, unsigned count, XButtonEvent * event)
+EmitButtonCode(TScreen * screen, Char * line, unsigned count, int value)
 {
-    int value = BtnCode(event, screen->mouse_button);
-
-    if (!screen->ext_mode_mouse || value < 128) {
+    if (screen->urxvt_ext_mode_mouse) {
+        count += sprintf(line + count, "%d", value);
+    } else if (!screen->ext_mode_mouse || value < 128) {
         line[count++] = CharOf(value);
     } else {
         line[count++] = CharOf(0xC0 + (value >> 6));
@@ -4084 +4113 @@
 {
     TScreen *screen = TScreenOf(xw);
     int pty = screen->respond;
-    int mouse_limit = screen->ext_mode_mouse ? EXT_MOUSE_LIMIT : MOUSE_LIMIT;
-    Char line[10];
+    int mouse_limit = screen->urxvt_ext_mode_mouse ? -1 : screen->ext_mode_mouse ? EXT_MOUSE_LIMIT : MOUSE_LIMIT;
+    Char line[32];
     int row, col;
     int button;
     unsigned count = 0;
@@ -4111 +4140 @@
     else if (col > screen->max_col)
         col = screen->max_col;
 
-    /* Limit to representable mouse dimensions */
-    if (row > mouse_limit)
-        row = mouse_limit;
-    if (col > mouse_limit)
-        col = mouse_limit;
+    if (mouse_limit > 0) {
+        /* Limit to representable mouse dimensions */
+        if (row > mouse_limit)
+            row = mouse_limit;
+        if (col > mouse_limit)
+            col = mouse_limit;
+    }
 
     /* Build key sequence starting with \E[M */
     if (screen->control_eight_bits) {
@@ -4133 +4164 @@
         line[count++] = '>';
     }
 #endif
-    line[count++] = 'M';
+    if (!screen->urxvt_ext_mode_mouse) {
+        line[count++] = 'M';
+    }
 
     /* Add event code to key sequence */
     if (screen->send_mouse_pos == X10_MOUSE) {
-        line[count++] = CharOf(' ' + button);
+        count = EmitButtonCode(screen, line, count, CharOf(' ' + button));
     } else {
         /* Button-Motion events */
         switch (event->type) {
         case ButtonPress:
             screen->mouse_button = button;
-            count = EmitButtonCode(screen, line, count, event);
+            count = EmitButtonCode(screen, line, count, BtnCode(event, button));
             break;
         case ButtonRelease:
             /*
@@ -4154 +4187 @@
             if (button < 3)
                 button = -1;
             screen->mouse_button = button;
-            count = EmitButtonCode(screen, line, count, event);
+            count = EmitButtonCode(screen, line, count, BtnCode(event, button));
             break;
         case MotionNotify:
             /* BTN_EVENT_MOUSE and ANY_EVENT_MOUSE modes send motion
@@ -4164 +4197 @@
                 && (col == screen->mouse_col)) {
                 changed = False;
             } else {
-                count = EmitButtonCode(screen, line, count, event);
+                count = EmitButtonCode(screen, line, count, BtnCode(event, screen->mouse_button));
             }
             break;
         default:
@@ -4180 +4213 @@
         TRACE(("mouse at %d,%d button+mask = %#x\n", row, col, line[count - 1]));
 
         /* Add pointer position to key sequence */
+        count = EmitMousePositionSeparator(screen, line, count);
         count = EmitMousePosition(screen, line, count, col);
+        count = EmitMousePositionSeparator(screen, line, count);
         count = EmitMousePosition(screen, line, count, row);
 
+        if (screen->urxvt_ext_mode_mouse) {
+            line[count++] = 'M';
+        }
+
         /* Transmit key sequence to process running under xterm */
         v_write(pty, line, count);
     }

charproc.c

@@ -4360 +4360 @@
         case SET_EXT_MODE_MOUSE:
             set_bool_mode(screen->ext_mode_mouse);
             break;
+        case SET_URXVT_EXT_MODE_MOUSE:
+            set_bool_mode(screen->urxvt_ext_mode_mouse);
+            break;
         case 1010:              /* rxvt */
             set_bool_mode(screen->scrollttyoutput);
             update_scrollttyoutput();
@@ -4565 +4568 @@
         case SET_EXT_MODE_MOUSE:
             DoSM(DP_X_EXT_MOUSE, screen->ext_mode_mouse);
             break;
+        case SET_URXVT_EXT_MODE_MOUSE:
+            DoSM(DP_X_EXT_MOUSE, screen->urxvt_ext_mode_mouse);
+            break;
         case 1048:
             if (!xw->misc.titeInhibit) {
                 CursorSave(xw);
@@ -4736 +4742 @@
         case SET_EXT_MODE_MOUSE:
             DoRM(DP_X_EXT_MOUSE, screen->ext_mode_mouse);
             break;
+        case SET_URXVT_EXT_MODE_MOUSE:
+            DoRM(DP_X_EXT_MOUSE, screen->urxvt_ext_mode_mouse);
+            break;
         case 1048:
             if (!xw->misc.titeInhibit) {
                 CursorRestore(xw);
@@ -8385 +8394 @@
         screen->send_mouse_pos = MOUSE_OFF;
         screen->send_focus_pos = OFF;
         screen->ext_mode_mouse = OFF;
+        screen->urxvt_ext_mode_mouse = OFF;
         screen->waitingForTrackInfo = False;
         screen->eventMode = NORMAL;
 

ctlseqs.ms

@@ -2010 +2010 @@
 #define SET_FOCUS_EVENT_MOUSE       1004
 
 #define SET_EXT_MODE_MOUSE          1005
+
+#define SET_URXVT_EXT_MODE_MOUSE    1015
 .DE
 .br
 The motion reporting modes are strictly \fIxterm\fP extensions, and are not

ctlseqs.txt

@@ -1356 +1356 @@
 
                 #define SET_EXT_MODE_MOUSE          1005
 
+                #define SET_URXVT_EXT_MODE_MOUSE    1015
+
 The motion reporting modes are strictly xterm extensions, and are not
 part of any standard, though they are analogous to the DEC VT200 DECELR
 locator reports.

xterm-276

@@ -3776 +3776 @@
         case SET_EXT_MODE_MOUSE:
             result = MdBool(screen->ext_mode_mouse);
             break;
+        case SET_URXVT_EXT_MODE_MOUSE:
+            result = MdBool(screen->urxvt_ext_mode_mouse);
+            break;
         case 1010:              /* rxvt */
             result = MdBool(screen->scrollttyoutput);
             break;

xterm-276

@@ -1635 +1635 @@
         unsigned        send_mouse_pos; /* user wants mouse transition  */
                                         /* and position information     */
         Boolean         ext_mode_mouse; /* support large terminals      */
+        Boolean         urxvt_ext_mode_mouse; /* support large terminals */
         Boolean         send_focus_pos; /* user wants focus in/out info */
         Boolean         quiet_grab;     /* true if no cursor change on focus */
 #if OPT_PASTE64

xcharmouse.h

@@ -48 +48 @@
 
 /* Extend mouse tracking for terminals wider(taller) than 223 cols(rows) */
 #define SET_EXT_MODE_MOUSE          1005 /* compatible with above */
+#define SET_URXVT_EXT_MODE_MOUSE    1015
 
 #define SET_BUTTON1_MOVE_POINT      2001 /* click1 emit Esc seq to move point*/
 #define SET_BUTTON2_MOVE_POINT      2002 /* press2 emit Esc seq to move point*/