aboutsummaryrefslogtreecommitdiff
path: root/screen-write.c
diff options
context:
space:
mode:
Diffstat (limited to 'screen-write.c')
-rw-r--r--screen-write.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/screen-write.c b/screen-write.c
index 016127b7..5524f370 100644
--- a/screen-write.c
+++ b/screen-write.c
@@ -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. */