Import ncurses-5.0-release to update the 5.0-prerelease that we had.vendor/ncurses/5.0

1 files changed, 173 insertions, 131 deletions

diff --git a/contrib/ncurses/test/tclock.c b/contrib/ncurses/test/tclock.c
index bccce31d1373..0c79568411be 100644
--- a/contrib/ncurses/test/tclock.c
+++ b/contrib/ncurses/test/tclock.c
@@ -1,6 +1,5 @@
 #include "test.priv.h"
 
-#include <float.h>
 #include <math.h>
 #include <time.h>
 
@@ -19,9 +18,9 @@
   would be a precalc table for the 60 hand positions, so
   that the floating point stuff can be ditched. As I said,
   it was a 20 hackup minute job.]
-  
+
   COMING SOON: tfishtank. Be the envy of your mac-owning
-  colleagues.  
+  colleagues.
 */
 
 /* To compile: cc -o tclock tclock.c -lcurses -lm */
@@ -40,145 +39,188 @@
 
 /* Plot a point */
 static void
-plot(int x,int y,char col)
+plot(int x, int y, char col)
 {
-  mvaddch(y,x,(chtype)col);
+    mvaddch(y, x, (chtype) col);
 }
- 
 
 /* Draw a diagonal(arbitrary) line using Bresenham's alogrithm. */
 static void
