Changes to support building of 'libform' (ncurses forms menu) and som…

…e associated ncurses demos
Bill-Gray · Jul 30, 2024 · 1ad9562 · 1ad9562
1 parent 07bc4ac
commit 1ad9562
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 8 deletions.
diff --git a/demos/curses.priv.h b/demos/curses.priv.h
@@ -14,6 +14,7 @@
 #define NCURSES_INLINE inline
 #define Min(a,b)  ((a) > (b)  ?  (b)  :  (a))
 #define TR_FUNC_BFR(max)
+#define TR(n, a)
 #define NCURSES_SP_DCLx
 
 #define StdScreen(sp)  stdscr
@@ -22,4 +23,15 @@
 #define CharOf(c) ChCharOf(c)
 #define BLANK     ' '
 #define ZEROS     '\0'
+#define _nc_SPRINTF              snprintf
+#define _nc_SLIMIT(n)          ((size_t)(n)),
+#define FreeIfNeeded(p)  if ((p) != 0) free(p)
 
+#ifdef PDC_WIDE
+   #define ISBLANK(ch)  ((ch).chars[0] == L' ' && (ch).chars[1] == L'\0')
+#else
+   #define ISBLANK(ch)  (CharOf(ch) == ' ')
+#endif
+
+#define IsValidScreen(sp)           true
+unsigned addch_used;       /* number of 'pending' bytes for a multi-byte character */
diff --git a/demos/nctests.mif b/demos/nctests.mif
@@ -77,8 +77,8 @@ blue$(E): $(ncurses_testdir)/blue.c
 bs$(E): $(ncurses_testdir)/bs.c
 	$(BUILD) $(NCFLAGS) -o $@ $< $(LDFLAGS)
 
-cardfile$(E): $(ncurses_testdir)/cardfile.c
-	$(BUILD) $(NCFLAGS) -o $@ $< $(LDFLAGS)
+cardfile$(E): $(ncurses_testdir)/cardfile.c $(LIBFORM)
+	$(BUILD) $(NCFLAGS) -o $@ $^ $(LDFLAGS)
 
 chgat$(E): $(ncurses_testdir)/chgat.c $(ncurses_testdir)/popup_msg.c
 	$(BUILD) $(NCFLAGS) -o $@ $^ $(LDFLAGS)
@@ -98,8 +98,8 @@ demo_altkeys$(E): $(ncurses_testdir)/demo_altkeys.c
 demo_defkey$(E): $(ncurses_testdir)/demo_defkey.c $(ncurses_testdir)/popup_msg.c
 	$(BUILD) $(NCFLAGS) -o $@ $^ $(LDFLAGS)
 
-demo_forms$(E): $(ncurses_testdir)/demo_forms.c
-	$(BUILD) $(NCFLAGS) -o $@ $< $(LDFLAGS)
+demo_forms$(E): $(ncurses_testdir)/demo_forms.c $(ncurses_testdir)/popup_msg.c $(ncurses_testdir)/edit_field.c $(LIBFORM)
+	$(BUILD) $(NCFLAGS) -o $@ $^ $(LDFLAGS)
 
 demo_keyok$(E): $(ncurses_testdir)/demo_keyok.c
 	$(BUILD) $(NCFLAGS) -o $@ $< $(LDFLAGS)
@@ -140,8 +140,8 @@ dots_termcap$(E): $(ncurses_testdir)/dots_termcap.c
 dots_xcurses$(E): $(ncurses_testdir)/dots_xcurses.c
 	$(BUILD) $(NCFLAGS) -o $@ $< $(LDFLAGS)
 
-dup_field$(E): $(ncurses_testdir)/dup_field.c
-	$(BUILD) $(NCFLAGS) -o $@ $< $(LDFLAGS)
+dup_field$(E): $(ncurses_testdir)/dup_field.c $(ncurses_testdir)/edit_field.c $(ncurses_testdir)/popup_msg.c $(LIBFORM)
+	$(BUILD) $(NCFLAGS) -o $@ $^ $(LDFLAGS)
 
 echochar$(E): $(ncurses_testdir)/echochar.c
 	$(BUILD) $(NCFLAGS) -o $@ $< $(LDFLAGS)
@@ -200,8 +200,8 @@ list_keys$(E): $(ncurses_testdir)/list_keys.c
 lrtest$(E): $(ncurses_testdir)/lrtest.c
 	$(BUILD) $(NCFLAGS) -o $@ $< $(LDFLAGS)
 
-move_field$(E): $(ncurses_testdir)/move_field.c
-	$(BUILD) $(NCFLAGS) -o $@ $< $(LDFLAGS)
+move_field$(E): $(ncurses_testdir)/move_field.c $(ncurses_testdir)/edit_field.c $(ncurses_testdir)/popup_msg.c $(LIBFORM)
+	$(BUILD) $(NCFLAGS) -o $@ $^ $(LDFLAGS)
 
 movewindow$(E): $(ncurses_testdir)/movewindow.c
 	$(BUILD) $(NCFLAGS) -o $@ $< $(LDFLAGS)

diff --git a/demos/ncurses_cfg.h b/demos/ncurses_cfg.h
@@ -31,6 +31,7 @@
 #define HAVE_COPYWIN 1
 #define HAVE_CURSES_VERSION 1
 #define HAVE_DELSCREEN 1
+#define HAVE_FORM_H 1
 #define HAVE_GETBEGX 1
 #define HAVE_GETCURX 1
 #define HAVE_GETMAXX 1
@@ -60,6 +61,7 @@
 #define HAVE_WRESIZE 1
 #define USE_STRING_HACKS 1
 #define USE_LIBMENU      1
+#define USE_LIBFORM      1
 
 #ifdef PDC_WIDE
    # define USE_WIDEC_SUPPORT 1