Implement 1002/1003 mouse tracking modes.

diff --git a/Changes b/Changes
index 9768160f258afeeb6ed8ae884e26b14a6659ee7f..4832b56a6fea4bb258d5ee778a75ba07fdf6bf13 100644 (file)
--- a/Changes
+++ b/Changes
@@ -24,6 +24,7 @@ DUMB: support tex fonts
         - rxvt -e no longer crashes the child.
         - fixed some minor memleaks on incorrect usage or
           missing DISPLAY.
+        - implement xterm 1002/1003 mouse tracking modes (exg).
 
 8.3  Wed Aug  1 20:21:31 CEST 2007
        - new option: skipScroll/-ss, enabled by default.

diff --git a/doc/rxvt.7.pod b/doc/rxvt.7.pod
index 72a6f0d453dae005a20da9c30050ee8b33d8b1f9..6a831ea320bf39ce75617111810f53f1cf868bd5 100644 (file)
--- a/doc/rxvt.7.pod
+++ b/doc/rxvt.7.pod
@@ -1906,6 +1906,24 @@ X<Priv66>
 
 =end table
 
+=item B<< C<Pm = 1002> >> (X11 XTerm)
+
+=begin table
+
+       B<< C<h> >>     Send Mouse X & Y on button press and release, and motion with a button pressed.
+       B<< C<l> >>     No mouse reporting.
+
+=end table
+
+=item B<< C<Pm = 1003> >> (X11 XTerm)
+
+=begin table
+
+       B<< C<h> >>     Send Mouse X & Y on button press and release, and motion.
+       B<< C<l> >>     No mouse reporting.
+
+=end table
+
 =item B<< C<Pm = 1010> >> (B<rxvt>)
 
 =begin table

diff --git a/src/command.C b/src/command.C
index edff4d111c794f64ab4c4734a8d4dc849f9cdfc8..496d13fcf13f6c09b1d56e227319fb94d265fd18 100644 (file)
--- a/src/command.C
+++ b/src/command.C
@@ -1303,9 +1303,17 @@ rxvt_term::mouse_report (XButtonEvent &ev)
 {
   int button_number, key_state = 0;
   int x, y;
+  int code = 32;
 
   x = Pixel2Col (ev.x);
   y = Pixel2Row (ev.y);
+  if (ev.type == MotionNotify) {
+    if (x == mouse_row && y == mouse_col)
+      return;
+    mouse_row = x;
+    mouse_col = y;
+    code += 32;
+  }
 
   if (MEvent.button == AnyButton)
     button_number = 3;
@@ -1361,7 +1369,7 @@ rxvt_term::mouse_report (XButtonEvent &ev)
 #endif
 
   tt_printf ("\033[M%c%c%c",
-            (32 + button_number + key_state),
+            (code + button_number + key_state),
             (32 + x + 1),
             (32 + y + 1));
 }
@@ -1578,6 +1586,9 @@ rxvt_term::x_cb (XEvent &ev)
         if (hidden_pointer)
           pointer_unblank ();
 #endif
+        if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
+            || priv_modes & PrivMode_MouseAnyEvent)
+          mouse_report (ev.xbutton);
         if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
           break;
 
@@ -2850,10 +2861,10 @@ rxvt_term::process_csi_seq ()
                 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
                 //
                 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
-                // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
-                // that we do not support xterm mouse reporting (should be 95 when we do).
+                // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
+                // versions.
                 //
-                tt_printf ("\033[>%d;94;0c", 'U');
+                tt_printf ("\033[>%d;95;0c", 'U');
               }
             break;
           case '?':
@@ -3628,8 +3639,8 @@ rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs,
 #endif
                   { 1000, PrivMode_MouseX11 },
                  // 1001 Use Hilite Mouse Tracking. NYI, TODO
-                 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
-                 // 1003 Use All Motion Mouse Tracking. NYI, TODO
+                  { 1002, PrivMode_MouseBtnEvent },
+                  { 1003, PrivMode_MouseAnyEvent },
                   { 1010, PrivMode_TtyOutputInh }, // rxvt extension
                   { 1011, PrivMode_Keypress }, // rxvt extension
                  // 1035 enable modifiers for alt, numlock NYI
@@ -3713,7 +3724,7 @@ rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs,
             /* case 8: - auto repeat, can't do on a per window basis */
             case 9:                    /* X10 mouse reporting */
               if (state)               /* orthogonal */
-                priv_modes &= ~PrivMode_MouseX11;
+                priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
               break;
 #ifdef scrollBar_esc
             case scrollBar_esc:
@@ -3736,12 +3747,22 @@ rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs,
             /* case 67:        - backspace key */
             case 1000:         /* X11 mouse reporting */
               if (state)               /* orthogonal */
-                priv_modes &= ~PrivMode_MouseX10;
+                priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
               break;
 #if 0
             case 1001:
               break;           /* X11 mouse highlighting */
 #endif
+            case 1002:
+            case 1003:
+              if (state) {
+                priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
+                priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
+                vt_emask_mouse = PointerMotionMask;
+              } else
+                vt_emask_mouse = NoEventMask;
+              vt_select_input ();
+              break;
             case 1010:         /* scroll to bottom on TTY output inhibit */
               set_option (Opt_scrollTtyOutput, !state);
               break;

diff --git a/src/rxvt.h b/src/rxvt.h
index 1ba9e33217f1b8f325b60fd32f0ff1233ed0dd9b..8ce467b624fad9c3f0a80675166d6972694cbb6f 100644 (file)
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -600,10 +600,12 @@ enum {
 #define PrivMode_smoothScroll   (1UL<<17)
 #define PrivMode_vt52           (1UL<<18)
 #define PrivMode_LFNL          (1UL<<19)
+#define PrivMode_MouseBtnEvent  (1UL<<20)
+#define PrivMode_MouseAnyEvent  (1UL<<21)
 /* too annoying to implement X11 highlight tracking */
 /* #define PrivMode_MouseX11Track       (1LU<<20) */
 
-#define PrivMode_mouse_report   (PrivMode_MouseX10|PrivMode_MouseX11)
+#define PrivMode_mouse_report   (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
 
 #ifdef ALLOW_132_MODE
 # define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
@@ -926,6 +928,8 @@ struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
                   window_vt_x,
                   window_vt_y,
                   window_sb_x,
+                  mouse_row,
+                  mouse_col,
 # ifdef POINTER_BLANK
                   pointerBlankDelay,
 # endif
@@ -1041,11 +1045,11 @@ struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
 # endif
 #endif
 
-  long vt_emask, vt_emask_perl, vt_emask_xim;
+  long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse;
 
   void vt_select_input () const NOTHROW
   {
-    XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
+    XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse);
   }
 
 #if ENABLE_TRANSPARENCY || ENABLE_PERL