Remove support for the continuous reporting "any" mouse mode which never

really worked properly and is rarely used.

diff --git a/usr.bin/tmux/format.c b/usr.bin/tmux/format.c
index 2f89424..3b1c12c 100644 (file)
--- a/usr.bin/tmux/format.c
+++ b/usr.bin/tmux/format.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: format.c,v 1.47 2014/05/27 12:49:36 nicm Exp $ */
+/* $OpenBSD: format.c,v 1.48 2014/08/09 07:33:37 nicm Exp $ */
 
 /*
  * Copyright (c) 2011 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -601,8 +601,6 @@ format_window_pane(struct format_tree *ft, struct window_pane *wp)
            !!(wp->base.mode & MODE_MOUSE_STANDARD));
        format_add(ft, "mouse_button_flag", "%d",
            !!(wp->base.mode & MODE_MOUSE_BUTTON));
-       format_add(ft, "mouse_any_flag", "%d",
-           !!(wp->base.mode & MODE_MOUSE_ANY));
        format_add(ft, "mouse_utf8_flag", "%d",
            !!(wp->base.mode & MODE_MOUSE_UTF8));
 

diff --git a/usr.bin/tmux/input.c b/usr.bin/tmux/input.c
index 8c55d89..5970f98 100644 (file)
--- a/usr.bin/tmux/input.c
+++ b/usr.bin/tmux/input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: input.c,v 1.69 2014/06/06 13:21:41 nicm Exp $ */
+/* $OpenBSD: input.c,v 1.70 2014/08/09 07:33:37 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -1374,7 +1374,6 @@ input_csi_dispatch_rm_private(struct input_ctx *ictx)
                case 1000:
                case 1001:
                case 1002:
-               case 1003:
                        screen_write_mode_clear(&ictx->ctx, ALL_MOUSE_MODES);
                        break;
                case 1004:
@@ -1451,10 +1450,6 @@ input_csi_dispatch_sm_private(struct input_ctx *ictx)
                        screen_write_mode_clear(&ictx->ctx, ALL_MOUSE_MODES);
                        screen_write_mode_set(&ictx->ctx, MODE_MOUSE_BUTTON);
                        break;
-               case 1003:
-                       screen_write_mode_clear(&ictx->ctx, ALL_MOUSE_MODES);
-                       screen_write_mode_set(&ictx->ctx, MODE_MOUSE_ANY);
-                       break;
                case 1004:
                        if (ictx->ctx.s->mode & MODE_FOCUSON)
                                break;

diff --git a/usr.bin/tmux/server-client.c b/usr.bin/tmux/server-client.c
index 5876b21..ed7f85b 100644 (file)
--- a/usr.bin/tmux/server-client.c
+++ b/usr.bin/tmux/server-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server-client.c,v 1.122 2014/07/13 20:51:08 krw Exp $ */
+/* $OpenBSD: server-client.c,v 1.123 2014/08/09 07:33:37 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -647,7 +647,7 @@ server_client_reset_state(struct client *c)
         */
        mode = s->mode;
        if ((c->tty.mouse.flags & MOUSE_RESIZE_PANE) &&
-           !(mode & (MODE_MOUSE_BUTTON|MODE_MOUSE_ANY)))
+           !(mode & MODE_MOUSE_BUTTON))
                mode |= MODE_MOUSE_BUTTON;
 
        /*

diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h
index 64da3db..c9d7c68 100644 (file)
--- a/usr.bin/tmux/tmux.h
+++ b/usr.bin/tmux/tmux.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.466 2014/07/21 10:25:48 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.467 2014/08/09 07:33:37 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -682,13 +682,13 @@ struct mode_key_table {
 #define MODE_WRAP 0x10         /* whether lines wrap */
 #define MODE_MOUSE_STANDARD 0x20
 #define MODE_MOUSE_BUTTON 0x40
-#define MODE_MOUSE_ANY 0x80
+/* 0x80 unused */
 #define MODE_MOUSE_UTF8 0x100
 #define MODE_MOUSE_SGR 0x200
 #define MODE_BRACKETPASTE 0x400
 #define MODE_FOCUSON 0x800
 
-#define ALL_MOUSE_MODES (MODE_MOUSE_STANDARD|MODE_MOUSE_BUTTON|MODE_MOUSE_ANY)
+#define ALL_MOUSE_MODES (MODE_MOUSE_STANDARD|MODE_MOUSE_BUTTON)
 
 /* A single UTF-8 character. */
 struct utf8_data {

diff --git a/usr.bin/tmux/tty.c b/usr.bin/tmux/tty.c
index df5dbea..55e8c66 100644 (file)
--- a/usr.bin/tmux/tty.c
+++ b/usr.bin/tmux/tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty.c,v 1.169 2014/04/25 12:45:16 jsg Exp $ */
+/* $OpenBSD: tty.c,v 1.170 2014/08/09 07:33:37 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -513,16 +513,12 @@ tty_update_mode(struct tty *tty, int mode, struct screen *s)
                                tty_puts(tty, "\033[?1005l");
                        tty_puts(tty, "\033[?1006h");
 
-                       if (mode & MODE_MOUSE_ANY)
-                               tty_puts(tty, "\033[?1003h");
-                       else if (mode & MODE_MOUSE_BUTTON)
+                       if (mode & MODE_MOUSE_BUTTON)
                                tty_puts(tty, "\033[?1002h");
                        else if (mode & MODE_MOUSE_STANDARD)
                                tty_puts(tty, "\033[?1000h");
                } else {
-                       if (tty->mode & MODE_MOUSE_ANY)
-                               tty_puts(tty, "\033[?1003l");
-                       else if (tty->mode & MODE_MOUSE_BUTTON)
+                       if (tty->mode & MODE_MOUSE_BUTTON)
                                tty_puts(tty, "\033[?1002l");
                        else if (tty->mode & MODE_MOUSE_STANDARD)
                                tty_puts(tty, "\033[?1000l");