Some fixes to ncurses / tinfo wrapped lib (for dialog shell helper, used in some installer)

8 files changed, 24 insertions, 17 deletions

diff --git a/src/librarian/globalsymbols.c b/src/librarian/globalsymbols.c
index fb561b6a..b4f43a71 100644
--- a/src/librarian/globalsymbols.c
+++ b/src/librarian/globalsymbols.c
@@ -71,18 +71,19 @@ void** my_GetGTKDisplay()
 }

 

 // **************** NCurses ****************

-EXPORT int COLS;

-EXPORT int LINES;

-EXPORT int TABSIZE;

-EXPORT void* curscr;

-EXPORT void* newscr;

-EXPORT void* stdscr;

-EXPORT void* acs_map[128];

-EXPORT void* UP;

-EXPORT void* BC;

-EXPORT uint8_t PC;

-EXPORT uint16_t ospeed;

-EXPORT void* ttytype;

+EXPORT int COLS = 0;

+EXPORT int LINES = 0;

+EXPORT int TABSIZE = 0;

+EXPORT void* curscr = NULL;

+EXPORT void* newscr = NULL;

+EXPORT void* stdscr = NULL;

+EXPORT void* acs_map[64] = {0};

+EXPORT void* UP = NULL;

+EXPORT void* BC = NULL;

+EXPORT uint8_t PC = 0;

+EXPORT uint16_t ospeed = 0;

+EXPORT void* ttytype[32] = {0};

+EXPORT void* cur_term = NULL;

 

 void my_checkGlobalTInfo()

 {

@@ -99,6 +100,7 @@ void my_checkGlobalTInfo()
     GLOB(PC, NULL)

     GLOB(ospeed, NULL)

     GLOB(ttytype, NULL)

+    GLOB(cur_term, NULL)

 }

 

 void my_updateGlobalTInfo()

@@ -116,6 +118,7 @@ void my_updateGlobalTInfo()
     TOGLOB(PC, NULL)

     TOGLOB(ospeed, NULL)

     TOGLOB(ttytype, NULL)

+    TOGLOB(cur_term, NULL)

 }

 

 // **************** getopts ****************

diff --git a/src/librarian/globalsymbols32.c b/src/librarian/globalsymbols32.c
index b4c83682..922c0cea 100644
--- a/src/librarian/globalsymbols32.c
+++ b/src/librarian/globalsymbols32.c
@@ -44,7 +44,7 @@ extern int TABSIZE;
 extern void* curscr;
 extern void* newscr;
 extern void* stdscr;
-extern void* acs_map[128];
+extern void* acs_map[64];
 extern void* UP;
 extern void* BC;
 extern uint8_t PC;
diff --git a/src/wrapped/wrappedlibncurses.c b/src/wrapped/wrappedlibncurses.c
index d602cf16..ffca6188 100644
--- a/src/wrapped/wrappedlibncurses.c
+++ b/src/wrapped/wrappedlibncurses.c
@@ -83,6 +83,7 @@ EXPORT int my_mvprintw(x64emu_t* emu, int x, int y, void* fmt, void* b)
 
 EXPORT void* my_initscr()
 {
+    my_updateGlobalTInfo();
     void* ret = my->initscr();
     my_checkGlobalTInfo();
     return ret;
diff --git a/src/wrapped/wrappedlibncurses6.c b/src/wrapped/wrappedlibncurses6.c
index 1880a267..055aa995 100644
--- a/src/wrapped/wrappedlibncurses6.c
+++ b/src/wrapped/wrappedlibncurses6.c
@@ -82,6 +82,7 @@ EXPORT int my6_mvprintw(x64emu_t* emu, int x, int y, void* fmt, void* b)
 
 EXPORT void* my6_initscr()
 {
+    my_updateGlobalTInfo();
     void* ret = my->initscr();
     my_checkGlobalTInfo();
     return ret;
diff --git a/src/wrapped/wrappedlibncursesw.c b/src/wrapped/wrappedlibncursesw.c
index 26eec25e..2dba363e 100644
--- a/src/wrapped/wrappedlibncursesw.c
+++ b/src/wrapped/wrappedlibncursesw.c
@@ -73,6 +73,7 @@ EXPORT int myw_mvprintw(x64emu_t* emu, int x, int y, void* fmt, void* b)
 
 EXPORT void* myw_initscr()
 {
+    my_updateGlobalTInfo();
     void* ret = my->initscr();
     my_checkGlobalTInfo();
     return ret;
diff --git a/src/wrapped/wrappedlibncursesw6.c b/src/wrapped/wrappedlibncursesw6.c
index c2837432..787b19f3 100644
--- a/src/wrapped/wrappedlibncursesw6.c
+++ b/src/wrapped/wrappedlibncursesw6.c
@@ -73,6 +73,7 @@ EXPORT int myw6_mvprintw(x64emu_t* emu, int x, int y, void* fmt, void* b)
 
 EXPORT void* myw6_initscr()
 {
+    my_updateGlobalTInfo();
     void* ret = my->initscr();
     my_checkGlobalTInfo();
     return ret;
diff --git a/src/wrapped/wrappedlibtinfo6_private.h b/src/wrapped/wrappedlibtinfo6_private.h
index 41ec64ff..1c1bfbe5 100644
--- a/src/wrapped/wrappedlibtinfo6_private.h
+++ b/src/wrapped/wrappedlibtinfo6_private.h
@@ -151,9 +151,9 @@ DATA(TABSIZE, sizeof(int))
 DATA(curscr, sizeof(void*))
 DATA(newscr, sizeof(void*))
 DATA(stdscr, sizeof(void*))
-DATA(acs_map, 128*sizeof(void*))
+DATA(acs_map, 64*sizeof(void*))
 DATA(UP, sizeof(void*))
 DATA(BC, sizeof(void*))
 DATA(PC, 1)
 DATA(ospeed, 2)
-DATA(ttytype, sizeof(void*))
+DATA(ttytype, 32*sizeof(void*))
diff --git a/src/wrapped/wrappedlibtinfo_private.h b/src/wrapped/wrappedlibtinfo_private.h
index 41ec64ff..1c1bfbe5 100644
--- a/src/wrapped/wrappedlibtinfo_private.h
+++ b/src/wrapped/wrappedlibtinfo_private.h
@@ -151,9 +151,9 @@ DATA(TABSIZE, sizeof(int))
 DATA(curscr, sizeof(void*))
 DATA(newscr, sizeof(void*))
 DATA(stdscr, sizeof(void*))
-DATA(acs_map, 128*sizeof(void*))
+DATA(acs_map, 64*sizeof(void*))
 DATA(UP, sizeof(void*))
 DATA(BC, sizeof(void*))
 DATA(PC, 1)
 DATA(ospeed, 2)
-DATA(ttytype, sizeof(void*))
+DATA(ttytype, 32*sizeof(void*))