summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2011-01-15 00:16:01 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2011-01-15 00:16:01 +0000
commit9507faedebbf5f0548f937eab0650f208b70cda3 (patch)
tree33a9c09a27456b9b000a21023c5be663284b6c97
parentf0276a021c053e42c0f8e1bda37ece86df791612 (diff)
Mouse highlight mode (1001) requires a program to cooperate so
supporting it through tmux is not as easy as this, remove it for now.
-rw-r--r--usr.bin/tmux/input.c6
-rw-r--r--usr.bin/tmux/tmux.h12
-rw-r--r--usr.bin/tmux/tty.c6
3 files changed, 7 insertions, 17 deletions
diff --git a/usr.bin/tmux/input.c b/usr.bin/tmux/input.c
index d13a1f5443e..8b839638f34 100644
--- a/usr.bin/tmux/input.c
+++ b/usr.bin/tmux/input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: input.c,v 1.33 2011/01/03 23:35:21 nicm Exp $ */
+/* $OpenBSD: input.c,v 1.34 2011/01/15 00:16:00 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -1201,10 +1201,6 @@ input_csi_dispatch(struct input_ctx *ictx)
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);
diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h
index fde96365745..eaed4ce09db 100644
--- a/usr.bin/tmux/tmux.h
+++ b/usr.bin/tmux/tmux.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.265 2011/01/08 01:52:37 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.266 2011/01/15 00:16:00 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -547,13 +547,11 @@ struct mode_key_table {
#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.
diff --git a/usr.bin/tmux/tty.c b/usr.bin/tmux/tty.c
index 9ef1f7c9304..418b3bee664 100644
--- a/usr.bin/tmux/tty.c
+++ b/usr.bin/tmux/tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty.c,v 1.96 2011/01/08 01:52:37 nicm Exp $ */
+/* $OpenBSD: tty.c,v 1.97 2011/01/15 00:16:00 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -403,8 +403,6 @@ tty_update_mode(struct tty *tty, int mode)
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 @@ tty_update_mode(struct tty *tty, int mode)
} 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)