-dline(int from_x, int from_y, int x2, int y2, char ch)
+dline(int pair, int from_x, int from_y, int x2, int y2, char ch)
 {
-	int dx,dy;
-	int ax,ay;
-	int sx,sy;
-	int x,y;
-	int d;
-	
-	dx=x2-from_x;
-	dy=y2-from_y;
-	
-	ax=abs(dx*2);
-	ay=abs(dy*2);
-
-	sx=sign(dx);
-	sy=sign(dy);
-
-	x=from_x;
-	y=from_y;
-		
-	if(ax>ay)
-	{
-		d=ay-(ax/2);
-		
-		while(1)
-		{
-			plot(x,y,ch);
-			if(x==x2) return;
-			
-			if(d>=0)
-			{
-				y+=sy;
-				d-=ax;
-			}
-			x+=sx;
-			d+=ay;			
-		}
+    int dx, dy;
+    int ax, ay;
+    int sx, sy;
+    int x, y;
+    int d;
+
+    if (has_colors())
+	attrset(COLOR_PAIR(pair));
+
+    dx = x2 - from_x;
+    dy = y2 - from_y;
+
+    ax = abs(dx * 2);
+    ay = abs(dy * 2);
+
+    sx = sign(dx);
+    sy = sign(dy);
+
+    x = from_x;
+    y = from_y;
+
+    if (ax > ay) {
+	d = ay - (ax / 2);
+
+	while (1) {
+	    plot(x, y, ch);
+	    if (x == x2)
+		return;
+
+	    if (d >= 0) {
+		y += sy;
+		d -= ax;
+	    }
+	    x += sx;
+	    d += ay;
 	}
-	else
-	{
-		d=ax-(ay/2);
-		
-		while(1)
-		{
-			plot(x,y,ch);
-			if(y==y2) return;
-			
-			if(d>=0)
-			{
-				x+=sx;
-				d-=ay;
-			}
-			y+=sy;
-			d+=ax;			
-		}	
+    } else {
+	d = ax - (ay / 2);
+
+	while (1) {
+	    plot(x, y, ch);
+	    if (y == y2)
+		return;
+
+	    if (d >= 0) {
+		x += sx;
+		d -= ay;
+	    }
+	    y += sy;
+	    d += ax;
 	}
+    }
 }
 
 int
 main(
-	int argc GCC_UNUSED,
-	char *argv[] GCC_UNUSED)
+    int argc GCC_UNUSED,
+    char *argv[]GCC_UNUSED)
 {
-	int i,cx,cy;
-	double mradius, hradius, mangle, hangle;
-	double sangle, sradius, hours;
-	int hdx, hdy;
-	int mdx, mdy;
-	int sdx, sdy;
-	time_t tim;
-	struct tm *t;
-	char szChar[10];
-	
-	initscr();
-	noecho();
-
-	cx=39;
-	cy=12;
-	mradius=9;
-	hradius=6;
-	sradius=8;
-
-	for(i=0;i<12;i++)
-	  {
-	    sangle=(i+1)*(2.0*PI)/12.0;
-	    sradius=10;
-	    sdx = A2X(sangle, sradius);
-	    sdy = A2Y(sangle, sradius);
-	    sprintf(szChar,"%d",i+1);
-
-	    mvaddstr((int)(cy-sdy),(int)(cx+sdx),szChar);
-	  }
-
-	mvaddstr(0,0,"ASCII Clock by Howard Jones (ha.jones@ic.ac.uk),1994");
-
-	sradius=8;
-	for(;;)
-	  {
-	    napms(1000);
-
-	    tim = time(0);
-	    t = localtime(&tim);
-
-	    hours = (t->tm_hour + (t->tm_min/60.0));
-	    if(hours>12.0) hours -= 12.0;
-
-	    mangle = ((t->tm_min) * (2 * PI)/60.0);
-	    mdx    = A2X(mangle, mradius);
-	    mdy    = A2Y(mangle, mradius);
-	    
-	    hangle = ((hours) * (2.0 * PI)/12.0);
-	    hdx    = A2X(hangle, hradius);
-	    hdy    = A2Y(hangle, hradius);
-       
-	    sangle = ((t->tm_sec) * (2.0 * PI)/60.0);
-	    sdx    = A2X(sangle, sradius);
-	    sdy    = A2Y(sangle, sradius);
-
-	    plot(cx+sdx,cy-sdy,'O');
-	    dline(cx,cy,cx+hdx,cy-hdy,'.');
-	    dline(cx,cy,cx+mdx,cy-mdy,'#');
-
-	    mvaddstr(23,0,ctime(&tim));
-	    refresh();
-	    if ((t->tm_sec % 5) == 0) beep();
-
-	    plot(cx+sdx,cy-sdy,' ');
-	    dline(cx,cy,cx+hdx,cy-hdy,' ');
-	    dline(cx,cy,cx+mdx,cy-mdy,' ');
-	    
-	  }
-
-	return 0;
+    int i, cx, cy;
+    double mradius, hradius, mangle, hangle;
+    double sangle, sradius, hours;
+    int hdx, hdy;
+    int mdx, mdy;
+    int sdx, sdy;
+    int ch;
+    int lastbeep = -1;
+    time_t tim;
+    struct tm *t;
+    char szChar[10];
+    int my_bg = COLOR_BLACK;
+
+    initscr();
+    noecho();
+    cbreak();
+    nodelay(stdscr, TRUE);
+    curs_set(0);
+
+    if (has_colors()) {
+	start_color();
+#ifdef NCURSES_VERSION
+	if (use_default_colors() == OK)
+	    my_bg = -1;
+#endif
+	init_pair(1, COLOR_RED, my_bg);
+	init_pair(2, COLOR_MAGENTA, my_bg);
+	init_pair(3, COLOR_GREEN, my_bg);
+    }
+#ifdef KEY_RESIZE
+    keypad(stdscr, TRUE);
+  restart:
+#endif
+    cx = (COLS - 1) / 2;	/* 39 */
+    cy = LINES / 2;		/* 12 */
+    ch = (cx > cy) ? cy : cx;	/* usually cy */
+    mradius = (3 * cy) / 4;	/* 9 */
+    hradius = cy / 2;		/* 6 */
+    sradius = (2 * cy) / 3;	/* 8 */
+
+    for (i = 0; i < 12; i++) {
+	sangle = (i + 1) * (2.0 * PI) / 12.0;
+	sradius = (5 * cy) / 6;	/* 10 */
+	sdx = A2X(sangle, sradius);
+	sdy = A2Y(sangle, sradius);
+	sprintf(szChar, "%d", i + 1);
+
+	mvaddstr(cy - sdy, cx + sdx, szChar);
+    }
+
+    mvaddstr(0, 0, "ASCII Clock by Howard Jones (ha.jones@ic.ac.uk),1994");
+
+    sradius = 8;
+    for (;;) {
+	napms(1000);
+
+	tim = time(0);
+	t = localtime(&tim);
+
+	hours = (t->tm_hour + (t->tm_min / 60.0));
+	if (hours > 12.0)
+	    hours -= 12.0;
+
+	mangle = ((t->tm_min) * (2 * PI) / 60.0);
+	mdx = A2X(mangle, mradius);
+	mdy = A2Y(mangle, mradius);
+
+	hangle = ((hours) * (2.0 * PI) / 12.0);
+	hdx = A2X(hangle, hradius);
+	hdy = A2Y(hangle, hradius);
+
+	sangle = ((t->tm_sec) * (2.0 * PI) / 60.0);
+	sdx = A2X(sangle, sradius);
+	sdy = A2Y(sangle, sradius);
+
+	dline(3, cx, cy, cx + mdx, cy - mdy, '#');
+
+	attrset(A_REVERSE);
+	dline(2, cx, cy, cx + hdx, cy - hdy, '.');
+	attroff(A_REVERSE);
+
+	if (has_colors())
+	    attrset(COLOR_PAIR(1));
+
+	plot(cx + sdx, cy - sdy, 'O');
+
+	if (has_colors())
+	    attrset(COLOR_PAIR(0));
+
+	mvaddstr(LINES - 2, 0, ctime(&tim));
+	refresh();
+	if ((t->tm_sec % 5) == 0
+	 && t->tm_sec != lastbeep) {
+	    lastbeep = t->tm_sec;
+	    beep();
+	}
+
+	if ((ch = getch()) != ERR) {
+#ifdef KEY_RESIZE
+	    if (ch == KEY_RESIZE) {
+		erase();
+		goto restart;
+	    }
+#endif
+	    break;
+	}
+
+	plot(cx + sdx, cy - sdy, ' ');
+	dline(0, cx, cy, cx + hdx, cy - hdy, ' ');
+	dline(0, cx, cy, cx + mdx, cy - mdy, ' ');
+
+    }
+
+    curs_set(1);
+    endwin();
+    return 0;
 }