head 1.6; access; symbols pkgsrc-2026Q1:1.6.0.192 pkgsrc-2026Q1-base:1.6 pkgsrc-2025Q4:1.6.0.190 pkgsrc-2025Q4-base:1.6 pkgsrc-2025Q3:1.6.0.188 pkgsrc-2025Q3-base:1.6 pkgsrc-2025Q2:1.6.0.186 pkgsrc-2025Q2-base:1.6 pkgsrc-2025Q1:1.6.0.184 pkgsrc-2025Q1-base:1.6 pkgsrc-2024Q4:1.6.0.182 pkgsrc-2024Q4-base:1.6 pkgsrc-2024Q3:1.6.0.180 pkgsrc-2024Q3-base:1.6 pkgsrc-2024Q2:1.6.0.178 pkgsrc-2024Q2-base:1.6 pkgsrc-2024Q1:1.6.0.176 pkgsrc-2024Q1-base:1.6 pkgsrc-2023Q4:1.6.0.174 pkgsrc-2023Q4-base:1.6 pkgsrc-2023Q3:1.6.0.172 pkgsrc-2023Q3-base:1.6 pkgsrc-2023Q2:1.6.0.170 pkgsrc-2023Q2-base:1.6 pkgsrc-2023Q1:1.6.0.168 pkgsrc-2023Q1-base:1.6 pkgsrc-2022Q4:1.6.0.166 pkgsrc-2022Q4-base:1.6 pkgsrc-2022Q3:1.6.0.164 pkgsrc-2022Q3-base:1.6 pkgsrc-2022Q2:1.6.0.162 pkgsrc-2022Q2-base:1.6 pkgsrc-2022Q1:1.6.0.160 pkgsrc-2022Q1-base:1.6 pkgsrc-2021Q4:1.6.0.158 pkgsrc-2021Q4-base:1.6 pkgsrc-2021Q3:1.6.0.156 pkgsrc-2021Q3-base:1.6 pkgsrc-2021Q2:1.6.0.154 pkgsrc-2021Q2-base:1.6 pkgsrc-2021Q1:1.6.0.152 pkgsrc-2021Q1-base:1.6 pkgsrc-2020Q4:1.6.0.150 pkgsrc-2020Q4-base:1.6 pkgsrc-2020Q3:1.6.0.148 pkgsrc-2020Q3-base:1.6 pkgsrc-2020Q2:1.6.0.144 pkgsrc-2020Q2-base:1.6 pkgsrc-2020Q1:1.6.0.124 pkgsrc-2020Q1-base:1.6 pkgsrc-2019Q4:1.6.0.146 pkgsrc-2019Q4-base:1.6 pkgsrc-2019Q3:1.6.0.142 pkgsrc-2019Q3-base:1.6 pkgsrc-2019Q2:1.6.0.140 pkgsrc-2019Q2-base:1.6 pkgsrc-2019Q1:1.6.0.138 pkgsrc-2019Q1-base:1.6 pkgsrc-2018Q4:1.6.0.136 pkgsrc-2018Q4-base:1.6 pkgsrc-2018Q3:1.6.0.134 pkgsrc-2018Q3-base:1.6 pkgsrc-2018Q2:1.6.0.132 pkgsrc-2018Q2-base:1.6 pkgsrc-2018Q1:1.6.0.130 pkgsrc-2018Q1-base:1.6 pkgsrc-2017Q4:1.6.0.128 pkgsrc-2017Q4-base:1.6 pkgsrc-2017Q3:1.6.0.126 pkgsrc-2017Q3-base:1.6 pkgsrc-2017Q2:1.6.0.122 pkgsrc-2017Q2-base:1.6 pkgsrc-2017Q1:1.6.0.120 pkgsrc-2017Q1-base:1.6 pkgsrc-2016Q4:1.6.0.118 pkgsrc-2016Q4-base:1.6 pkgsrc-2016Q3:1.6.0.116 pkgsrc-2016Q3-base:1.6 pkgsrc-2016Q2:1.6.0.114 pkgsrc-2016Q2-base:1.6 pkgsrc-2016Q1:1.6.0.112 pkgsrc-2016Q1-base:1.6 pkgsrc-2015Q4:1.6.0.110 pkgsrc-2015Q4-base:1.6 pkgsrc-2015Q3:1.6.0.108 pkgsrc-2015Q3-base:1.6 pkgsrc-2015Q2:1.6.0.106 pkgsrc-2015Q2-base:1.6 pkgsrc-2015Q1:1.6.0.104 pkgsrc-2015Q1-base:1.6 pkgsrc-2014Q4:1.6.0.102 pkgsrc-2014Q4-base:1.6 pkgsrc-2014Q3:1.6.0.100 pkgsrc-2014Q3-base:1.6 pkgsrc-2014Q2:1.6.0.98 pkgsrc-2014Q2-base:1.6 pkgsrc-2014Q1:1.6.0.96 pkgsrc-2014Q1-base:1.6 pkgsrc-2013Q4:1.6.0.94 pkgsrc-2013Q4-base:1.6 pkgsrc-2013Q3:1.6.0.92 pkgsrc-2013Q3-base:1.6 pkgsrc-2013Q2:1.6.0.90 pkgsrc-2013Q2-base:1.6 pkgsrc-2013Q1:1.6.0.88 pkgsrc-2013Q1-base:1.6 pkgsrc-2012Q4:1.6.0.86 pkgsrc-2012Q4-base:1.6 pkgsrc-2012Q3:1.6.0.84 pkgsrc-2012Q3-base:1.6 pkgsrc-2012Q2:1.6.0.82 pkgsrc-2012Q2-base:1.6 pkgsrc-2012Q1:1.6.0.80 pkgsrc-2012Q1-base:1.6 pkgsrc-2011Q4:1.6.0.78 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q3:1.6.0.76 pkgsrc-2011Q3-base:1.6 pkgsrc-2011Q2:1.6.0.74 pkgsrc-2011Q2-base:1.6 pkgsrc-2011Q1:1.6.0.72 pkgsrc-2011Q1-base:1.6 pkgsrc-2010Q4:1.6.0.70 pkgsrc-2010Q4-base:1.6 pkgsrc-2010Q3:1.6.0.68 pkgsrc-2010Q3-base:1.6 pkgsrc-2010Q2:1.6.0.66 pkgsrc-2010Q2-base:1.6 pkgsrc-2010Q1:1.6.0.64 pkgsrc-2010Q1-base:1.6 pkgsrc-2009Q4:1.6.0.62 pkgsrc-2009Q4-base:1.6 pkgsrc-2009Q3:1.6.0.60 pkgsrc-2009Q3-base:1.6 pkgsrc-2009Q2:1.6.0.58 pkgsrc-2009Q2-base:1.6 pkgsrc-2009Q1:1.6.0.56 pkgsrc-2009Q1-base:1.6 pkgsrc-2008Q4:1.6.0.54 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.52 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.50 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.48 pkgsrc-2008Q2-base:1.6 cwrapper:1.6.0.46 pkgsrc-2008Q1:1.6.0.44 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.42 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.40 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.6.0.38 pkgsrc-2007Q2-base:1.6 pkgsrc-2007Q1:1.6.0.36 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.6.0.34 pkgsrc-2006Q4-base:1.6 pkgsrc-2006Q3:1.6.0.32 pkgsrc-2006Q3-base:1.6 pkgsrc-2006Q2:1.6.0.30 pkgsrc-2006Q2-base:1.6 pkgsrc-2006Q1:1.6.0.28 pkgsrc-2006Q1-base:1.6 pkgsrc-2005Q4:1.6.0.26 pkgsrc-2005Q4-base:1.6 pkgsrc-2005Q3:1.6.0.24 pkgsrc-2005Q3-base:1.6 pkgsrc-2005Q2:1.6.0.22 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.6.0.20 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.6.0.18 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.6.0.16 pkgsrc-2004Q3-base:1.6 pkgsrc-2004Q2:1.6.0.14 pkgsrc-2004Q2-base:1.6 pkgsrc-2004Q1:1.6.0.12 pkgsrc-2004Q1-base:1.6 pkgsrc-2003Q4:1.6.0.10 pkgsrc-2003Q4-base:1.6 netbsd-1-6-1:1.6.0.6 netbsd-1-6-1-base:1.6 netbsd-1-6:1.6.0.8 netbsd-1-6-RELEASE-base:1.6 pkgviews:1.6.0.4 pkgviews-base:1.6 buildlink2:1.6.0.2 buildlink2-base:1.6 netbsd-1-5-PATCH003:1.6 netbsd-1-5-PATCH001:1.6 netbsd-1-5-RELEASE:1.6 netbsd-1-4-PATCH003:1.6 netbsd-1-4-PATCH002:1.2 comdex-fall-1999:1.2 netbsd-1-4-PATCH001:1.2 netbsd-1-4-RELEASE:1.2; locks; strict; comment @# @; 1.6 date 2000.04.27.20.44.21; author mycroft; state Exp; branches; next 1.5; 1.5 date 2000.04.27.17.03.47; author mycroft; state Exp; branches; next 1.4; 1.4 date 2000.04.27.16.45.13; author mycroft; state Exp; branches; next 1.3; 1.3 date 2000.04.15.23.50.33; author mycroft; state Exp; branches; next 1.2; 1.2 date 99.03.07.15.44.06; author hubertf; state Exp; branches; next 1.1; 1.1 date 99.03.07.02.55.59; author hubertf; state Exp; branches; next ; desc @@ 1.6 log @Turn off the cursor. Also, delete some changes we don't actually need. @ text @$NetBSD: patch-ad,v 1.5 2000/04/27 17:03:47 mycroft Exp $ --- screens.c.orig Mon Oct 21 14:18:25 1996 +++ screens.c Thu Apr 27 16:41:05 2000 @@@@ -25,14 +25,15 @@@@ #include "cam.h" #include +#include void finish(int sig) { close_mixer(); echo(); - endwin(); clear(); refresh(); + endwin(); if (sig != 0) exit(1); } @@@@ -40,19 +41,21 @@@@ void set_screen(void) { - char dummy[COLS]; + char *dummy; int left, right; - left = ( COLS - 15 - strlen(VERSION_HIGH) - strlen(VERSION_LOW) ) / 2; - right = COLS - 15 - strlen(VERSION_HIGH) - strlen(VERSION_LOW) - left; + left = ( COLS - 16 - strlen(VERSION_HIGH) - strlen(VERSION_LOW) ) / 2; + right = COLS - 16 - strlen(VERSION_HIGH) - strlen(VERSION_LOW) - left; clear(); leaveok(stdscr ,TRUE); attrset(COLOR_PAIR( COLOR_SCREEN ) | A_BOLD); - sprintf(dummy,"%*cCAM %s.%s for Linux%*c",left,' ',VERSION_HIGH,VERSION_LOW,right,' '); + asprintf(&dummy, "%*cCAM %s.%s for NetBSD%*c",left,' ',VERSION_HIGH,VERSION_LOW,right,' '); mvaddstr(0,0,dummy); - sprintf(dummy," Cpu's Audio Mixer %s.%s%*cauthor : Jan 'TWP' VANDENBERGHE (c)1994-1996 ",VERSION_HIGH,VERSION_LOW,COLS-20-45-strlen(VERSION_HIGH)-strlen(VERSION_LOW),' '); - mvaddstr(LINES-1,0,dummy ); - attrset(A_NORMAL | A_BOLD ); + free(dummy); + asprintf(&dummy, " Cpu's Audio Mixer %s.%s%*cauthor : Jan 'TWP' VANDENBERGHE (c)1994-1996 ",VERSION_HIGH,VERSION_LOW,COLS-20-45-strlen(VERSION_HIGH)-strlen(VERSION_LOW),' '); + mvaddstr(LINES-1,0,dummy); + free(dummy); + attrset(A_NORMAL | A_BOLD); mvaddstr(LINES-2,4,"Press 'h' for help"); } @@@@ -64,17 +67,17 @@@@ mvaddstr(Y+1,X+8,"Left"); mvaddstr(Y+2,X+8,"Right"); attrset(COLOR_PAIR(COLOR_SLIDER) | A_ALTCHARSET); - mvaddstr(Y+1,X+14,"ÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍ"); - mvaddstr(Y+2,X+14,"ÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍ"); + mvhline(Y+1,X+14,ACS_HLINE,21); + mvhline(Y+2,X+14,ACS_HLINE,21); attrset(COLOR_PAIR(COLOR_VOL1) | A_ALTCHARSET); - mvaddstr(Y,X+14,"ù ù ù ù"); - mvaddstr(Y+3,X+14,"ù ù ù ù"); + mvaddstr(Y,X+14,". . . ."); + mvaddstr(Y+3,X+14,". . . ."); attrset(COLOR_PAIR(COLOR_VOL2) | A_ALTCHARSET); - mvaddstr(Y,X+22,"ù ù ù ù"); - mvaddstr(Y+3,X+22,"ù ù ù ù"); + mvaddstr(Y,X+22,". : . ."); + mvaddstr(Y+3,X+22,". : . ."); attrset(COLOR_PAIR(COLOR_VOL3) | A_ALTCHARSET); - mvaddstr(Y,X+30,"ù ù ù"); - mvaddstr(Y+3,X+30,"ù ù ù"); + mvaddstr(Y,X+30,". . ."); + mvaddstr(Y+3,X+30,". . ."); } /* @@@@ -87,21 +90,21 @@@@ { if ((level == 1 ) || ( level == 2 )) { attrset(A_NORMAL | A_ALTCHARSET); - mvaddch(Y,X++,205); + mvaddch(Y,X++,ACS_HLINE); } if ( level != 5) { - #define ACT_HANDLE COLOR_PAIR(COLOR_HANDLE) | A_BOLD | A_ALTCHARSET - #define NACT_HANDLE COLOR_PAIR(COLOR_HANDLE) | A_DIM | A_ALTCHARSET + #define ACT_HANDLE COLOR_PAIR(COLOR_HANDLE) | A_BOLD + #define NACT_HANDLE COLOR_PAIR(COLOR_HANDLE) | A_DIM attrset(( active == TRUE ? ACT_HANDLE : NACT_HANDLE)); - mvaddch(Y,X++,178); + mvaddch(Y,X++,(active ? 'O' : 'o')); } if ((level == 3) || (level == 2)) { attrset(A_NORMAL | A_ALTCHARSET); - mvaddch(Y,X++,205); + mvaddch(Y,X++,ACS_HLINE); } if ( level == 5 ) { attrset(A_NORMAL | A_ALTCHARSET); - mvaddch(Y,X++,205); + mvaddch(Y,X++,ACS_HLINE); } } @@@@ -113,6 +116,7 @@@@ fprintf(stderr,"The screensize has to be minimum 80x25\n"); exit(1); } + curs_set(0); make_colors(); } @@@@ -181,9 +185,9 @@@@ char ch; touchwin(stdscr); help_win = newwin(15,50,(LINES - 15) / 2,(COLS - 50) / 2); - wattrset(help_win, COLOR_PAIR( COLOR_HELP) | A_BOLD | A_ALTCHARSET); + wattrset(help_win, COLOR_PAIR( COLOR_HELP) | A_BOLD ); leaveok(help_win,TRUE); - wborder(help_win,179,179,196,196,218, 191,192,217); + wborder(help_win,ACS_VLINE,ACS_VLINE,ACS_HLINE,ACS_HLINE,ACS_ULCORNER,ACS_URCORNER,ACS_LLCORNER,ACS_LRCORNER); wattrset(help_win, A_NORMAL | A_BOLD); mvwaddstr(help_win,2,2," Left/Right : Lower/Higher "); mvwaddstr(help_win,3,2," Up/Down : Previous/Next "); @ 1.5 log @Use mvhline(). @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.3 2000/04/15 23:50:33 mycroft Exp $ d4 2 a5 2 +++ screens.c Thu Apr 27 13:00:04 2000 @@@@ -25,6 +25,7 @@@@ d13 3 a15 2 @@@@ -33,6 +34,7 @@@@ endwin(); d18 1 a18 1 + reset_shell_mode(); d22 1 a22 1 @@@@ -40,19 +42,21 @@@@ d51 1 a51 1 @@@@ -64,17 +68,17 @@@@ d77 1 a77 1 @@@@ -87,26 +91,27 @@@@ d105 9 a113 7 void init_screen(void) { + def_shell_mode(); stdscr = initscr(); if ( (COLS < 80) || (LINES < 25) ) { finish(0); @@@@ -181,9 +186,9 @@@@ @ 1.4 log @Work around compiler bug exposed by previous change. Also remove explicit refreshes. @ text @d4 1 a4 1 +++ screens.c Sat Apr 15 19:39:10 2000 d21 1 a21 1 @@@@ -40,41 +42,46 @@@@ d50 1 a50 6 /* Draws the sliders */ void draw_slider(int Y, int X, char *device) { + int i; attrset(COLOR_PAIR(COLOR_SLIDER)); mvaddnstr(Y+1,X,device,7); d56 2 a57 4 + for (i = 0; i < 21; i++) + mvaddch(Y+1,X+14+i,ACS_HLINE); + for (i = 0; i < 21; i++) + mvaddch(Y+2,X+14+i,ACS_HLINE); d76 1 a76 1 @@@@ -87,26 +94,27 @@@@ d110 1 a110 1 @@@@ -181,9 +189,9 @@@@ @ 1.3 log @Use box-drawing characters. Add explicit refresh operations. @ text @d1 1 a1 1 $NetBSD$ d5 9 a13 1 @@@@ -33,6 +33,7 @@@@ d21 1 a21 1 @@@@ -40,15 +41,15 @@@@ d26 1 a26 1 + char dummy[COLS + 1]; d37 1 a37 1 + sprintf(dummy,"%*cCAM %s.%s for NetBSD%*c",left,' ',VERSION_HIGH,VERSION_LOW,right,' '); d39 11 a49 3 sprintf(dummy," Cpu's Audio Mixer %s.%s%*cauthor : Jan 'TWP' VANDENBERGHE (c)1994-1996 ",VERSION_HIGH,VERSION_LOW,COLS-20-45-strlen(VERSION_HIGH)-strlen(VERSION_LOW),' '); mvaddstr(LINES-1,0,dummy ); @@@@ -59,22 +60,25 @@@@ d83 1 a83 1 @@@@ -87,26 +91,27 @@@@ d117 1 a117 1 @@@@ -181,9 +186,9 @@@@ a128 8 @@@@ -193,6 +198,7 @@@@ mvwaddstr(help_win,9,2," h : help "); mvwaddstr(help_win,11,2," ESC/q : exit "); mvwaddstr(help_win,13,8," Press key to leave help screen "); + wrefresh(help_win); ch = wgetch(help_win); delwin(help_win); } @ 1.2 log @Fixes more than the things pointed out in PR 7093, sent in by Thilo Manske. CV : Enter Log. Lines beginning with `CVS:' are removed automatically @ text @d3 2 a4 6 Submitted by Thilo Manske after some discussion on PR 7093. --- screens.c.BAK Sun Mar 7 16:32:59 1999 +++ screens.c Sun Mar 7 16:36:03 1999 d13 27 a39 1 @@@@ -64,17 +65,17 @@@@ d45 4 a48 2 + mvaddstr(Y+1,X+14,"---------------------"); + mvaddstr(Y+2,X+14,"---------------------"); d67 1 a67 1 @@@@ -87,26 +88,27 @@@@ d72 1 a72 1 + mvaddch(Y,X++,'-'); d86 1 a86 1 + mvaddch(Y,X++,'-'); d91 1 a91 1 + mvaddch(Y,X++,'-'); d101 1 a101 1 @@@@ -181,9 +183,9 @@@@ d109 1 a109 1 + wborder(help_win,'|','|','-','-','+','+','+','+'); d113 8 @ 1.1 log @Use some nicer graphics, from PR 7093 by Thilo.Manske@@HEH.Uni-Oldenburg.DE @ text @d1 1 a1 15 Received: (qmail 20615 invoked from network); 6 Mar 1999 18:24:19 -0000 Received: from extern.heh.uni-oldenburg.de (HELO Server.HEH.Uni-Oldenburg.DE) (134.106.137.37) by redmail.netbsd.org with SMTP; 6 Mar 1999 18:24:19 -0000 Received: from WintelKiller.HEH.Uni-Oldenburg.DE (WintelKiller.HEH.Uni-Oldenburg.DE [134.106.148.8]) by Server.HEH.Uni-Oldenburg.DE (8.9.3/8.9.3/HEHOL) with ESMTP id TAA01496 for ; Sat, 6 Mar 1999 19:23:21 +0100 (MET) Received: by WintelKiller.HEH.Uni-Oldenburg.DE (Postfix, from userid 1000) id 04F2996F; Sat, 6 Mar 1999 19:23:20 +0100 (MET) Message-Id: <19990306182320.04F2996F@@WintelKiller.HEH.Uni-Oldenburg.DE> Date: Sat, 6 Mar 1999 19:23:20 +0100 (MET) From: Thilo.Manske@@HEH.Uni-Oldenburg.DE Reply-To: Thilo.Manske@@HEH.Uni-Oldenburg.DE To: gnats-bugs@@gnats.netbsd.org Subject: cam's output looks ugly X-Send-Pr-Version: 3.95 d3 2 a4 20 >Number: 7093 >Category: pkg >Synopsis: package audio/cam's output looks quite ugly on most terminals >Confidential: no >Severity: non-critical >Priority: low >Responsible: gnats-admin (GNATS administrator) >State: open >Class: sw-bug >Submitter-Id: net >Arrival-Date: Sat Mar 6 10:35:00 1999 >Last-Modified: >Originator: Thilo Manske >Organization: Dies ist Thilos Unix Signature! Viel Spass damit. (Thilos Unix Signature wird unter der BSD-Lizenz vertrieben.) >Release: ~late February (doesn't matter) >Environment: System: NetBSD WintelKiller 1.3K NetBSD 1.3K (WintelKiller) #91: Wed Mar 3 16:31:10 MET 1999 thilo@@WintelKiller:/usr/src/sys/arch/i386/compile/WintelKiller i386 d7 11 a17 13 >Description: cam uses some "non-standard" characters for printing the sliders etc. that may look good on some linux-boxes but not on NetBSD using wscons or xterm. >How-To-Repeat: Start cam and look at the screen. *UGH* >Fix: the following patch makes cam use only "standard" chars: (probably not the best choice but better than before) --- screens.c.orig Mon Oct 21 20:18:25 1996 +++ screens.c Sat Mar 6 19:07:20 1999 @@@@ -64,17 +64,17 @@@@ d23 2 a24 2 + mvaddstr(Y+1,X+14,"---------------------"); + mvaddstr(Y+2,X+14,"---------------------"); d43 1 a43 1 @@@@ -87,21 +87,21 @@@@ d48 1 a48 1 + mvaddch(Y,X++,'-'); d51 4 a54 2 #define ACT_HANDLE COLOR_PAIR(COLOR_HANDLE) | A_BOLD | A_ALTCHARSET #define NACT_HANDLE COLOR_PAIR(COLOR_HANDLE) | A_DIM | A_ALTCHARSET d57 1 a57 1 + mvaddch(Y,X++,'*'); d62 1 a62 1 + mvaddch(Y,X++,'-'); d67 1 a67 1 + mvaddch(Y,X++,'-'); d70 19 a88 4 >Audit-Trail: >Unformatted: @