The branch, master has been updated
via 1ec93570bf765c4cd67a3d6be1d5c2f8ca9f5f06 (commit)
via 2c53b23d5968da2e796ead6ed9f8ff3c33b8bbfb (commit)
from 4123d69b51c1806fe37dde7f2bd28ac916cb1407 (commit)
- Log -----------------------------------------------------------------
commit 1ec93570bf765c4cd67a3d6be1d5c2f8ca9f5f06
Merge: 4123d69 2c53b23
Author: n6tadam <[email protected]>
Commit: n6tadam <[email protected]>
Merge branch 'obsd-master'
tty.c | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
commit 2c53b23d5968da2e796ead6ed9f8ff3c33b8bbfb
Author: nicm <nicm>
Commit: nicm <nicm>
In terminfo, sometimes cvvis implies cnorm and sometimes it doesn't, so
don't assume it does. Fixes missing cursor with emacs-in-tmux-in-tmux.
---
tty.c | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/tty.c b/tty.c
index a58ca93..63380c2 100644
--- a/tty.c
+++ b/tty.c
@@ -507,14 +507,17 @@ tty_update_mode(struct tty *tty, int mode, struct screen
*s)
mode &= ~MODE_CURSOR;
changed = mode ^ tty->mode;
- if (changed & (MODE_CURSOR|MODE_BLINKING)) {
- if (mode & MODE_CURSOR) {
- if (mode & MODE_BLINKING &&
- tty_term_has(tty->term, TTYC_CVVIS))
- tty_putcode(tty, TTYC_CVVIS);
- else
- tty_putcode(tty, TTYC_CNORM);
- } else
+ if (changed & MODE_BLINKING) {
+ if (tty_term_has(tty->term, TTYC_CVVIS))
+ tty_putcode(tty, TTYC_CVVIS);
+ else
+ tty_putcode(tty, TTYC_CNORM);
+ changed |= MODE_CURSOR;
+ }
+ if (changed & MODE_CURSOR) {
+ if (mode & MODE_CURSOR)
+ tty_putcode(tty, TTYC_CNORM);
+ else
tty_putcode(tty, TTYC_CIVIS);
}
if (s != NULL && tty->cstyle != s->cstyle) {
-----------------------------------------------------------------------
Summary of changes:
tty.c | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
One dashboard for servers and applications across Physical-Virtual-Cloud
Widest out-of-the-box monitoring support with 50+ applications
Performance metrics, stats and reports that give you Actionable Insights
Deep dive visibility with transaction tracing using APM Insight.
http://ad.doubleclick.net/ddm/clk/290420510;117567292;y
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
