* Better support for at least the most common variant of mouse input: parse it and adjust for different panes. Also support mouse in window/session choice mode.

* Bring back the fancy window titles with session/window names: it is easy to work around problems with elinks (see FAQ).

1 files changed, 31 insertions, 50 deletions

diff --git a/tty.c b/tty.c
index cd0a68c7..82ef0c15 100644
--- a/tty.c
+++ b/tty.c
@@ -1,4 +1,4 @@
-/* $Id: tty.c,v 1.63 2009-01-27 21:39:15 nicm Exp $ */
+/* $Id: tty.c,v 1.64 2009-01-28 19:52:21 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -71,9 +71,7 @@ void (*tty_cmds[])(struct tty *, struct screen *, u_int, va_list) = {
 	tty_cmd_deleteline,
 	tty_cmd_insertcharacter,
 	tty_cmd_insertline,
-	tty_cmd_insertmode,
 	tty_cmd_linefeed,
-	tty_cmd_mousemode,
 	tty_cmd_reverseindex,
 };
 
@@ -170,6 +168,8 @@ tty_start_tty(struct tty *tty)
 	tty_putcode(tty, TTYC_CLEAR);
 	
 	tty_putcode(tty, TTYC_CNORM);
+	if (tty_term_has(tty->term, TTYC_KMOUS))
+		tty_puts(tty, "\033[?1000l");
 
 	memcpy(&tty->cell, &grid_default_cell, sizeof tty->cell);
 
@@ -179,7 +179,7 @@ tty_start_tty(struct tty *tty)
 	tty->rlower = UINT_MAX;
 	tty->rupper = UINT_MAX;
 
-	tty->cursor = 1;
+	tty->mode = MODE_CURSOR;
 }
 
 void
@@ -206,7 +206,10 @@ tty_stop_tty(struct tty *tty)
 		tty_raw(tty, tty_term_string(tty->term, TTYC_CLEAR));
 		tty_raw(tty, tty_term_string(tty->term, TTYC_RMKX));
 		tty_raw(tty, tty_term_string(tty->term, TTYC_RMCUP));
+
 		tty_raw(tty, tty_term_string(tty->term, TTYC_CNORM));
+		if (tty_term_has(tty->term, TTYC_KMOUS))
+			tty_raw(tty, "\033[?1000l");
 	}
 }
 
@@ -336,6 +339,30 @@ tty_set_title(struct tty *tty, const char *title)
 }
 
 void
+tty_update_mode(struct tty *tty, int mode)
+{
+	int	changed;
+
+	if (tty->flags & TTY_NOCURSOR)
+		mode &= ~MODE_CURSOR;
+
+	changed = mode ^ tty->mode;
+	if (changed & MODE_CURSOR) {
+		if (mode & MODE_CURSOR)
+			tty_putcode(tty, TTYC_CNORM);
+		else
+			tty_putcode(tty, TTYC_CIVIS);
+	}
+	if (changed & MODE_MOUSE) {
+		if (mode & MODE_MOUSE)
+			tty_puts(tty, "\033[?1000h");
+		else
+			tty_puts(tty, "\033[?1000l");
+	}
+	tty->mode = mode;
+}
+
+void
 tty_emulate_repeat(
     struct tty *tty, enum tty_code_code code, enum tty_code_code code1, u_int n)
 {
@@ -505,32 +532,6 @@ tty_cmd_reverseindex(
 }
 
 void
-tty_cmd_insertmode(unused struct tty *tty,
-    unused struct screen *s, unused u_int oy, va_list ap)
-{
-	int	ua;
-
-	ua = va_arg(ap, int);
-}
-
-void
-tty_cmd_mousemode(
-    struct tty *tty, unused struct screen *s, unused u_int oy, va_list ap)
-{
-	int	ua;
-
-	if (!tty_term_has(tty->term, TTYC_KMOUS))
-		return;
-
-	ua = va_arg(ap, int);
-
-	if (ua)
-		tty_puts(tty, "\033[?1000h");
-	else
-		tty_puts(tty, "\033[?1000l");
-}
-
-void
 tty_cmd_linefeed(struct tty *tty, struct screen *s, u_int oy, unused va_list ap)
 {
 	tty_reset(tty);
@@ -709,26 +710,6 @@ tty_cursor(struct tty *tty, u_int cx, u_int cy, u_int oy)
 }
 
 void
-tty_cursor_off(struct tty *tty)
-{
-	if (!tty->cursor)
-		return;
-	tty->cursor = 0;
-
-	tty_putcode(tty, TTYC_CIVIS);
-}
-
-void
-tty_cursor_on(struct tty *tty)
-{
-	if (tty->cursor || tty->flags & TTY_NOCURSOR)
-		return;
-	tty->cursor = 1;
-	
-	tty_putcode(tty, TTYC_CNORM);
-}
-
-void
 tty_attributes(struct tty *tty, const struct grid_cell *gc)
 {
 	struct grid_cell	*tc = &tty->cell;