Update ChangeLog and bump version for v1.9.2 release

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>

ChangeLog.md

@@ -4,6 +4,14 @@ Change Log
 All notable changes to the project are documented in this file.
 
 
+[v1.9.2][] - 2017-07-09
+-----------------------
+
+### Changes
+- Add `initscr()` function to query screen size
+- Convert `printheader()` to a static inline function
+
+
 [v1.9.1][] - 2017-07-03
 -----------------------
 

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT(libite, 1.9.1, https://github.com/troglobit/libite/issues)
+AC_INIT(libite, 1.9.2, https://github.com/troglobit/libite/issues)
 AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz])
 AM_SILENT_RULES([yes])
 

conio.h

@@ -1,6 +1,6 @@
 /* A conio.h like implementation for VTANSI displays.
  *
- * Copyright (c) 2009-2013  Joachim Nilsson <troglobit@gmail.com>
+ * Copyright (c) 2009-2017  Joachim Nilsson <troglobit@gmail.com>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -49,7 +49,7 @@
 #define WHITE        0x17
 
 #ifndef SCREEN_WIDTH
-#define SCREEN_WIDTH 80		/* Override as #define SCREEN_WIDTH tty_width() */
+#define SCREEN_WIDTH 80		/* Override using, e.g. #define SCREEN_WIDTH tty_width() */
 #endif
 
 /* Esc[2JEsc[1;1H             - Clear screen and move cursor to 1,1 (upper left) pos. */
@@ -59,25 +59,78 @@
 /* Esc[2K                     - Erases the entire current line. */
 #define delline()             fputs ("\033[2K", stdout)
 /* Esc[Line;ColumnH           - Moves the cursor to the specified position (coordinates) */
-#define gotoxy(x,y)           printf("\033[%d;%dH", y, x)
+#define gotoxy(x,y)           fprintf(stdout, "\033[%d;%dH", y, x)
 /* Esc[?25l (lower case L)    - Hide Cursor */
 #define hidecursor()          fputs ("\033[?25l", stdout)
 /* Esc[?25h (lower case H)    - Show Cursor */
 #define showcursor()          fputs ("\033[?25h", stdout)
 
-/* Esc[Value;...;Valuem       - Set Graphics Mode */
-#define __set_gm(attr,color,val)					\
-	if (!color)							\
-		printf("\033[%dm", attr);				\
+/* Esc[Value;...;Valuem       - Set Graphics Mode (attr, color, val) */
+#define __set_gm(a,c,v)							\
+	if (!c)								\
+		fprintf(stdout, "\033[%dm", a);				\
 	else								\
-		printf("\033[%d;%dm", color & 0x10 ? 1 : 0, (color & 0xF) + val)
+		fprintf(stdout, "\033[%d;%dm", c & 0x10 ? 1 : 0, (c & 0xF) + v)
 #define textattr(attr)        __set_gm(attr, 0, 0)
 #define textcolor(color)      __set_gm(RESETATTR, color, 30)
 #define textbackground(color) __set_gm(RESETATTR, color, 40)
 
-#define printheader(fp, line, nl)					\
-	fprintf(fp ?: stdout, "%s\033[7m%s%*s\033[0m\n", nl ? "\n" : "",\
-		line, SCREEN_WIDTH - (int)strlen(line), "")
+/* Print table heading @line to @fp, with optional leading newline */
+static inline void printheader(FILE *fp, const char *line, int nl)
+{
+	fprintf(fp ?: stdout,
+		"%s\033[7m%s%*s\033[0m\n",
+		nl ? "\n" : "",
+		line, SCREEN_WIDTH - (int)strlen(line), "");
+}
+
+/* Requries: #inlude <termios.h> and #include <poll.h> */
+static inline void initscr(int *row, int *col)
+{
+	if (!row || !col)
+		return;
+
+#if defined(TCSANOW) && defined(POLLIN)
+	struct termios tc, saved;
+	struct pollfd fd = { STDIN_FILENO, POLLIN, 0 };
+
+	/* Disable echo to terminal while probing */
+	tcgetattr(STDERR_FILENO, &tc);
+	saved = tc;
+	tc.c_cflag |= (CLOCAL | CREAD);
+	tc.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG);
+	tcsetattr(STDERR_FILENO, TCSANOW, &tc);
+
+	/*
+	 * Save cursor pos+attr
+	 * Diable top+bottom margins
+	 * Set cursor at the far bottom,right pos
+	 * Query term for resulting pos
+	 */
+	fprintf(stderr, "\e7" "\e[r" "\e[999;999H" "\e[6n");
+
+	/*
+	 * Wait here for terminal to echo back \e[row,lineR ...
+	 */
+	if (poll(&fd, 1, 300) <= 0 || scanf("\e[%d;%dR", row, col) != 2) {
+		*row = 24;
+		*col = 80;
+	}
+
+	/*
+	 * Restore above saved cursor pos+attr
+	 */
+	fprintf(stderr, "\e8");
+
+	/* Restore terminal */
+	tcsetattr(STDERR_FILENO, TCSANOW, &saved);
+
+	return;
+#else
+	*row = 24;
+	*col = 80;
+#endif
+}
 
 #endif /* CONIO_H_ */