From d69c57942c90501b693aa1d9b7fa546cd614a7e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacobo=20Tarr=C3=ADo?= <jtarrio@users.sourceforge.net>
Date: Tue, 18 Apr 2000 20:50:23 +0000
Subject: [PATCH] Couple of bugs fixed: terminal not sane after shell and
 cursor changing shape

---
 docs/ncurses.txt          | 5 +----
 golded3/gedoss.cpp        | 6 +++---
 goldlib/gall/gvidbase.cpp | 4 ----
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/docs/ncurses.txt b/docs/ncurses.txt
index e9517ea..07ba20b 100644
--- a/docs/ncurses.txt
+++ b/docs/ncurses.txt
@@ -24,14 +24,11 @@ If you find any bug not listed here, please report to Jacobo Tarrio,
 2:348/105.93@fidonet <jtarrio@iname.com> ASAP to get it fixed soon, or,
 even better, fix it yourself and send me the patch :-)
 
-=== 2000-03-05: Fourth public release
+=== 2000-04-18: Fourth public release
 Known bugs:
 
 ! Messages from the program viewed before entering full-screen are not
   displayed properly
-! The cursor grows very big every 30 seconds when editing a message
-  (possible reincarnation of a similar bug in former versions)
-* Terminal is messed up after exiting GoldED+ if shell was invoked.
 
 Notes:
 
diff --git a/golded3/gedoss.cpp b/golded3/gedoss.cpp
index dbab58a..0e5ed25 100644
--- a/golded3/gedoss.cpp
+++ b/golded3/gedoss.cpp
@@ -283,7 +283,7 @@ int ShellToDos(char* command, char* message, int cls, int cursor, int swap, int
   if(CFG->screenpalette[16])
     gvid->setpalette(gvid->orig.color.palette);
 
-  #ifdef __UNIX__
+  #if defined(__UNIX__) and not defined(__USE_NCURSES__)
   gkbd_tty_reset();
   #endif
 
@@ -343,11 +343,11 @@ int ShellToDos(char* command, char* message, int cls, int cursor, int swap, int
     status = 0;
 
   // Restore keyboard settings
-  gkbd.Init();
-
   #ifdef __USE_NCURSES__
   clearok(stdscr, TRUE);
   resetty();
+  #else
+  gkbd.Init();
   #endif
 
   // Pause if needed
diff --git a/goldlib/gall/gvidbase.cpp b/goldlib/gall/gvidbase.cpp
index a959bdb..a69f322 100644
--- a/goldlib/gall/gvidbase.cpp
+++ b/goldlib/gall/gvidbase.cpp
@@ -2000,11 +2000,7 @@ void vcurhide() {
 void vcurshow() {
 
   if(__vcurhidden) {
-    #if defined(__USE_NCURSES__)
-    curs_set(gvid->curr.cursor.end ? 2 : 1);
-    #else
     vcurset(gvid->curr.cursor.start, gvid->curr.cursor.end);
-    #endif
     __vcurhidden = false;
   }
 }