From 332bfbf27330a87c1a7f2bc974032cf18a058328 Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Fri, 21 Jan 2011 23:56:11 +0000 Subject: [PATCH] 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. --- input.c | 6 +----- tmux.h | 12 +++++------- tty.c | 6 +----- 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/input.c b/input.c index 818033b8..7495a038 100644 --- a/input.c +++ b/input.c @@ -1,4 +1,4 @@ -/* $Id: input.c,v 1.113 2011-01-07 14:34:45 tcunha Exp $ */ +/* $Id: input.c,v 1.114 2011-01-21 23:56:11 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -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/tmux.h b/tmux.h index 8238fcc1..af353b21 100644 --- a/tmux.h +++ b/tmux.h @@ -1,4 +1,4 @@ -/* $Id: tmux.h,v 1.604 2011-01-21 23:44:13 tcunha Exp $ */ +/* $Id: tmux.h,v 1.605 2011-01-21 23:56:11 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -543,13 +543,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/tty.c b/tty.c index a45a6099..c93e0f7d 100644 --- a/tty.c +++ b/tty.c @@ -1,4 +1,4 @@ -/* $Id: tty.c,v 1.200 2011-01-21 23:44:13 tcunha Exp $ */ +/* $Id: tty.c,v 1.201 2011-01-21 23:56:11 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -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)