Update of /cvsroot/tmux/tmux
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7776

Modified Files:
        input.c tmux.h tty.c 
Log Message:
Sync OpenBSD patchset 845:

Mouse highlight mode (1001) requires a program to cooperate so
supporting it through tmux is not as easy as this, remove it for now.


Index: tty.c
===================================================================
RCS file: /cvsroot/tmux/tmux/tty.c,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -d -r1.200 -r1.201
--- tty.c       21 Jan 2011 23:44:13 -0000      1.200
+++ tty.c       21 Jan 2011 23:56:11 -0000      1.201
@@ -403,8 +403,6 @@
                                tty_puts(tty, "\033[?1005h");
                        if (mode & MODE_MOUSE_STANDARD)
                                tty_puts(tty, "\033[?1000h");
-                       else if (mode & MODE_MOUSE_HIGHLIGHT)
-                               tty_puts(tty, "\033[?1001h");
                        else if (mode & MODE_MOUSE_BUTTON)
                                tty_puts(tty, "\033[?1002h");
                        else if (mode & MODE_MOUSE_ANY)
@@ -412,8 +410,6 @@
                } else {
                        if (tty->mode & MODE_MOUSE_STANDARD)
                                tty_puts(tty, "\033[?1000l");
-                       else if (tty->mode & MODE_MOUSE_HIGHLIGHT)
-                               tty_puts(tty, "\033[?1001l");
                        else if (tty->mode & MODE_MOUSE_BUTTON)
                                tty_puts(tty, "\033[?1002l");
                        else if (tty->mode & MODE_MOUSE_ANY)

Index: input.c
===================================================================
RCS file: /cvsroot/tmux/tmux/input.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- input.c     7 Jan 2011 14:34:45 -0000       1.113
+++ input.c     21 Jan 2011 23:56:11 -0000      1.114
@@ -1201,10 +1201,6 @@
                        screen_write_mousemode_on(
                            &ictx->ctx, MODE_MOUSE_STANDARD);
                        break;
-               case 1001:
-                       screen_write_mousemode_on(
-                           &ictx->ctx, MODE_MOUSE_HIGHLIGHT);
-                       break;
                case 1002:
                        screen_write_mousemode_on(
                            &ictx->ctx, MODE_MOUSE_BUTTON);

Index: tmux.h
===================================================================
RCS file: /cvsroot/tmux/tmux/tmux.h,v
retrieving revision 1.604
retrieving revision 1.605
diff -u -d -r1.604 -r1.605
--- tmux.h      21 Jan 2011 23:44:13 -0000      1.604
+++ tmux.h      21 Jan 2011 23:56:11 -0000      1.605
@@ -543,13 +543,11 @@
 #define MODE_KKEYPAD 0x8       /* set = application, clear = number */
 #define MODE_WRAP 0x10         /* whether lines wrap */
 #define MODE_MOUSE_STANDARD 0x20
-#define MODE_MOUSE_HIGHLIGHT 0x40
-#define MODE_MOUSE_BUTTON 0x80
-#define MODE_MOUSE_ANY 0x100
-#define MODE_MOUSE_UTF8 0x200
+#define MODE_MOUSE_BUTTON 0x40
+#define MODE_MOUSE_ANY 0x80
+#define MODE_MOUSE_UTF8 0x100
 
-#define ALL_MOUSE_MODES (MODE_MOUSE_STANDARD| \
-    MODE_MOUSE_HIGHLIGHT|MODE_MOUSE_BUTTON|MODE_MOUSE_ANY)
+#define ALL_MOUSE_MODES (MODE_MOUSE_STANDARD|MODE_MOUSE_BUTTON|MODE_MOUSE_ANY)
 
 /*
  * A single UTF-8 character.


------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires 
February 28th, so secure your free ArcSight Logger TODAY! 
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs

Reply via email to