diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2009-08-09 17:32:06 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2009-08-09 17:32:06 +0000 |
| commit | 97eb537f38f732f86a046e6fee9116c55c1ff706 (patch) | |
| tree | 708fa32f751b2f0775c97400e30ef74002e1885b /input.c | |
| parent | 37b0bcd7c15b6dac69ac8cb1c0d9d6a4fd5c54c0 (diff) | |
| download | rtmux-97eb537f38f732f86a046e6fee9116c55c1ff706.tar.gz rtmux-97eb537f38f732f86a046e6fee9116c55c1ff706.tar.bz2 rtmux-97eb537f38f732f86a046e6fee9116c55c1ff706.zip | |
Sync OpenBSD patchset 227:
Add a flags member to the grid_line struct and use it to differentiate lines
wrapped at the screen edge from those terminated by a newline. Then use this
when copying to combine wrapped lines together into one.
Diffstat (limited to 'input.c')
| -rw-r--r-- | input.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -1,4 +1,4 @@ -/* $Id: input.c,v 1.89 2009-08-09 16:57:49 tcunha Exp $ */ +/* $Id: input.c,v 1.90 2009-08-09 17:32:06 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -635,7 +635,7 @@ input_handle_c0_control(u_char ch, struct input_ctx *ictx) case '\0': /* NUL */ break; case '\n': /* LF */ - screen_write_linefeed(&ictx->ctx); + screen_write_linefeed(&ictx->ctx, 0); break; case '\r': /* CR */ screen_write_carriagereturn(&ictx->ctx); @@ -659,7 +659,7 @@ input_handle_c0_control(u_char ch, struct input_ctx *ictx) } while (s->cx < screen_size_x(s) - 1); break; case '\013': /* VT */ - screen_write_linefeed(&ictx->ctx); + screen_write_linefeed(&ictx->ctx, 0); break; case '\016': /* SO */ ictx->cell.attr |= GRID_ATTR_CHARSET; @@ -682,11 +682,11 @@ input_handle_c1_control(u_char ch, struct input_ctx *ictx) switch (ch) { case 'D': /* IND */ - screen_write_linefeed(&ictx->ctx); + screen_write_linefeed(&ictx->ctx, 0); break; case 'E': /* NEL */ screen_write_carriagereturn(&ictx->ctx); - screen_write_linefeed(&ictx->ctx); + screen_write_linefeed(&ictx->ctx, 0); break; case 'H': /* HTS */ if (s->cx < screen_size_x(s)) |