X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Flib_printw.c;h=d901b727a91c0a04486c9de9367bce9ff7982515;hp=8d28f288d3c16681c7516c5ab0f81c28dbd1a3d0;hb=7f4b9f390624835ceb0849965a7f6ff2dcb39d00;hpb=0eb88fc5281804773e2a0c7a488a4452463535ce

diff --git a/ncurses/base/lib_printw.c b/ncurses/base/lib_printw.c
index 8d28f288..d901b727 100644
--- a/ncurses/base/lib_printw.c
+++ b/ncurses/base/lib_printw.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright 2018-2019,2020 Thomas E. Dickey                                *
+ * Copyright 1998-2012,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -27,7 +28,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- *  Author: Thomas E. Dickey <dickey@clark.net> 1997                        *
+ *  Author: Thomas E. Dickey            1997-on                             *
  ****************************************************************************/
 
 /*
@@ -39,72 +40,128 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_printw.c,v 1.7 1998/04/11 22:53:44 tom Exp $")
+MODULE_ID("$Id: lib_printw.c,v 1.28 2020/02/02 23:34:34 tom Exp $")
 
-int printw(NCURSES_CONST char *fmt, ...)
+NCURSES_EXPORT(int)
+printw(const char *fmt, ...)
 {
-	va_list argp;
-	int code;
+    va_list argp;
+    int code;
+
+#ifdef TRACE
+    va_list argq;
+    va_start(argq, fmt);
+    T((T_CALLED("printw(%s%s)"),
+       _nc_visbuf(fmt), _nc_varargs(fmt, argq)));
+    va_end(argq);
+#endif
 
-	T(("printw(%s,...) called", _nc_visbuf(fmt)));
+    va_start(argp, fmt);
+    code = vw_printw(stdscr, fmt, argp);
+    va_end(argp);
 
-	va_start(argp, fmt);
-	code = vwprintw(stdscr, fmt, argp);
-	va_end(argp);
+    returnCode(code);
+}
 
-	return code;
+NCURSES_EXPORT(int)
+wprintw(WINDOW *win, const char *fmt, ...)
+{
+    va_list argp;
+    int code;
+
+#ifdef TRACE
+    va_list argq;
+    va_start(argq, fmt);
+    T((T_CALLED("wprintw(%p,%s%s)"),
+       (void *) win, _nc_visbuf(fmt), _nc_varargs(fmt, argq)));
+    va_end(argq);
+#endif
+
+    va_start(argp, fmt);
+    code = vw_printw(win, fmt, argp);
+    va_end(argp);
+
+    returnCode(code);
 }
 
-int wprintw(WINDOW *win, NCURSES_CONST char *fmt, ...)
+NCURSES_EXPORT(int)
+mvprintw(int y, int x, const char *fmt, ...)
 {
-	va_list argp;
-	int code;
+    int code;
+
+#ifdef TRACE
+    va_list argq;
+    va_start(argq, fmt);
+    T((T_CALLED("mvprintw(%d,%d,%s%s)"),
+       y, x, _nc_visbuf(fmt), _nc_varargs(fmt, argq)));
+    va_end(argq);
+#endif
 
-	T(("wprintw(%p,%s,...) called", win, _nc_visbuf(fmt)));
+    if ((code = move(y, x)) != ERR) {
+	va_list argp;
 
 	va_start(argp, fmt);
-	code = vwprintw(win, fmt, argp);
+	code = vw_printw(stdscr, fmt, argp);
 	va_end(argp);
-
-	return code;
+    }
+    returnCode(code);
 }
 
-int mvprintw(int y, int x, NCURSES_CONST char *fmt, ...)
+NCURSES_EXPORT(int)
+mvwprintw(WINDOW *win, int y, int x, const char *fmt, ...)
 {
+    int code;
+
+#ifdef TRACE
+    va_list argq;
+    va_start(argq, fmt);
+    T((T_CALLED("mvwprintw(%d,%d,%p,%s%s)"),
+       y, x, (void *) win, _nc_visbuf(fmt), _nc_varargs(fmt, argq)));
+    va_end(argq);
+#endif
+
+    if ((code = wmove(win, y, x)) != ERR) {
 	va_list argp;
-	int code = move(y, x);
-
-	if (code != ERR) {
-		va_start(argp, fmt);
-		code = vwprintw(stdscr, fmt, argp);
-		va_end(argp);
-	}
-	return code;
+
+	va_start(argp, fmt);
+	code = vw_printw(win, fmt, argp);
+	va_end(argp);
+    }
+    returnCode(code);
 }
 
-int mvwprintw(WINDOW *win, int y, int x, NCURSES_CONST char *fmt, ...)
+NCURSES_EXPORT(int)
+vwprintw(WINDOW *win, const char *fmt, va_list argp)
 {
-	va_list argp;
-	int code = wmove(win, y, x);
-
-	if (code != ERR) {
-		va_start(argp, fmt);
-		code = vwprintw(win, fmt, argp);
-		va_end(argp);
-	}
-	return code;
+    char *buf;
+    int code = ERR;
+#if NCURSES_SP_FUNCS
+    SCREEN *sp = _nc_screen_of(win);
+#endif
+
+    T((T_CALLED("vwprintw(%p,%s,va_list)"), (void *) win, _nc_visbuf(fmt)));
+
+    buf = NCURSES_SP_NAME(_nc_printf_string) (NCURSES_SP_ARGx fmt, argp);
+    if (buf != 0) {
+	code = waddstr(win, buf);
+    }
+    returnCode(code);
 }
 
-int vwprintw(WINDOW *win, NCURSES_CONST char *fmt, va_list argp)
+NCURSES_EXPORT(int)
+vw_printw(WINDOW *win, const char *fmt, va_list argp)
 {
-	char *buf = _nc_printf_string(fmt, argp);
-	int code = ERR;
-
-	if (buf != 0) {
-		code = waddstr(win, buf);
-#if USE_SAFE_SPRINTF
-		free(buf);
+    char *buf;
+    int code = ERR;
+#if NCURSES_SP_FUNCS
+    SCREEN *sp = _nc_screen_of(win);
 #endif
-	}
-	return code;
+
+    T((T_CALLED("vw_printw(%p,%s,va_list)"), (void *) win, _nc_visbuf(fmt)));
+
+    buf = NCURSES_SP_NAME(_nc_printf_string) (NCURSES_SP_ARGx fmt, argp);
+    if (buf != 0) {
+	code = waddstr(win, buf);
+    }
+    returnCode(code);
 }