mirror of
https://github.com/tmate-io/tmate.git
synced 2025-08-09 13:54:54 +02:00
Merge output (more) and copy modes into one single mode (called copy).
This commit is contained in:
@ -1,4 +1,4 @@
|
||||
/* $Id: screen-write.c,v 1.88 2009-12-04 22:14:47 tcunha Exp $ */
|
||||
/* $Id: screen-write.c,v 1.89 2010-04-05 05:11:43 micahcowan Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
|
||||
@ -1009,13 +1009,14 @@ screen_write_cell(struct screen_write_ctx *ctx,
|
||||
}
|
||||
|
||||
/* Check this will fit on the current line and wrap if not. */
|
||||
if (s->cx > screen_size_x(s) - width) {
|
||||
if ((s->mode & MODE_WRAP) && s->cx > screen_size_x(s) - width) {
|
||||
screen_write_linefeed(ctx, 1);
|
||||
s->cx = 0; /* carriage return */
|
||||
}
|
||||
|
||||
/* Sanity checks. */
|
||||
if (s->cx > screen_size_x(s) - 1 || s->cy > screen_size_y(s) - 1)
|
||||
if (((s->mode & MODE_WRAP) && s->cx > screen_size_x(s) - 1)
|
||||
|| s->cy > screen_size_y(s) - 1)
|
||||
return;
|
||||
|
||||
/* Handle overwriting of UTF-8 characters. */
|
||||
|
Reference in New Issue
Block a user