Don't allow talk own messages wrap around on the screen, just

scroll them like normal user input/output does.

2 files changed, 8 insertions, 7 deletions

diff --git a/usr.bin/talk/invite.c b/usr.bin/talk/invite.c
index ae73539..16fc4e6 100644
--- a/usr.bin/talk/invite.c
+++ b/usr.bin/talk/invite.c
@@ -122,7 +122,9 @@ re_invite()
 {
 
 	message("Ringing your party again");
-	current_line++;
+	waddch(my_win.x_win, '\n');
+	if (current_line < my_win.x_nlines - 1)
+		current_line++;
 	/* force a re-announce */
 	msg.id_num = htonl(remote_id + 1);
 	announce_invite();
diff --git a/usr.bin/talk/io.c b/usr.bin/talk/io.c
index 5ba6f97..e9f0480 100644
--- a/usr.bin/talk/io.c
+++ b/usr.bin/talk/io.c
@@ -118,7 +118,7 @@ extern	int sys_nerr;
 p_error(string) 
 	char *string;
 {
-	wmove(my_win.x_win, current_line%my_win.x_nlines, 0);
+	wmove(my_win.x_win, current_line, 0);
 	wprintw(my_win.x_win, "[%s : %s (%d)]\n",
 	    string, strerror(errno), errno);
 	wrefresh(my_win.x_win);
@@ -133,10 +133,9 @@ p_error(string)
 message(string)
 	char *string;
 {
-	wmove(my_win.x_win, current_line % my_win.x_nlines, 0);
-	wprintw(my_win.x_win, "[%s]", string);
-	wclrtoeol(my_win.x_win);
-	current_line++;
-	wmove(my_win.x_win, current_line % my_win.x_nlines, 0);
+	wmove(my_win.x_win, current_line, 0);
+	wprintw(my_win.x_win, "[%s]\n", string);
+	if (current_line < my_win.x_nlines - 1)
+		current_line++;
 	wrefresh(my_win.x_win);
 }