head	1.4;
access;
symbols
	pkgsrc-2013Q3:1.3.0.92
	pkgsrc-2013Q3-base:1.3
	pkgsrc-2013Q2:1.3.0.90
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2013Q1:1.3.0.88
	pkgsrc-2013Q1-base:1.3
	pkgsrc-2012Q4:1.3.0.86
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2012Q3:1.3.0.84
	pkgsrc-2012Q3-base:1.3
	pkgsrc-2012Q2:1.3.0.82
	pkgsrc-2012Q2-base:1.3
	pkgsrc-2012Q1:1.3.0.80
	pkgsrc-2012Q1-base:1.3
	pkgsrc-2011Q4:1.3.0.78
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q3:1.3.0.76
	pkgsrc-2011Q3-base:1.3
	pkgsrc-2011Q2:1.3.0.74
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2011Q1:1.3.0.72
	pkgsrc-2011Q1-base:1.3
	pkgsrc-2010Q4:1.3.0.70
	pkgsrc-2010Q4-base:1.3
	pkgsrc-2010Q3:1.3.0.68
	pkgsrc-2010Q3-base:1.3
	pkgsrc-2010Q2:1.3.0.66
	pkgsrc-2010Q2-base:1.3
	pkgsrc-2010Q1:1.3.0.64
	pkgsrc-2010Q1-base:1.3
	pkgsrc-2009Q4:1.3.0.62
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2009Q3:1.3.0.60
	pkgsrc-2009Q3-base:1.3
	pkgsrc-2009Q2:1.3.0.58
	pkgsrc-2009Q2-base:1.3
	pkgsrc-2009Q1:1.3.0.56
	pkgsrc-2009Q1-base:1.3
	pkgsrc-2008Q4:1.3.0.54
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.52
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.50
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.3.0.48
	pkgsrc-2008Q2-base:1.3
	cwrapper:1.3.0.46
	pkgsrc-2008Q1:1.3.0.44
	pkgsrc-2008Q1-base:1.3
	pkgsrc-2007Q4:1.3.0.42
	pkgsrc-2007Q4-base:1.3
	pkgsrc-2007Q3:1.3.0.40
	pkgsrc-2007Q3-base:1.3
	pkgsrc-2007Q2:1.3.0.38
	pkgsrc-2007Q2-base:1.3
	pkgsrc-2007Q1:1.3.0.36
	pkgsrc-2007Q1-base:1.3
	pkgsrc-2006Q4:1.3.0.34
	pkgsrc-2006Q4-base:1.3
	pkgsrc-2006Q3:1.3.0.32
	pkgsrc-2006Q3-base:1.3
	pkgsrc-2006Q2:1.3.0.30
	pkgsrc-2006Q2-base:1.3
	pkgsrc-2006Q1:1.3.0.28
	pkgsrc-2006Q1-base:1.3
	pkgsrc-2005Q4:1.3.0.26
	pkgsrc-2005Q4-base:1.3
	pkgsrc-2005Q3:1.3.0.24
	pkgsrc-2005Q3-base:1.3
	pkgsrc-2005Q2:1.3.0.22
	pkgsrc-2005Q2-base:1.3
	pkgsrc-2005Q1:1.3.0.20
	pkgsrc-2005Q1-base:1.3
	pkgsrc-2004Q4:1.3.0.18
	pkgsrc-2004Q4-base:1.3
	pkgsrc-2004Q3:1.3.0.16
	pkgsrc-2004Q3-base:1.3
	pkgsrc-2004Q2:1.3.0.14
	pkgsrc-2004Q2-base:1.3
	pkgsrc-2004Q1:1.3.0.12
	pkgsrc-2004Q1-base:1.3
	pkgsrc-2003Q4:1.3.0.10
	pkgsrc-2003Q4-base:1.3
	netbsd-1-6-1:1.3.0.6
	netbsd-1-6-1-base:1.3
	netbsd-1-6:1.3.0.8
	netbsd-1-6-RELEASE-base:1.3
	pkgviews:1.3.0.4
	pkgviews-base:1.3
	buildlink2:1.3.0.2
	buildlink2-base:1.3
	netbsd-1-5-PATCH003:1.3
	netbsd-1-5-PATCH001:1.3
	netbsd-1-5-RELEASE:1.2
	netbsd-1-4-PATCH003:1.2;
