123 lines
2.6 KiB
Text
123 lines
2.6 KiB
Text
$NetBSD: patch-ai,v 1.3 2003/06/13 10:55:26 cjep Exp $
|
|
--- cda_d/visual.c.orig Wed Aug 8 01:15:14 2001
|
|
+++ cda_d/visual.c Tue Jun 10 15:13:16 2003
|
|
@@ -52,15 +52,17 @@
|
|
#if defined(ultrix) || defined(__ultrix)
|
|
#include <cursesX.h>
|
|
#else
|
|
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__bsdi__)
|
|
+#if defined(__FreeBSD__) || defined(__bsdi__) || \
|
|
+(defined(__NetBSD__) && !defined(USE_NETBSD_CURSES))
|
|
#include <ncurses.h>
|
|
#else
|
|
#include <curses.h>
|
|
-#endif /* __FreeBSD__ __NetBSD__ __bsdi__ */
|
|
+#endif /* __FreeBSD__ __bsdi__ __NetBSD__ */
|
|
#endif /* ultrix */
|
|
#endif /* SYSV */
|
|
|
|
-#ifndef __QNX__
|
|
+#if !((defined __QNX__) || \
|
|
+(defined(__NetBSD__) && defined(USE_NETBSD_CURSES)))
|
|
#include <term.h>
|
|
#endif
|
|
|
|
@@ -425,7 +427,7 @@
|
|
cda_clrstatus();
|
|
wprintw(status_win, "Choose one (1-%d): ", i);
|
|
cda_v_echo(TRUE);
|
|
- putp(cursor_normal);
|
|
+ curs_set(1);
|
|
wrefresh(status_win);
|
|
cda_wgetstr(status_win, input, 60);
|
|
|
|
@@ -437,7 +439,7 @@
|
|
}
|
|
|
|
cda_v_echo(FALSE);
|
|
- putp(cursor_invisible);
|
|
+ curs_set(0);
|
|
|
|
if (n == i)
|
|
return 0;
|
|
@@ -508,7 +510,7 @@
|
|
cda_clrstatus();
|
|
wprintw(status_win, "Username: ");
|
|
cda_v_echo(TRUE);
|
|
- putp(cursor_normal);
|
|
+ curs_set(1);
|
|
wrefresh(status_win);
|
|
cda_wgetstr(status_win, input, 60);
|
|
if (input[0] == '\0')
|
|
@@ -1575,7 +1577,7 @@
|
|
cda_clrstatus();
|
|
wprintw(status_win, "Program: ");
|
|
cda_v_echo(TRUE);
|
|
- putp(cursor_normal);
|
|
+ curs_set(1);
|
|
wrefresh(status_win);
|
|
|
|
/* Before reading the program list, check for
|
|
@@ -1616,7 +1618,7 @@
|
|
}
|
|
|
|
cda_v_echo(FALSE);
|
|
- putp(cursor_invisible);
|
|
+ curs_set(0);
|
|
|
|
refresh_sts = TRUE;
|
|
}
|
|
@@ -2061,7 +2063,7 @@
|
|
cda_clrstatus();
|
|
wprintw(status_win, "Track n [mins secs] : ");
|
|
cda_v_echo(TRUE);
|
|
- putp(cursor_normal);
|
|
+ curs_set(1);
|
|
wrefresh(status_win);
|
|
|
|
cda_wgetstr(status_win, inbuf, 20);
|
|
@@ -2091,7 +2093,7 @@
|
|
}
|
|
|
|
cda_v_echo(FALSE);
|
|
- putp(cursor_invisible);
|
|
+ curs_set(0);
|
|
refresh_sts = TRUE;
|
|
}
|
|
|
|
@@ -2119,7 +2121,7 @@
|
|
/* Put screen in sane state */
|
|
move(LINES-1, 0);
|
|
printw("\r\n\n");
|
|
- putp(cursor_normal);
|
|
+ curs_set(1);
|
|
refresh();
|
|
reset_shell_mode();
|
|
|
|
@@ -2150,7 +2152,7 @@
|
|
|
|
/* Restore visual attributes */
|
|
reset_prog_mode();
|
|
- putp(cursor_invisible);
|
|
+ curs_set(0);
|
|
|
|
/* Set up for auto refresh */
|
|
wclear(info_win);
|
|
@@ -2184,7 +2186,7 @@
|
|
{
|
|
if (isvisual) {
|
|
keypad(stdscr, FALSE);
|
|
- putp(cursor_normal);
|
|
+ curs_set(1);
|
|
clear();
|
|
|
|
move(LINES-1, 0);
|
|
@@ -2293,7 +2295,7 @@
|
|
|
|
noecho();
|
|
cbreak();
|
|
- putp(cursor_invisible);
|
|
+ curs_set(0);
|
|
|
|
if ((info_win = newpad(MAXTRACK * 2, COLS)) == (WINDOW *) NULL) {
|
|
cda_quit(s);
|