From 8dcd82f193500659f5edb949d069278282a85795 Mon Sep 17 00:00:00 2001
From: Curtis McEnroe <june@causal.agency>
Date: Tue, 13 Aug 2019 12:40:16 -0400
Subject: Add minimums of 1 to some parameters

---
 term.c | 18 ++++++++++--------
 term.h |  2 --
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/term.c b/term.c
index 5814f33..0554ec2 100644
--- a/term.c
+++ b/term.c
@@ -26,6 +26,10 @@
 
 #include "term.h"
 
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+#define BOX(l, x, u) MIN(MAX((x), (l)), (u))
+
 static void unhandled(const char *format, ...) {
 	if (isatty(STDERR_FILENO)) return;
 	va_list ap;
@@ -54,7 +58,6 @@ static void move(struct Cell *dst, struct Cell *src, uint len) {
 }
 
 static void scrollUp(struct Term *term, uint top, uint n) {
-	if (!n) return;
 	move(
 		cell(term, top, 0),
 		cell(term, top + n, 0),
@@ -68,7 +71,6 @@ static void scrollUp(struct Term *term, uint top, uint n) {
 }
 
 static void scrollDown(struct Term *term, uint top, uint n) {
-	if (!n) return;
 	move(
 		cell(term, top + n, 0),
 		cell(term, top, 0),
@@ -179,18 +181,18 @@ ACTION(ech) {
 }
 
 ACTION(dch) {
-	uint n = MIN(P(0, 1), t->cols - X); if (!n) return;
+	uint n = BOX(1, P(0, 1), t->cols - X);
 	move(C(Y, X), C(Y, X + n), t->cols - X - n);
 	erase(t->style, C(Y, t->cols - n), C(Y, R));
 }
 ACTION(ich) {
-	uint n = MIN(P(0, 1), t->cols - X); if (!n) return;
+	uint n = BOX(1, P(0, 1), t->cols - X);
 	move(C(Y, X + n), C(Y, X), t->cols - X - n);
 	erase(t->style, C(Y, X), C(Y, X + n - 1));
 }
 
-ACTION(dl) { scrollUp(t, Y, MIN(P(0, 1), t->scroll.bot - Y)); }
-ACTION(il) { scrollDown(t, Y, MIN(P(0, 1), t->scroll.bot - Y)); }
+ACTION(dl) { scrollUp(t, Y, BOX(1, P(0, 1), t->scroll.bot - Y)); }
+ACTION(il) { scrollDown(t, Y, BOX(1, P(0, 1), t->scroll.bot - Y)); }
 
 ACTION(nl) {
 	if (Y == t->scroll.bot) {
@@ -207,10 +209,10 @@ ACTION(ri) {
 	}
 }
 ACTION(su) {
-	scrollUp(t, t->scroll.top, MIN(P(0, 1), t->scroll.bot - t->scroll.top));
+	scrollUp(t, t->scroll.top, BOX(1, P(0, 1), t->scroll.bot - t->scroll.top));
 }
 ACTION(sd) {
-	scrollDown(t, t->scroll.top, MIN(P(0, 1), t->scroll.bot - t->scroll.top));
+	scrollDown(t, t->scroll.top, BOX(1, P(0, 1), t->scroll.bot - t->scroll.top));
 }
 ACTION(decstbm) {
 	t->scroll.bot = MIN(P(1, t->rows) - 1, B);
diff --git a/term.h b/term.h
index 2bc4dcb..b4a96af 100644
--- a/term.h
+++ b/term.h
@@ -17,8 +17,6 @@
 #include <stdbool.h>
 #include <wchar.h>
 
-#define MIN(a, b) ((a) < (b) ? (a) : (b))
-
 typedef unsigned uint;
 
 enum {
-- 
cgit 1.4.1

ver'><th></th><th class='left'>Commit message (<a href='/libretls/log/tls.sym?id=d680afaaadfd567166de53185156128a0a59c3e0&amp;follow=1'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2020-09-29 14:48:15 -0400'>2020-09-29</span></td><td class='logsubject'><a href='/libretls/commit/man/Makefile.am?id=3b4a10a68682f3b8590450c9be75a8ed4c7307c4&amp;follow=1'>Import LibreSSL 3.2.1</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2020-09-29 14:47:14 -0400'>2020-09-29</span></td><td class='logsubject'><a href='/libretls/commit/import.sh?id=eea3cdfb26b07f4fdbb4ad570283fb1e1ea99772&amp;follow=1'>import: Add m4/ax_add_fortify_source.m4</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2020-08-05 11:43:02 -0400'>2020-08-05</span></td><td class='logsubject'><a href='/libretls/commit/Makefile.am?id=cc13f4d43a9e6f8544f347800adbbe5000b83305&amp;follow=1'>build: Add README.7 to EXTRA_DIST</a><span class='decoration'> <a class='tag-annotated-deco' href='/libretls/tag/?h=3.2.0'>3.2.0</a></span></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2020-08-03 22:27:18 -0400'>2020-08-03</span></td><td class='logsubject'><a href='/libretls/commit/README.7?id=1f76eb0e84b70024abe78149bef743a7b7699590&amp;follow=1'>doc: Indicate that only OpenSSL 1.1.1b and newer work</a></td><td>June McEnroe