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.
This commit is contained in:
Tiago Cunha 2011-01-21 23:56:11 +00:00
parent 7a68cff1db
commit 332bfbf273
3 changed files with 7 additions and 17 deletions

View File

@ -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 <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -1201,10 +1201,6 @@ input_csi_dispatch(struct input_ctx *ictx)
screen_write_mousemode_on( screen_write_mousemode_on(
&ictx->ctx, MODE_MOUSE_STANDARD); &ictx->ctx, MODE_MOUSE_STANDARD);
break; break;
case 1001:
screen_write_mousemode_on(
&ictx->ctx, MODE_MOUSE_HIGHLIGHT);
break;
case 1002: case 1002:
screen_write_mousemode_on( screen_write_mousemode_on(
&ictx->ctx, MODE_MOUSE_BUTTON); &ictx->ctx, MODE_MOUSE_BUTTON);

12
tmux.h
View File

@ -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 <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -543,13 +543,11 @@ struct mode_key_table {
#define MODE_KKEYPAD 0x8 /* set = application, clear = number */ #define MODE_KKEYPAD 0x8 /* set = application, clear = number */
#define MODE_WRAP 0x10 /* whether lines wrap */ #define MODE_WRAP 0x10 /* whether lines wrap */
#define MODE_MOUSE_STANDARD 0x20 #define MODE_MOUSE_STANDARD 0x20
#define MODE_MOUSE_HIGHLIGHT 0x40 #define MODE_MOUSE_BUTTON 0x40
#define MODE_MOUSE_BUTTON 0x80 #define MODE_MOUSE_ANY 0x80
#define MODE_MOUSE_ANY 0x100 #define MODE_MOUSE_UTF8 0x100
#define MODE_MOUSE_UTF8 0x200
#define ALL_MOUSE_MODES (MODE_MOUSE_STANDARD| \ #define ALL_MOUSE_MODES (MODE_MOUSE_STANDARD|MODE_MOUSE_BUTTON|MODE_MOUSE_ANY)
MODE_MOUSE_HIGHLIGHT|MODE_MOUSE_BUTTON|MODE_MOUSE_ANY)
/* /*
* A single UTF-8 character. * A single UTF-8 character.

6
tty.c
View File

@ -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 <nicm@users.sourceforge.net> * 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"); tty_puts(tty, "\033[?1005h");
if (mode & MODE_MOUSE_STANDARD) if (mode & MODE_MOUSE_STANDARD)
tty_puts(tty, "\033[?1000h"); tty_puts(tty, "\033[?1000h");
else if (mode & MODE_MOUSE_HIGHLIGHT)
tty_puts(tty, "\033[?1001h");
else if (mode & MODE_MOUSE_BUTTON) else if (mode & MODE_MOUSE_BUTTON)
tty_puts(tty, "\033[?1002h"); tty_puts(tty, "\033[?1002h");
else if (mode & MODE_MOUSE_ANY) else if (mode & MODE_MOUSE_ANY)
@ -412,8 +410,6 @@ tty_update_mode(struct tty *tty, int mode)
} else { } else {
if (tty->mode & MODE_MOUSE_STANDARD) if (tty->mode & MODE_MOUSE_STANDARD)
tty_puts(tty, "\033[?1000l"); tty_puts(tty, "\033[?1000l");
else if (tty->mode & MODE_MOUSE_HIGHLIGHT)
tty_puts(tty, "\033[?1001l");
else if (tty->mode & MODE_MOUSE_BUTTON) else if (tty->mode & MODE_MOUSE_BUTTON)
tty_puts(tty, "\033[?1002l"); tty_puts(tty, "\033[?1002l");
else if (tty->mode & MODE_MOUSE_ANY) else if (tty->mode & MODE_MOUSE_ANY)