locks; strict;
comment	@# @;


1.4
date	2013.10.14.13.33.31;	author roy;	state dead;
branches;
next	1.3;
commitid	vUfsp4z8HPhksg9x;

1.3
date	2001.01.07.03.10.50;	author wiz;	state Exp;
branches;
next	1.2;

1.2
date	2000.04.16.03.59.32;	author mycroft;	state Exp;
branches;
next	1.1;

1.1
date	2000.04.16.02.57.22;	author mycroft;	state Exp;
branches;
next	;


desc
@@


1.4
log
@Drop dependency on ncurses as system curses works fine.
Regenrate patchset.
@
text
@$NetBSD: patch-ac,v 1.3 2001/01/07 03:10:50 wiz Exp $

--- nctgui.c.orig	Fri Jan 28 17:30:52 2000
+++ nctgui.c
@@@@ -31,6 +31,10 @@@@
 {
     (void) initscr();
     curs_set(0);
+    cbreak();
+    noecho();
+    timeout(2);
+    keypad(stdscr,TRUE);
 }/* ncurses_init */
 
 void ncurses_exit(void)
@@@@ -66,24 +70,23 @@@@
     int j;
     int maxY,maxX;
 
-    wattrset(barWin,COLOR_PAIR(2)); wbkgdset(barWin,COLOR_PAIR(2));
+    wbkgdset(barWin,COLOR_PAIR(2));
+    wmove(barWin,0,0); wclrtoeol(barWin);
 
-    wmove(barWin,0,0); wclrtoeol(barWin);  wrefresh(barWin);
     for(j=0; j<num_menus; j++)
     {
         wmove(barWin,0,(j*MENU_WIDTH));
         if(j==hpos && menus_active)
-        {
             wattrset(barWin,COLOR_PAIR(3)|A_BOLD);
-        }
-        waddstr(barWin,menu_name[j]); wrefresh (barWin);
+	else
+            wattrset(barWin,COLOR_PAIR(2));
+        waddstr(barWin,menu_name[j]);
 
         wattrset(barWin,COLOR_PAIR(15));
         getmaxyx(stdscr,maxY,maxX); mvwaddstr(barWin,0,maxX-20,emixer_version);
-        
-        wattrset(barWin,COLOR_PAIR(2));
-        wrefresh (barWin);
     }
+
+    wrefresh (barWin);
 } /* display_bar */
 
 /*Display additional info at bottom of screen*/
@@@@ -106,14 +109,14 @@@@
     
     for(j=0;j<num_items[hpos];j++)
     {
-        if(j==vpos){wattrset(subWn,COLOR_PAIR(3)); wbkgdset(subWn,COLOR_PAIR(3)); }
+        if(j==vpos){wattrset(subWn,COLOR_PAIR(3)|A_BOLD);wbkgdset(subWn,COLOR_PAIR(3)); }
         else {wattrset(subWn,COLOR_PAIR(2));wbkgdset(subWn,COLOR_PAIR(2)); }
 
         wmove(subWn,j+1,1);
         waddstr(subWn,menu_item[hpos][j]); wclrtoeol(subWn);
-        wrefresh(subWn);
     }
-    wattrset(subWn,COLOR_PAIR(2));wbkgdset(subWn,COLOR_PAIR(2));
+    wattrset(subWn,COLOR_PAIR(2)|A_ALTCHARSET);
+    wbkgdset(subWn,COLOR_PAIR(2));
     box(subWn,0,0);
     wrefresh(subWn);
 } /* display_menu */
