summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormycroft <mycroft>2000-04-15 23:50:32 +0000
committermycroft <mycroft>2000-04-15 23:50:32 +0000
commit397fe3d4105354dd7980870151a070d483a6184e (patch)
tree77ff7a525a83c5a79d2889f7f4693bf97a8525a3
parentc19f87beef1a1960fefc9e0b1a49d80f17aef938 (diff)
downloadpkgsrc-397fe3d4105354dd7980870151a070d483a6184e.tar.gz
Use box-drawing characters.
Add explicit refresh operations.
-rw-r--r--audio/cam/files/patch-sum6
-rw-r--r--audio/cam/patches/patch-aa15
-rw-r--r--audio/cam/patches/patch-ad64
3 files changed, 62 insertions, 23 deletions
diff --git a/audio/cam/files/patch-sum b/audio/cam/files/patch-sum
index 209c2c88736..67435652b90 100644
--- a/audio/cam/files/patch-sum
+++ b/audio/cam/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.2 1999/08/25 01:42:20 hubertf Exp $
+$NetBSD: patch-sum,v 1.3 2000/04/15 23:50:32 mycroft Exp $
-MD5 (patch-aa) = f5d4975ae6a1a42cc61947b2757fea27
+MD5 (patch-aa) = 4a48e22e642440c2b2953e5310b9ce8a
MD5 (patch-ab) = 3b84e793288fae99a40bd949557ae08a
MD5 (patch-ac) = ca4e653096374554dde227401dc07bec
-MD5 (patch-ad) = cddf8828de265ead5f980774a50581a6
+MD5 (patch-ad) = 8208a2c7c7822c271836cf2626850a68
diff --git a/audio/cam/patches/patch-aa b/audio/cam/patches/patch-aa
index 64df1c01079..7ce47316e43 100644
--- a/audio/cam/patches/patch-aa
+++ b/audio/cam/patches/patch-aa
@@ -1,8 +1,7 @@
-$NetBSD: patch-aa,v 1.4 1999/07/06 07:54:06 jlam Exp $
+$NetBSD: patch-aa,v 1.5 2000/04/15 23:50:33 mycroft Exp $
-diff -ru ../cam-1.02-virgin/sounds.c ./sounds.c
---- ../cam-1.02-virgin/sounds.c Mon Oct 21 13:33:55 1996
-+++ ./sounds.c Sun Nov 10 12:20:22 1996
+--- sounds.c.orig Mon Oct 21 14:33:55 1996
++++ sounds.c Sat Apr 15 19:33:31 2000
@@ -36,7 +36,7 @@
@@ -21,3 +20,11 @@ diff -ru ../cam-1.02-virgin/sounds.c ./sounds.c
draw_handle( Y+1, X+14+dev_vol[dev_count].vol_left, FALSE, 4);
if (STEREO(dev_nr))
draw_handle( Y+2, X+14+dev_vol[dev_count].vol_right, FALSE, 4);
+@@ -331,6 +331,7 @@
+ do {
+
+ status( ((locked == TRUE) ? " LOCKED " : " UNLOCKED "));
++ refresh();
+ ch = getch();
+ fflush(stdin);
+ message("");
diff --git a/audio/cam/patches/patch-ad b/audio/cam/patches/patch-ad
index 72238802b42..5a82696ae87 100644
--- a/audio/cam/patches/patch-ad
+++ b/audio/cam/patches/patch-ad
@@ -1,11 +1,7 @@
-$NetBSD: patch-ad,v 1.2 1999/03/07 15:44:06 hubertf Exp $
+$NetBSD: patch-ad,v 1.3 2000/04/15 23:50:33 mycroft Exp $
-Submitted by Thilo Manske <Thilo.Manske@HEH.Uni-Oldenburg.DE> 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
+--- screens.c.orig Mon Oct 21 14:18:25 1996
++++ screens.c Sat Apr 15 19:39:10 2000
@@ -33,6 +33,7 @@
endwin();
clear();
@@ -14,14 +10,42 @@ some discussion on PR 7093.
if (sig != 0)
exit(1);
}
-@@ -64,17 +65,17 @@
+@@ -40,15 +41,15 @@
+
+ void set_screen(void)
+ {
+- char dummy[COLS];
++ char dummy[COLS + 1];
+ 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,' ');
++ sprintf(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 );
+@@ -59,22 +60,25 @@
+ /* 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);
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,"ÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍ");
-+ mvaddstr(Y+1,X+14,"---------------------");
-+ mvaddstr(Y+2,X+14,"---------------------");
++ 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);
attrset(COLOR_PAIR(COLOR_VOL1) | A_ALTCHARSET);
- mvaddstr(Y,X+14,"ù ù ù ù");
- mvaddstr(Y+3,X+14,"ù ù ù ù");
@@ -40,12 +64,12 @@ some discussion on PR 7093.
}
/*
-@@ -87,26 +88,27 @@
+@@ -87,26 +91,27 @@
{
if ((level == 1 ) || ( level == 2 )) {
attrset(A_NORMAL | A_ALTCHARSET);
- mvaddch(Y,X++,205);
-+ mvaddch(Y,X++,'-');
++ mvaddch(Y,X++,ACS_HLINE);
}
if ( level != 5) {
- #define ACT_HANDLE COLOR_PAIR(COLOR_HANDLE) | A_BOLD | A_ALTCHARSET
@@ -59,12 +83,12 @@ some discussion on PR 7093.
if ((level == 3) || (level == 2)) {
attrset(A_NORMAL | A_ALTCHARSET);
- mvaddch(Y,X++,205);
-+ mvaddch(Y,X++,'-');
++ mvaddch(Y,X++,ACS_HLINE);
}
if ( level == 5 ) {
attrset(A_NORMAL | A_ALTCHARSET);
- mvaddch(Y,X++,205);
-+ mvaddch(Y,X++,'-');
++ mvaddch(Y,X++,ACS_HLINE);
}
}
@@ -74,7 +98,7 @@ some discussion on PR 7093.
stdscr = initscr();
if ( (COLS < 80) || (LINES < 25) ) {
finish(0);
-@@ -181,9 +183,9 @@
+@@ -181,9 +186,9 @@
char ch;
touchwin(stdscr);
help_win = newwin(15,50,(LINES - 15) / 2,(COLS - 50) / 2);
@@ -82,7 +106,15 @@ some discussion on PR 7093.
+ 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,'|','|','-','-','+','+','+','+');
++ 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 ");
+@@ -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);
+ }