summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Brinkmann <marcus@gnu.org>2002-08-29 10:24:08 +0000
committerMarcus Brinkmann <marcus@gnu.org>2002-08-29 10:24:08 +0000
commitc19963fb7ad44ac4c5f908f3587e551c727c5be1 (patch)
treec60c82a32b1abd715bac29ef480aee985fbe91b7
parent513afcf4f8cd67275bad59251d1ee2a845d0ddca (diff)
2002-08-29 Marcus Brinkmann <marcus@gnu.org>
* console-ncurses.c (main): Call endwin () before bailing out because of an error. (cons_vcons_write): Use getyx and wmove on stdscr instead getsyx and setsyx (which operate on newscr, and mess up the cursor anyway, probably because we don't commit the change immediately). Submitted by David Walter <dwalter@syr.edu>.
-rw-r--r--utils/ChangeLog9
-rw-r--r--utils/console-ncurses.c9
2 files changed, 15 insertions, 3 deletions
diff --git a/utils/ChangeLog b/utils/ChangeLog
index be04d8f2..904e5bd6 100644
--- a/utils/ChangeLog
+++ b/utils/ChangeLog
@@ -1,3 +1,12 @@
+2002-08-29 Marcus Brinkmann <marcus@gnu.org>
+
+ * console-ncurses.c (main): Call endwin () before bailing out
+ because of an error.
+ (cons_vcons_write): Use getyx and wmove on stdscr instead getsyx
+ and setsyx (which operate on newscr, and mess up the cursor
+ anyway, probably because we don't commit the change immediately).
+ Submitted by David Walter <dwalter@syr.edu>.
+
2002-08-22 Marcus Brinkmann <marcus@gnu.org>
* Makefile: Include `../config.make' early on to get LIBNCURSESW
diff --git a/utils/console-ncurses.c b/utils/console-ncurses.c
index 4ec60d7d..1f12ff3c 100644
--- a/utils/console-ncurses.c
+++ b/utils/console-ncurses.c
@@ -518,9 +518,9 @@ cons_vcons_write (vcons_t vcons, conchar_t *str, size_t length,
return;
mutex_lock (&ncurses_lock);
- getsyx (y, x);
+ getyx (stdscr, y, x);
mvwputsn (str, length, col, row);
- setsyx (y, x);
+ wmove (stdscr, y, x);
mutex_unlock (&ncurses_lock);
}
@@ -574,7 +574,10 @@ main (int argc, char *argv[])
err = cons_init ();
if (err)
- error (5, err, "Console library initialization failed");
+ {
+ endwin ();
+ error (5, err, "Console library initialization failed");
+ }
cons_server_loop ();