summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2009-10-12 16:41:03 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2009-10-12 16:41:03 +0000
commitd75b9e3cb93538cdb6e59d5bfea958937d2c7428 (patch)
treed315c88076ec5c2201334df567d3f0063b235e06
parent9838933fda3727cae18faeaaf188da2031bb3416 (diff)
Don't run through the column unchanged case if the row was unchanged but there
were no suitable optimisations, instead make it an else to fall through to absolute addressing.
-rw-r--r--usr.bin/tmux/tty.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/usr.bin/tmux/tty.c b/usr.bin/tmux/tty.c
index b1c3c9d2bbd..04484754705 100644
--- a/usr.bin/tmux/tty.c
+++ b/usr.bin/tmux/tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty.c,v 1.44 2009/10/12 16:37:43 nicm Exp $ */
+/* $OpenBSD: tty.c,v 1.45 2009/10/12 16:41:02 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -968,8 +968,12 @@ tty_cursor(struct tty *tty, u_int cx, u_int cy)
goto out;
}
- /* Row staying the same. */
+ /* Moving column or row. */
if (cy == thisy) {
+ /*
+ * Moving column only, row staying the same.
+ */
+
/* To left edge. */
if (cx == 0) {
tty_putc(tty, '\r');
@@ -1005,10 +1009,11 @@ tty_cursor(struct tty *tty, u_int cx, u_int cy)
tty_putcode1(tty, TTYC_CUF, -change);
goto out;
}
- }
+ } else if (cx == thisx) {
+ /*
+ * Moving row only, column staying the same.
+ */
- /* Column staying the same. */
- if (cx == thisx ) {
/* One above. */
if (cy != tty->rupper &&
cy == thisy - 1 && tty_term_has(term, TTYC_CUU1)) {