Revision: 2802
http://tmux.svn.sourceforge.net/tmux/?rev=2802&view=rev
Author: tcunha
Date: 2012-05-22 20:58:33 +0000 (Tue, 22 May 2012)
Log Message:
-----------
Sync OpenBSD patchset 1116:
If there are any terminals with insert mode but not ich1, they can go
through the slow path. Tidies code slightly.
Modified Paths:
--------------
trunk/tmux.h
trunk/tty-term.c
trunk/tty.c
Modified: trunk/tmux.h
===================================================================
--- trunk/tmux.h 2012-05-22 20:57:47 UTC (rev 2801)
+++ trunk/tmux.h 2012-05-22 20:58:33 UTC (rev 2802)
@@ -312,7 +312,6 @@
TTYC_RI, /* scroll_reverse, sr */
TTYC_RMACS, /* exit_alt_charset_mode */
TTYC_RMCUP, /* exit_ca_mode, te */
- TTYC_RMIR, /* exit_insert_mode, ei */
TTYC_RMKX, /* keypad_local, ke */
TTYC_SETAB, /* set_a_background, AB */
TTYC_SETAF, /* set_a_foreground, AF */
@@ -320,7 +319,6 @@
TTYC_SITM, /* enter_italics_mode, it */
TTYC_SMACS, /* enter_alt_charset_mode, as */
TTYC_SMCUP, /* enter_ca_mode, ti */
- TTYC_SMIR, /* enter_insert_mode, im */
TTYC_SMKX, /* keypad_xmit, ks */
TTYC_SMSO, /* enter_standout_mode, so */
TTYC_SMUL, /* enter_underline_mode, us */
Modified: trunk/tty-term.c
===================================================================
--- trunk/tty-term.c 2012-05-22 20:57:47 UTC (rev 2801)
+++ trunk/tty-term.c 2012-05-22 20:58:33 UTC (rev 2802)
@@ -177,7 +177,6 @@
{ TTYC_RI, TTYCODE_STRING, "ri" },
{ TTYC_RMACS, TTYCODE_STRING, "rmacs" },
{ TTYC_RMCUP, TTYCODE_STRING, "rmcup" },
- { TTYC_RMIR, TTYCODE_STRING, "rmir" },
{ TTYC_RMKX, TTYCODE_STRING, "rmkx" },
{ TTYC_SETAB, TTYCODE_STRING, "setab" },
{ TTYC_SETAF, TTYCODE_STRING, "setaf" },
@@ -185,7 +184,6 @@
{ TTYC_SITM, TTYCODE_STRING, "sitm" },
{ TTYC_SMACS, TTYCODE_STRING, "smacs" },
{ TTYC_SMCUP, TTYCODE_STRING, "smcup" },
- { TTYC_SMIR, TTYCODE_STRING, "smir" },
{ TTYC_SMKX, TTYCODE_STRING, "smkx" },
{ TTYC_SMSO, TTYCODE_STRING, "smso" },
{ TTYC_SMUL, TTYCODE_STRING, "smul" },
Modified: trunk/tty.c
===================================================================
--- trunk/tty.c 2012-05-22 20:57:47 UTC (rev 2801)
+++ trunk/tty.c 2012-05-22 20:58:33 UTC (rev 2802)
@@ -754,12 +754,7 @@
if (tty_term_has(tty->term, TTYC_ICH) ||
tty_term_has(tty->term, TTYC_ICH1))
tty_emulate_repeat(tty, TTYC_ICH, TTYC_ICH1, ctx->num);
- else if (tty_term_has(tty->term, TTYC_SMIR) &&
- tty_term_has(tty->term, TTYC_RMIR)) {
- tty_putcode(tty, TTYC_SMIR);
- tty_repeat_space(tty, ctx->num);
- tty_putcode(tty, TTYC_RMIR);
- } else
+ else
tty_draw_line(tty, wp->screen, ctx->ocy, ctx->xoff, ctx->yoff);
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
tmux-cvs mailing list
tmux-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
