From dd2f8d7d74a67f0bb3b44b482555c8f528332efd Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Thu, 14 May 2009 16:21:55 +0000 Subject: [PATCH] Don't force wrapping with \n when asked, let the cursor code figure it out. Should fix terminals which use this to detect line breaks. --- CHANGES | 4 +++- tty.c | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index b1aeb89b..4f3e3147 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,7 @@ 14 May 2009 +* Don't force wrapping with \n when asked, let the cursor code figure it out. + Should fix terminals which use this to detect line breaks. * Major cleanup and restructuring of build infrastructure. Still separate files for GNU and BSD make, but they are now hugely simplified at the expense of adding a configure script which must be run before make. Now build and @@ -1252,7 +1254,7 @@ (including mutt, emacs). No status bar yet and no key remapping or other customisation. -$Id: CHANGES,v 1.285 2009-05-13 23:40:30 nicm Exp $ +$Id: CHANGES,v 1.286 2009-05-14 16:21:54 nicm Exp $ LocalWords: showw utf UTF fulvio ciriaco joshe OSC APC gettime abc DEF OA clr LocalWords: rivo nurges lscm Erdely eol smysession mysession ek dstname RB ms diff --git a/tty.c b/tty.c index 352cd45b..72224039 100644 --- a/tty.c +++ b/tty.c @@ -1,4 +1,4 @@ -/* $Id: tty.c,v 1.97 2009-05-04 17:58:27 nicm Exp $ */ +/* $Id: tty.c,v 1.98 2009-05-14 16:21:55 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -652,10 +652,10 @@ tty_cmd_linefeed(struct tty *tty, struct window_pane *wp, unused va_list ap) tty_region(tty, s->old_rupper, s->old_rlower, wp->yoff); - tty_cursor(tty, s->old_cx, s->old_cy, wp->xoff, wp->yoff); - tty_putc(tty, '\n'); - - tty->cy++; + if (s->old_cy == s->old_rlower) { + tty_cursor(tty, s->old_cx, s->old_cy, wp->xoff, wp->yoff); + tty_putc(tty, '\n'); + } } void