@@@@ -127,7 +130,8 @@@@
     switch(active_channel)
     {
     case CHANNEL_1:
-        wbkgd(chWin,COLOR_PAIR(11)|A_BOLD);
+	wattrset(chWin,COLOR_PAIR(11)|A_BOLD|A_ALTCHARSET);
+        wbkgdset(chWin,COLOR_PAIR(11)|A_BOLD);
         box(chWin,0,0);
         wmove(chWin,0,2);
         wattrset(chWin,COLOR_PAIR(5)|A_BOLD|A_BLINK);
@@@@ -137,7 +141,8 @@@@
         break;
      
     case CHANNEL_2:
-        wbkgd(chWin,COLOR_PAIR(12)|A_BOLD);
+	wattrset(chWin,COLOR_PAIR(12)|A_BOLD|A_ALTCHARSET);
+        wbkgdset(chWin,COLOR_PAIR(12)|A_BOLD);
         box(chWin,0,0);
         wmove(chWin,0,width-13);
         wattrset(chWin,COLOR_PAIR(6)|A_BOLD|A_BLINK);
@@@@ -155,6 +160,7 @@@@
     int centre, j;
 
     centre=(FADER_BARS/2)+2;
+    wattrset(faderWin,COLOR_PAIR(1)|A_BOLD|A_ALTCHARSET);
     wbkgd(faderWin,COLOR_PAIR(1)|A_BOLD);
     box(faderWin,0,0);
     wattrset(faderWin,COLOR_PAIR(9)|A_BOLD);
@@@@ -201,6 +207,7 @@@@
 
     getmaxyx(volumeWin,maxY,maxX);
     centre=(VOLUME_BARS/2)+2;
+    wattrset(volumeWin,COLOR_PAIR(1)|A_BOLD|A_ALTCHARSET);
     wbkgd(volumeWin,COLOR_PAIR(1)|A_BOLD);
     box(volumeWin,0,0);
     if(bar==VOLBAR)mvwaddstr(volumeWin,maxY-1,maxX-9,"[Active]");
@@@@ -263,6 +270,7 @@@@
 
     getmaxyx(speedWin,maxY,maxX);
     centre=(SPEED_BARS/2)+2;
+    wattrset(speedWin,COLOR_PAIR(1)|A_BOLD|A_ALTCHARSET);
     wbkgd(speedWin,COLOR_PAIR(1)|A_BOLD);
     box(speedWin,0,0);
     if(bar==SPDBAR)mvwaddstr(speedWin,maxY-1,maxX-9,"[Active]");
@@@@ -323,6 +331,7 @@@@
 void display_player_status(int sim_play, int playmode)
 {
 
+    wattrset(pStatusWin,COLOR_PAIR(1)|A_BOLD|A_ALTCHARSET);
     wbkgd(pStatusWin,COLOR_PAIR(1)|A_BOLD);
     box(pStatusWin,0,0);
     wattrset(pStatusWin,COLOR_PAIR(9)|A_BOLD);
@@@@ -343,54 +352,6 @@@@
  exit(0);
 } /*gui_exit/*/
 
-void sLang_init(void)
-{
-    SLtt_get_terminfo();
-    SLang_init_tty(0,0,1);
-    SLkp_init();
-    SLsmg_init_smg();
-    SLsig_block_signals();
-    /*ncurses stuff - experimental */
-    (void) initscr();
-    curs_set(0);
-    noecho();
-    keypad(stdscr,TRUE);
-} /* sLang_init*/
-
-
-void sLang_exit(void)
-{
-    /*ncurses stuff - experimental */
-    endwin();
-
-    SLsmg_cls();
-    SLsmg_refresh ();
-    SLsmg_reset_smg();
-    SLang_reset_tty();
-} /* sLang_exit*/
-
-void set_color_schemes(void)
-{
-    SLtt_set_color(1, NULL, "white", "blue");
-    SLtt_set_color(2, NULL, "black", "lightgray");
-    SLtt_set_color(3, NULL, "black", "green");
-    SLtt_set_color(4, NULL, "red","lightgray");
-    SLtt_set_color(5, NULL, "yellow","blue");
-    SLtt_set_color(6, NULL, "lightgray","blue");
-    SLtt_set_color(7, NULL, "yellow","black");
-    SLtt_set_color(8, NULL, "green","blue");
-    SLtt_set_color(9, NULL, "lightgray","black");
-    SLtt_set_color(10, NULL, "red","black");
-    SLtt_set_color(11, NULL, "brightcyan","black");
-    SLtt_set_color(12, NULL, "brightmagenta","black");
-    SLtt_set_color(13, NULL, "black","brightcyan");
-    SLtt_set_color(14, NULL, "black","brightmagenta");
-    SLtt_set_color(15, NULL, "white","brightcyan");
-    SLtt_set_color(16, NULL, "white","brightmagenta");
-
-
-}/*set_color_schemes*/
-
 void create_windows()
 {
     int maxY, maxX, height, width, origY=1, origX=0;
@@@@ -398,10 +359,7 @@@@
     getmaxyx(stdscr,maxY,maxX);
     height = maxY-4; width  = (maxX/10)*7;
     chWin  = newwin(height,width,origY,origX);
-
-    origY=origY++; origX=origX++ ;
-    height = maxY-6;  width = ((maxX/10)*7)-2;
-    subWin  = newwin(height,width,origY,origX);
+    subWin  = subwin(chWin,height-2,width-2,origY+1,origX+1);
     
     origY=maxY-1; origX=0;
     height = 1;  width = maxX-1;
@


1.3
log
@USE_CURSES instead of hardwired dependency on ncurses.
Fix a segfault while I'm here.
@
text
@d1 1
a1 1
$NetBSD$
@


1.2
log
@Fix yet more display problems.
@
text
@d3 3
a5 4
--- nctgui.c.orig	Fri Jan 28 11:30:52 2000
+++ nctgui.c	Sat Apr 15 23:53:35 2000
@@@@ -30,7 +30,10 @@@@
 void ncurses_init(void)
d8 1
a8 1
-    curs_set(0);
d16 1
a16 1
@@@@ -66,24 +69,23 @@@@
d48 1
a48 1
@@@@ -106,14 +108,14 @@@@
d66 1
a66 1
@@@@ -127,7 +129,8 @@@@
d76 1
a76 1
@@@@ -137,7 +140,8 @@@@
d86 1
a86 1
@@@@ -155,6 +159,7 @@@@
d94 1
a94 1
@@@@ -201,6 +206,7 @@@@
d102 1
a102 1
@@@@ -263,6 +269,7 @@@@
d110 1
a110 1
@@@@ -323,6 +330,7 @@@@
d118 1
a118 1
@@@@ -343,54 +351,6 @@@@
d173 1
a173 1
@@@@ -398,10 +358,7 @@@@
@


1.1
log
@Fix numerous display problems.
Eliminate the use of slang alongside ncurses.
@
text
@d3 2
a4 2
--- nctgui.c.orig	Sun Dec  5 21:41:42 1999
+++ nctgui.c	Sat Apr 15 22:41:06 2000
d12 1
a12 1
+    //nodelay(stdscr,TRUE);
d67 1
a67 1
@@@@ -127,6 +129,7 @@@@
d71 1
d73 1
a73 1
         wbkgd(chWin,COLOR_PAIR(11)|A_BOLD);
d76 2
a77 1
@@@@ -137,6 +140,7 @@@@
d81 1
d83 1
a83 1
         wbkgd(chWin,COLOR_PAIR(12)|A_BOLD);
d86 1
d112 1
a112 1
 void display_player_status(int sim_play, int cont_play)
d119 1
a119 1
@@@@ -341,54 +349,6 @@@@
d174 1
a174 1
@@@@ -396,10 +356,7 @@@@
@