Merge pull request #30 from dunhamsteve/macos-fixes

[ fix ] Fix issues with varargs FFI on M1 mac
mattpolzin · Jan 4, 2023 · c3a9a8c · c3a9a8c
2 parents 228dac8 + c4a77f7
commit c3a9a8c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/src/NCurses/Core.idr b/src/NCurses/Core.idr
@@ -63,10 +63,10 @@ prim__erase : PrimIO ()
 %foreign libncurses "werase"
 prim__eraseWindow : AnyPtr -> PrimIO ()
 
-%foreign libncurses "printw"
+%foreign libhelper "print"
 prim__print : String -> String -> PrimIO ()
 
-%foreign libncurses "wprintw"
+%foreign libhelper "printWindow"
 prim__printWindow : AnyPtr -> String -> String -> PrimIO ()
 
 %foreign libncurses "addch"
@@ -83,10 +83,10 @@ prim__addCharWindow : AnyPtr -> Char -> PrimIO ()
 |||
 ||| The second to last argument is a format string but
 ||| its best to just always pass strings ("%s").
-%foreign libncurses "mvprintw"
+%foreign libhelper "mvPrint"
 prim__mvPrint : Int -> Int -> String -> String -> PrimIO ()
 
-%foreign libncurses "mvwprintw"
+%foreign libhelper "mvPrintWindow"
 prim__mvPrintWindow : AnyPtr -> Int -> Int -> String -> String -> PrimIO ()
 
 %foreign libncurses "vline"

diff --git a/support/curses-helpers.c b/support/curses-helpers.c
@@ -154,3 +154,18 @@ int keyBackspace() {
   return KEY_BACKSPACE;
 }
 
+int print(const char* fmt, const char* arg) {
+  return printw(fmt, arg);
+}
+
+int printWindow(WINDOW* win, const char* fmt, const char* arg) {
+  return wprintw(win, fmt, arg);
+}
+
+int mvPrint(int y, int x, const char* fmt, char* arg) {
+  return mvprintw(y, x, fmt, arg);
+}
+
+int mvPrintWindow(WINDOW* win, int y, int x, const char* fmt, char* arg) {
+  return mvwprintw(win, y, x, fmt, arg); 
+}