From 1ebfbe37ef30f8c81ebd6b4bed6e59a03cc92ff4 Mon Sep 17 00:00:00 2001 From: William McBrine Date: Sat, 28 Jan 2006 16:53:26 +0000 Subject: [PATCH] Removed non-ANSI prototypes and HAVE_PROTO. --- curses.h | 596 +++++++++++++++++++--------------------- curspriv.h | 200 +++++++------- demos/firework.c | 35 +-- demos/newdemo.c | 45 +-- demos/ptest.c | 62 +---- demos/testcurs.c | 105 +------ demos/tui.c | 191 ++----------- demos/tui.h | 60 ++-- demos/tuidemo.c | 58 ++-- demos/xmas.c | 80 +++--- dos/pdcdisp.c | 53 +--- dos/pdcgetsc.c | 49 +--- dos/pdckbd.c | 40 +-- dos/pdcprint.c | 9 +- dos/pdcscrn.c | 23 +- dos/pdcsetsc.c | 37 +-- panel.h | 44 ++- panel/panel.c | 153 +---------- pdcurses/addch.c | 39 +-- pdcurses/addchstr.c | 58 +--- pdcurses/addstr.c | 58 +--- pdcurses/attr.c | 71 +---- pdcurses/beep.c | 10 +- pdcurses/bkgd.c | 29 +- pdcurses/border.c | 129 +-------- pdcurses/clear.c | 38 +-- pdcurses/color.c | 74 +---- pdcurses/delch.c | 24 +- pdcurses/deleteln.c | 37 +-- pdcurses/getch.c | 29 +- pdcurses/getstr.c | 58 +--- pdcurses/getyx.c | 32 +-- pdcurses/inch.c | 24 +- pdcurses/inchstr.c | 58 +--- pdcurses/initscr.c | 75 +---- pdcurses/inopts.c | 85 +----- pdcurses/insch.c | 28 +- pdcurses/insstr.c | 58 +--- pdcurses/instr.c | 58 +--- pdcurses/kernel.c | 47 +--- pdcurses/mouse.c | 40 +-- pdcurses/move.c | 15 +- pdcurses/outopts.c | 64 +---- pdcurses/overlay.c | 28 +- pdcurses/pad.c | 51 +--- pdcurses/pdcutil.c | 26 +- pdcurses/pdcwin.c | 73 +---- pdcurses/refresh.c | 32 +-- pdcurses/scr_dump.c | 22 +- pdcurses/scroll.c | 18 +- pdcurses/slk.c | 88 +----- pdcurses/termattr.c | 38 +-- pdcurses/terminfo.c | 120 +------- pdcurses/touch.c | 38 +-- pdcurses/util.c | 56 +--- pdcurses/window.c | 103 +------ term.h | 44 ++- x11/pdcdisp.c | 26 +- x11/pdcgetsc.c | 14 +- x11/pdckbd.c | 27 +- x11/pdcprint.c | 9 +- x11/pdcscrn.c | 19 +- x11/pdcsetsc.c | 22 +- x11/pdcx11.c | 242 ---------------- x11/pdcx11.h | 15 - x11/process/x11.c | 58 ---- x11/process/x11.h | 41 --- x11/process/x11common.c | 14 - x11/process/x11curses.c | 90 ------ x11/sb.c | 30 +- 70 files changed, 607 insertions(+), 3815 deletions(-) diff --git a/curses.h b/curses.h index 3bce6000..d335c1c8 100644 --- a/curses.h +++ b/curses.h @@ -16,7 +16,7 @@ * See the file maintain.er for details of the current maintainer. **************************************************************************/ -/* $Id: curses.h,v 1.110 2006/01/28 15:02:15 wmcbrine Exp $ */ +/* $Id: curses.h,v 1.111 2006/01/28 16:53:25 wmcbrine Exp $ */ /* ---------------------------------------------------------------------- PDCurses @@ -41,7 +41,6 @@ PDCurses definitions list: (Only define those needed) HC True if using a Metaware compiler. TC True if using a Borland compiler. MSC True if using a Microsoft compiler. - HAVE_PROTO True if the compiler supports ANSI prototypes. PDC_BUILD Defines API build version. PDCurses portable platform definitions list: @@ -428,10 +427,6 @@ PDCurses portable platform definitions list: /*---------------------------------------------------------------------*/ -#ifndef HAVE_PROTO -# define HAVE_PROTO 1 -#endif - #if defined(WIN32) && defined(INCLUDE_WINDOWS_H) # include # ifdef MOUSE_MOVED @@ -658,11 +653,7 @@ typedef struct _wins typedef struct /* structure for ripped off lines */ { int line; -#ifdef HAVE_PROTO int (*init)(WINDOW *, int); -#else - int (*init)(); -#endif } RIPPEDOFFLINE; @@ -1272,321 +1263,314 @@ currently used.) * PDCurses function declarations * */ -#ifdef HAVE_PROTO -# define Args(x) x -#else -# define Args(x) () -#endif /* Standard */ -int PDC_CDECL addch Args((const chtype)); -int PDC_CDECL addchnstr Args((const chtype *, int)); -int PDC_CDECL addchstr Args((const chtype *)); -int PDC_CDECL addnstr Args((const char *, int)); -int PDC_CDECL addstr Args((const char *)); -int PDC_CDECL attroff Args((chtype)); -int PDC_CDECL attron Args((chtype)); -int PDC_CDECL attrset Args((chtype)); -int PDC_CDECL baudrate Args((void)); -int PDC_CDECL beep Args((void)); -int PDC_CDECL bkgd Args((chtype)); -void PDC_CDECL bkgdset Args((chtype)); -int PDC_CDECL border Args((chtype, chtype, chtype, chtype, chtype, - chtype, chtype, chtype)); -int PDC_CDECL box Args((WINDOW *, chtype, chtype)); -bool PDC_CDECL can_change_color Args((void)); -int PDC_CDECL cbreak Args((void)); -int PDC_CDECL clearok Args((WINDOW *, bool)); -int PDC_CDECL clear Args((void)); -int PDC_CDECL clrtobot Args((void)); -int PDC_CDECL clrtoeol Args((void)); -int PDC_CDECL color_content Args((short, short *, short *, short *)); -chtype PDC_CDECL COLOR_PAIR Args((int)); -int PDC_CDECL color_set Args((short, void *)); -int PDC_CDECL copywin Args((const WINDOW *, WINDOW *, int, int, int, - int, int, int, int)); -int PDC_CDECL curs_set Args((int)); -int PDC_CDECL def_prog_mode Args((void)); -int PDC_CDECL def_shell_mode Args((void)); -int PDC_CDECL delay_output Args((int)); -int PDC_CDECL delch Args((void)); -int PDC_CDECL deleteln Args((void)); -void PDC_CDECL delscreen Args((SCREEN *)); -int PDC_CDECL delwin Args((WINDOW *)); -WINDOW* PDC_CDECL derwin Args((WINDOW *, int, int, int, int)); -int PDC_CDECL doupdate Args((void)); -WINDOW* PDC_CDECL dupwin Args((WINDOW *)); -int PDC_CDECL echochar Args((const chtype)); -int PDC_CDECL echo Args((void)); -int PDC_CDECL endwin Args((void)); -char PDC_CDECL erasechar Args((void)); -int PDC_CDECL erase Args((void)); -void PDC_CDECL filter Args((void)); -int PDC_CDECL flash Args((void)); -int PDC_CDECL flushinp Args((void)); -chtype PDC_CDECL getbkgd Args((WINDOW *)); -int PDC_CDECL getnstr Args((char *, int)); -int PDC_CDECL getstr Args((char *)); -WINDOW* PDC_CDECL getwin Args((FILE *)); -int PDC_CDECL halfdelay Args((int)); -bool PDC_CDECL has_colors Args((void)); -bool PDC_CDECL has_ic Args((void)); -bool PDC_CDECL has_il Args((void)); -int PDC_CDECL hline Args((chtype, int)); -void PDC_CDECL idcok Args((WINDOW *, bool)); -int PDC_CDECL idlok Args((WINDOW *, bool)); -void PDC_CDECL immedok Args((WINDOW *, bool)); -int PDC_CDECL inchnstr Args((chtype *, int)); -int PDC_CDECL inchstr Args((chtype *)); -chtype PDC_CDECL inch Args((void)); -int PDC_CDECL init_color Args((short, short, short, short)); -int PDC_CDECL init_pair Args((short, short, short)); -WINDOW* PDC_CDECL initscr Args((void)); -int PDC_CDECL innstr Args((char *, int)); -int PDC_CDECL insch Args((chtype)); -int PDC_CDECL insdelln Args((int)); -int PDC_CDECL insertln Args((void)); -int PDC_CDECL insnstr Args((const char *, int)); -int PDC_CDECL insstr Args((const char *)); -int PDC_CDECL instr Args((char *)); -int PDC_CDECL intrflush Args((WINDOW *, bool)); -bool PDC_CDECL isendwin Args((void)); -bool PDC_CDECL is_linetouched Args((WINDOW *, int)); -bool PDC_CDECL is_wintouched Args((WINDOW *)); -char * PDC_CDECL keyname Args((int)); -int PDC_CDECL keypad Args((WINDOW *, bool)); -char PDC_CDECL killchar Args((void)); -int PDC_CDECL leaveok Args((WINDOW *, bool)); -char * PDC_CDECL longname Args((void)); -int PDC_CDECL meta Args((WINDOW *, bool)); -int PDC_CDECL move Args((int, int)); -int PDC_CDECL mvaddch Args((int, int, const chtype)); -int PDC_CDECL mvaddchnstr Args((int, int, const chtype *, int)); -int PDC_CDECL mvaddchstr Args((int, int, const chtype *)); -int PDC_CDECL mvaddnstr Args((int, int, const char *, int)); -int PDC_CDECL mvaddstr Args((int, int, const char *)); -int PDC_CDECL mvcur Args((int, int, int, int)); -int PDC_CDECL mvdelch Args((int, int)); -int PDC_CDECL mvderwin Args((WINDOW *, int, int)); -int PDC_CDECL mvgetch Args((int, int)); -int PDC_CDECL mvgetnstr Args((int, int, char *, int)); -int PDC_CDECL mvgetstr Args((int, int, char *)); -int PDC_CDECL mvhline Args((int, int, chtype, int)); -chtype PDC_CDECL mvinch Args((int, int)); -int PDC_CDECL mvinchnstr Args((int, int, chtype *, int)); -int PDC_CDECL mvinchstr Args((int, int, chtype *)); -int PDC_CDECL mvinnstr Args((int, int, char *, int)); -int PDC_CDECL mvinsch Args((int, int, chtype)); -int PDC_CDECL mvinsnstr Args((int, int, const char *, int)); -int PDC_CDECL mvinsstr Args((int, int, const char *)); -int PDC_CDECL mvinstr Args((int, int, char *)); -int PDC_CDECL mvprintw Args((int, int, char *, ...)); -int PDC_CDECL mvscanw Args((int, int, char *, ...)); -int PDC_CDECL mvvline Args((int, int, chtype, int)); -int PDC_CDECL mvwaddchnstr Args((WINDOW *, int, int, const chtype *, int)); -int PDC_CDECL mvwaddchstr Args((WINDOW *, int, int, const chtype *)); -int PDC_CDECL mvwaddch Args((WINDOW *, int, int, const chtype)); -int PDC_CDECL mvwaddnstr Args((WINDOW *, int, int, const char *, int)); -int PDC_CDECL mvwaddstr Args((WINDOW *, int, int, const char *)); -int PDC_CDECL mvwdelch Args((WINDOW *, int, int)); -int PDC_CDECL mvwgetch Args((WINDOW *, int, int)); -int PDC_CDECL mvwgetnstr Args((WINDOW *, int, int, char *, int)); -int PDC_CDECL mvwgetstr Args((WINDOW *, int, int, char *)); -int PDC_CDECL mvwhline Args((WINDOW *, int, int, chtype, int)); -int PDC_CDECL mvwinchnstr Args((WINDOW *, int, int, chtype *, int)); -int PDC_CDECL mvwinchstr Args((WINDOW *, int, int, chtype *)); -chtype PDC_CDECL mvwinch Args((WINDOW *, int, int)); -int PDC_CDECL mvwinnstr Args((WINDOW *, int, int, char *, int)); -int PDC_CDECL mvwinsch Args((WINDOW *, int, int, chtype)); -int PDC_CDECL mvwinsnstr Args((WINDOW *, int, int, const char *, int)); -int PDC_CDECL mvwinsstr Args((WINDOW *, int, int, const char *)); -int PDC_CDECL mvwinstr Args((WINDOW *, int, int, char *)); -int PDC_CDECL mvwin Args((WINDOW *, int, int)); -int PDC_CDECL mvwprintw Args((WINDOW *, int, int, char *, ...)); -int PDC_CDECL mvwscanw Args((WINDOW *, int, int, char *, ...)); -int PDC_CDECL mvwvline Args((WINDOW *, int, int, chtype, int)); -int PDC_CDECL napms Args((int)); -WINDOW* PDC_CDECL newpad Args((int, int)); -SCREEN* PDC_CDECL newterm Args((char *, FILE *, FILE *)); -WINDOW* PDC_CDECL newwin Args((int, int, int, int)); -int PDC_CDECL nl Args((void)); -int PDC_CDECL nocbreak Args((void)); -int PDC_CDECL nodelay Args((WINDOW *, bool)); -int PDC_CDECL noecho Args((void)); -int PDC_CDECL nonl Args((void)); -void PDC_CDECL noqiflush Args((void)); -int PDC_CDECL noraw Args((void)); -int PDC_CDECL notimeout Args((WINDOW *, bool)); -int PDC_CDECL overlay Args((const WINDOW *, WINDOW *)); -int PDC_CDECL overwrite Args((const WINDOW *, WINDOW *)); -int PDC_CDECL pair_content Args((short, short *, short *)); -int PDC_CDECL PAIR_NUMBER Args((chtype)); -int PDC_CDECL pechochar Args((WINDOW *, chtype)); -int PDC_CDECL pnoutrefresh Args((WINDOW *, int, int, int, int, int, int)); -int PDC_CDECL prefresh Args((WINDOW *, int, int, int, int, int, int)); -int PDC_CDECL printw Args((char *, ...)); -int PDC_CDECL putwin Args((WINDOW *, FILE *)); -void PDC_CDECL qiflush Args((void)); -int PDC_CDECL raw Args((void)); -int PDC_CDECL redrawwin Args((WINDOW *)); -int PDC_CDECL refresh Args((void)); -int PDC_CDECL reset_prog_mode Args((void)); -int PDC_CDECL reset_shell_mode Args((void)); -int PDC_CDECL resetty Args((void)); -int PDC_CDECL ripoffline Args((int, int (*)(WINDOW *, int))); -int PDC_CDECL savetty Args((void)); -int PDC_CDECL scanw Args((char *, ...)); -int PDC_CDECL scr_dump Args((const char *)); -int PDC_CDECL scr_init Args((const char *)); -int PDC_CDECL scrl Args((int)); -int PDC_CDECL scrollok Args((WINDOW *, bool)); -int PDC_CDECL scroll Args((WINDOW *)); -int PDC_CDECL scr_restore Args((const char *)); -int PDC_CDECL scr_set Args((const char *)); -int PDC_CDECL setscrreg Args((int, int)); -SCREEN* PDC_CDECL set_term Args((SCREEN *)); -int PDC_CDECL slk_attroff Args((const chtype)); -int PDC_CDECL slk_attron Args((const chtype)); -int PDC_CDECL slk_attrset Args((const chtype)); -int PDC_CDECL slk_clear Args((void)); -int PDC_CDECL slk_color Args((short)); -int PDC_CDECL slk_init Args((int)); -char * PDC_CDECL slk_label Args((int)); -int PDC_CDECL slk_noutrefresh Args((void)); -int PDC_CDECL slk_refresh Args((void)); -int PDC_CDECL slk_restore Args((void)); -int PDC_CDECL slk_set Args((int, const char *, int)); -int PDC_CDECL slk_touch Args((void)); -int PDC_CDECL standend Args((void)); -int PDC_CDECL standout Args((void)); -int PDC_CDECL start_color Args((void)); -WINDOW* PDC_CDECL subpad Args((WINDOW *, int, int, int, int)); -WINDOW* PDC_CDECL subwin Args((WINDOW *, int, int, int, int)); -int PDC_CDECL syncok Args((WINDOW *, bool)); -chtype PDC_CDECL termattrs Args((void)); -char * PDC_CDECL termname Args((void)); -void PDC_CDECL timeout Args((int)); -int PDC_CDECL touchline Args((WINDOW *, int, int)); -int PDC_CDECL touchwin Args((WINDOW *)); -int PDC_CDECL typeahead Args((int)); -int PDC_CDECL untouchwin Args((WINDOW *)); -void PDC_CDECL use_env Args((bool)); -int PDC_CDECL vidattr Args((chtype)); -int PDC_CDECL vidputs Args((chtype, int (*)(int))); -int PDC_CDECL vline Args((chtype, int)); -int PDC_CDECL vw_printw Args((WINDOW *, char *, va_list)); -int PDC_CDECL vwprintw Args((WINDOW *, char *, va_list)); -int PDC_CDECL vw_scanw Args((WINDOW *, char *, va_list)); -int PDC_CDECL vwscanw Args((WINDOW *, char *, va_list)); -int PDC_CDECL waddchnstr Args((WINDOW *, const chtype *, int)); -int PDC_CDECL waddchstr Args((WINDOW *, const chtype *)); -int PDC_CDECL waddch Args((WINDOW *, const chtype)); -int PDC_CDECL waddnstr Args((WINDOW *, const char *, int)); -int PDC_CDECL waddstr Args((WINDOW *, const char *)); -int PDC_CDECL wattroff Args((WINDOW *, chtype)); -int PDC_CDECL wattron Args((WINDOW *, chtype)); -int PDC_CDECL wattrset Args((WINDOW *, chtype)); -void PDC_CDECL wbkgdset Args((WINDOW *, chtype)); -int PDC_CDECL wbkgd Args((WINDOW *, chtype)); -int PDC_CDECL wborder Args((WINDOW *, chtype, chtype, chtype, chtype, - chtype, chtype, chtype, chtype)); -int PDC_CDECL wclear Args((WINDOW *)); -int PDC_CDECL wclrtobot Args((WINDOW *)); -int PDC_CDECL wclrtoeol Args((WINDOW *)); -int PDC_CDECL wcolor_set Args((WINDOW *, short, void *)); -void PDC_CDECL wcursyncup Args((WINDOW *)); -int PDC_CDECL wdelch Args((WINDOW *)); -int PDC_CDECL wdeleteln Args((WINDOW *)); -int PDC_CDECL wechochar Args((WINDOW *, const chtype)); -int PDC_CDECL werase Args((WINDOW *)); -int PDC_CDECL wgetch Args((WINDOW *)); -int PDC_CDECL wgetnstr Args((WINDOW *, char *, int)); -int PDC_CDECL wgetstr Args((WINDOW *, char *)); -int PDC_CDECL whline Args((WINDOW *, chtype, int)); -int PDC_CDECL winchnstr Args((WINDOW *, chtype *, int)); -int PDC_CDECL winchstr Args((WINDOW *, chtype *)); -chtype PDC_CDECL winch Args((WINDOW *)); -int PDC_CDECL winnstr Args((WINDOW *, char *, int)); -int PDC_CDECL winsch Args((WINDOW *, chtype)); -int PDC_CDECL winsdelln Args((WINDOW *, int)); -int PDC_CDECL winsertln Args((WINDOW *)); -int PDC_CDECL winsnstr Args((WINDOW *, const char *, int)); -int PDC_CDECL winsstr Args((WINDOW *, const char *)); -int PDC_CDECL winstr Args((WINDOW *, char *)); -int PDC_CDECL wmove Args((WINDOW *, int, int)); -int PDC_CDECL wnoutrefresh Args((WINDOW *)); -int PDC_CDECL wprintw Args((WINDOW *, char *, ...)); -int PDC_CDECL wredrawln Args((WINDOW *, int, int)); -int PDC_CDECL wrefresh Args((WINDOW *)); -int PDC_CDECL wscanw Args((WINDOW *, char *, ...)); -int PDC_CDECL wscrl Args((WINDOW *, int)); -int PDC_CDECL wsetscrreg Args((WINDOW *, int, int)); -int PDC_CDECL wstandend Args((WINDOW *)); -int PDC_CDECL wstandout Args((WINDOW *)); -void PDC_CDECL wsyncdown Args((WINDOW *)); -void PDC_CDECL wsyncup Args((WINDOW *)); -void PDC_CDECL wtimeout Args((WINDOW *, int)); -int PDC_CDECL wtouchln Args((WINDOW *, int, int, int)); -int PDC_CDECL wvline Args((WINDOW *, chtype, int)); +int PDC_CDECL addch(const chtype); +int PDC_CDECL addchnstr(const chtype *, int); +int PDC_CDECL addchstr(const chtype *); +int PDC_CDECL addnstr(const char *, int); +int PDC_CDECL addstr(const char *); +int PDC_CDECL attroff(chtype); +int PDC_CDECL attron(chtype); +int PDC_CDECL attrset(chtype); +int PDC_CDECL baudrate(void); +int PDC_CDECL beep(void); +int PDC_CDECL bkgd(chtype); +void PDC_CDECL bkgdset(chtype); +int PDC_CDECL border(chtype, chtype, chtype, chtype, chtype, + chtype, chtype, chtype); +int PDC_CDECL box(WINDOW *, chtype, chtype); +bool PDC_CDECL can_change_color(void); +int PDC_CDECL cbreak(void); +int PDC_CDECL clearok(WINDOW *, bool); +int PDC_CDECL clear(void); +int PDC_CDECL clrtobot(void); +int PDC_CDECL clrtoeol(void); +int PDC_CDECL color_content(short, short *, short *, short *); +chtype PDC_CDECL COLOR_PAIR(int); +int PDC_CDECL color_set(short, void *); +int PDC_CDECL copywin(const WINDOW *, WINDOW *, int, int, int, + int, int, int, int); +int PDC_CDECL curs_set(int); +int PDC_CDECL def_prog_mode(void); +int PDC_CDECL def_shell_mode(void); +int PDC_CDECL delay_output(int); +int PDC_CDECL delch(void); +int PDC_CDECL deleteln(void); +void PDC_CDECL delscreen(SCREEN *); +int PDC_CDECL delwin(WINDOW *); +WINDOW* PDC_CDECL derwin(WINDOW *, int, int, int, int); +int PDC_CDECL doupdate(void); +WINDOW* PDC_CDECL dupwin(WINDOW *); +int PDC_CDECL echochar(const chtype); +int PDC_CDECL echo(void); +int PDC_CDECL endwin(void); +char PDC_CDECL erasechar(void); +int PDC_CDECL erase(void); +void PDC_CDECL filter(void); +int PDC_CDECL flash(void); +int PDC_CDECL flushinp(void); +chtype PDC_CDECL getbkgd(WINDOW *); +int PDC_CDECL getnstr(char *, int); +int PDC_CDECL getstr(char *); +WINDOW* PDC_CDECL getwin(FILE *); +int PDC_CDECL halfdelay(int); +bool PDC_CDECL has_colors(void); +bool PDC_CDECL has_ic(void); +bool PDC_CDECL has_il(void); +int PDC_CDECL hline(chtype, int); +void PDC_CDECL idcok(WINDOW *, bool); +int PDC_CDECL idlok(WINDOW *, bool); +void PDC_CDECL immedok(WINDOW *, bool); +int PDC_CDECL inchnstr(chtype *, int); +int PDC_CDECL inchstr(chtype *); +chtype PDC_CDECL inch(void); +int PDC_CDECL init_color(short, short, short, short); +int PDC_CDECL init_pair(short, short, short); +WINDOW* PDC_CDECL initscr(void); +int PDC_CDECL innstr(char *, int); +int PDC_CDECL insch(chtype); +int PDC_CDECL insdelln(int); +int PDC_CDECL insertln(void); +int PDC_CDECL insnstr(const char *, int); +int PDC_CDECL insstr(const char *); +int PDC_CDECL instr(char *); +int PDC_CDECL intrflush(WINDOW *, bool); +bool PDC_CDECL isendwin(void); +bool PDC_CDECL is_linetouched(WINDOW *, int); +bool PDC_CDECL is_wintouched(WINDOW *); +char * PDC_CDECL keyname(int); +int PDC_CDECL keypad(WINDOW *, bool); +char PDC_CDECL killchar(void); +int PDC_CDECL leaveok(WINDOW *, bool); +char * PDC_CDECL longname(void); +int PDC_CDECL meta(WINDOW *, bool); +int PDC_CDECL move(int, int); +int PDC_CDECL mvaddch(int, int, const chtype); +int PDC_CDECL mvaddchnstr(int, int, const chtype *, int); +int PDC_CDECL mvaddchstr(int, int, const chtype *); +int PDC_CDECL mvaddnstr(int, int, const char *, int); +int PDC_CDECL mvaddstr(int, int, const char *); +int PDC_CDECL mvcur(int, int, int, int); +int PDC_CDECL mvdelch(int, int); +int PDC_CDECL mvderwin(WINDOW *, int, int); +int PDC_CDECL mvgetch(int, int); +int PDC_CDECL mvgetnstr(int, int, char *, int); +int PDC_CDECL mvgetstr(int, int, char *); +int PDC_CDECL mvhline(int, int, chtype, int); +chtype PDC_CDECL mvinch(int, int); +int PDC_CDECL mvinchnstr(int, int, chtype *, int); +int PDC_CDECL mvinchstr(int, int, chtype *); +int PDC_CDECL mvinnstr(int, int, char *, int); +int PDC_CDECL mvinsch(int, int, chtype); +int PDC_CDECL mvinsnstr(int, int, const char *, int); +int PDC_CDECL mvinsstr(int, int, const char *); +int PDC_CDECL mvinstr(int, int, char *); +int PDC_CDECL mvprintw(int, int, char *, ...); +int PDC_CDECL mvscanw(int, int, char *, ...); +int PDC_CDECL mvvline(int, int, chtype, int); +int PDC_CDECL mvwaddchnstr(WINDOW *, int, int, const chtype *, int); +int PDC_CDECL mvwaddchstr(WINDOW *, int, int, const chtype *); +int PDC_CDECL mvwaddch(WINDOW *, int, int, const chtype); +int PDC_CDECL mvwaddnstr(WINDOW *, int, int, const char *, int); +int PDC_CDECL mvwaddstr(WINDOW *, int, int, const char *); +int PDC_CDECL mvwdelch(WINDOW *, int, int); +int PDC_CDECL mvwgetch(WINDOW *, int, int); +int PDC_CDECL mvwgetnstr(WINDOW *, int, int, char *, int); +int PDC_CDECL mvwgetstr(WINDOW *, int, int, char *); +int PDC_CDECL mvwhline(WINDOW *, int, int, chtype, int); +int PDC_CDECL mvwinchnstr(WINDOW *, int, int, chtype *, int); +int PDC_CDECL mvwinchstr(WINDOW *, int, int, chtype *); +chtype PDC_CDECL mvwinch(WINDOW *, int, int); +int PDC_CDECL mvwinnstr(WINDOW *, int, int, char *, int); +int PDC_CDECL mvwinsch(WINDOW *, int, int, chtype); +int PDC_CDECL mvwinsnstr(WINDOW *, int, int, const char *, int); +int PDC_CDECL mvwinsstr(WINDOW *, int, int, const char *); +int PDC_CDECL mvwinstr(WINDOW *, int, int, char *); +int PDC_CDECL mvwin(WINDOW *, int, int); +int PDC_CDECL mvwprintw(WINDOW *, int, int, char *, ...); +int PDC_CDECL mvwscanw(WINDOW *, int, int, char *, ...); +int PDC_CDECL mvwvline(WINDOW *, int, int, chtype, int); +int PDC_CDECL napms(int); +WINDOW* PDC_CDECL newpad(int, int); +SCREEN* PDC_CDECL newterm(char *, FILE *, FILE *); +WINDOW* PDC_CDECL newwin(int, int, int, int); +int PDC_CDECL nl(void); +int PDC_CDECL nocbreak(void); +int PDC_CDECL nodelay(WINDOW *, bool); +int PDC_CDECL noecho(void); +int PDC_CDECL nonl(void); +void PDC_CDECL noqiflush(void); +int PDC_CDECL noraw(void); +int PDC_CDECL notimeout(WINDOW *, bool); +int PDC_CDECL overlay(const WINDOW *, WINDOW *); +int PDC_CDECL overwrite(const WINDOW *, WINDOW *); +int PDC_CDECL pair_content(short, short *, short *); +int PDC_CDECL PAIR_NUMBER(chtype); +int PDC_CDECL pechochar(WINDOW *, chtype); +int PDC_CDECL pnoutrefresh(WINDOW *, int, int, int, int, int, int); +int PDC_CDECL prefresh(WINDOW *, int, int, int, int, int, int); +int PDC_CDECL printw(char *, ...); +int PDC_CDECL putwin(WINDOW *, FILE *); +void PDC_CDECL qiflush(void); +int PDC_CDECL raw(void); +int PDC_CDECL redrawwin(WINDOW *); +int PDC_CDECL refresh(void); +int PDC_CDECL reset_prog_mode(void); +int PDC_CDECL reset_shell_mode(void); +int PDC_CDECL resetty(void); +int PDC_CDECL ripoffline(int, int (*)(WINDOW *, int)); +int PDC_CDECL savetty(void); +int PDC_CDECL scanw(char *, ...); +int PDC_CDECL scr_dump(const char *); +int PDC_CDECL scr_init(const char *); +int PDC_CDECL scrl(int); +int PDC_CDECL scrollok(WINDOW *, bool); +int PDC_CDECL scroll(WINDOW *); +int PDC_CDECL scr_restore(const char *); +int PDC_CDECL scr_set(const char *); +int PDC_CDECL setscrreg(int, int); +SCREEN* PDC_CDECL set_term(SCREEN *); +int PDC_CDECL slk_attroff(const chtype); +int PDC_CDECL slk_attron(const chtype); +int PDC_CDECL slk_attrset(const chtype); +int PDC_CDECL slk_clear(void); +int PDC_CDECL slk_color(short); +int PDC_CDECL slk_init(int); +char * PDC_CDECL slk_label(int); +int PDC_CDECL slk_noutrefresh(void); +int PDC_CDECL slk_refresh(void); +int PDC_CDECL slk_restore(void); +int PDC_CDECL slk_set(int, const char *, int); +int PDC_CDECL slk_touch(void); +int PDC_CDECL standend(void); +int PDC_CDECL standout(void); +int PDC_CDECL start_color(void); +WINDOW* PDC_CDECL subpad(WINDOW *, int, int, int, int); +WINDOW* PDC_CDECL subwin(WINDOW *, int, int, int, int); +int PDC_CDECL syncok(WINDOW *, bool); +chtype PDC_CDECL termattrs(void); +char * PDC_CDECL termname(void); +void PDC_CDECL timeout(int); +int PDC_CDECL touchline(WINDOW *, int, int); +int PDC_CDECL touchwin(WINDOW *); +int PDC_CDECL typeahead(int); +int PDC_CDECL untouchwin(WINDOW *); +void PDC_CDECL use_env(bool); +int PDC_CDECL vidattr(chtype); +int PDC_CDECL vidputs(chtype, int (*)(int)); +int PDC_CDECL vline(chtype, int); +int PDC_CDECL vw_printw(WINDOW *, char *, va_list); +int PDC_CDECL vwprintw(WINDOW *, char *, va_list); +int PDC_CDECL vw_scanw(WINDOW *, char *, va_list); +int PDC_CDECL vwscanw(WINDOW *, char *, va_list); +int PDC_CDECL waddchnstr(WINDOW *, const chtype *, int); +int PDC_CDECL waddchstr(WINDOW *, const chtype *); +int PDC_CDECL waddch(WINDOW *, const chtype); +int PDC_CDECL waddnstr(WINDOW *, const char *, int); +int PDC_CDECL waddstr(WINDOW *, const char *); +int PDC_CDECL wattroff(WINDOW *, chtype); +int PDC_CDECL wattron(WINDOW *, chtype); +int PDC_CDECL wattrset(WINDOW *, chtype); +void PDC_CDECL wbkgdset(WINDOW *, chtype); +int PDC_CDECL wbkgd(WINDOW *, chtype); +int PDC_CDECL wborder(WINDOW *, chtype, chtype, chtype, chtype, + chtype, chtype, chtype, chtype); +int PDC_CDECL wclear(WINDOW *); +int PDC_CDECL wclrtobot(WINDOW *); +int PDC_CDECL wclrtoeol(WINDOW *); +int PDC_CDECL wcolor_set(WINDOW *, short, void *); +void PDC_CDECL wcursyncup(WINDOW *); +int PDC_CDECL wdelch(WINDOW *); +int PDC_CDECL wdeleteln(WINDOW *); +int PDC_CDECL wechochar(WINDOW *, const chtype); +int PDC_CDECL werase(WINDOW *); +int PDC_CDECL wgetch(WINDOW *); +int PDC_CDECL wgetnstr(WINDOW *, char *, int); +int PDC_CDECL wgetstr(WINDOW *, char *); +int PDC_CDECL whline(WINDOW *, chtype, int); +int PDC_CDECL winchnstr(WINDOW *, chtype *, int); +int PDC_CDECL winchstr(WINDOW *, chtype *); +chtype PDC_CDECL winch(WINDOW *); +int PDC_CDECL winnstr(WINDOW *, char *, int); +int PDC_CDECL winsch(WINDOW *, chtype); +int PDC_CDECL winsdelln(WINDOW *, int); +int PDC_CDECL winsertln(WINDOW *); +int PDC_CDECL winsnstr(WINDOW *, const char *, int); +int PDC_CDECL winsstr(WINDOW *, const char *); +int PDC_CDECL winstr(WINDOW *, char *); +int PDC_CDECL wmove(WINDOW *, int, int); +int PDC_CDECL wnoutrefresh(WINDOW *); +int PDC_CDECL wprintw(WINDOW *, char *, ...); +int PDC_CDECL wredrawln(WINDOW *, int, int); +int PDC_CDECL wrefresh(WINDOW *); +int PDC_CDECL wscanw(WINDOW *, char *, ...); +int PDC_CDECL wscrl(WINDOW *, int); +int PDC_CDECL wsetscrreg(WINDOW *, int, int); +int PDC_CDECL wstandend(WINDOW *); +int PDC_CDECL wstandout(WINDOW *); +void PDC_CDECL wsyncdown(WINDOW *); +void PDC_CDECL wsyncup(WINDOW *); +void PDC_CDECL wtimeout(WINDOW *, int); +int PDC_CDECL wtouchln(WINDOW *, int, int, int); +int PDC_CDECL wvline(WINDOW *, chtype, int); /* Quasi-standard */ -chtype PDC_CDECL getattrs Args((WINDOW *)); -char * PDC_CDECL unctrl Args((chtype)); +chtype PDC_CDECL getattrs(WINDOW *); +char * PDC_CDECL unctrl(chtype); -int PDC_CDECL mouse_set Args((unsigned long)); -int PDC_CDECL mouse_on Args((unsigned long)); -int PDC_CDECL mouse_off Args((unsigned long)); -int PDC_CDECL request_mouse_pos Args((void)); -int PDC_CDECL map_button Args((unsigned long)); -void PDC_CDECL wmouse_position Args((WINDOW *, int *, int *)); -unsigned long PDC_CDECL getmouse Args((void)); -unsigned long PDC_CDECL getbmap Args((void)); +int PDC_CDECL mouse_set(unsigned long); +int PDC_CDECL mouse_on(unsigned long); +int PDC_CDECL mouse_off(unsigned long); +int PDC_CDECL request_mouse_pos(void); +int PDC_CDECL map_button(unsigned long); +void PDC_CDECL wmouse_position(WINDOW *, int *, int *); +unsigned long PDC_CDECL getmouse(void); +unsigned long PDC_CDECL getbmap(void); /* NCurses */ -bool PDC_CDECL has_key Args((int)); +bool PDC_CDECL has_key(int); /* PDCurses */ -int PDC_CDECL mvwinsertln Args((WINDOW *, int, int)); -int PDC_CDECL raw_output Args((bool)); -int PDC_CDECL resize_term Args((int, int)); -WINDOW* PDC_CDECL resize_window Args((WINDOW *, int, int)); -void PDC_CDECL traceoff Args((void)); -void PDC_CDECL traceon Args((void)); -char PDC_CDECL wordchar Args((void)); +int PDC_CDECL mvwinsertln(WINDOW *, int, int); +int PDC_CDECL raw_output(bool); +int PDC_CDECL resize_term(int, int); +WINDOW* PDC_CDECL resize_window(WINDOW *, int, int); +void PDC_CDECL traceoff(void); +void PDC_CDECL traceon(void); +char PDC_CDECL wordchar(void); #ifdef XCURSES -WINDOW* PDC_CDECL Xinitscr Args((int, char **)); -void PDC_CDECL XCursesExit Args((void)); -int PDC_CDECL sb_init Args((void)); -int PDC_CDECL sb_set_horz Args((int, int, int)); -int PDC_CDECL sb_set_vert Args((int, int, int)); -int PDC_CDECL sb_get_horz Args((int *, int *, int *)); -int PDC_CDECL sb_get_vert Args((int *, int *, int *)); -int PDC_CDECL sb_refresh Args((void)); +WINDOW* PDC_CDECL Xinitscr(int, char **); +void PDC_CDECL XCursesExit(void); +int PDC_CDECL sb_init(void); +int PDC_CDECL sb_set_horz(int, int, int); +int PDC_CDECL sb_set_vert(int, int, int); +int PDC_CDECL sb_get_horz(int *, int *, int *); +int PDC_CDECL sb_get_vert(int *, int *, int *); +int PDC_CDECL sb_refresh(void); #endif -int PDC_CDECL PDC_chadd Args((WINDOW *, chtype, bool, bool)); -int PDC_CDECL PDC_chins Args((WINDOW *, chtype, bool)); -int PDC_CDECL PDC_ungetch Args((int)); -void PDC_CDECL PDC_set_title Args((char *)); -int PDC_CDECL PDC_getclipboard Args((char **, long *)); -int PDC_CDECL PDC_setclipboard Args((char *, long)); -int PDC_CDECL PDC_freeclipboard Args((char *)); -int PDC_CDECL PDC_clearclipboard Args((void)); +int PDC_CDECL PDC_chadd(WINDOW *, chtype, bool, bool); +int PDC_CDECL PDC_chins(WINDOW *, chtype, bool); +int PDC_CDECL PDC_ungetch(int); +void PDC_CDECL PDC_set_title(char *); +int PDC_CDECL PDC_getclipboard(char **, long *); +int PDC_CDECL PDC_setclipboard(char *, long); +int PDC_CDECL PDC_freeclipboard(char *); +int PDC_CDECL PDC_clearclipboard(void); -unsigned long PDC_CDECL PDC_get_input_fd Args((void)); -unsigned long PDC_CDECL PDC_get_key_modifiers Args((void)); +unsigned long PDC_CDECL PDC_get_input_fd(void); +unsigned long PDC_CDECL PDC_get_key_modifiers(void); -int PDC_CDECL PDC_wunderline Args((WINDOW *, int, bool)); -int PDC_CDECL PDC_wleftline Args((WINDOW *, int, bool)); -int PDC_CDECL PDC_wrightline Args((WINDOW *, int, bool)); -int PDC_CDECL PDC_set_line_color Args((short)); - -#undef Args +int PDC_CDECL PDC_wunderline(WINDOW *, int, bool); +int PDC_CDECL PDC_wleftline(WINDOW *, int, bool); +int PDC_CDECL PDC_wrightline(WINDOW *, int, bool); +int PDC_CDECL PDC_set_line_color(short); #ifndef max # define max(a,b) (((a) > (b)) ? (a) : (b)) diff --git a/curspriv.h b/curspriv.h index 9f728394..7c6b2b6d 100644 --- a/curspriv.h +++ b/curspriv.h @@ -16,7 +16,7 @@ * See the file maintain.er for details of the current maintainer. **************************************************************************/ -/* $Id: curspriv.h,v 1.28 2006/01/28 13:27:23 wmcbrine Exp $ */ +/* $Id: curspriv.h,v 1.29 2006/01/28 16:53:25 wmcbrine Exp $ */ /* CURSPRIV.H @@ -197,135 +197,125 @@ extern bool trace_on; /*---------------------------------------------------------------------- -* ANSI C prototypes. Be sure that your compiler conditional -* compilation definitions above define HAVE_PROTO if your compiler -* supports prototypes. +* ANSI C prototypes. */ -#ifdef HAVE_PROTO -# define Args(x) x -#else -# define Args(x) () -#endif -void PDC_beep Args((void)); -bool PDC_breakout Args((void)); -int PDC_chadd Args((WINDOW *, chtype, bool, bool)); -bool PDC_check_bios_key Args((void)); -int PDC_chg_attrs Args((WINDOW *, chtype, int, int, int, int)); -int PDC_chins Args((WINDOW *, chtype, bool)); -int PDC_clr_scrn Args((WINDOW *)); -int PDC_clr_update Args((WINDOW *)); -int PDC_copy_win Args((const WINDOW *, WINDOW *, int, int, int, - int, int, int, int, int, bool)); -int PDC_cursor_off Args((void)); -int PDC_cursor_on Args((void)); -int PDC_curs_set Args((int)); -int PDC_fix_cursor Args((int)); -int PDC_get_bios_key Args((void)); -int PDC_get_columns Args((void)); -bool PDC_get_ctrl_break Args((void)); -int PDC_get_cur_col Args((void)); -int PDC_get_cur_row Args((void)); -int PDC_get_cursor_pos Args((int *, int *)); -int PDC_get_cursor_mode Args((void)); -int PDC_get_font Args((void)); -int PDC_get_rows Args((void)); -int PDC_get_buffer_rows Args((void)); -int PDC_gotoxy Args((int, int)); -void PDC_init_atrtab Args((void)); -WINDOW * PDC_makenew Args((int, int, int, int)); -int PDC_mouse_in_slk Args((int, int)); -int PDC_newline Args((WINDOW *, int)); -int PDC_print Args((int, int, int)); -int PDC_putc Args((chtype, chtype)); -int PDC_putchar Args((chtype)); -int PDC_putctty Args((chtype, chtype)); -int PDC_rawgetch Args((void)); -int PDC_reset_prog_mode Args((void)); -int PDC_reset_shell_mode Args((void)); -int PDC_resize_screen Args((int, int)); -int PDC_sanity_check Args((int)); -int PDC_scr_close Args((void)); -int PDC_scr_open Args((SCREEN *, bool)); -int PDC_scroll Args((int, int, int, int, int, chtype)); -int PDC_set_80x25 Args((void)); -int PDC_set_ctrl_break Args((bool)); -int PDC_set_cursor_mode Args((int, int)); -int PDC_set_font Args((int)); -int PDC_set_rows Args((int)); -void PDC_slk_calc Args((void)); -void PDC_sync Args((WINDOW *)); -int PDC_sysgetch Args((void)); -bool PDC_transform_line Args((int)); -int PDC_validchar Args((int)); -int PDC_vsscanf Args((char *, const char *, va_list)); +void PDC_beep(void); +bool PDC_breakout(void); +int PDC_chadd(WINDOW *, chtype, bool, bool); +bool PDC_check_bios_key(void); +int PDC_chg_attrs(WINDOW *, chtype, int, int, int, int); +int PDC_chins(WINDOW *, chtype, bool); +int PDC_clr_scrn(WINDOW *); +int PDC_clr_update(WINDOW *); +int PDC_copy_win(const WINDOW *, WINDOW *, int, int, int, + int, int, int, int, int, bool); +int PDC_cursor_off(void); +int PDC_cursor_on(void); +int PDC_curs_set(int); +int PDC_fix_cursor(int); +int PDC_get_bios_key(void); +int PDC_get_columns(void); +bool PDC_get_ctrl_break(void); +int PDC_get_cur_col(void); +int PDC_get_cur_row(void); +int PDC_get_cursor_pos(int *, int *); +int PDC_get_cursor_mode(void); +int PDC_get_font(void); +int PDC_get_rows(void); +int PDC_get_buffer_rows(void); +int PDC_gotoxy(int, int); +void PDC_init_atrtab(void); +WINDOW * PDC_makenew(int, int, int, int); +int PDC_mouse_in_slk(int, int); +int PDC_newline(WINDOW *, int); +int PDC_print(int, int, int); +int PDC_putc(chtype, chtype); +int PDC_putchar(chtype); +int PDC_putctty(chtype, chtype); +int PDC_rawgetch(void); +int PDC_reset_prog_mode(void); +int PDC_reset_shell_mode(void); +int PDC_resize_screen(int, int); +int PDC_sanity_check(int); +int PDC_scr_close(void); +int PDC_scr_open(SCREEN *, bool); +int PDC_scroll(int, int, int, int, int, chtype); +int PDC_set_80x25(void); +int PDC_set_ctrl_break(bool); +int PDC_set_cursor_mode(int, int); +int PDC_set_font(int); +int PDC_set_rows(int); +void PDC_slk_calc(void); +void PDC_sync(WINDOW *); +int PDC_sysgetch(void); +bool PDC_transform_line(int); +int PDC_validchar(int); +int PDC_vsscanf(char *, const char *, va_list); #if defined(OS2) && !defined(EMXVIDEO) -int PDC_set_scrn_mode Args((VIOMODEINFO)); -bool PDC_scrn_modes_equal Args((VIOMODEINFO, VIOMODEINFO)); -int PDC_get_scrn_mode Args((VIOMODEINFO *)); -int PDC_query_adapter_type Args((VIOCONFIGINFO *)); -int PDC_get_keyboard_info Args((KBDINFO *)); -int PDC_set_keyboard_binary Args((void)); -int PDC_set_keyboard_default Args((void)); -int PDC_reset_shell_mode Args((void)); -int PDC_reset_prog_mode Args((void)); +int PDC_set_scrn_mode(VIOMODEINFO); +bool PDC_scrn_modes_equal(VIOMODEINFO, VIOMODEINFO); +int PDC_get_scrn_mode(VIOMODEINFO *); +int PDC_query_adapter_type(VIOCONFIGINFO *); +int PDC_get_keyboard_info(KBDINFO *); +int PDC_set_keyboard_binary(void); +int PDC_set_keyboard_default(void); +int PDC_reset_shell_mode(void); +int PDC_reset_prog_mode(void); #else -int PDC_set_scrn_mode Args((int)); -bool PDC_scrn_modes_equal Args((int, int)); -int PDC_get_scrn_mode Args((void)); -int PDC_query_adapter_type Args((void)); +int PDC_set_scrn_mode(int); +bool PDC_scrn_modes_equal(int, int); +int PDC_get_scrn_mode(void); +int PDC_query_adapter_type(void); #endif #ifdef WIN32 -void PDC_doupdate Args((void)); +void PDC_doupdate(void); #endif #if defined(XCURSES) -int XCurses_redraw_curscr Args((void)); -int XCurses_display_cursor Args((int, int, int, int, int)); -int XCurses_rawgetch Args((int)); -bool XCurses_kbhit Args((void)); -int XCurses_get_input_fd Args((void)); -int XCursesInstruct Args((int)); -int XCursesInstructAndWait Args((int)); -int XCurses_transform_line Args((chtype *, int, int, int)); -int XCursesInitscr Args((char *, int, char **)); -int XCursesEndwin Args((void)); -void XCursesCleanupCursesProcess Args((int)); -int XCursesResizeScreen Args((int, int)); -int XCurses_get_cols Args((void)); -int XCurses_get_rows Args((void)); -int XCurses_refresh_scrollbar Args((void)); -void XCurses_set_title Args((char *)); -int XCurses_getclipboard Args((char **, long *)); -int XCurses_setclipboard Args((char *, long)); -int XCurses_clearclipboard Args((void)); -unsigned long XCurses_get_key_modifiers Args((void)); +int XCurses_redraw_curscr(void); +int XCurses_display_cursor(int, int, int, int, int); +int XCurses_rawgetch(int); +bool XCurses_kbhit(void); +int XCurses_get_input_fd(void); +int XCursesInstruct(int); +int XCursesInstructAndWait(int); +int XCurses_transform_line(chtype *, int, int, int); +int XCursesInitscr(char *, int, char **); +int XCursesEndwin(void); +void XCursesCleanupCursesProcess(int); +int XCursesResizeScreen(int, int); +int XCurses_get_cols(void); +int XCurses_get_rows(void); +int XCurses_refresh_scrollbar(void); +void XCurses_set_title(char *); +int XCurses_getclipboard(char **, long *); +int XCurses_setclipboard(char *, long); +int XCurses_clearclipboard(void); +unsigned long XCurses_get_key_modifiers(void); #endif #ifdef PC -void movedata Args(((unsigned, unsigned, unsigned, - unsigned, unsigned)); +void movedata(unsigned, unsigned, unsigned, unsigned, unsigned); #endif #ifdef PDCDEBUG -void PDC_CDECL PDC_debug Args((char *, ...)); +void PDC_CDECL PDC_debug(char *, ...); # define PDC_LOG(x) if (trace_on) PDC_debug x #else # define PDC_LOG(x) #endif #ifdef REGISTERWINDOWS -bool PDC_inswin Args((WINDOW *, WINDOW *)); -int PDC_addtail Args((WINDOW *)); -int PDC_addwin Args((WINDOW *, WINDOW *)); -int PDC_rmwin Args((WINDOW *)); -WINDS * PDC_findwin Args((WINDOW *)); +bool PDC_inswin(WINDOW *, WINDOW *); +int PDC_addtail(WINDOW *); +int PDC_addwin(WINDOW *, WINDOW *); +int PDC_rmwin(WINDOW *); +WINDS * PDC_findwin(WINDOW *); #endif -#undef Args - #define PDC_COLORS 8 #define PDC_COLOR_PAIRS 64 diff --git a/demos/firework.c b/demos/firework.c index d4def7ed..98e2338b 100644 --- a/demos/firework.c +++ b/demos/firework.c @@ -30,32 +30,14 @@ #define DELAYSIZE 200 #ifdef PDCDEBUG -char *rcsid_firework = "$Id: firework.c,v 1.14 2006/01/28 13:27:23 wmcbrine Exp $"; +char *rcsid_firework = "$Id: firework.c,v 1.15 2006/01/28 16:53:26 wmcbrine Exp $"; #endif -#if defined(HAVE_PROTO) && !defined(__STDC__) -# define __STDC__ 1 -#endif +void myrefresh(void); +void get_colour(void); +void explode(int, int); -#ifndef Args -# if __STDC__ -# define Args(x) x -# else -# define Args(x) () -# endif -#endif - -void myrefresh Args((void)); -void get_colour Args((void)); -void explode Args((int, int)); - -#if __STDC__ int main(int argc, char **argv) -#else -int main(argc, argv) -int argc; -char **argv; -#endif { int start, end, row, diff, flag, direction, seed; @@ -121,12 +103,7 @@ char **argv; return 0; } -#if __STDC__ void explode(int row, int col) -#else -void explode(row, col) -int row, col; -#endif { clear(); mvprintw(row, col, "-"); @@ -175,14 +152,14 @@ int row, col; myrefresh(); } -void myrefresh Args((void)) +void myrefresh(void) { napms(DELAYSIZE); move(LINES - 1, COLS - 1); refresh(); } -void get_colour Args((void)) +void get_colour(void) { static short tbl[] = { diff --git a/demos/newdemo.c b/demos/newdemo.c index 9f49ac7c..8a1c5814 100644 --- a/demos/newdemo.c +++ b/demos/newdemo.c @@ -39,25 +39,13 @@ #endif #ifdef PDCDEBUG -char *rcsid_newdemo = "$Id: newdemo.c,v 1.18 2006/01/28 13:27:23 wmcbrine Exp $"; +char *rcsid_newdemo = "$Id: newdemo.c,v 1.19 2006/01/28 16:53:26 wmcbrine Exp $"; #endif -#if defined(HAVE_PROTO) && !defined(__STDC__) -# define __STDC__ 1 -#endif - -#ifndef Args -# if __STDC__ -# define Args(x) x -# else -# define Args(x) () -# endif -#endif - -int WaitForUser Args((void)); -int SubWinTest Args((WINDOW *)); -int BouncingBalls Args((WINDOW *)); -void trap Args((int)); +int WaitForUser(void); +int SubWinTest(WINDOW *); +int BouncingBalls(WINDOW *); +void trap(int); /* An ASCII map of Australia */ @@ -91,7 +79,7 @@ char *messages[] = NULL }; -int WaitForUser Args((void)) +int WaitForUser(void) { chtype ch; @@ -107,12 +95,7 @@ int WaitForUser Args((void)) return (ch == '\033') ? ch : 0; } -#if __STDC__ int SubWinTest(WINDOW *win) -#else -int SubWinTest(win) -WINDOW *win; -#endif { WINDOW *swin1, *swin2, *swin3; int w, h, sw, sh, bx, by; @@ -157,12 +140,7 @@ WINDOW *win; return 0; } -#if __STDC__ int BouncingBalls(WINDOW *win) -#else -int BouncingBalls(win) -WINDOW *win; -#endif { chtype c1, c2, c3, ball1, ball2, ball3; int w, h, x1, y1, xd1, yd1, x2, y2, xd2, yd2, x3, y3, xd3, yd3, c; @@ -250,12 +228,7 @@ WINDOW *win; /* Trap interrupt */ -#if __STDC__ void trap(int sig) -#else -void trap(sig) -int sig; -#endif { if (sig == SIGINT) { @@ -267,13 +240,7 @@ int sig; } } -#if __STDC__ int main(int argc, char **argv) -#else -int main(argc, argv) -int argc; -char **argv; -#endif { WINDOW *win; chtype save[80], ch; diff --git a/demos/ptest.c b/demos/ptest.c index 48d27bf0..f52479e2 100644 --- a/demos/ptest.c +++ b/demos/ptest.c @@ -25,7 +25,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_ptest = "$Id: ptest.c,v 1.13 2006/01/28 13:27:23 wmcbrine Exp $"; +char *rcsid_ptest = "$Id: ptest.c,v 1.14 2006/01/28 16:53:26 wmcbrine Exp $"; #endif #include @@ -42,34 +42,17 @@ char *mod[] = "test ", "TEST ", "(**) ", "*()* ", "<--> ", "LAST " }; -#if defined(HAVE_PROTO) && !defined(__STDC__) -# define __STDC__ 1 -#endif - -#ifndef Args -# if __STDC__ -# define Args(x) x -# else -# define Args(x) () -# endif -#endif - -PANEL *mkpanel Args((int, int, int, int)); -void fill_panel Args((PANEL *)); -void pflush Args((void)); -void wait_a_while Args((long)); -void saywhat Args((const char *)); -void rmpanel Args((PANEL *)); +PANEL *mkpanel(int, int, int, int); +void fill_panel(PANEL *); +void pflush(void); +void wait_a_while(long); +void saywhat(const char *); +void rmpanel(PANEL *); /*+------------------------------------------------------------------------- wait_a_while(msec) --------------------------------------------------------------------------*/ -#if __STDC__ void wait_a_while(long msec) -#else -void wait_a_while(msec) -long msec; -#endif { /* timeout(msec); */ getch(); @@ -78,12 +61,7 @@ long msec; /*+------------------------------------------------------------------------- saywhat(text) --------------------------------------------------------------------------*/ -#if __STDC__ void saywhat(const char *text) -#else -void saywhat(text) -char *text; -#endif { wmove(stdscr, LINES - 1, 0); wprintw(stdscr, "%-20.20s", text); @@ -92,15 +70,7 @@ char *text; /*+------------------------------------------------------------------------- mkpanel(rows, cols, tly, tlx) - alloc a win and panel and associate them --------------------------------------------------------------------------*/ -#if __STDC__ PANEL *mkpanel(int rows, int cols, int tly, int tlx) -#else -PANEL *mkpanel(rows, cols, tly, tlx) -int rows; -int cols; -int tly; -int tlx; -#endif { WINDOW *win = newwin(rows, cols, tly, tlx); PANEL *pan = (PANEL *)0; @@ -119,12 +89,7 @@ int tlx; /*+------------------------------------------------------------------------- rmpanel(pan) --------------------------------------------------------------------------*/ -#if __STDC__ void rmpanel(PANEL *pan) -#else -void rmpanel(pan) -PANEL *pan; -#endif { WINDOW *win = pan->win; @@ -135,7 +100,7 @@ PANEL *pan; /*+------------------------------------------------------------------------- pflush() --------------------------------------------------------------------------*/ -void pflush Args((void)) +void pflush(void) { update_panels(); doupdate(); @@ -144,12 +109,7 @@ void pflush Args((void)) /*+------------------------------------------------------------------------- fill_panel(win) --------------------------------------------------------------------------*/ -#if __STDC__ void fill_panel(PANEL *pan) -#else -void fill_panel(pan) -PANEL *pan; -#endif { WINDOW *win = pan->win; char num = *((char *)pan->user + 1); @@ -171,13 +131,7 @@ PANEL *pan; /*+------------------------------------------------------------------------- main(argc,argv) --------------------------------------------------------------------------*/ -#if __STDC__ int main(int argc, char **argv) -#else -int main(argc, argv) -int argc; -char **argv; -#endif { int itmp, y,x; diff --git a/demos/testcurs.c b/demos/testcurs.c index 18f1420b..8d4ea308 100644 --- a/demos/testcurs.c +++ b/demos/testcurs.c @@ -31,7 +31,7 @@ #ifdef PDCDEBUG # define CURSES_LIBRARY /* needed for the prototype of PDC_debug */ -char *rcsid_testcurs = "$Id: testcurs.c,v 1.31 2006/01/28 13:27:23 wmcbrine Exp $"; +char *rcsid_testcurs = "$Id: testcurs.c,v 1.32 2006/01/28 16:53:26 wmcbrine Exp $"; #endif #include @@ -51,43 +51,27 @@ char *rcsid_testcurs = "$Id: testcurs.c,v 1.31 2006/01/28 13:27:23 wmcbrine Exp # define HAVE_CLIPBOARD 0 #endif -#if defined(HAVE_PROTO) && !defined(__STDC__) -# define __STDC__ 1 -#endif - -#ifndef Args -# if __STDC__ -# define Args(x) x -# else -# define Args(x) () -# endif -#endif - -void inputTest Args((WINDOW *)); -void scrollTest Args((WINDOW *)); -void introTest Args((WINDOW *)); -int initTest Args((WINDOW **, int, char **)); -void outputTest Args((WINDOW *)); -void padTest Args((WINDOW *)); -void acsTest Args((WINDOW *)); -void display_menu Args((int, int)); +void inputTest(WINDOW *); +void scrollTest(WINDOW *); +void introTest(WINDOW *); +int initTest(WINDOW **, int, char **); +void outputTest(WINDOW *); +void padTest(WINDOW *); +void acsTest(WINDOW *); +void display_menu(int, int); #if HAVE_RESIZE -void resizeTest Args((WINDOW *)); +void resizeTest(WINDOW *); #endif #if HAVE_CLIPBOARD -void clipboardTest Args((WINDOW *)); +void clipboardTest(WINDOW *); #endif struct commands { char *text; -#ifdef __STDC__ void (*function)(WINDOW *); -#else - void (*function)(); -#endif }; typedef struct commands COMMAND; @@ -112,13 +96,7 @@ COMMAND command[MAX_OPTIONS] = int width, height; -#ifdef __STDC__ int main(int argc, char *argv[]) -#else -int main(argc, argv) -int argc; -char *argv[]; -#endif { WINDOW *win; int key, old_option = -1, new_option = 0; @@ -210,12 +188,7 @@ char *argv[]; return 0; } -#ifdef __STDC__ void Continue(WINDOW *win) -#else -void Continue(win) -WINDOW *win; -#endif { mvwaddstr(win, 10, 1, " Press any key to continue"); wrefresh(win); @@ -223,14 +196,7 @@ WINDOW *win; wgetch(win); } -#ifdef __STDC__ int initTest(WINDOW **win, int argc, char *argv[]) -#else -int initTest(win, argc, argv) -WINDOW **win; -int argc; -char *argv[]; -#endif { #ifdef PDCDEBUG PDC_debug("initTest called\n"); @@ -263,12 +229,7 @@ char *argv[]; return 0; } -#ifdef __STDC__ void introTest(WINDOW *win) -#else -void introTest(win) -WINDOW *win; -#endif { werase(win); wmove(win, height / 2 - 5, width / 2); @@ -290,12 +251,7 @@ WINDOW *win; Continue(win); } -#ifdef __STDC__ void scrollTest(WINDOW *win) -#else -void scrollTest(win) -WINDOW *win; -#endif { int i, OldY, OldX; @@ -346,12 +302,7 @@ WINDOW *win; wsetscrreg(win, 0, OldY); } -#ifdef __STDC__ void inputTest(WINDOW *win) -#else -void inputTest(win) -WINDOW *win; -#endif { int w, h, bx, by, sw, sh, i, c, num; char buffer[80]; @@ -581,12 +532,7 @@ WINDOW *win; Continue(win); } -#ifdef __STDC__ void outputTest(WINDOW *win) -#else -void outputTest(win) -WINDOW *win; -#endif { WINDOW *win1; char Buffer[80]; @@ -757,12 +703,7 @@ WINDOW *win; } #if HAVE_RESIZE -# ifdef __STDC__ void resizeTest(WINDOW *dummy) -# else -void resizeTest(dummy) -WINDOW *dummy; -# endif { WINDOW *win1; @@ -803,14 +744,9 @@ WINDOW *dummy; clear(); refresh(); } -#endif +#endif /* HAVE_RESIZE */ -#ifdef __STDC__ void padTest(WINDOW *dummy) -#else -void padTest(dummy) -WINDOW *dummy; -#endif { WINDOW *pad, *spad; @@ -848,12 +784,7 @@ WINDOW *dummy; } #if HAVE_CLIPBOARD -# ifdef __STDC__ void clipboardTest(WINDOW *win) -# else -void clipboardTest(win) -WINDOW *win; -# endif { long i, length = 0; char *text = @@ -947,14 +878,9 @@ WINDOW *win; raw(); getch(); } -#endif +#endif /* HAVE_CLIPBOARD */ -#ifdef __STDC__ void acsTest(WINDOW *win) -#else -void acsTest(win) -WINDOW *win; -#endif { static char *acs_names[] = { @@ -1016,12 +942,7 @@ WINDOW *win; } -#ifdef __STDC__ void display_menu(int old_option, int new_option) -#else -void display_menu(old_option, new_option) -int old_option, new_option; -#endif { int lmarg = (COLS - 14) / 2, tmarg = (LINES - (MAX_OPTIONS + 2)) / 2; diff --git a/demos/tui.c b/demos/tui.c index f93391b8..9e649414 100644 --- a/demos/tui.c +++ b/demos/tui.c @@ -35,12 +35,12 @@ #include #include "tui.h" -void statusmsg Args((char *)); -int waitforkey Args((void)); -void rmerror Args((void)); +void statusmsg(char *); +int waitforkey(void); +void rmerror(void); #ifdef PDCDEBUG -char *rcsid_tui = "$Id: tui.c,v 1.13 2006/01/28 13:27:23 wmcbrine Exp $"; +char *rcsid_tui = "$Id: tui.c,v 1.14 2006/01/28 16:53:26 wmcbrine Exp $"; #endif #if defined(__unix) && !defined(__DJGPP__) @@ -86,19 +86,13 @@ static bool quit = FALSE; static bool incurses = FALSE; #ifndef PDCURSES -static char wordchar Args((void)) +static char wordchar(void) { return 0x17; /* ^W */ } #endif -#if __STDC__ static char *padstr(char *s, int length) -#else -static char *padstr(s, length) -char *s; -int length; -#endif { static char buf[MAXSTRLEN]; char fmt[10]; @@ -109,24 +103,15 @@ int length; return buf; } -#if __STDC__ static char *prepad(char *s, int length) -#else -static char *prepad(s, length) -char *s; -int length; -#endif { int i; char *p = s; if (length > 0) { -#if __STDC__ memmove((void *)(s + length), (const void *)s, strlen(s) + 1); -#else - memmove(s + length, s, strlen(s) + 1); -#endif + for (i = 0; i < length; i++) *p++ = ' '; } @@ -134,19 +119,13 @@ int length; return s; } -#if __STDC__ static void rmline(WINDOW *win, int nr) /* keeps box lines intact */ -#else -static void rmline(win, nr) -WINDOW *win; -int nr; -#endif { mvwaddstr(win, nr, 1, padstr(" ", bw - 2)); wrefresh(win); } -static void initcolor Args((void)) +static void initcolor(void) { #ifdef A_COLOR if (has_colors()) @@ -166,13 +145,7 @@ static void initcolor Args((void)) #endif } -#if __STDC__ static void setcolor(WINDOW *win, chtype color) -#else -static void setcolor(win, color) -WINDOW *win; -chtype color; -#endif { chtype attr = color & A_ATTR; /* extract Bold, Reverse, Blink bits */ @@ -185,14 +158,7 @@ chtype color; #endif } -#if __STDC__ static void colorbox(WINDOW *win, chtype color, int hasbox) -#else -static void colorbox(win, color, hasbox) -WINDOW *win; -chtype color; -int hasbox; -#endif { int maxy, maxx; chtype attr = color & A_ATTR; /* extract Bold, Reverse, Blink bits */ @@ -218,7 +184,7 @@ int hasbox; wrefresh(win); } -static void idle Args((void)) +static void idle(void) { char buf[MAXSTRLEN]; time_t t; @@ -236,14 +202,7 @@ static void idle Args((void)) wrefresh(wtitl); } -#if __STDC__ static void menudim(menu *mp, int *lines, int *columns) -#else -static void menudim(mp, lines, columns) -menu *mp; -int *lines; -int *columns; -#endif { int n, l, mmax = 0; @@ -254,34 +213,19 @@ int *columns; *columns = mmax + 2; } -#if __STDC__ static void setmenupos(int y, int x) -#else -static void setmenupos(y, x) -int y, x; -#endif { nexty = y; nextx = x; } -#if __STDC__ static void getmenupos(int *y, int *x) -#else -static void getmenupos(y, x) -int *y, *x; -#endif { *y = nexty; *x = nextx; } -#if __STDC__ static int hotkey(char *s) -#else -static int hotkey(s) -char *s; -#endif { int c0 = *s; /* if no upper case found, return first char */ @@ -292,13 +236,7 @@ char *s; return *s ? *s : c0; } -#if __STDC__ static void repaintmenu(WINDOW *wmenu, menu *mp) -#else -static void repaintmenu(wmenu, mp) -WINDOW *wmenu; -menu *mp; -#endif { int i; menu *p = mp; @@ -310,13 +248,7 @@ menu *mp; wrefresh(wmenu); } -#if __STDC__ static void repaintmainmenu(int width, menu *mp) -#else -static void repaintmainmenu(width, mp) -int width; -menu *mp; -#endif { int i; menu *p = mp; @@ -328,7 +260,7 @@ menu *mp; touchwin (wmain); wrefresh (wmain); } -static void mainhelp Args((void)) +static void mainhelp(void) { #ifdef ALT_X statusmsg("Use arrow keys and Enter to select (Alt-X to quit)"); @@ -337,33 +269,28 @@ static void mainhelp Args((void)) #endif } -static void hidecursor Args((void)) +static void hidecursor(void) { #if defined(PDCURSES) || defined(SYSV) curs_set(0); #endif } -static void normalcursor Args((void)) +static void normalcursor(void) { #if defined(PDCURSES) || defined(SYSV) curs_set(1); #endif } -static void insertcursor Args((void)) +static void insertcursor(void) { #if defined(PDCURSES) || defined(SYSV) curs_set(2); #endif } -#if __STDC__ static void mainmenu(menu *mp) -#else -static void mainmenu(mp) -menu *mp; -#endif { int nitems, barlen, old = -1, cur = 0, c, cur0; @@ -460,7 +387,7 @@ menu *mp; wrefresh(wbody); } -static void cleanup Args((void)) /* cleanup curses settings */ +static void cleanup(void) /* cleanup curses settings */ { if (incurses) { @@ -480,13 +407,13 @@ static void cleanup Args((void)) /* cleanup curses settings */ /******************************* EXTERNAL **********************************/ -void clsbody Args((void)) +void clsbody(void) { werase(wbody); wmove(wbody, 0, 0); } -int bodylen Args((void)) +int bodylen(void) { int maxy, maxx; @@ -494,74 +421,54 @@ int bodylen Args((void)) return maxy; } -WINDOW *bodywin Args((void)) +WINDOW *bodywin(void) { return wbody; } -void rmerror Args((void)) +void rmerror(void) { rmline(wstat, 0); } -void rmstatus Args((void)) +void rmstatus(void) { rmline(wstat, 1); } -#if __STDC__ void titlemsg(char *msg) -#else -void titlemsg(msg) -char *msg; -#endif { mvwaddstr(wtitl, 0, 2, padstr(msg, bw - 3)); wrefresh(wtitl); } -#if __STDC__ void bodymsg(char *msg) -#else -void bodymsg(msg) -char *msg; -#endif { waddstr(wbody, msg); wrefresh(wbody); } -#if __STDC__ void errormsg(char *msg) -#else -void errormsg(msg) -char *msg; -#endif { beep(); mvwaddstr(wstat, 0, 2, padstr(msg, bw - 3)); wrefresh(wstat); } -#if __STDC__ void statusmsg(char *msg) -#else -void statusmsg(msg) -char *msg; -#endif { mvwaddstr(wstat, 1, 2, padstr(msg, bw - 3)); wrefresh(wstat); } -bool keypressed Args((void)) +bool keypressed(void) { ch = wgetch(wbody); return ch != ERR; } -int getkey Args((void)) +int getkey(void) { int c = ch; @@ -572,23 +479,18 @@ int getkey Args((void)) return c; } -int waitforkey Args((void)) +int waitforkey(void) { do idle(); while (!keypressed()); return getkey(); } -void DoExit Args((void)) /* terminate program */ +void DoExit(void) /* terminate program */ { quit = TRUE; } -#if __STDC__ void domenu(menu *mp) -#else -void domenu(mp) -menu *mp; -#endif { int y, x, nitems, barlen, mheight, mw, old = -1, cur = 0, cur0; bool stop = FALSE; @@ -684,13 +586,7 @@ menu *mp; wrefresh(wbody); } -#if __STDC__ void startmenu(menu *mp, char *mtitle) -#else -void startmenu(mp, mtitle) -menu *mp; -char *mtitle; -#endif { initscr(); incurses = TRUE; @@ -758,15 +654,7 @@ char *mtitle; **man-end**********************************************************************/ - -#if __STDC__ static void repainteditbox(WINDOW *win, int x, char *buf) -#else -static void repainteditbox(win, x, buf) -WINDOW *win; -int x; -char *buf; -#endif { int maxy, maxx; @@ -777,14 +665,7 @@ char *buf; wrefresh(win); } -#if __STDC__ int weditstr(WINDOW *win, char *buf, int field) -#else -int weditstr(win, buf, field) -WINDOW *win; -char *buf; -int field; -#endif { char org[MAXSTRLEN], *tp, *bp = buf; bool defdisp = TRUE, stop = FALSE, insert = FALSE; @@ -854,13 +735,9 @@ int field; { if (bp > buf) { -#if __STDC__ memmove((void *)(bp - 1), (const void *)bp, strlen(bp) + 1); -#else - memmove(bp-1, bp, strlen(bp) + 1); -#endif bp--; } } @@ -877,12 +754,9 @@ int field; bp--; while ((bp > buf) && (*(bp - 1) != ' ')) bp--; -#if __STDC__ + memmove((void *)bp, (const void *)tp, strlen(tp) + 1); -#else - memmove(bp, tp, strlen(tp) + 1); -#endif } else if (isprint(c)) { @@ -897,14 +771,10 @@ int field; { if ((int)strlen(buf) < field - 1) { -#if __STDC__ memmove((void *)(bp + 1), (const void *)bp, strlen(bp) + 1); -#else - memmove(bp + 1, bp, - strlen(bp) + 1); -#endif + *bp++ = c; } } @@ -928,13 +798,7 @@ int field; return c; } -#if __STDC__ WINDOW *winputbox(WINDOW *win, int nlines, int ncols) -#else -WINDOW *winputbox(win, nlines, ncols) -WINDOW *win; -int nlines, ncols; -#endif { WINDOW *winp; int cury, curx, begy, begx; @@ -948,14 +812,7 @@ int nlines, ncols; return winp; } -#if __STDC__ int getstrings(char *desc[], char *buf[], int field) -#else -int getstrings(desc, buf, field) -char *desc[]; -char *buf[]; -int field; -#endif { WINDOW *winput; int oldy, oldx, maxy, maxx, nlines, ncols, i, n, l, mmax = 0; diff --git a/demos/tui.h b/demos/tui.h index ca3a73c2..2e5e6da0 100644 --- a/demos/tui.h +++ b/demos/tui.h @@ -27,40 +27,16 @@ #include -#if defined(HAVE_PROTO) && !defined(__STDC__) -# define __STDC__ 1 -#endif - -#ifndef Args -# if __STDC__ -# define Args(x) x -# else -# define Args(x) () -# endif -#endif - -#ifndef getbegyx -#define getbegyx(w,y,x) ( y = (w)->_begy, x = (w)->_begx ) -#endif -#ifndef getmaxyx -#define getmaxyx(w,y,x) ( y = (w)->_maxy, x = (w)->_maxx ) -#endif - #ifdef A_COLOR #define A_ATTR (A_ATTRIBUTES ^ A_COLOR) /* A_BLINK, A_REVERSE, A_BOLD */ #else #define A_ATTR (A_ATTRIBUTES) /* standard UNIX attributes */ #endif - #define MAXSTRLEN 256 #define KEY_ESC 0x1b /* Escape */ -#if __STDC__ typedef void (*FUNC)(void); -#else -typedef void (*FUNC)(); -#endif typedef struct { @@ -71,29 +47,29 @@ typedef struct /* ANSI C function prototypes: */ -void clsbody Args((void)); -int bodylen Args((void)); -WINDOW *bodywin Args((void)); +void clsbody(void); +int bodylen(void); +WINDOW *bodywin(void); -void rmerror Args((void)); -void rmstatus Args((void)); +void rmerror(void); +void rmstatus(void); -void titlemsg Args((char *msg)); -void bodymsg Args((char *msg)); -void errormsg Args((char *msg)); -void statusmsg Args((char *msg)); +void titlemsg(char *msg); +void bodymsg(char *msg); +void errormsg(char *msg); +void statusmsg(char *msg); -bool keypressed Args((void)); -int getkey Args((void)); -int waitforkey Args((void)); +bool keypressed(void); +int getkey(void); +int waitforkey(void); -void DoExit Args((void)); -void startmenu Args((menu *mp, char *title)); -void domenu Args((menu *mp)); +void DoExit(void); +void startmenu(menu *mp, char *title); +void domenu(menu *mp); -int weditstr Args((WINDOW *win, char *buf, int field)); -WINDOW *winputbox Args((WINDOW *win, int nlines, int ncols)); -int getstrings Args((char *desc[], char *buf[], int field)); +int weditstr(WINDOW *win, char *buf, int field); +WINDOW *winputbox(WINDOW *win, int nlines, int ncols); +int getstrings(char *desc[], char *buf[], int field); #define editstr(s,f) (weditstr(stdscr,s,f)) #define mveditstr(y,x,s,f) (move(y,x)==ERR?ERR:editstr(s,f)) diff --git a/demos/tuidemo.c b/demos/tuidemo.c index 04a8dc16..0873f167 100644 --- a/demos/tuidemo.c +++ b/demos/tuidemo.c @@ -43,7 +43,7 @@ #include "tui.h" #ifdef PDCDEBUG -char *rcsid_tuidemo = "$Id: tuidemo.c,v 1.8 2006/01/28 13:27:23 wmcbrine Exp $"; +char *rcsid_tuidemo = "$Id: tuidemo.c,v 1.9 2006/01/28 16:53:26 wmcbrine Exp $"; #endif #if defined(XCURSES) @@ -54,29 +54,17 @@ char *rcsid_tuidemo = "$Id: tuidemo.c,v 1.8 2006/01/28 13:27:23 wmcbrine Exp $"; /**************************** strings entry box ***************************/ -void address Args((void)) +void address(void) { -#ifdef __STDC__ char *fieldname[6] = { "Name", "Street", "City", "State", "Country", (char *)0 }; -#else - char *fieldname[6]; -#endif + char *fieldbuf[5]; WINDOW *wbody = bodywin(); int i, field = 50; -#ifndef __STDC__ - fieldname[0] = "Name"; - fieldname[1] = "Street"; - fieldname[2] = "City"; - fieldname[3] = "State"; - fieldname[4] = "Country"; - fieldname[5] = (char *)0; -#endif - for (i = 0; i < 5; i++) fieldbuf[i] = (char *) calloc(field + 1, sizeof(char)); @@ -95,14 +83,7 @@ void address Args((void)) /**************************** string entry box ****************************/ -#if __STDC__ char *getfname(char *desc, char *fname, int field) -#else -char *getfname(desc, fname, field) -char *desc; -char *fname; -int field; -#endif { char *fieldname[2]; char *fieldbuf[1]; @@ -117,12 +98,7 @@ int field; /**************************** a very simple file browser ******************/ -#if __STDC__ void showfile(char *fname) -#else -void showfile(fname) -char *fname; -#endif { int i, bh = bodylen(); FILE *fp; @@ -168,10 +144,10 @@ char *fname; /***************************** forward declarations ***********************/ -void sub0 Args((void)), sub1 Args((void)), sub2 Args((void)), sub3 Args((void)); -void func1 Args((void)), func2 Args((void)); -void subfunc1 Args((void)), subfunc2 Args((void)); -void subsub Args((void)); +void sub0(void), sub1(void), sub2(void), sub3(void); +void func1(void), func2(void); +void subfunc1(void), subfunc2(void); +void subsub(void); /***************************** menus initialization ***********************/ @@ -213,35 +189,35 @@ menu SubMenu3[] = /***************************** main menu functions ************************/ -void sub0 Args((void)) +void sub0(void) { domenu(SubMenu0); } -void sub1 Args((void)) +void sub1(void) { domenu(SubMenu1); } -void sub2 Args((void)) +void sub2(void) { domenu(SubMenu2); } -void sub3 Args((void)) +void sub3(void) { domenu(SubMenu3); } /***************************** submenu1 functions *************************/ -void func1 Args((void)) +void func1(void) { beep(); bodymsg("One beep! "); } -void func2 Args((void)) +void func2(void) { beep(); bodymsg("Two beeps! "); @@ -250,12 +226,12 @@ void func2 Args((void)) /***************************** submenu2 functions *************************/ -void subfunc1 Args((void)) +void subfunc1(void) { showfile(FNAME); } -void subfunc2 Args((void)) +void subfunc2(void) { char fname[MAXSTRLEN]; @@ -266,14 +242,14 @@ void subfunc2 Args((void)) /***************************** submenu3 functions *************************/ -void subsub Args((void)) +void subsub(void) { domenu(SubMenu2); } /***************************** start main menu ***************************/ -int main Args((void)) +int main(void) { startmenu(MainMenu, "TUI - 'textual user interface' demonstration program"); diff --git a/demos/xmas.c b/demos/xmas.c index 850e3074..ace6789c 100644 --- a/demos/xmas.c +++ b/demos/xmas.c @@ -99,39 +99,27 @@ #endif #ifdef PDCDEBUG -char *rcsid_xmas = "$Id: xmas.c,v 1.13 2006/01/28 13:27:23 wmcbrine Exp $"; +char *rcsid_xmas = "$Id: xmas.c,v 1.14 2006/01/28 16:53:26 wmcbrine Exp $"; #endif #include #include -#if defined(HAVE_PROTO) && !defined(__STDC__) -# define __STDC__ 1 -#endif - -#ifndef Args -# if __STDC__ -# define Args(x) x -# else -# define Args(x) () -# endif -#endif - -void boxit Args((void)); -void seas Args((void)); -void greet Args((void)); -void fromwho Args((void)); -void del_msg Args((void)); -void tree Args((void)); -void balls Args((void)); -void star Args((void)); -void strng1 Args((void)); -void strng2 Args((void)); -void strng3 Args((void)); -void strng4 Args((void)); -void strng5 Args((void)); -void blinkit Args((void)); -void reindeer Args((void)); +void boxit(void); +void seas(void); +void greet(void); +void fromwho(void); +void del_msg(void); +void tree(void); +void balls(void); +void star(void); +void strng1(void); +void strng2(void); +void strng3(void); +void strng4(void); +void strng5(void); +void blinkit(void); +void reindeer(void); #define FROMWHO "Mark Hessling - (M.Hessling@qut.edu.au)" @@ -144,13 +132,7 @@ WINDOW *treescrn, *treescrn2, *treescrn3, *treescrn4, *treescrn5, *bigdeer2, *bigdeer3, *bigdeer4, *lookdeer0, *lookdeer1, *lookdeer2, *lookdeer3, *lookdeer4, *w_holiday, *w_del_msg; -#if __STDC__ int main(int argc, char **argv) -#else -int main(argc, argv) -int argc; -char **argv; -#endif { int loopy; chtype noseattr; @@ -652,7 +634,7 @@ char **argv; return 0; } -void boxit Args((void)) +void boxit(void) { int x = 0; @@ -679,7 +661,7 @@ void boxit Args((void)) } } -void seas Args((void)) +void seas(void) { mvaddch(4, 1, 'S'); mvaddch(6, 1, 'E'); @@ -691,7 +673,7 @@ void seas Args((void)) mvaddch(18, 1, 'S'); } -void greet Args((void)) +void greet(void) { mvaddch(3, 5, 'G'); mvaddch(5, 5, 'R'); @@ -704,17 +686,17 @@ void greet Args((void)) mvaddch(19, 5, 'S'); } -void fromwho Args((void)) +void fromwho(void) { mvaddstr(21, 13, FROMWHO); } -void del_msg Args((void)) +void del_msg(void) { refresh(); } -void tree Args((void)) +void tree(void) { #ifdef A_COLOR if (has_colors()) @@ -771,7 +753,7 @@ void tree Args((void)) wrefresh(w_del_msg); } -void balls Args((void)) +void balls(void) { chtype ball1, ball2, ball3, ball4, ball5, ball6; @@ -818,7 +800,7 @@ void balls Args((void)) wrefresh(w_del_msg); } -void star Args((void)) +void star(void) { mvwaddch(treescrn2, 0, 12, (chtype) '*' | A_STANDOUT); @@ -826,7 +808,7 @@ void star Args((void)) wrefresh(w_del_msg); } -void strng1 Args((void)) +void strng1(void) { #ifdef A_COLOR if (has_colors()) @@ -843,7 +825,7 @@ void strng1 Args((void)) wrefresh(w_del_msg); } -void strng2 Args((void)) +void strng2(void) { #ifdef A_COLOR if (has_colors()) @@ -863,7 +845,7 @@ void strng2 Args((void)) wrefresh(w_del_msg); } -void strng3 Args((void)) +void strng3(void) { #ifdef A_COLOR if (has_colors()) @@ -885,7 +867,7 @@ void strng3 Args((void)) wrefresh(w_del_msg); } -void strng4 Args((void)) +void strng4(void) { #ifdef A_COLOR if (has_colors()) @@ -912,7 +894,7 @@ void strng4 Args((void)) wrefresh(w_del_msg); } -void strng5 Args((void)) +void strng5(void) { #ifdef A_COLOR if (has_colors()) @@ -937,7 +919,7 @@ void strng5 Args((void)) wrefresh(w_del_msg); } -void blinkit Args((void)) +void blinkit(void) { static int cycle; @@ -990,7 +972,7 @@ void blinkit Args((void)) ++cycle; } -void reindeer Args((void)) +void reindeer(void) { int looper; diff --git a/dos/pdcdisp.c b/dos/pdcdisp.c index 54b02660..b29c1dd7 100644 --- a/dos/pdcdisp.c +++ b/dos/pdcdisp.c @@ -29,7 +29,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_PDCdisp = "$Id: pdcdisp.c,v 1.14 2006/01/28 13:27:23 wmcbrine Exp $"; +char *rcsid_PDCdisp = "$Id: pdcdisp.c,v 1.15 2006/01/28 16:53:26 wmcbrine Exp $"; #endif extern unsigned char atrtab[MAX_ATRTAB]; @@ -69,12 +69,7 @@ void movedata(unsigned sseg, unsigned soff, unsigned dseg, **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_clr_update(WINDOW *s) -#else -int PDC_clr_update(s) -WINDOW *s; -#endif /***********************************************************************/ { int i, j; @@ -186,11 +181,7 @@ WINDOW *s; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_cursor_on(void) -#else -int PDC_cursor_on() -#endif /***********************************************************************/ { PDC_LOG(("PDC_cursor_on() - called\n")); @@ -243,11 +234,7 @@ int PDC_cursor_on() **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_cursor_off(void) -#else -int PDC_cursor_off() -#endif /***********************************************************************/ { PDC_LOG(("PDC_cursor_off() - called\n")); @@ -292,12 +279,7 @@ int PDC_cursor_off() **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_fix_cursor(int flag) -#else -int PDC_fix_cursor(flag) -int flag; -#endif /***********************************************************************/ { PDC_LOG(("PDC_fix_cursor() - called\n")); @@ -362,13 +344,7 @@ int flag; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_gotoxy(int row, int col) -#else -int PDC_gotoxy(row, col) -int row; -int col; -#endif /***********************************************************************/ { PDC_LOG(("PDC_gotoxy() - called: row %d col %d\n", row, col)); @@ -404,13 +380,7 @@ int col; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_putc(chtype character, chtype color) -#else -int PDC_putc(character, color) -chtype character; -chtype color; -#endif /***********************************************************************/ { PDC_LOG(("PDC_putc() - called: char=%c attrib=0x%x color=0x%x\n", @@ -455,13 +425,7 @@ chtype color; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_putctty(chtype character, chtype color) -#else -int PDC_putctty(character, color) -chtype character; -chtype color; -#endif /***********************************************************************/ { PDC_LOG(("PDC_putctty() - called\n")); @@ -498,18 +462,8 @@ chtype color; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_scroll(int urow, int lcol, int lrow, int rcol, int nlines, chtype attr) -#else -int PDC_scroll(urow, lcol, lrow, rcol, nlines, attr) -int urow; -int lcol; -int lrow; -int rcol; -int nlines; -chtype attr; -#endif /***********************************************************************/ { int phys_attr = chtype_attr(attr); @@ -562,12 +516,7 @@ chtype attr; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO bool PDC_transform_line(int lineno) -#else -bool PDC_transform_line(lineno) -int lineno; -#endif /***********************************************************************/ { chtype *srcp; diff --git a/dos/pdcgetsc.c b/dos/pdcgetsc.c index 1c9f5b99..8461814f 100644 --- a/dos/pdcgetsc.c +++ b/dos/pdcgetsc.c @@ -24,7 +24,7 @@ #include #ifdef PDCDEBUG -char *rcsid_PDCgetsc = "$Id: pdcgetsc.c,v 1.11 2006/01/28 13:27:23 wmcbrine Exp $"; +char *rcsid_PDCgetsc = "$Id: pdcgetsc.c,v 1.12 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -51,13 +51,7 @@ char *rcsid_PDCgetsc = "$Id: pdcgetsc.c,v 1.11 2006/01/28 13:27:23 wmcbrine Exp **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_get_cursor_pos(int *row, int *col) -#else -int PDC_get_cursor_pos(row, col) -int *row; -int *col; -#endif /***********************************************************************/ { PDC_LOG(("PDC_get_cursor_pos() - called\n")); @@ -94,11 +88,7 @@ int *col; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_get_cur_col(void) -#else -int PDC_get_cur_col() -#endif /***********************************************************************/ { PDC_LOG(("PDC_get_cur_col() - called\n")); @@ -137,11 +127,7 @@ int PDC_get_cur_col() **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_get_cur_row(void) -#else -int PDC_get_cur_row() -#endif /***********************************************************************/ { PDC_LOG(("PDC_get_cur_row() - called\n")); @@ -180,11 +166,7 @@ int PDC_get_cur_row() **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_get_attribute(void) -#else -int PDC_get_attribute() -#endif /***********************************************************************/ { PDC_LOG(("PDC_get_attribute() - called\n")); @@ -222,11 +204,7 @@ int PDC_get_attribute() **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_get_columns(void) -#else -int PDC_get_columns() -#endif /***********************************************************************/ { int cols; @@ -270,11 +248,7 @@ int PDC_get_columns() **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_get_cursor_mode(void) -#else -int PDC_get_cursor_mode() -#endif /***********************************************************************/ { PDC_LOG(("PDC_get_cursor_mode() - called\n")); @@ -297,11 +271,7 @@ int PDC_get_cursor_mode() **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_get_font(void) -#else -int PDC_get_font() -#endif /***********************************************************************/ { int retval; @@ -362,11 +332,7 @@ int PDC_get_font() **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_get_rows(void) -#else -int PDC_get_rows() -#endif /***********************************************************************/ { char *env_rows; @@ -439,11 +405,7 @@ int PDC_get_rows() **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_get_scrn_mode(void) -#else -int PDC_get_scrn_mode() -#endif /***********************************************************************/ { PDC_LOG(("PDC_get_scrn_mode() - called\n")); @@ -479,11 +441,7 @@ int PDC_get_scrn_mode() **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_query_adapter_type(void) -#else -int PDC_query_adapter_type() -#endif /***********************************************************************/ { int equip; @@ -687,12 +645,7 @@ int PDC_query_adapter_type() **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_sanity_check(int adapter) -#else -int PDC_sanity_check(adapter) -int adapter; -#endif /***********************************************************************/ { int fontsize = PDC_get_font(); diff --git a/dos/pdckbd.c b/dos/pdckbd.c index 3967167b..ee4cfe4a 100644 --- a/dos/pdckbd.c +++ b/dos/pdckbd.c @@ -29,7 +29,7 @@ #include #ifdef PDCDEBUG -char *rcsid_PDCkbd = "$Id: pdckbd.c,v 1.13 2006/01/28 13:27:23 wmcbrine Exp $"; +char *rcsid_PDCkbd = "$Id: pdckbd.c,v 1.14 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /****************************************************************************** @@ -143,11 +143,7 @@ MOUSE_STATUS Trapped_Mouse_status; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO unsigned long PDC_get_input_fd(void) -#else -unsigned long PDC_get_input_fd() -#endif /***********************************************************************/ { PDC_LOG(("PDC_get_input_fd() - called\n")); @@ -177,11 +173,7 @@ unsigned long PDC_get_input_fd() **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO bool PDC_check_bios_key(void) -#else -bool PDC_check_bios_key() -#endif /***********************************************************************/ { PDC_LOG(("PDC_check_bios_key() - called\n")); @@ -212,11 +204,7 @@ bool PDC_check_bios_key() **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_get_bios_key(void) -#else -int PDC_get_bios_key() -#endif /***********************************************************************/ { int ascii, scan; @@ -351,11 +339,7 @@ int PDC_get_bios_key() **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO bool PDC_get_ctrl_break(void) -#else -bool PDC_get_ctrl_break() -#endif /***********************************************************************/ { PDC_LOG(("PDC_get_ctrl_break() - called\n")); @@ -395,11 +379,7 @@ bool PDC_get_ctrl_break() **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_rawgetch(void) -#else -int PDC_rawgetch() -#endif /***********************************************************************/ { extern WINDOW *_getch_win_; @@ -452,12 +432,7 @@ int PDC_rawgetch() **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_set_ctrl_break(bool setting) -#else -int PDC_set_ctrl_break(setting) -bool setting; -#endif /***********************************************************************/ { PDC_LOG(("PDC_set_ctrl_break() - called\n")); @@ -508,11 +483,7 @@ bool setting; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_sysgetch(void) -#else -int PDC_sysgetch() -#endif /***********************************************************************/ { extern WINDOW *_getch_win_; @@ -569,12 +540,7 @@ int PDC_sysgetch() **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_validchar(int c) -#else -int PDC_validchar(c) -int c; -#endif /***********************************************************************/ { extern WINDOW *_getch_win_; @@ -632,11 +598,7 @@ int c; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO unsigned long PDC_get_key_modifiers(void) -#else -unsigned long PDC_get_key_modifiers() -#endif /***********************************************************************/ { PDC_LOG(("PDC_get_key_modifiers() - called\n")); diff --git a/dos/pdcprint.c b/dos/pdcprint.c index ea1c0594..478afc1a 100644 --- a/dos/pdcprint.c +++ b/dos/pdcprint.c @@ -23,7 +23,7 @@ #include #ifdef PDCDEBUG -char *rcsid_PDCprint = "$Id: pdcprint.c,v 1.6 2006/01/28 13:27:23 wmcbrine Exp $"; +char *rcsid_PDCprint = "$Id: pdcprint.c,v 1.7 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -51,14 +51,7 @@ char *rcsid_PDCprint = "$Id: pdcprint.c,v 1.6 2006/01/28 13:27:23 wmcbrine Exp $ **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_print(int cmd, int byte, int port) -#else -int PDC_print(cmd, byte, port) -int cmd; -int byte; -int port; -#endif /***********************************************************************/ { PDC_LOG(("PDC_print() - called\n")); diff --git a/dos/pdcscrn.c b/dos/pdcscrn.c index 88d74ef2..72f34bcd 100644 --- a/dos/pdcscrn.c +++ b/dos/pdcscrn.c @@ -32,7 +32,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_PDCscrn = "$Id: pdcscrn.c,v 1.13 2006/01/28 13:27:23 wmcbrine Exp $"; +char *rcsid_PDCscrn = "$Id: pdcscrn.c,v 1.14 2006/01/28 16:53:26 wmcbrine Exp $"; #endif static unsigned short *saved_screen = NULL; @@ -59,11 +59,7 @@ char *rcsid_PDCscrn = "$Id: pdcscrn.c,v 1.13 2006/01/28 13:27:23 wmcbrine Exp $" **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_scr_close(void) -#else -int PDC_scr_close() -#endif /***********************************************************************/ { #if SMALL || MEDIUM @@ -130,13 +126,7 @@ int PDC_scr_close() **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO bool PDC_scrn_modes_equal(int mode1, int mode2) -#else -bool PDC_scrn_modes_equal(mode1, mode2) -int mode1; -int mode2; -#endif /***********************************************************************/ { PDC_LOG(("PDC_scrn_modes_equal() - called\n")); @@ -164,13 +154,7 @@ int mode2; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_scr_open(SCREEN *internal, bool echo) -#else -int PDC_scr_open(internal, echo) -SCREEN *internal; -bool echo; -#endif /***********************************************************************/ { #if SMALL || MEDIUM @@ -287,12 +271,7 @@ bool echo; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_resize_screen(int nlines, int ncols) -#else -int PDC_resize_screen(nlines, ncols) -int nlines, ncols; -#endif /***********************************************************************/ { PDC_LOG(("PDC_resize_screen() - called. Lines: %d Cols: %d\n", diff --git a/dos/pdcsetsc.c b/dos/pdcsetsc.c index 96264aa2..cc72904f 100644 --- a/dos/pdcsetsc.c +++ b/dos/pdcsetsc.c @@ -23,7 +23,7 @@ #include #ifdef PDCDEBUG -char *rcsid_PDCsetsc = "$Id: pdcsetsc.c,v 1.8 2006/01/28 13:27:23 wmcbrine Exp $"; +char *rcsid_PDCsetsc = "$Id: pdcsetsc.c,v 1.9 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -47,11 +47,7 @@ char *rcsid_PDCsetsc = "$Id: pdcsetsc.c,v 1.8 2006/01/28 13:27:23 wmcbrine Exp $ **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_set_80x25(void) -#else -int PDC_set_80x25() -#endif /***********************************************************************/ { PDC_LOG(("PDC_set_80x25() - called\n")); @@ -98,13 +94,7 @@ int PDC_set_80x25() **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_set_cursor_mode(int startrow, int endrow) -#else -int PDC_set_cursor_mode(startrow, endrow) -int startrow; -int endrow; -#endif /***********************************************************************/ { PDC_LOG(("PDC_set_cursor_mode() - called: startrow %d endrow %d\n", @@ -143,12 +133,7 @@ int endrow; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_set_font(int size) -#else -int PDC_set_font(size) -int size; -#endif /***********************************************************************/ { PDC_LOG(("PDC_set_font() - called\n")); @@ -248,12 +233,7 @@ int size; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_set_rows(int rows) -#else -int PDC_set_rows(rows) -int rows; -#endif /***********************************************************************/ { PDC_LOG(("PDC_set_rows() - called\n")); @@ -309,12 +289,7 @@ int rows; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_set_scrn_mode(int new_mode) -#else -int PDC_set_scrn_mode(new_mode) -int new_mode; -#endif /***********************************************************************/ { PDC_LOG(("PDC_set_scrn_mode() - called\n")); @@ -335,12 +310,7 @@ int new_mode; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_curs_set(int visibility) -#else -int PDC_curs_set(visibility) -int visibility; -#endif /***********************************************************************/ { int ret_vis, start = 6, end = 7; @@ -404,12 +374,7 @@ int visibility; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO void PDC_set_title(char *title) -#else -void PDC_set_title(title) -char *title; -#endif /***********************************************************************/ { PDC_LOG(("PDC_set_title() - called: <%s>\n", title)); diff --git a/panel.h b/panel.h index ec5047b2..5cd9aecf 100644 --- a/panel.h +++ b/panel.h @@ -16,7 +16,7 @@ * See the file maintain.er for details of the current maintainer. **************************************************************************/ -/* $Id: panel.h,v 1.9 2006/01/28 13:27:23 wmcbrine Exp $ */ +/* $Id: panel.h,v 1.10 2006/01/28 16:53:25 wmcbrine Exp $ */ /* ---------------------------------------------------------------------- Panels for PDCurses @@ -47,37 +47,25 @@ typedef struct panel int wendx; struct panel *below; struct panel *above; -#ifdef HAVE_PROTO const void *user; -#else - void *user; -#endif struct panelobs *obscure; } PANEL; -#ifdef HAVE_PROTO -# define Args(x) x -#else -# define Args(x) () -#endif - -WINDOW *panel_window Args((const PANEL *pan)); -void update_panels Args((void)); -int hide_panel Args((PANEL *pan)); -int show_panel Args((PANEL *pan)); -int del_panel Args((PANEL *pan)); -int top_panel Args((PANEL *pan)); -int bottom_panel Args((PANEL *pan)); -PANEL *new_panel Args((WINDOW *win)); -PANEL *panel_above Args((const PANEL *pan)); -PANEL *panel_below Args((const PANEL *pan)); -int panel_hidden Args((const PANEL *pan)); -int set_panel_userptr Args((PANEL *pan, const void *uptr)); -const void *panel_userptr Args((const PANEL *pan)); -int move_panel Args((PANEL *pan, int starty, int startx)); -int replace_panel Args((PANEL *pan, WINDOW *win)); - -#undef Args +WINDOW *panel_window(const PANEL *pan); +void update_panels(void); +int hide_panel(PANEL *pan); +int show_panel(PANEL *pan); +int del_panel(PANEL *pan); +int top_panel(PANEL *pan); +int bottom_panel(PANEL *pan); +PANEL *new_panel(WINDOW *win); +PANEL *panel_above(const PANEL *pan); +PANEL *panel_below(const PANEL *pan); +int panel_hidden(const PANEL *pan); +int set_panel_userptr(PANEL *pan, const void *uptr); +const void *panel_userptr(const PANEL *pan); +int move_panel(PANEL *pan, int starty, int startx); +int replace_panel(PANEL *pan, WINDOW *win); #endif /* __PDCURSES_PANEL_H__ */ diff --git a/panel/panel.c b/panel/panel.c index 7f86f3ea..1ccb609d 100644 --- a/panel/panel.c +++ b/panel/panel.c @@ -28,7 +28,7 @@ #include #ifdef PDCDEBUG -char *rcsid_panel = "$Id: panel.c,v 1.12 2006/01/28 10:28:59 wmcbrine Exp $"; +char *rcsid_panel = "$Id: panel.c,v 1.13 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -109,7 +109,6 @@ PANEL __stdscr_pseudo_panel = { (WINDOW *)0 }; #define STATIC static -#ifdef HAVE_PROTO STATIC void __calculate_obscure(void); STATIC void __free_obscure(PANEL *); STATIC void __override(PANEL *, int); @@ -118,19 +117,12 @@ STATIC void __panel_link_bottom(PANEL *); STATIC void __panel_link_top(PANEL *); STATIC bool __panels_overlapped(PANEL *, PANEL *); STATIC void __panel_unlink(PANEL *); -#endif /*+------------------------------------------------------------------------- dPanel(text, pan) --------------------------------------------------------------------------*/ #ifdef PANEL_DEBUG -# ifdef HAVE_PROTO STATIC void dPanel(char *text, PANEL *pan) -# else -STATIC void dPanel(text, pan) -char *text; -PANEL *pan; -# endif { _tracef("%s id=%s b=%s a=%s y=%d x=%d", text, pan->user, @@ -146,14 +138,7 @@ PANEL *pan; dStack(fmt, num, pan) --------------------------------------------------------------------------*/ #ifdef PANEL_DEBUG -# ifdef HAVE_PROTO STATIC void dStack(char *fmt, int num, PANEL *pan) -# else -STATIC void dStack(fmt, num, pan) -char *fmt; -int num; -PANEL *pan; -# endif { char s80[80]; @@ -181,12 +166,7 @@ PANEL *pan; Wnoutrefresh(pan) - debugging hook for wnoutrefresh --------------------------------------------------------------------------*/ #ifdef PANEL_DEBUG -# ifdef HAVE_PROTO STATIC void Wnoutrefresh(PANEL *pan) -# else -STATIC void Wnoutrefresh(pan) -PANEL *pan; -# endif { dPanel("wnoutrefresh", pan); wnoutrefresh(pan->win); @@ -199,12 +179,7 @@ PANEL *pan; Touchpan(pan) --------------------------------------------------------------------------*/ #ifdef PANEL_DEBUG -# ifdef HAVE_PROTO STATIC void Touchpan(PANEL *pan) -# else -STATIC void Touchpan(pan) -PANEL *pan; -# endif { dPanel("Touchpan", pan); touchwin(pan->win); @@ -217,14 +192,7 @@ PANEL *pan; Touchline(pan, start, count) --------------------------------------------------------------------------*/ #ifdef PANEL_DEBUG -# ifdef HAVE_PROTO STATIC void Touchline(PANEL *pan, int start, int count) -# else -STATIC void Touchline(pan, start, count) -PANEL *pan; -int start; -int count; -# endif { char s80[80]; @@ -239,13 +207,7 @@ int count; /*+------------------------------------------------------------------------- __panels_overlapped(pan1, pan2) - check panel overlapped --------------------------------------------------------------------------*/ -#ifdef HAVE_PROTO STATIC bool __panels_overlapped(PANEL *pan1, PANEL *pan2) -#else -STATIC bool __panels_overlapped(pan1, pan2) -PANEL *pan1; -PANEL *pan2; -#endif { if (!pan1 || !pan2) return FALSE; @@ -261,12 +223,7 @@ PANEL *pan2; /*+------------------------------------------------------------------------- __free_obscure(pan) --------------------------------------------------------------------------*/ -#ifdef HAVE_PROTO STATIC void __free_obscure(PANEL *pan) -#else -STATIC void __free_obscure(pan) -PANEL *pan; -#endif { PANELOBS *tobs = pan->obscure; /* "this" one */ PANELOBS *nobs; /* "next" one */ @@ -283,13 +240,7 @@ PANEL *pan; /*+------------------------------------------------------------------------- __override(pan, show) --------------------------------------------------------------------------*/ -#ifdef HAVE_PROTO STATIC void __override(PANEL *pan, int show) -#else -STATIC void __override(pan, show) -PANEL *pan; -int show; -#endif { int y; PANEL *pan2; @@ -323,11 +274,7 @@ int show; /*+------------------------------------------------------------------------- __calculate_obscure() --------------------------------------------------------------------------*/ -#ifdef HAVE_PROTO STATIC void __calculate_obscure(void) -#else -STATIC void __calculate_obscure() -#endif { PANEL *pan; PANEL *pan2; @@ -374,12 +321,7 @@ STATIC void __calculate_obscure() /*+------------------------------------------------------------------------- __panel_is_linked(pan) - check to see if panel is in the stack --------------------------------------------------------------------------*/ -#ifdef HAVE_PROTO STATIC bool __panel_is_linked(const PANEL *pan) -#else -STATIC bool __panel_is_linked(pan) -PANEL *pan; -#endif { PANEL *pan2 = __bottom_panel; @@ -397,12 +339,7 @@ PANEL *pan; /*+------------------------------------------------------------------------- __panel_link_top(pan) - link panel into stack at top --------------------------------------------------------------------------*/ -#ifdef HAVE_PROTO STATIC void __panel_link_top(PANEL *pan) -#else -STATIC void __panel_link_top(pan) -PANEL *pan; -#endif { #ifdef PANEL_DEBUG dStack("", 1, pan); @@ -430,12 +367,7 @@ PANEL *pan; /*+------------------------------------------------------------------------- __panel_link_bottom(pan) - link panel into stack at bottom --------------------------------------------------------------------------*/ -#ifdef HAVE_PROTO STATIC void __panel_link_bottom(PANEL *pan) -#else -STATIC void __panel_link_bottom(pan) -PANEL *pan; -#endif { #ifdef PANEL_DEBUG dStack("", 1, pan); @@ -463,12 +395,7 @@ PANEL *pan; /*+------------------------------------------------------------------------- __panel_unlink(pan) - unlink panel from stack --------------------------------------------------------------------------*/ -#ifdef HAVE_PROTO STATIC void __panel_unlink(PANEL *pan) -#else -STATIC void __panel_unlink(pan) -PANEL *pan; -#endif { PANEL *prev; PANEL *next; @@ -533,12 +460,7 @@ PANEL *pan; **man-end**********************************************************************/ -#ifdef HAVE_PROTO int bottom_panel(PANEL *pan) -#else -int bottom_panel(pan) -PANEL *pan; -#endif { if (!pan) return ERR; @@ -573,12 +495,7 @@ PANEL *pan; **man-end**********************************************************************/ -#ifdef HAVE_PROTO int del_panel(PANEL *pan) -#else -int del_panel(pan) -PANEL *pan; -#endif { if (pan) { @@ -612,12 +529,7 @@ PANEL *pan; **man-end**********************************************************************/ -#ifdef HAVE_PROTO int hide_panel(PANEL *pan) -#else -int hide_panel(pan) -PANEL *pan; -#endif { if (!pan) return ERR; @@ -656,14 +568,7 @@ PANEL *pan; **man-end**********************************************************************/ -#ifdef HAVE_PROTO int move_panel(PANEL *pan, int starty, int startx) -#else -int move_panel(pan, starty, startx) -PANEL *pan; -int starty; -int startx; -#endif { WINDOW *win; int maxy, maxx; @@ -710,12 +615,7 @@ int startx; **man-end**********************************************************************/ -#ifdef HAVE_PROTO PANEL *new_panel(WINDOW *win) -#else -PANEL *new_panel(win) -WINDOW *win; -#endif { PANEL *pan = (PANEL *)malloc(sizeof(PANEL)); @@ -775,12 +675,7 @@ WINDOW *win; **man-end**********************************************************************/ -#ifdef HAVE_PROTO PANEL *panel_above(const PANEL *pan) -#else -PANEL *panel_above(pan) -PANEL *pan; -#endif { return pan ? pan->above : __bottom_panel; } @@ -807,12 +702,7 @@ PANEL *pan; **man-end**********************************************************************/ -#ifdef HAVE_PROTO PANEL *panel_below(const PANEL *pan) -#else -PANEL *panel_below(pan) -PANEL *pan; -#endif { return pan ? pan->below : __top_panel; } @@ -836,12 +726,7 @@ PANEL *pan; **man-end**********************************************************************/ -#ifdef HAVE_PROTO int panel_hidden(const PANEL *pan) -#else -int panel_hidden(pan) -PANEL *pan; -#endif { if (!pan) return ERR; @@ -870,12 +755,7 @@ PANEL *pan; **man-end**********************************************************************/ -#ifdef HAVE_PROTO const void *panel_userptr(const PANEL *pan) -#else -void *panel_userptr(pan) -PANEL *pan; -#endif { return pan ? pan->user : NULL; } @@ -900,12 +780,7 @@ PANEL *pan; **man-end**********************************************************************/ -#ifdef HAVE_PROTO WINDOW *panel_window(const PANEL *pan) -#else -WINDOW *panel_window(pan) -PANEL *pan; -#endif { PDC_LOG(("panel_window() - called\n")); @@ -931,13 +806,7 @@ PANEL *pan; **man-end**********************************************************************/ -#ifdef HAVE_PROTO int replace_panel(PANEL *pan, WINDOW *win) -#else -int replace_panel(pan, win) -PANEL *pan; -WINDOW *win; -#endif { int maxy, maxx; @@ -979,13 +848,7 @@ WINDOW *win; **man-end**********************************************************************/ -#ifdef HAVE_PROTO int set_panel_userptr(PANEL *pan, const void *uptr) -#else -int set_panel_userptr(pan, uptr) -PANEL *pan; -void *uptr; -#endif { if (!pan) return ERR; @@ -1014,12 +877,7 @@ void *uptr; **man-end**********************************************************************/ -#ifdef HAVE_PROTO int show_panel(PANEL *pan) -#else -int show_panel(pan) -PANEL *pan; -#endif { if (!pan) return ERR; @@ -1055,12 +913,7 @@ PANEL *pan; **man-end**********************************************************************/ -#ifdef HAVE_PROTO int top_panel(PANEL *pan) -#else -int top_panel(pan) -PANEL *pan; -#endif { return show_panel(pan); } @@ -1086,11 +939,7 @@ PANEL *pan; **man-end**********************************************************************/ -#ifdef HAVE_PROTO void update_panels(void) -#else -void update_panels() -#endif { PANEL *pan; diff --git a/pdcurses/addch.c b/pdcurses/addch.c index a72268c2..7ec86f35 100644 --- a/pdcurses/addch.c +++ b/pdcurses/addch.c @@ -39,7 +39,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_addch = "$Id: addch.c,v 1.8 2006/01/28 15:01:41 wmcbrine Exp $"; +char *rcsid_addch = "$Id: addch.c,v 1.9 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -133,12 +133,7 @@ char *rcsid_addch = "$Id: addch.c,v 1.8 2006/01/28 15:01:41 wmcbrine Exp $"; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL addch(const chtype ch) -#else -int PDC_CDECL addch(ch) -chtype ch; -#endif /***********************************************************************/ { PDC_LOG(("addch() - called: ch=%x\n", ch)); @@ -147,13 +142,7 @@ chtype ch; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL waddch(WINDOW *win, const chtype ch) -#else -int PDC_CDECL waddch(win, ch) -WINDOW *win; -chtype ch; -#endif /***********************************************************************/ { PDC_LOG(("waddch() - called: win=%x ch=%x\n", win, ch)); @@ -162,14 +151,7 @@ chtype ch; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvaddch(int y, int x, const chtype ch) -#else -int PDC_CDECL mvaddch(y, x, ch) -int y; -int x; -chtype ch; -#endif /***********************************************************************/ { PDC_LOG(("mvaddch() - called: y=%d x=%d ch=%x\n", y, x, ch)); @@ -181,15 +163,7 @@ chtype ch; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvwaddch(WINDOW *win, int y, int x, const chtype ch) -#else -int PDC_CDECL mvwaddch(win, y, x, ch) -WINDOW *win; -int y; -int x; -chtype ch; -#endif /***********************************************************************/ { PDC_LOG(("mvwaddch() - called: win=%x y=%d x=%d ch=%d\n", @@ -202,12 +176,7 @@ chtype ch; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL echochar(const chtype ch) -#else -int PDC_CDECL echochar(ch) -chtype ch; -#endif /***********************************************************************/ { PDC_LOG(("echochar() - called: ch=%x\n", ch)); @@ -219,13 +188,7 @@ chtype ch; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL wechochar(WINDOW *win, const chtype ch) -#else -int PDC_CDECL wechochar(win, ch) -WINDOW *win; -chtype ch; -#endif /***********************************************************************/ { PDC_LOG(("wechochar() - called: win=%x ch=%x\n", win, ch)); diff --git a/pdcurses/addchstr.c b/pdcurses/addchstr.c index 68271417..029b9001 100644 --- a/pdcurses/addchstr.c +++ b/pdcurses/addchstr.c @@ -40,7 +40,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_addchstr = "$Id: addchstr.c,v 1.14 2006/01/28 15:01:41 wmcbrine Exp $"; +char *rcsid_addchstr = "$Id: addchstr.c,v 1.15 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -91,12 +91,7 @@ char *rcsid_addchstr = "$Id: addchstr.c,v 1.14 2006/01/28 15:01:41 wmcbrine Exp **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL addchstr(const chtype *ch) -#else -int PDC_CDECL addchstr(ch) -chtype *ch; -#endif /***********************************************************************/ { PDC_LOG(("addchstr() - called\n")); @@ -105,13 +100,7 @@ chtype *ch; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL addchnstr(const chtype *ch, int n) -#else -int PDC_CDECL addchnstr(ch, n) -chtype *ch; -int n; -#endif /***********************************************************************/ { PDC_LOG(("addchnstr() - called\n")); @@ -120,13 +109,7 @@ int n; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL waddchstr(WINDOW *win, const chtype *ch) -#else -int PDC_CDECL waddchstr(win, ch) -WINDOW *win; -chtype *ch; -#endif /***********************************************************************/ { PDC_LOG(("waddchstr() - called: win=%x\n", win)); @@ -135,14 +118,7 @@ chtype *ch; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL waddchnstr(WINDOW *win, const chtype *ch, int n) -#else -int PDC_CDECL waddchnstr(win, ch, n) -WINDOW *win; -chtype *ch; -int n; -#endif /***********************************************************************/ { int y, x, maxx, minx; @@ -192,14 +168,7 @@ int n; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvaddchstr(int y, int x, const chtype *ch) -#else -int PDC_CDECL mvaddchstr(y, x, ch) -int y; -int x; -chtype *ch; -#endif /***********************************************************************/ { PDC_LOG(("mvaddchstr() - called: y %d x %d\n", y, x)); @@ -211,15 +180,7 @@ chtype *ch; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvaddchnstr(int y, int x, const chtype *ch, int n) -#else -int PDC_CDECL mvaddchnstr(y, x, ch, n) -int y; -int x; -chtype *ch; -int n; -#endif /***********************************************************************/ { PDC_LOG(("mvaddchnstr() - called: y %d x %d n %d\n", y, x, n)); @@ -231,15 +192,7 @@ int n; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvwaddchstr(WINDOW *win, int y, int x, const chtype *ch) -#else -int PDC_CDECL mvwaddchstr(win, y, x, ch) -WINDOW *win; -int y; -int x; -chtype *ch; -#endif /***********************************************************************/ { PDC_LOG(("waddchstr() - called:\n")); @@ -251,17 +204,8 @@ chtype *ch; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvwaddchnstr(WINDOW *win, int y, int x, const chtype *ch, int n) -#else -int PDC_CDECL mvwaddchnstr(win, y, x, ch, n) -WINDOW *win; -int y; -int x; -chtype *ch; -int n; -#endif /***********************************************************************/ { PDC_LOG(("mvwaddchnstr() - called: y %d x %d n %d \n", y, x, n)); diff --git a/pdcurses/addstr.c b/pdcurses/addstr.c index ded02d22..b4004b9f 100644 --- a/pdcurses/addstr.c +++ b/pdcurses/addstr.c @@ -41,7 +41,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_addstr = "$Id: addstr.c,v 1.8 2006/01/28 15:01:41 wmcbrine Exp $"; +char *rcsid_addstr = "$Id: addstr.c,v 1.9 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -97,12 +97,7 @@ char *rcsid_addstr = "$Id: addstr.c,v 1.8 2006/01/28 15:01:41 wmcbrine Exp $"; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL addstr(const char *str) -#else -int PDC_CDECL addstr(str) -char *str; -#endif /***********************************************************************/ { PDC_LOG(("addstr() - called: string=\"%s\"\n", str)); @@ -111,13 +106,7 @@ char *str; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL addnstr(const char *str, int n) -#else -int PDC_CDECL addnstr(str, n) -char *str; -int n; -#endif /***********************************************************************/ { PDC_LOG(("addnstr() - called: string=\"%s\" n %d \n", str, n)); @@ -126,13 +115,7 @@ int n; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL waddstr(WINDOW *win, const char *str) -#else -int PDC_CDECL waddstr(win, str) -WINDOW *win; -char *str; -#endif /***********************************************************************/ { PDC_LOG(("waddstr() - called: string=\"%s\"\n", str)); @@ -141,14 +124,7 @@ char *str; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL waddnstr(WINDOW *win, const char *str, int n) -#else -int PDC_CDECL waddnstr(win, str, n) -WINDOW *win; -char *str; -int n; -#endif /***********************************************************************/ { int i, ic; @@ -173,14 +149,7 @@ int n; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvaddstr(int y, int x, const char *str) -#else -int PDC_CDECL mvaddstr(y, x, str) -int y; -int x; -char *str; -#endif /***********************************************************************/ { PDC_LOG(("mvaddstr() - called: y %d x %d string=\"%s\"\n", y, x, str)); @@ -192,15 +161,7 @@ char *str; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvaddnstr(int y, int x, const char *str, int n) -#else -int PDC_CDECL mvaddnstr(y, x, str, n) -int y; -int x; -char *str; -int n; -#endif /***********************************************************************/ { PDC_LOG(("mvaddnstr() - called: y %d x %d string=\"%s\" n %d \n", @@ -213,15 +174,7 @@ int n; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvwaddstr(WINDOW *win, int y, int x, const char *str) -#else -int PDC_CDECL mvwaddstr(win, y, x, str) -WINDOW *win; -int y; -int x; -char *str; -#endif /***********************************************************************/ { PDC_LOG(("mvwaddstr() - called: string=\"%s\"\n", str)); @@ -233,17 +186,8 @@ char *str; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvwaddnstr(WINDOW *win, int y, int x, const char *str, int n) -#else -int PDC_CDECL mvwaddnstr(win, y, x, str, n) -WINDOW *win; -int y; -int x; -char *str; -int n; -#endif /***********************************************************************/ { PDC_LOG(("mvwaddnstr() - called: y %d x %d string=\"%s\" n %d \n", diff --git a/pdcurses/attr.c b/pdcurses/attr.c index c161f52a..49fd1e35 100644 --- a/pdcurses/attr.c +++ b/pdcurses/attr.c @@ -42,7 +42,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_attr = "$Id: attr.c,v 1.11 2006/01/28 15:01:41 wmcbrine Exp $"; +char *rcsid_attr = "$Id: attr.c,v 1.12 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -120,12 +120,7 @@ char *rcsid_attr = "$Id: attr.c,v 1.11 2006/01/28 15:01:41 wmcbrine Exp $"; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL attroff(chtype attrs) -#else -int PDC_CDECL attroff(attrs) -chtype attrs; -#endif /***********************************************************************/ { PDC_LOG(("attroff() - called\n")); @@ -134,13 +129,7 @@ chtype attrs; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL wattroff(WINDOW *win, chtype attrs) -#else -int PDC_CDECL wattroff(win, attrs) -WINDOW *win; -chtype attrs; -#endif /***********************************************************************/ { PDC_LOG(("wattroff() - called\n")); @@ -154,12 +143,7 @@ chtype attrs; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL attron(chtype attrs) -#else -int PDC_CDECL attron(attrs) -chtype attrs; -#endif /***********************************************************************/ { PDC_LOG(("attron() - called\n")); @@ -168,13 +152,7 @@ chtype attrs; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL wattron(WINDOW *win, chtype attrs) -#else -int PDC_CDECL wattron(win, attrs) -WINDOW *win; -chtype attrs; -#endif /***********************************************************************/ { chtype newcolr, oldcolr; @@ -201,12 +179,7 @@ chtype attrs; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL attrset(chtype attrs) -#else -int PDC_CDECL attrset(attrs) -chtype attrs; -#endif /***********************************************************************/ { PDC_LOG(("attrset() - called\n")); @@ -215,13 +188,7 @@ chtype attrs; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL wattrset(WINDOW *win, chtype attrs) -#else -int PDC_CDECL wattrset(win, attrs) -WINDOW *win; -chtype attrs; -#endif /***********************************************************************/ { PDC_LOG(("wattrset() - called\n")); @@ -235,11 +202,7 @@ chtype attrs; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL standend(void) -#else -int PDC_CDECL standend() -#endif /***********************************************************************/ { PDC_LOG(("standend() - called\n")); @@ -248,11 +211,7 @@ int PDC_CDECL standend() } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL standout(void) -#else -int PDC_CDECL standout() -#endif /***********************************************************************/ { PDC_LOG(("standout() - called\n")); @@ -261,12 +220,7 @@ int PDC_CDECL standout() } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL wstandend(WINDOW *win) -#else -int PDC_CDECL wstandend(win) -WINDOW *win; -#endif /***********************************************************************/ { PDC_LOG(("wstandend() - called\n")); @@ -275,12 +229,7 @@ WINDOW *win; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL wstandout(WINDOW *win) -#else -int PDC_CDECL wstandout(win) -WINDOW *win; -#endif /***********************************************************************/ { PDC_LOG(("wstandout() - called\n")); @@ -289,25 +238,14 @@ WINDOW *win; } /***********************************************************************/ -#ifdef HAVE_PROTO chtype PDC_CDECL getattrs(WINDOW *win) -#else -chtype PDC_CDECL getattrs(win) -WINDOW *win; -#endif /***********************************************************************/ { return win ? win->_attrs : 0; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL color_set(short color_pair, void *opts) -#else -int PDC_CDECL color_set(color_pair, opts) -short color_pair; -void *opts; -#endif /***********************************************************************/ { PDC_LOG(("color_set() - called\n")); @@ -316,14 +254,7 @@ void *opts; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL wcolor_set(WINDOW *win, short color_pair, void *opts) -#else -int PDC_CDECL wcolor_set(win, color_pair, opts) -WINDOW *win; -short color_pair; -void *opts; /* "opts" not used, but required by the standard */ -#endif /***********************************************************************/ { PDC_LOG(("wcolor_set() - called\n")); diff --git a/pdcurses/beep.c b/pdcurses/beep.c index d74a25ff..2f5bc5b1 100644 --- a/pdcurses/beep.c +++ b/pdcurses/beep.c @@ -32,7 +32,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_beep = "$Id: beep.c,v 1.7 2006/01/28 15:01:41 wmcbrine Exp $"; +char *rcsid_beep = "$Id: beep.c,v 1.8 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -66,11 +66,7 @@ char *rcsid_beep = "$Id: beep.c,v 1.7 2006/01/28 15:01:41 wmcbrine Exp $"; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL beep(void) -#else -int PDC_CDECL beep() -#endif /***********************************************************************/ { PDC_LOG(("beep() - called\n")); @@ -87,11 +83,7 @@ int PDC_CDECL beep() } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL flash(void) -#else -int PDC_CDECL flash() -#endif /***********************************************************************/ { PDC_LOG(("flash() - called\n")); diff --git a/pdcurses/bkgd.c b/pdcurses/bkgd.c index 01c11849..4b89df03 100644 --- a/pdcurses/bkgd.c +++ b/pdcurses/bkgd.c @@ -30,7 +30,7 @@ #undef wbkgdset #ifdef PDCDEBUG -char *rcsid_bkgd = "$Id: bkgd.c,v 1.8 2006/01/28 15:01:41 wmcbrine Exp $"; +char *rcsid_bkgd = "$Id: bkgd.c,v 1.9 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -93,12 +93,7 @@ char *rcsid_bkgd = "$Id: bkgd.c,v 1.8 2006/01/28 15:01:41 wmcbrine Exp $"; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL bkgd(chtype ch) -#else -int PDC_CDECL bkgd(ch) -chtype ch; -#endif /***********************************************************************/ { PDC_LOG(("bkgd() - called\n")); @@ -107,12 +102,7 @@ chtype ch; } /***********************************************************************/ -#ifdef HAVE_PROTO void PDC_CDECL bkgdset(chtype ch) -#else -void PDC_CDECL bkgdset(ch) -chtype ch; -#endif /***********************************************************************/ { PDC_LOG(("bkgdset() - called\n")); @@ -121,25 +111,14 @@ chtype ch; } /***********************************************************************/ -#ifdef HAVE_PROTO chtype PDC_CDECL getbkgd(WINDOW *win) -#else -chtype PDC_CDECL getbkgd(win) -WINDOW *win; -#endif /***********************************************************************/ { return win ? win->_bkgd : (chtype)ERR; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL wbkgd(WINDOW *win, chtype ch) -#else -int PDC_CDECL wbkgd(win, ch) -WINDOW *win; -chtype ch; -#endif /***********************************************************************/ { int x, y; @@ -228,13 +207,7 @@ chtype ch; } /***********************************************************************/ -#ifdef HAVE_PROTO void PDC_CDECL wbkgdset(WINDOW *win, chtype ch) -#else -void PDC_CDECL wbkgdset(win, ch) -WINDOW *win; -chtype ch; -#endif /***********************************************************************/ { chtype bkgdattr; diff --git a/pdcurses/border.c b/pdcurses/border.c index f18680f5..a858ea54 100644 --- a/pdcurses/border.c +++ b/pdcurses/border.c @@ -43,7 +43,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_border = "$Id: border.c,v 1.11 2006/01/28 15:01:41 wmcbrine Exp $"; +char *rcsid_border = "$Id: border.c,v 1.12 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -125,13 +125,7 @@ char *rcsid_border = "$Id: border.c,v 1.11 2006/01/28 15:01:41 wmcbrine Exp $"; it. Attributes set explicitly in ch take precedence. */ /***********************************************************************/ -#ifdef HAVE_PROTO chtype PDC_attr_passthru(WINDOW *win, chtype ch) -#else -chtype PDC_attr_passthru(win, ch) -WINDOW *win; -chtype ch; -#endif /***********************************************************************/ { chtype attr, bktmp; @@ -169,22 +163,9 @@ chtype ch; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL wborder(WINDOW *win, chtype ls, chtype rs, chtype ts, chtype bs, chtype tl, chtype tr, chtype bl, chtype br) -#else -int PDC_CDECL wborder(win, ls, rs, ts, bs, tl, tr, bl, br) -WINDOW *win; -chtype ls; -chtype rs; -chtype ts; -chtype bs; -chtype tl; -chtype tr; -chtype bl; -chtype br; -#endif /***********************************************************************/ { int ymax, xmax; @@ -247,20 +228,8 @@ chtype br; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL border(chtype ls, chtype rs, chtype ts, chtype bs, chtype tl, chtype tr, chtype bl, chtype br) -#else -int PDC_CDECL border(ls, rs, ts, bs, tl, tr, bl, br) -chtype ls; -chtype rs; -chtype ts; -chtype bs; -chtype tl; -chtype tr; -chtype bl; -chtype br; -#endif /***********************************************************************/ { PDC_LOG(("border() - called\n")); @@ -269,14 +238,7 @@ chtype br; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL box(WINDOW *win, chtype verch, chtype horch) -#else -int PDC_CDECL box(win, verch, horch) -WINDOW *win; -chtype verch; -chtype horch; -#endif /***********************************************************************/ { PDC_LOG(("box() - called\n")); @@ -288,13 +250,7 @@ chtype horch; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL hline(chtype ch, int n) -#else -int PDC_CDECL hline(ch, n) -chtype ch; -int n; -#endif /***********************************************************************/ { PDC_LOG(("hline() - called\n")); @@ -303,13 +259,7 @@ int n; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL vline(chtype ch, int n) -#else -int PDC_CDECL vline(ch, n) -chtype ch; -int n; -#endif /***********************************************************************/ { PDC_LOG(("vline() - called\n")); @@ -318,14 +268,7 @@ int n; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL whline(WINDOW *win, chtype ch, int n) -#else -int PDC_CDECL whline(win, ch, n) -WINDOW *win; -chtype ch; -int n; -#endif /***********************************************************************/ { int startpos, endpos; @@ -366,14 +309,7 @@ int n; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL wvline(WINDOW *win, chtype ch, int n) -#else -int PDC_CDECL wvline(win, ch, n) -WINDOW *win; -chtype ch; -int n; -#endif /***********************************************************************/ { int endpos; @@ -412,15 +348,7 @@ int n; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvhline(int y, int x, chtype ch, int n) -#else -int PDC_CDECL mvhline(y, x, ch, n) -int y; -int x; -chtype ch; -int n; -#endif /***********************************************************************/ { PDC_LOG(("mvhline() - called\n")); @@ -432,15 +360,7 @@ int n; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvvline(int y, int x, chtype ch, int n) -#else -int PDC_CDECL mvvline(y, x, ch, n) -int y; -int x; -chtype ch; -int n; -#endif /***********************************************************************/ { PDC_LOG(("mvvline() - called\n")); @@ -452,16 +372,7 @@ int n; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvwhline(WINDOW *win, int y, int x, chtype ch, int n) -#else -int PDC_CDECL mvwhline(win, y, x, ch, n) -WINDOW *win; -int y; -int x; -chtype ch; -int n; -#endif /***********************************************************************/ { PDC_LOG(("mvwhline() - called\n")); @@ -473,16 +384,7 @@ int n; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvwvline(WINDOW *win, int y, int x, chtype ch, int n) -#else -int PDC_CDECL mvwvline(win, y, x, ch, n) -WINDOW *win; -int y; -int x; -chtype ch; -int n; -#endif /***********************************************************************/ { PDC_LOG(("mvwvline() - called\n")); @@ -497,16 +399,8 @@ int n; Used only as the core routine for the next three functions. */ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL PDC_lineattr(WINDOW *win, int n, bool state, chtype attr) -#else -int PDC_CDECL PDC_lineattr(win, n, state, attr) -WINDOW *win; -int n; -bool state; -chtype attr; -#endif /***********************************************************************/ { int endpos; @@ -546,14 +440,7 @@ chtype attr; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL PDC_wunderline(WINDOW *win, int n, bool state) -#else -int PDC_CDECL PDC_wunderline(win, n, state) -WINDOW *win; -int n; -bool state; -#endif /***********************************************************************/ { PDC_LOG(("PDC_wunderline() - called\n")); @@ -562,14 +449,7 @@ bool state; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL PDC_wleftline(WINDOW *win, int n, bool state) -#else -int PDC_CDECL PDC_wleftline(win, n, state) -WINDOW *win; -int n; -bool state; -#endif /***********************************************************************/ { PDC_LOG(("PDC_wleftline() - called\n")); @@ -578,14 +458,7 @@ bool state; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL PDC_wrightline(WINDOW *win, int n, bool state) -#else -int PDC_CDECL PDC_wrightline(win, n, state) -WINDOW *win; -int n; -bool state; -#endif /***********************************************************************/ { PDC_LOG(("PDC_wrightline() - called\n")); diff --git a/pdcurses/clear.c b/pdcurses/clear.c index c6f3eee7..c776aff0 100644 --- a/pdcurses/clear.c +++ b/pdcurses/clear.c @@ -37,7 +37,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_clear = "$Id: clear.c,v 1.8 2006/01/28 15:01:41 wmcbrine Exp $"; +char *rcsid_clear = "$Id: clear.c,v 1.9 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -102,11 +102,7 @@ char *rcsid_clear = "$Id: clear.c,v 1.8 2006/01/28 15:01:41 wmcbrine Exp $"; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL clear(void) -#else -int PDC_CDECL clear() -#endif /***********************************************************************/ { PDC_LOG(("clear() - called\n")); @@ -119,12 +115,7 @@ int PDC_CDECL clear() } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL wclear(WINDOW *win) -#else -int PDC_CDECL wclear(win) -WINDOW *win; -#endif /***********************************************************************/ { PDC_LOG(("wclear() - called\n")); @@ -137,23 +128,14 @@ WINDOW *win; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL erase(void) -#else -int PDC_CDECL erase() -#endif /***********************************************************************/ { return werase(stdscr); } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL werase(WINDOW *win) -#else -int PDC_CDECL werase(win) -WINDOW *win; -#endif /***********************************************************************/ { PDC_LOG(("werase() - called\n")); @@ -166,23 +148,14 @@ WINDOW *win; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL clrtobot(void) -#else -int PDC_CDECL clrtobot() -#endif /***********************************************************************/ { return wclrtobot(stdscr); } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL wclrtobot(WINDOW *win) -#else -int PDC_CDECL wclrtobot(win) -WINDOW *win; -#endif /***********************************************************************/ { int savey=win->_cury; @@ -211,23 +184,14 @@ WINDOW *win; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL clrtoeol(void) -#else -int PDC_CDECL clrtoeol() -#endif /***********************************************************************/ { return wclrtoeol(stdscr); } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL wclrtoeol(WINDOW *win) -#else -int PDC_CDECL wclrtoeol(win) -WINDOW *win; -#endif /***********************************************************************/ { int x, y, minx; diff --git a/pdcurses/color.c b/pdcurses/color.c index 8882f405..b8e4b36e 100644 --- a/pdcurses/color.c +++ b/pdcurses/color.c @@ -39,14 +39,10 @@ #ifdef PDCDEBUG #endif -#ifdef HAVE_PROTO static void PDC_init_pair(short, short, short); -#else -static void PDC_init_pair(); -#endif #ifdef PDCDEBUG -char *rcsid_color = "$Id: color.c,v 1.23 2006/01/28 15:01:41 wmcbrine Exp $"; +char *rcsid_color = "$Id: color.c,v 1.24 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -181,12 +177,7 @@ unsigned char atrtab[MAX_ATRTAB] = unsigned char colorset[PDC_COLOR_PAIRS]; /***********************************************************************/ -#ifdef HAVE_PROTO chtype PDC_CDECL COLOR_PAIR(int n) -#else -chtype PDC_CDECL COLOR_PAIR(n) -int n; -#endif /***********************************************************************/ { #ifdef CHTYPE_LONG @@ -197,12 +188,7 @@ int n; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL PAIR_NUMBER(chtype value) -#else -int PDC_CDECL PAIR_NUMBER(value) -chtype value; -#endif /***********************************************************************/ { #ifdef CHTYPE_LONG @@ -213,11 +199,7 @@ chtype value; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL start_color(void) -#else -int PDC_CDECL start_color() -#endif /***********************************************************************/ { PDC_LOG(("start_color() - called\n")); @@ -238,15 +220,8 @@ int PDC_CDECL start_color() } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL init_pair(short colorpair, short foreground, short background) -#else -int PDC_CDECL init_pair(colorpair, foreground, background) -short colorpair; -short foreground; -short background; -#endif /***********************************************************************/ { #if defined(CHTYPE_LONG) && !defined(XCURSES) @@ -294,11 +269,7 @@ short background; } /***********************************************************************/ -#ifdef HAVE_PROTO bool PDC_CDECL has_colors(void) -#else -bool PDC_CDECL has_colors() -#endif /***********************************************************************/ { PDC_LOG(("has_colors() - called\n")); @@ -307,16 +278,8 @@ bool PDC_CDECL has_colors() } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL init_color(short color, short red, short green, short blue) -#else -int PDC_CDECL init_color(color, red, green, blue) -short color; -short red; -short green; -short blue; -#endif /***********************************************************************/ { PDC_LOG(("init_color() - called\n")); @@ -325,16 +288,8 @@ short blue; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL color_content(short color, short *red, short *green, short *blue) -#else -int PDC_CDECL color_content(color, red, green, blue) -short color; -short *red; -short *green; -short *blue; -#endif /***********************************************************************/ { PDC_LOG(("color_content() - called\n")); @@ -354,11 +309,7 @@ short *blue; } /***********************************************************************/ -#ifdef HAVE_PROTO bool PDC_CDECL can_change_color(void) -#else -bool PDC_CDECL can_change_color() -#endif /***********************************************************************/ { PDC_LOG(("can_change_color() - called\n")); @@ -367,15 +318,8 @@ bool PDC_CDECL can_change_color() } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL pair_content(short colorpair, short *foreground, short *background) -#else -int PDC_CDECL pair_content(colorpair, foreground, background) -short colorpair; -short *foreground; -short *background; -#endif /***********************************************************************/ { PDC_LOG(("pair_content() - called\n")); @@ -391,12 +335,7 @@ short *background; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL PDC_set_line_color(short color) -#else -int PDC_CDECL PDC_set_line_color(color) -short color; -#endif /***********************************************************************/ { if (color >= COLORS || color < 0) @@ -409,11 +348,7 @@ short color; #if defined(CHTYPE_LONG) /***********************************************************************/ -#ifdef HAVE_PROTO void PDC_init_atrtab(void) -#else -void PDC_init_atrtab() -#endif /***********************************************************************/ { int i, orig_fore, orig_back; @@ -436,14 +371,7 @@ void PDC_init_atrtab() } /***********************************************************************/ -#ifdef HAVE_PROTO static void PDC_init_pair(short pairnum, short fg, short bg) -#else -static void PDC_init_pair(pairnum, fg, bg) -short pairnum; -short fg; -short bg; -#endif /***********************************************************************/ { unsigned char att, temp_bg; diff --git a/pdcurses/delch.c b/pdcurses/delch.c index 3c7fb64a..9a79c814 100644 --- a/pdcurses/delch.c +++ b/pdcurses/delch.c @@ -45,7 +45,7 @@ #ifdef PDCDEBUG -char *rcsid_delch = "$Id: delch.c,v 1.6 2006/01/28 15:01:41 wmcbrine Exp $"; +char *rcsid_delch = "$Id: delch.c,v 1.7 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -91,11 +91,7 @@ char *rcsid_delch = "$Id: delch.c,v 1.6 2006/01/28 15:01:41 wmcbrine Exp $"; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL delch(void) -#else -int PDC_CDECL delch() -#endif /***********************************************************************/ { PDC_LOG(("delch() - called\n")); @@ -104,12 +100,7 @@ int PDC_CDECL delch() } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL wdelch(WINDOW *win) -#else -int PDC_CDECL wdelch(win) -WINDOW *win; -#endif /***********************************************************************/ { int y, x, maxx; @@ -145,13 +136,7 @@ WINDOW *win; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvdelch(int y, int x) -#else -int PDC_CDECL mvdelch(y, x) -int y; -int x; -#endif /***********************************************************************/ { PDC_LOG(("mvdelch() - called\n")); @@ -163,14 +148,7 @@ int x; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvwdelch(WINDOW *win, int y, int x) -#else -int PDC_CDECL mvwdelch(win, y, x) -WINDOW *win; -int y; -int x; -#endif /***********************************************************************/ { PDC_LOG(("mvwdelch() - called\n")); diff --git a/pdcurses/deleteln.c b/pdcurses/deleteln.c index 5d60a577..24a40088 100644 --- a/pdcurses/deleteln.c +++ b/pdcurses/deleteln.c @@ -36,7 +36,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_deleteln = "$Id: deleteln.c,v 1.7 2006/01/28 15:01:41 wmcbrine Exp $"; +char *rcsid_deleteln = "$Id: deleteln.c,v 1.8 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -89,11 +89,7 @@ char *rcsid_deleteln = "$Id: deleteln.c,v 1.7 2006/01/28 15:01:41 wmcbrine Exp **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL deleteln(void) -#else -int PDC_CDECL deleteln() -#endif /***********************************************************************/ { PDC_LOG(("deleteln() - called\n")); @@ -102,12 +98,7 @@ int PDC_CDECL deleteln() } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL wdeleteln(WINDOW *win) -#else -int PDC_CDECL wdeleteln(win) -WINDOW *win; -#endif /***********************************************************************/ { chtype blank; @@ -150,12 +141,7 @@ WINDOW *win; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL insdelln(int n) -#else -int PDC_CDECL insdelln(n) -int n; -#endif /***********************************************************************/ { PDC_LOG(("insdelln() - called\n")); @@ -164,13 +150,7 @@ int n; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL winsdelln(WINDOW *win, int n) -#else -int PDC_CDECL winsdelln(win, n) -WINDOW *win; -int n; -#endif /***********************************************************************/ { int i; @@ -198,12 +178,7 @@ int n; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL winsertln(WINDOW *win) -#else -int PDC_CDECL winsertln(win) -WINDOW *win; -#endif /***********************************************************************/ { chtype blank; @@ -243,11 +218,7 @@ WINDOW *win; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL insertln(void) -#else -int PDC_CDECL insertln() -#endif /***********************************************************************/ { PDC_LOG(("insertln() - called\n")); @@ -256,13 +227,7 @@ int PDC_CDECL insertln() } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvwinsertln(WINDOW *win, int y, int x) -#else -int PDC_CDECL mvwinsertln(win, y, x) -WINDOW *win; -int y,x; -#endif /***********************************************************************/ { PDC_LOG(("mvwinsertln() - called\n")); diff --git a/pdcurses/getch.c b/pdcurses/getch.c index 518b2eb2..f7aa9e27 100644 --- a/pdcurses/getch.c +++ b/pdcurses/getch.c @@ -38,7 +38,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_getch = "$Id: getch.c,v 1.17 2006/01/28 15:01:41 wmcbrine Exp $"; +char *rcsid_getch = "$Id: getch.c,v 1.18 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -114,11 +114,7 @@ char *rcsid_getch = "$Id: getch.c,v 1.17 2006/01/28 15:01:41 wmcbrine Exp $"; #define ungetch PDC_ungetch /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL PDC_getch(void) -#else -int PDC_CDECL PDC_getch() -#endif /***********************************************************************/ { PDC_LOG(("getch() - called\n")); @@ -127,12 +123,7 @@ int PDC_CDECL PDC_getch() } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL wgetch(WINDOW *win) -#else -int PDC_CDECL wgetch(win) -WINDOW *win; -#endif /***********************************************************************/ { extern int c_pindex; /* putter index */ @@ -267,13 +258,7 @@ WINDOW *win; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvgetch(int y, int x) -#else -int PDC_CDECL mvgetch(y, x) -int y; -int x; -#endif /***********************************************************************/ { PDC_LOG(("mvgetch() - called\n")); @@ -285,14 +270,7 @@ int x; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvwgetch(WINDOW *win, int y, int x) -#else -int PDC_CDECL mvwgetch(win, y, x) -WINDOW *win; -int y; -int x; -#endif /***********************************************************************/ { PDC_LOG(("mvwgetch() - called\n")); @@ -304,12 +282,7 @@ int x; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL PDC_ungetch(int ch) -#else -int PDC_CDECL PDC_ungetch(ch) -int ch; -#endif /***********************************************************************/ { extern int c_ungind; /* ungetch() push index */ diff --git a/pdcurses/getstr.c b/pdcurses/getstr.c index 1fa6d2ba..ac1cf9d1 100644 --- a/pdcurses/getstr.c +++ b/pdcurses/getstr.c @@ -43,7 +43,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_getstr = "$Id: getstr.c,v 1.15 2006/01/28 15:01:41 wmcbrine Exp $"; +char *rcsid_getstr = "$Id: getstr.c,v 1.16 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -103,12 +103,7 @@ char *rcsid_getstr = "$Id: getstr.c,v 1.15 2006/01/28 15:01:41 wmcbrine Exp $"; #define MAXLINE 255 /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL getstr(char *str) -#else -int PDC_CDECL getstr(str) -char *str; -#endif /***********************************************************************/ { PDC_LOG(("getstr() - called\n")); @@ -117,13 +112,7 @@ char *str; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL wgetstr(WINDOW *win, char *str) -#else -int PDC_CDECL wgetstr(win, str) -WINDOW *win; -char *str; -#endif /***********************************************************************/ { PDC_LOG(("wgetstr() - called\n")); @@ -132,14 +121,7 @@ char *str; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvgetstr(int y, int x, char *str) -#else -int PDC_CDECL mvgetstr(y, x, str) -int y; -int x; -char *str; -#endif /***********************************************************************/ { PDC_LOG(("mvgetstr() - called\n")); @@ -151,15 +133,7 @@ char *str; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvwgetstr(WINDOW *win, int y, int x, char *str) -#else -int PDC_CDECL mvwgetstr(win, y, x, str) -WINDOW *win; -int y; -int x; -char *str; -#endif /***********************************************************************/ { PDC_LOG(("mvwgetstr() - called\n")); @@ -171,13 +145,7 @@ char *str; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL getnstr(char *str, int n) -#else -int PDC_CDECL getnstr(str, n) -char *str; -int n; -#endif /***********************************************************************/ { PDC_LOG(("getnstr() - called\n")); @@ -186,14 +154,7 @@ int n; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL wgetnstr(WINDOW *win, char *str, int n) -#else -int PDC_CDECL wgetnstr(win, str, n) -WINDOW *win; -char *str; -int n; -#endif /***********************************************************************/ { int ch, i, num, t, x, chars; @@ -336,15 +297,7 @@ int n; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvgetnstr(int y, int x, char *str, int n) -#else -int PDC_CDECL mvgetnstr(y, x, str, n) -int y; -int x; -char *str; -int n; -#endif /***********************************************************************/ { PDC_LOG(("mvgetnstr() - called\n")); @@ -356,16 +309,7 @@ int n; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvwgetnstr(WINDOW *win, int y, int x, char *str, int n) -#else -int PDC_CDECL mvwgetnstr(win, y, x, str, n) -WINDOW *win; -int y; -int x; -char *str; -int n; -#endif /***********************************************************************/ { PDC_LOG(("mvwgetnstr() - called\n")); diff --git a/pdcurses/getyx.c b/pdcurses/getyx.c index 60b47c33..50ad71fc 100644 --- a/pdcurses/getyx.c +++ b/pdcurses/getyx.c @@ -35,7 +35,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_getyx = "$Id: getyx.c,v 1.5 2006/01/28 15:01:41 wmcbrine Exp $"; +char *rcsid_getyx = "$Id: getyx.c,v 1.6 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -91,12 +91,7 @@ char *rcsid_getyx = "$Id: getyx.c,v 1.5 2006/01/28 15:01:41 wmcbrine Exp $"; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL getbegy(WINDOW *win) -#else -int PDC_CDECL getbegy(win) -WINDOW *win; -#endif /***********************************************************************/ { PDC_LOG(("getbegy() - called\n")); @@ -108,12 +103,7 @@ WINDOW *win; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL getbegx(WINDOW *win) -#else -int PDC_CDECL getbegx(win) -WINDOW *win; -#endif /***********************************************************************/ { PDC_LOG(("getbegx() - called\n")); @@ -125,12 +115,7 @@ WINDOW *win; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL getpary(WINDOW *win) -#else -int PDC_CDECL getpary(win) -WINDOW *win; -#endif /***********************************************************************/ { PDC_LOG(("getpary() - called\n")); @@ -142,12 +127,7 @@ WINDOW *win; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL getparx(WINDOW *win) -#else -int PDC_CDECL getparx(win) -WINDOW *win; -#endif /***********************************************************************/ { PDC_LOG(("getparx() - called\n")); @@ -159,12 +139,7 @@ WINDOW *win; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL getmaxy(WINDOW *win) -#else -int PDC_CDECL getmaxy(win) -WINDOW *win; -#endif /***********************************************************************/ { PDC_LOG(("getmaxy() - called\n")); @@ -176,12 +151,7 @@ WINDOW *win; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL getmaxx(WINDOW *win) -#else -int PDC_CDECL getmaxx(win) -WINDOW *win; -#endif /***********************************************************************/ { PDC_LOG(("getmaxx() - called\n")); diff --git a/pdcurses/inch.c b/pdcurses/inch.c index dc98c9e3..c76f1f54 100644 --- a/pdcurses/inch.c +++ b/pdcurses/inch.c @@ -35,7 +35,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_inch = "$Id: inch.c,v 1.6 2006/01/28 15:01:41 wmcbrine Exp $"; +char *rcsid_inch = "$Id: inch.c,v 1.7 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -72,12 +72,7 @@ char *rcsid_inch = "$Id: inch.c,v 1.6 2006/01/28 15:01:41 wmcbrine Exp $"; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO chtype PDC_CDECL winch(WINDOW *win) -#else -chtype PDC_CDECL winch(win) -WINDOW *win; -#endif /***********************************************************************/ { PDC_LOG(("winch() - called\n")); @@ -89,11 +84,7 @@ WINDOW *win; } /***********************************************************************/ -#ifdef HAVE_PROTO chtype PDC_CDECL inch(void) -#else -chtype PDC_CDECL inch() -#endif /***********************************************************************/ { PDC_LOG(("inch() - called\n")); @@ -102,13 +93,7 @@ chtype PDC_CDECL inch() } /***********************************************************************/ -#ifdef HAVE_PROTO chtype PDC_CDECL mvinch(int y, int x) -#else -chtype PDC_CDECL mvinch(y, x) -int y; -int x; -#endif /***********************************************************************/ { PDC_LOG(("mvinch() - called\n")); @@ -120,14 +105,7 @@ int x; } /***********************************************************************/ -#ifdef HAVE_PROTO chtype PDC_CDECL mvwinch(WINDOW *win, int y, int x) -#else -chtype PDC_CDECL mvwinch(win, y, x) -WINDOW *win; -int y; -int x; -#endif /***********************************************************************/ { PDC_LOG(("mvwinch() - called\n")); diff --git a/pdcurses/inchstr.c b/pdcurses/inchstr.c index 1dd7bbe1..5e77d79c 100644 --- a/pdcurses/inchstr.c +++ b/pdcurses/inchstr.c @@ -39,7 +39,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_inchstr = "$Id: inchstr.c,v 1.6 2006/01/28 15:01:41 wmcbrine Exp $"; +char *rcsid_inchstr = "$Id: inchstr.c,v 1.7 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -87,12 +87,7 @@ char *rcsid_inchstr = "$Id: inchstr.c,v 1.6 2006/01/28 15:01:41 wmcbrine Exp $"; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL inchstr(chtype *ch) -#else -int PDC_CDECL inchstr(ch) -chtype *ch; -#endif /***********************************************************************/ { PDC_LOG(("inchstr() - called\n")); @@ -101,13 +96,7 @@ chtype *ch; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL inchnstr(chtype *ch, int n) -#else -int PDC_CDECL inchnstr(ch, n) -chtype *ch; -int n; -#endif /***********************************************************************/ { PDC_LOG(("inchnstr() - called\n")); @@ -116,13 +105,7 @@ int n; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL winchstr(WINDOW *win, chtype *ch) -#else -int PDC_CDECL winchstr(win, ch) -WINDOW *win; -chtype *ch; -#endif /***********************************************************************/ { PDC_LOG(("winchstr() - called\n")); @@ -131,14 +114,7 @@ chtype *ch; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL winchnstr(WINDOW *win, chtype *ch, int n) -#else -int PDC_CDECL winchnstr(win, ch, n) -WINDOW *win; -chtype *ch; -int n; -#endif /***********************************************************************/ { int i; @@ -163,14 +139,7 @@ int n; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvinchstr(int y, int x, chtype *ch) -#else -int PDC_CDECL mvinchstr(y, x, ch) -int y; -int x; -chtype *ch; -#endif /***********************************************************************/ { PDC_LOG(("mvinchstr() - called: y %d x %d\n", y, x)); @@ -182,15 +151,7 @@ chtype *ch; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvinchnstr(int y, int x, chtype *ch, int n) -#else -int PDC_CDECL mvinchnstr(y, x, ch, n) -int y; -int x; -chtype *ch; -int n; -#endif /***********************************************************************/ { PDC_LOG(("mvinchnstr() - called: y %d x %d n %d\n", y, x, n)); @@ -202,15 +163,7 @@ int n; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvwinchstr(WINDOW *win, int y, int x, chtype *ch) -#else -int PDC_CDECL mvwinchstr(win, y, x, ch) -WINDOW *win; -int y; -int x; -chtype *ch; -#endif /***********************************************************************/ { PDC_LOG(("winchstr() - called:\n")); @@ -222,17 +175,8 @@ chtype *ch; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvwinchnstr(WINDOW *win, int y, int x, chtype *ch, int n) -#else -int PDC_CDECL mvwinchnstr(win, y, x, ch, n) -WINDOW *win; -int y; -int x; -chtype *ch; -int n; -#endif /***********************************************************************/ { PDC_LOG(("mvwinchnstr() - called: y %d x %d n %d \n", y, x, n)); diff --git a/pdcurses/initscr.c b/pdcurses/initscr.c index a4b63d60..7fa5dde8 100644 --- a/pdcurses/initscr.c +++ b/pdcurses/initscr.c @@ -47,7 +47,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_initscr = "$Id: initscr.c,v 1.24 2006/01/28 15:01:41 wmcbrine Exp $"; +char *rcsid_initscr = "$Id: initscr.c,v 1.25 2006/01/28 16:53:26 wmcbrine Exp $"; #else char *_curses_notice = "PDCurses 2.7b - Public Domain 2006"; #endif @@ -85,49 +85,26 @@ struct cttyset c_save_tty = {0}; struct cttyset c_save_trm = {0}; #if EMALLOC -# ifdef HAVE_PROTO -extern void *emalloc(size_t); -extern void *ecalloc(size_t, size_t); -extern void efree(void *); -# else -extern void *emalloc(); /* user's emalloc(size) */ -extern void *ecalloc(); /* user's ecalloc(num, size) */ -extern void efree(); /* user's efree(ptr) */ -# endif +extern void *emalloc(size_t); /* user's emalloc(size) */ +extern void *ecalloc(size_t, size_t); /* user's ecalloc(num, size) */ +extern void efree(void *); /* user's efree(ptr) */ #endif #if !defined(XCURSES) -# ifdef HAVE_PROTO extern void *malloc(size_t); /* runtime's malloc(size) */ extern void *calloc(size_t, size_t); /* runtime's calloc(num, size) */ extern void free(void *); /* runtime's free(ptr) */ -# else -extern void *malloc(); /* runtime's malloc(size) */ -extern void *calloc(); /* runtime's calloc(num, size) */ -extern void free(); /* runtime's free(ptr) */ -# endif #endif -#ifdef HAVE_PROTO void* (*mallc)(size_t); /* ptr to some malloc(size) */ void* (*callc)(size_t, size_t); /* ptr to some ecalloc(num, size) */ void (*fre)(void *); /* ptr to some free(ptr) */ void* (*reallc)(void *, size_t); /* ptr to some realloc(ptr, size) */ -#else -void* (*mallc)(); /* ptr to some malloc(size) */ -void* (*callc)(); /* ptr to some ecalloc(num, size) */ -void (*fre)(); /* ptr to some free(ptr) */ -void* (*reallc)(); /* ptr to some realloc(ptr, size) */ -#endif extern RIPPEDOFFLINE linesripped[5]; extern char linesrippedoff; -#ifdef HAVE_PROTO extern void (*PDC_initial_slk)(void); -#else -extern void (*PDC_initial_slk)(); -#endif /*man-start********************************************************************* @@ -218,13 +195,7 @@ extern void (*PDC_initial_slk)(); **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO WINDOW* PDC_CDECL Xinitscr(int argc, char *argv[]) -#else -WINDOW* PDC_CDECL Xinitscr(argc, argv) -int argc; -char *argv[]; -#endif /***********************************************************************/ { int i; @@ -360,11 +331,7 @@ char *argv[]; } /***********************************************************************/ -#ifdef HAVE_PROTO WINDOW* PDC_CDECL initscr(void) -#else -WINDOW* PDC_CDECL initscr() -#endif /***********************************************************************/ { PDC_LOG(("initscr() - called\n")); @@ -373,11 +340,7 @@ WINDOW* PDC_CDECL initscr() } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL endwin(void) -#else -int PDC_CDECL endwin() -#endif /***********************************************************************/ { PDC_LOG(("endwin() - called\n")); @@ -418,11 +381,7 @@ int PDC_CDECL endwin() } /***********************************************************************/ -#ifdef HAVE_PROTO bool PDC_CDECL isendwin(void) -#else -bool PDC_CDECL isendwin() -#endif /***********************************************************************/ { PDC_LOG(("isendwin() - called\n")); @@ -431,14 +390,7 @@ bool PDC_CDECL isendwin() } /***********************************************************************/ -#ifdef HAVE_PROTO SCREEN* PDC_CDECL newterm(char *type, FILE *outfd, FILE *infd) -#else -SCREEN* PDC_CDECL newterm(type, outfd, infd) -char *type; -FILE *outfd; -FILE *infd; -#endif /***********************************************************************/ { PDC_LOG(("newterm() - called\n")); @@ -447,12 +399,7 @@ FILE *infd; } /***********************************************************************/ -#ifdef HAVE_PROTO SCREEN* PDC_CDECL set_term(SCREEN *new) -#else -SCREEN* PDC_CDECL set_term(new) -SCREEN *new; -#endif /***********************************************************************/ { PDC_LOG(("set_term() - called\n")); @@ -463,12 +410,7 @@ SCREEN *new; } /***********************************************************************/ -#ifdef HAVE_PROTO void PDC_CDECL delscreen(SCREEN *sp) -#else -void PDC_CDECL delscreen(sp) -SCREEN *sp; -#endif /***********************************************************************/ { PDC_LOG(("delscreen() - called\n")); @@ -492,12 +434,7 @@ SCREEN *sp; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL resize_term(int nlines, int ncols) -#else -int PDC_CDECL resize_term(nlines, ncols) -int nlines, ncols; -#endif /***********************************************************************/ { PDC_LOG(("resize_term() - called: nlines %d\n",nlines)); @@ -545,11 +482,7 @@ int nlines, ncols; } /***********************************************************************/ -#ifdef HAVE_PROTO bool PDC_CDECL is_termresized(void) -#else -bool PDC_CDECL is_termresized() -#endif /***********************************************************************/ { PDC_LOG(("is_termresized() - called\n")); diff --git a/pdcurses/inopts.c b/pdcurses/inopts.c index 6cf215f0..2e39c789 100644 --- a/pdcurses/inopts.c +++ b/pdcurses/inopts.c @@ -48,7 +48,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_inopts = "$Id: inopts.c,v 1.11 2006/01/28 15:01:41 wmcbrine Exp $"; +char *rcsid_inopts = "$Id: inopts.c,v 1.12 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -193,11 +193,7 @@ char *rcsid_inopts = "$Id: inopts.c,v 1.11 2006/01/28 15:01:41 wmcbrine Exp $"; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL cbreak(void) -#else -int PDC_CDECL cbreak() -#endif /***********************************************************************/ { PDC_LOG(("cbreak() - called\n")); @@ -208,11 +204,7 @@ int PDC_CDECL cbreak() } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL nocbreak(void) -#else -int PDC_CDECL nocbreak() -#endif /***********************************************************************/ { PDC_LOG(("nocbreak() - called\n")); @@ -224,11 +216,7 @@ int PDC_CDECL nocbreak() } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL echo(void) -#else -int PDC_CDECL echo() -#endif /***********************************************************************/ { PDC_LOG(("echo() - called\n")); @@ -239,11 +227,7 @@ int PDC_CDECL echo() } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL noecho(void) -#else -int PDC_CDECL noecho() -#endif /***********************************************************************/ { PDC_LOG(("noecho() - called\n")); @@ -254,12 +238,7 @@ int PDC_CDECL noecho() } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL halfdelay(int tenths) -#else -int PDC_CDECL halfdelay(tenths) -int tenths; -#endif /***********************************************************************/ { PDC_LOG(("halfdelay() - called\n")); @@ -273,13 +252,7 @@ int tenths; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL intrflush(WINDOW *win, bool bf) -#else -int PDC_CDECL intrflush(win, bf) -WINDOW *win; -bool bf; -#endif /***********************************************************************/ { int y, maxy; @@ -298,13 +271,7 @@ bool bf; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL keypad(WINDOW *win, bool bf) -#else -int PDC_CDECL keypad(win, bf) -WINDOW *win; -bool bf; -#endif /***********************************************************************/ { PDC_LOG(("keypad() - called\n")); @@ -318,13 +285,7 @@ bool bf; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL meta(WINDOW *win, bool bf) -#else -int PDC_CDECL meta(win, bf) -WINDOW *win; -bool bf; -#endif /***********************************************************************/ { PDC_LOG(("meta() - called\n")); @@ -335,13 +296,7 @@ bool bf; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL nodelay(WINDOW *win, bool flag) -#else -int PDC_CDECL nodelay(win, flag) -WINDOW *win; -bool flag; -#endif /***********************************************************************/ { PDC_LOG(("nodelay() - called\n")); @@ -355,13 +310,7 @@ bool flag; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL notimeout(WINDOW *win, bool flag) -#else -int PDC_CDECL notimeout(win, flag) -WINDOW *win; -bool flag; -#endif /***********************************************************************/ { PDC_LOG(("notimeout() - called\n")); @@ -370,11 +319,7 @@ bool flag; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL raw(void) -#else -int PDC_CDECL raw() -#endif /***********************************************************************/ { #ifdef OS2 @@ -402,11 +347,7 @@ int PDC_CDECL raw() } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL noraw(void) -#else -int PDC_CDECL noraw() -#endif /***********************************************************************/ { #ifdef OS2 @@ -433,34 +374,21 @@ int PDC_CDECL noraw() } /***********************************************************************/ -#ifdef HAVE_PROTO void PDC_CDECL noqiflush(void) -#else -void PDC_CDECL noqiflush() -#endif /***********************************************************************/ { PDC_LOG(("noqiflush() - called\n")); } /***********************************************************************/ -#ifdef HAVE_PROTO void PDC_CDECL qiflush(void) -#else -void PDC_CDECL qiflush() -#endif /***********************************************************************/ { PDC_LOG(("qiflush() - called\n")); } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL typeahead(int fildes) -#else -int PDC_CDECL typeahead(fildes) -int fildes; -#endif /***********************************************************************/ { PDC_LOG(("typeahead() - called\n")); @@ -471,13 +399,7 @@ int fildes; } /***********************************************************************/ -#ifdef HAVE_PROTO void PDC_CDECL wtimeout(WINDOW *win, int delay) -#else -void PDC_CDECL wtimeout(win, delay) -WINDOW *win; -int delay; -#endif /***********************************************************************/ { PDC_LOG(("wtimeout() - called\n")); @@ -513,12 +435,7 @@ int delay; } /***********************************************************************/ -#ifdef HAVE_PROTO void PDC_CDECL timeout(int delay) -#else -void PDC_CDECL timeout(delay) -int delay; -#endif /***********************************************************************/ { PDC_LOG(("timeout() - called\n")); diff --git a/pdcurses/insch.c b/pdcurses/insch.c index f9aa5762..0890e3fc 100644 --- a/pdcurses/insch.c +++ b/pdcurses/insch.c @@ -37,7 +37,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_insch = "$Id: insch.c,v 1.7 2006/01/28 15:01:41 wmcbrine Exp $"; +char *rcsid_insch = "$Id: insch.c,v 1.8 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -127,12 +127,7 @@ char *rcsid_insch = "$Id: insch.c,v 1.7 2006/01/28 15:01:41 wmcbrine Exp $"; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL insch(chtype ch) -#else -int PDC_CDECL insch(ch) -chtype ch; -#endif /***********************************************************************/ { PDC_LOG(("insch() - called\n")); @@ -141,13 +136,7 @@ chtype ch; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL winsch(WINDOW *win, chtype ch) -#else -int PDC_CDECL winsch(win, ch) -WINDOW *win; -chtype ch; -#endif /***********************************************************************/ { PDC_LOG(("winsch() - called\n")); @@ -156,14 +145,7 @@ chtype ch; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvinsch(int y, int x, chtype ch) -#else -int PDC_CDECL mvinsch(y, x, ch) -int y; -int x; -chtype ch; -#endif /***********************************************************************/ { PDC_LOG(("mvinsch() - called\n")); @@ -175,15 +157,7 @@ chtype ch; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvwinsch(WINDOW *win, int y, int x, chtype ch) -#else -int PDC_CDECL mvwinsch(win, y, x, ch) -WINDOW *win; -int y; -int x; -chtype ch; -#endif /***********************************************************************/ { PDC_LOG(("mvwinsch() - called\n")); diff --git a/pdcurses/insstr.c b/pdcurses/insstr.c index 7a35da5f..68687ff0 100644 --- a/pdcurses/insstr.c +++ b/pdcurses/insstr.c @@ -42,7 +42,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_insstr = "$Id: insstr.c,v 1.11 2006/01/28 15:01:41 wmcbrine Exp $"; +char *rcsid_insstr = "$Id: insstr.c,v 1.12 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -100,12 +100,7 @@ char *rcsid_insstr = "$Id: insstr.c,v 1.11 2006/01/28 15:01:41 wmcbrine Exp $"; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL insstr(const char *str) -#else -int PDC_CDECL insstr(str) -char *str; -#endif /***********************************************************************/ { PDC_LOG(("insstr() - called: string=\"%s\"\n", str)); @@ -114,13 +109,7 @@ char *str; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL insnstr(const char *str, int n) -#else -int PDC_CDECL insnstr(str, n) -char *str; -int n; -#endif /***********************************************************************/ { PDC_LOG(("insnstr() - called: string=\"%s\" n %d \n", str, n)); @@ -129,13 +118,7 @@ int n; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL winsstr(WINDOW *win, const char *str) -#else -int PDC_CDECL winsstr(win, str) -WINDOW *win; -char *str; -#endif /***********************************************************************/ { PDC_LOG(("winsstr() - called: string=\"%s\"\n", str)); @@ -144,14 +127,7 @@ char *str; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL winsnstr(WINDOW *win, const char *str, int n) -#else -int PDC_CDECL winsnstr(win, str, n) -WINDOW *win; -char *str; -int n; -#endif /***********************************************************************/ { int ic; @@ -176,14 +152,7 @@ int n; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvinsstr(int y, int x, const char *str) -#else -int PDC_CDECL mvinsstr(y, x, str) -int y; -int x; -char *str; -#endif /***********************************************************************/ { PDC_LOG(("mvinsstr() - called: y %d x %d string=\"%s\"\n", @@ -196,15 +165,7 @@ char *str; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvinsnstr(int y, int x, const char *str, int n) -#else -int PDC_CDECL mvinsnstr(y, x, str, n) -int y; -int x; -char *str; -int n; -#endif /***********************************************************************/ { PDC_LOG(("mvinsnstr() - called: y %d x %d string=\"%s\" n %d \n", @@ -217,15 +178,7 @@ int n; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvwinsstr(WINDOW *win, int y, int x, const char *str) -#else -int PDC_CDECL mvwinsstr(win, y, x, str) -WINDOW *win; -int y; -int x; -char *str; -#endif /***********************************************************************/ { PDC_LOG(("mvwinsstr() - called: string=\"%s\"\n", str)); @@ -237,17 +190,8 @@ char *str; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvwinsnstr(WINDOW *win,int y, int x, const char *str, int n) -#else -int PDC_CDECL mvwinsnstr(win, y, x, str, n) -WINDOW *win; -int y; -int x; -char *str; -int n; -#endif /***********************************************************************/ { PDC_LOG(("mvwinsnstr() - called: y %d x %d string=\"%s\" n %d \n", diff --git a/pdcurses/instr.c b/pdcurses/instr.c index 61d6a637..a9e754e7 100644 --- a/pdcurses/instr.c +++ b/pdcurses/instr.c @@ -42,7 +42,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_instr = "$Id: instr.c,v 1.7 2006/01/28 15:01:41 wmcbrine Exp $"; +char *rcsid_instr = "$Id: instr.c,v 1.8 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -89,12 +89,7 @@ char *rcsid_instr = "$Id: instr.c,v 1.7 2006/01/28 15:01:41 wmcbrine Exp $"; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL instr(char *str) -#else -int PDC_CDECL instr(str) -char *str; -#endif /***********************************************************************/ { PDC_LOG(("instr() - called: string=\"%s\"\n", str)); @@ -103,13 +98,7 @@ char *str; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL innstr(char *str, int n) -#else -int PDC_CDECL innstr(str, n) -char *str; -int n; -#endif /***********************************************************************/ { PDC_LOG(("innstr() - called: n %d \n", n)); @@ -118,13 +107,7 @@ int n; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL winstr(WINDOW *win, char *str) -#else -int PDC_CDECL winstr(win, str) -WINDOW *win; -char *str; -#endif /***********************************************************************/ { PDC_LOG(("winstr() - called: \n")); @@ -133,14 +116,7 @@ char *str; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL winnstr(WINDOW *win, char *str, int n) -#else -int PDC_CDECL winnstr(win, str, n) -WINDOW *win; -char *str; -int n; -#endif /***********************************************************************/ { chtype tmp; @@ -179,14 +155,7 @@ int n; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvinstr(int y, int x, char *str) -#else -int PDC_CDECL mvinstr(y, x, str) -int y; -int x; -char *str; -#endif /***********************************************************************/ { PDC_LOG(("mvinstr() - called: y %d x %d \n", y, x)); @@ -198,15 +167,7 @@ char *str; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvinnstr(int y, int x, char *str, int n) -#else -int PDC_CDECL mvinnstr(y, x, str, n) -int y; -int x; -char *str; -int n; -#endif /***********************************************************************/ { PDC_LOG(("mvinnstr() - called: y %d x %d n %d \n", y, x, n)); @@ -218,15 +179,7 @@ int n; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvwinstr(WINDOW *win, int y, int x, char *str) -#else -int PDC_CDECL mvwinstr(win, y, x, str) -WINDOW *win; -int y; -int x; -char *str; -#endif /***********************************************************************/ { PDC_LOG(("mvwinstr() - called: y %d x %d \n", y, x)); @@ -238,16 +191,7 @@ char *str; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvwinnstr(WINDOW *win, int y, int x, char *str, int n) -#else -int PDC_CDECL mvwinnstr(win, y, x, str, n) -WINDOW *win; -int y; -int x; -char *str; -int n; -#endif /***********************************************************************/ { PDC_LOG(("mvwinnstr() - called: y %d x %d n %d \n", y, x, n)); diff --git a/pdcurses/kernel.c b/pdcurses/kernel.c index 5abbf4f4..ad02b727 100644 --- a/pdcurses/kernel.c +++ b/pdcurses/kernel.c @@ -77,7 +77,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_kernel = "$Id: kernel.c,v 1.25 2006/01/28 15:01:41 wmcbrine Exp $"; +char *rcsid_kernel = "$Id: kernel.c,v 1.26 2006/01/28 16:53:26 wmcbrine Exp $"; #endif RIPPEDOFFLINE linesripped[5]; @@ -193,11 +193,7 @@ char linesrippedoff = 0; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL def_prog_mode(void) -#else -int PDC_CDECL def_prog_mode() -#endif /***********************************************************************/ { PDC_LOG(("def_prog_mode() - called\n")); @@ -210,11 +206,7 @@ int PDC_CDECL def_prog_mode() } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL def_shell_mode(void) -#else -int PDC_CDECL def_shell_mode() -#endif /***********************************************************************/ { PDC_LOG(("def_shell_mode() - called\n")); @@ -227,11 +219,7 @@ int PDC_CDECL def_shell_mode() } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL reset_prog_mode(void) -#else -int PDC_CDECL reset_prog_mode() -#endif /***********************************************************************/ { #if defined(OS2) && !defined(EMXVIDEO) @@ -281,11 +269,7 @@ int PDC_CDECL reset_prog_mode() } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL reset_shell_mode(void) -#else -int PDC_CDECL reset_shell_mode() -#endif /***********************************************************************/ { #if defined(OS2) && !defined(EMXVIDEO) @@ -342,11 +326,7 @@ int PDC_CDECL reset_shell_mode() } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL resetty(void) -#else -int PDC_CDECL resetty() -#endif /***********************************************************************/ { #if defined(OS2) && !defined(EMXVIDEO) @@ -398,11 +378,7 @@ int PDC_CDECL resetty() } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL savetty(void) -#else -int PDC_CDECL savetty() -#endif /***********************************************************************/ { PDC_LOG(("savetty() - called\n")); @@ -414,12 +390,7 @@ int PDC_CDECL savetty() } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL curs_set(int visibility) -#else -int PDC_CDECL curs_set(visibility) -int visibility; -#endif /***********************************************************************/ { PDC_LOG(("curs_set() - called: visibility=%d\n", visibility)); @@ -428,13 +399,7 @@ int visibility; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL ripoffline(int line, int (*init)(WINDOW *, int)) -#else -int PDC_CDECL ripoffline(line, init) -int line; -int (*init)(); -#endif /***********************************************************************/ { PDC_LOG(("ripoffline() - called: line=%d\n", line)); @@ -449,12 +414,7 @@ int (*init)(); } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL napms(int ms) -#else -int PDC_CDECL napms(ms) -int ms; -#endif /***********************************************************************/ { PDC_LOG(("napms() - called: ms=%d\n", ms)); @@ -510,12 +470,7 @@ int ms; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL draino(int ms) -#else -int PDC_CDECL draino(ms) -int ms; -#endif /***********************************************************************/ { PDC_LOG(("draino() - called: ms=%d\n", ms)); diff --git a/pdcurses/mouse.c b/pdcurses/mouse.c index 0b8f4891..0929870e 100644 --- a/pdcurses/mouse.c +++ b/pdcurses/mouse.c @@ -38,7 +38,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_mouse = "$Id: mouse.c,v 1.8 2006/01/28 15:01:41 wmcbrine Exp $"; +char *rcsid_mouse = "$Id: mouse.c,v 1.9 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -107,12 +107,7 @@ char *rcsid_mouse = "$Id: mouse.c,v 1.8 2006/01/28 15:01:41 wmcbrine Exp $"; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mouse_set(unsigned long mbe) -#else -int PDC_CDECL mouse_set(mbe) -unsigned long mbe; -#endif /***********************************************************************/ { PDC_LOG(("mouse_set() - called: event %x\n", mbe)); @@ -123,12 +118,7 @@ unsigned long mbe; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mouse_on(unsigned long mbe) -#else -int PDC_CDECL mouse_on(mbe) -unsigned long mbe; -#endif /***********************************************************************/ { PDC_LOG(("mouse_on() - called: event %x\n", mbe)); @@ -139,12 +129,7 @@ unsigned long mbe; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mouse_off(unsigned long mbe) -#else -int PDC_CDECL mouse_off(mbe) -unsigned long mbe; -#endif /***********************************************************************/ { PDC_LOG(("mouse_off() - called: event %x\n", mbe)); @@ -155,12 +140,7 @@ unsigned long mbe; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL map_button(unsigned long button) -#else -int PDC_CDECL map_button(button) -unsigned long button; -#endif /***********************************************************************/ { PDC_LOG(("map_button() - called: button %x\n", button)); @@ -172,11 +152,7 @@ unsigned long button; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL request_mouse_pos(void) -#else -int PDC_CDECL request_mouse_pos() -#endif /***********************************************************************/ { extern MOUSE_STATUS Trapped_Mouse_status; @@ -190,13 +166,7 @@ int PDC_CDECL request_mouse_pos() } /***********************************************************************/ -#ifdef HAVE_PROTO void PDC_CDECL wmouse_position(WINDOW *win, int *y, int *x) -#else -void PDC_CDECL wmouse_position(win, y, x) -WINDOW *win; -int *y,*x; -#endif /***********************************************************************/ { PDC_LOG(("wmouse_position() - called\n")); @@ -224,11 +194,7 @@ int *y,*x; } /***********************************************************************/ -#ifdef HAVE_PROTO unsigned long PDC_CDECL getmouse(void) -#else -unsigned long PDC_CDECL getmouse() -#endif /***********************************************************************/ { PDC_LOG(("getmouse() - called\n")); @@ -237,11 +203,7 @@ unsigned long PDC_CDECL getmouse() } /***********************************************************************/ -#ifdef HAVE_PROTO unsigned long PDC_CDECL getbmap(void) -#else -unsigned long PDC_CDECL getbmap() -#endif /***********************************************************************/ { PDC_LOG(("getbmap() - called\n")); diff --git a/pdcurses/move.c b/pdcurses/move.c index edd17c20..94bef8b7 100644 --- a/pdcurses/move.c +++ b/pdcurses/move.c @@ -31,7 +31,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_move = "$Id: move.c,v 1.5 2006/01/28 15:01:41 wmcbrine Exp $"; +char *rcsid_move = "$Id: move.c,v 1.6 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -64,13 +64,7 @@ char *rcsid_move = "$Id: move.c,v 1.5 2006/01/28 15:01:41 wmcbrine Exp $"; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL move(int y, int x) -#else -int PDC_CDECL move(y, x) -int y; -int x; -#endif /***********************************************************************/ { PDC_LOG(("move() - called: y=%d x=%d\n", y, x)); @@ -88,14 +82,7 @@ int x; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL wmove(WINDOW *win, int y, int x) -#else -int PDC_CDECL wmove(win, y, x) -WINDOW *win; -int y; -int x; -#endif /***********************************************************************/ { PDC_LOG(("wmove() - called: y=%d x=%d\n", y, x)); diff --git a/pdcurses/outopts.c b/pdcurses/outopts.c index 36c4cc1c..1f96223f 100644 --- a/pdcurses/outopts.c +++ b/pdcurses/outopts.c @@ -40,7 +40,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_outopts = "$Id: outopts.c,v 1.9 2006/01/28 15:01:41 wmcbrine Exp $"; +char *rcsid_outopts = "$Id: outopts.c,v 1.10 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -154,13 +154,7 @@ char *rcsid_outopts = "$Id: outopts.c,v 1.9 2006/01/28 15:01:41 wmcbrine Exp $"; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL clearok(WINDOW *win, bool bf) -#else -int PDC_CDECL clearok(win, bf) -WINDOW *win; -bool bf; -#endif /***********************************************************************/ { PDC_LOG(("clearok() - called\n")); @@ -174,13 +168,7 @@ bool bf; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL idlok(WINDOW *win, bool bf) -#else -int PDC_CDECL idlok(win, bf) -WINDOW *win; -bool bf; -#endif /***********************************************************************/ { PDC_LOG(("idlok() - called\n")); @@ -194,13 +182,7 @@ bool bf; } /***********************************************************************/ -#ifdef HAVE_PROTO void PDC_CDECL idcok(WINDOW *win, bool bf) -#else -void PDC_CDECL idcok(win, bf) -WINDOW *win; -bool bf; -#endif /***********************************************************************/ { PDC_LOG(("idcok() - called\n")); @@ -210,13 +192,7 @@ bool bf; } /***********************************************************************/ -#ifdef HAVE_PROTO void PDC_CDECL immedok(WINDOW *win, bool bf) -#else -void PDC_CDECL immedok(win, bf) -WINDOW *win; -bool bf; -#endif /***********************************************************************/ { PDC_LOG(("immedok() - called\n")); @@ -226,13 +202,7 @@ bool bf; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL leaveok(WINDOW *win, bool bf) -#else -int PDC_CDECL leaveok(win, bf) -WINDOW *win; -bool bf; -#endif /***********************************************************************/ { PDC_LOG(("leaveok() - called\n")); @@ -251,13 +221,7 @@ bool bf; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL setscrreg(int top, int bottom) -#else -int PDC_CDECL setscrreg(top, bottom) -int top; -int bottom; -#endif /***********************************************************************/ { PDC_LOG(("setscrreg() - called: top %d bottom %d\n", top, bottom)); @@ -266,14 +230,7 @@ int bottom; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL wsetscrreg(WINDOW *win, int top, int bottom) -#else -int PDC_CDECL wsetscrreg(win, top, bottom) -WINDOW *win; -int top; -int bottom; -#endif /***********************************************************************/ { PDC_LOG(("wsetscrreg() - called: top %d bottom %d\n", top, bottom)); @@ -294,13 +251,7 @@ int bottom; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL scrollok(WINDOW *win, bool bf) -#else -int PDC_CDECL scrollok(win, bf) -WINDOW *win; -bool bf; -#endif /***********************************************************************/ { PDC_LOG(("scrollok() - called\n")); @@ -314,11 +265,7 @@ bool bf; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL nl(void) -#else -int PDC_CDECL nl() -#endif /***********************************************************************/ { PDC_LOG(("nl() - called\n")); @@ -329,11 +276,7 @@ int PDC_CDECL nl() } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL nonl(void) -#else -int PDC_CDECL nonl() -#endif /***********************************************************************/ { PDC_LOG(("nonl() - called\n")); @@ -344,12 +287,7 @@ int PDC_CDECL nonl() } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL raw_output(bool bf) -#else -int PDC_CDECL raw_output(bf) -bool bf; -#endif /***********************************************************************/ { PDC_LOG(("raw_output() - called\n")); diff --git a/pdcurses/overlay.c b/pdcurses/overlay.c index 8300c1fd..35cd1851 100644 --- a/pdcurses/overlay.c +++ b/pdcurses/overlay.c @@ -34,7 +34,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_overlay = "$Id: overlay.c,v 1.7 2006/01/28 15:01:41 wmcbrine Exp $"; +char *rcsid_overlay = "$Id: overlay.c,v 1.8 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -97,13 +97,7 @@ char *rcsid_overlay = "$Id: overlay.c,v 1.7 2006/01/28 15:01:41 wmcbrine Exp $"; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL overlay(const WINDOW *src_w, WINDOW *dst_w) -#else -int PDC_CDECL overlay(src_w, dst_w) -WINDOW *src_w; -WINDOW *dst_w; -#endif /***********************************************************************/ { int first_line, first_col, last_line, last_col; @@ -165,13 +159,7 @@ WINDOW *dst_w; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL overwrite(const WINDOW *src_w, WINDOW *dst_w) -#else -int PDC_CDECL overwrite(src_w, dst_w) -WINDOW *src_w; -WINDOW *dst_w; -#endif /***********************************************************************/ { int first_line, first_col, last_line, last_col; @@ -233,24 +221,10 @@ WINDOW *dst_w; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL copywin(const WINDOW *src_w, WINDOW *dst_w, int src_tr, int src_tc, int dst_tr, int dst_tc, int dst_br, int dst_bc, int overlay) -#else -int PDC_CDECL copywin(src_w, dst_w, src_tr, src_tc, dst_tr, - dst_tc, dst_br, dst_bc, overlay) -WINDOW *src_w; -WINDOW *dst_w; -int src_tr; -int src_tc; -int dst_tr; -int dst_tc; -int dst_br; -int dst_bc; -int overlay; -#endif /***********************************************************************/ { int src_start_x = src_tc; diff --git a/pdcurses/pad.c b/pdcurses/pad.c index 25174054..df91f7dc 100644 --- a/pdcurses/pad.c +++ b/pdcurses/pad.c @@ -41,7 +41,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_pad = "$Id: pad.c,v 1.8 2006/01/28 15:01:41 wmcbrine Exp $"; +char *rcsid_pad = "$Id: pad.c,v 1.9 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /* save values for pechochar() */ @@ -125,22 +125,12 @@ static int save_sminrow, save_smincol, save_smaxrow, save_smaxcol; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO WINDOW* PDC_CDECL newpad(int nlines, int ncols) -#else -WINDOW* PDC_CDECL newpad(nlines, ncols) -int nlines; -int ncols; -#endif /***********************************************************************/ { -#ifdef HAVE_PROTO extern void* (*callc)(size_t, size_t); extern void (*fre)(void *); -#else - extern void* (*callc)(); - extern void (*fre)(); -#endif + WINDOW *win; chtype *ptr; int i, j; @@ -190,17 +180,8 @@ int ncols; } /***********************************************************************/ -#ifdef HAVE_PROTO WINDOW* PDC_CDECL subpad(WINDOW *orig, int nlines, int ncols, int begin_y, int begin_x) -#else -WINDOW* PDC_CDECL subpad(orig, nlines, ncols, begin_y, begin_x) -WINDOW *orig; -int nlines; -int ncols; -int begin_y; -int begin_x; -#endif /***********************************************************************/ { WINDOW *win; @@ -259,19 +240,8 @@ int begin_x; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL prefresh(WINDOW *win, int py, int px, int sy1, int sx1, int sy2, int sx2) -#else -int PDC_CDECL prefresh(win, py, px, sy1, sx1, sy2, sx2) -WINDOW *win; -int py; -int px; -int sy1; -int sx1; -int sy2; -int sx2; -#endif /***********************************************************************/ { PDC_LOG(("prefresh() - called\n")); @@ -287,19 +257,8 @@ int sx2; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL pnoutrefresh(WINDOW *w, int py, int px, int sy1, int sx1, int sy2, int sx2) -#else -int PDC_CDECL pnoutrefresh(w, py, px, sy1, sx1, sy2, sx2) -WINDOW *w; -int py; -int px; -int sy1; -int sx1; -int sy2; -int sx2; -#endif /***********************************************************************/ { int num_cols; @@ -371,13 +330,7 @@ int sx2; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL pechochar(WINDOW *pad, chtype ch) -#else -int PDC_CDECL pechochar(pad, ch) -WINDOW *pad; -chtype ch; -#endif /***********************************************************************/ { PDC_LOG(("pechochar() - called\n")); diff --git a/pdcurses/pdcutil.c b/pdcurses/pdcutil.c index bf1eb793..1ed2e01a 100644 --- a/pdcurses/pdcutil.c +++ b/pdcurses/pdcutil.c @@ -31,7 +31,7 @@ #include #ifdef PDCDEBUG -char *rcsid_PDCutil = "$Id: pdcutil.c,v 1.21 2006/01/28 15:01:41 wmcbrine Exp $"; +char *rcsid_PDCutil = "$Id: pdcutil.c,v 1.22 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -53,29 +53,15 @@ char *rcsid_PDCutil = "$Id: pdcutil.c,v 1.21 2006/01/28 15:01:41 wmcbrine Exp $" **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO void *PDC_memmove(void *s1, const void *s2, size_t n) -#else -void *PDC_memmove(s1, s2, n) -void *s1; -void *s2; -size_t n; -#endif /***********************************************************************/ { char *dd; -#ifdef HAVE_PROTO const char *ss; -#else - char *ss; -#endif dd = (char *) s1; -#ifdef HAVE_PROTO ss = (const char *) s2; -#else - ss = (char *) s2; -#endif + if (dd > ss && dd < ss + n) { dd += n; @@ -90,11 +76,7 @@ size_t n; } /***********************************************************************/ -#ifdef HAVE_PROTO void PDC_beep(void) -#else -void PDC_beep() -#endif /***********************************************************************/ { #if defined(XCURSES) @@ -622,11 +604,7 @@ int PDC_vsscanf(char *buf, const char *fmt, va_list arg_ptr) **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO bool PDC_breakout(void) -#else -bool PDC_breakout() -#endif /***********************************************************************/ { extern int c_pindex; /* putter index */ diff --git a/pdcurses/pdcwin.c b/pdcurses/pdcwin.c index 5040d48a..f337136b 100644 --- a/pdcurses/pdcwin.c +++ b/pdcurses/pdcwin.c @@ -33,7 +33,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_PDCwin = "$Id: pdcwin.c,v 1.16 2006/01/28 15:01:41 wmcbrine Exp $"; +char *rcsid_PDCwin = "$Id: pdcwin.c,v 1.17 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -61,26 +61,10 @@ char *rcsid_PDCwin = "$Id: pdcwin.c,v 1.16 2006/01/28 15:01:41 wmcbrine Exp $"; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_copy_win(const WINDOW *src_w, WINDOW *dst_w, int src_tr, int src_tc, int src_br, int src_bc, int dst_tr, int dst_tc, int dst_br, int dst_bc, bool overlay) -#else -int PDC_copy_win(src_w, dst_w, src_tr, src_tc, src_br, src_bc, dst_tr, - dst_tc, dst_br, dst_bc, overlay) -WINDOW *src_w; -WINDOW *dst_w; -int src_tr; -int src_tc; -int src_br; -int src_bc; -int dst_tr; -int dst_tc; -int dst_br; -int dst_bc; -bool overlay; -#endif /***********************************************************************/ { int col, line, y1, fc, *minchng, *maxchng; @@ -174,26 +158,12 @@ bool overlay; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO WINDOW *PDC_makenew(int num_lines, int num_columns, int begy, int begx) -#else -WINDOW *PDC_makenew(num_lines, num_columns, begy, begx) -int num_lines; -int num_columns; -int begy; -int begx; -#endif /***********************************************************************/ { -#ifdef HAVE_PROTO extern void *(*mallc)(size_t); extern void *(*callc)(size_t, size_t); extern void (*fre)(void *); -#else - extern void *(*mallc)(); - extern void *(*callc)(); - extern void (*fre)(); -#endif int i; WINDOW *win = NULL; @@ -303,12 +273,7 @@ int begx; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO void PDC_sync(WINDOW *win) -#else -void PDC_sync(win) -WINDOW *win; -#endif /***********************************************************************/ { PDC_LOG(("PDC_sync() - called:\n")); @@ -358,15 +323,7 @@ WINDOW *win; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL PDC_chadd(WINDOW *win, chtype ch, bool xlat, bool advance) -#else -int PDC_CDECL PDC_chadd(win, ch, xlat, advance) -WINDOW *win; -chtype ch; -bool xlat; -bool advance; -#endif /***********************************************************************/ { int x, y, newx, ts, retval; @@ -588,17 +545,7 @@ bool advance; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_chg_attrs(WINDOW *win, chtype attr, int sy, int sx, int ey, int ex) -#else -int PDC_chg_attrs(win, attr, sy, sx, ey, ex) -WINDOW *win; -chtype attr; -int sy; -int sx; -int ey; -int ex; -#endif /***********************************************************************/ { chtype oldattr = win->_attrs; @@ -667,14 +614,7 @@ int ex; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_chins(WINDOW *win, chtype c, bool xlat) -#else -int PDC_chins(win, c, xlat) -WINDOW *win; -chtype c; -bool xlat; -#endif /***********************************************************************/ { int x, y, maxx, offset; @@ -724,12 +664,7 @@ bool xlat; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_clr_scrn(WINDOW *win) -#else -int PDC_clr_scrn(win) -WINDOW *win; -#endif /***********************************************************************/ { #if !defined(XCURSES) @@ -772,13 +707,7 @@ WINDOW *win; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_newline(WINDOW *win, int lin) -#else -int PDC_newline(win, lin) -WINDOW *win; -int lin; -#endif /***********************************************************************/ { PDC_LOG(("PDC_newline() - called: line %d\n", lin)); diff --git a/pdcurses/refresh.c b/pdcurses/refresh.c index e1a38b9a..12bef5b6 100644 --- a/pdcurses/refresh.c +++ b/pdcurses/refresh.c @@ -47,7 +47,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_refresh = "$Id: refresh.c,v 1.10 2006/01/28 15:01:41 wmcbrine Exp $"; +char *rcsid_refresh = "$Id: refresh.c,v 1.11 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -109,11 +109,7 @@ char *rcsid_refresh = "$Id: refresh.c,v 1.10 2006/01/28 15:01:41 wmcbrine Exp $" **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL refresh(void) -#else -int PDC_CDECL refresh() -#endif /***********************************************************************/ { PDC_LOG(("refresh() - called\n")); @@ -122,12 +118,7 @@ int PDC_CDECL refresh() } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL wrefresh(WINDOW *win) -#else -int PDC_CDECL wrefresh(win) -WINDOW *win; -#endif /***********************************************************************/ { bool save_clear; @@ -152,12 +143,7 @@ WINDOW *win; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL wnoutrefresh(WINDOW *win) -#else -int PDC_CDECL wnoutrefresh(win) -WINDOW *win; -#endif /***********************************************************************/ { int first; /* first changed char on line */ @@ -233,11 +219,7 @@ WINDOW *win; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL doupdate(void) -#else -int PDC_CDECL doupdate() -#endif /***********************************************************************/ { int i; @@ -316,12 +298,7 @@ int PDC_CDECL doupdate() } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL redrawwin(WINDOW *win) -#else -int PDC_CDECL redrawwin(win) -WINDOW *win; -#endif /***********************************************************************/ { PDC_LOG(("redrawwin() - called: win=%x\n", win)); @@ -333,14 +310,7 @@ WINDOW *win; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL wredrawln(WINDOW *win, int start, int num) -#else -int PDC_CDECL wredrawln(win, start, num) -WINDOW *win; -int start; -int num; -#endif /***********************************************************************/ { int i; diff --git a/pdcurses/scr_dump.c b/pdcurses/scr_dump.c index c7e79d0b..81949827 100644 --- a/pdcurses/scr_dump.c +++ b/pdcurses/scr_dump.c @@ -33,7 +33,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_scr_dump = "$Id: scr_dump.c,v 1.6 2006/01/28 15:01:41 wmcbrine Exp $"; +char *rcsid_scr_dump = "$Id: scr_dump.c,v 1.7 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -88,12 +88,7 @@ char *rcsid_scr_dump = "$Id: scr_dump.c,v 1.6 2006/01/28 15:01:41 wmcbrine Exp $ **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int scr_dump(const char *filename) -#else -int scr_dump(filename) -char *filename; -#endif /***********************************************************************/ { PDC_LOG(("scr_dump() - called: filename %s\n", filename)); @@ -102,12 +97,7 @@ char *filename; } /***********************************************************************/ -#ifdef HAVE_PROTO int scr_init(const char *filename) -#else -int scr_init(filename) -char *filename; -#endif /***********************************************************************/ { PDC_LOG(("scr_init() - called: filename %s\n", filename)); @@ -116,12 +106,7 @@ char *filename; } /***********************************************************************/ -#ifdef HAVE_PROTO int scr_restore(const char *filename) -#else -int scr_restore(filename) -char *filename; -#endif /***********************************************************************/ { PDC_LOG(("scr_restore() - called: filename %s\n", filename)); @@ -130,12 +115,7 @@ char *filename; } /***********************************************************************/ -#ifdef HAVE_PROTO int scr_set(const char *filename) -#else -int scr_set(filename) -char *filename; -#endif /***********************************************************************/ { PDC_LOG(("scr_set() - called: filename %s\n", filename)); diff --git a/pdcurses/scroll.c b/pdcurses/scroll.c index 86aa639f..2fb89c53 100644 --- a/pdcurses/scroll.c +++ b/pdcurses/scroll.c @@ -32,7 +32,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_scroll = "$Id: scroll.c,v 1.8 2006/01/28 15:01:41 wmcbrine Exp $"; +char *rcsid_scroll = "$Id: scroll.c,v 1.9 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -82,12 +82,7 @@ char *rcsid_scroll = "$Id: scroll.c,v 1.8 2006/01/28 15:01:41 wmcbrine Exp $"; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL scroll(WINDOW *win) -#else -int PDC_CDECL scroll(win) -WINDOW *win; -#endif /***********************************************************************/ { PDC_LOG(("scroll() - called\n")); @@ -96,13 +91,7 @@ WINDOW *win; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL wscrl(WINDOW *win, int n) -#else -int PDC_CDECL wscrl(win, n) -WINDOW *win; -int n; -#endif /***********************************************************************/ { int i, l; @@ -180,12 +169,7 @@ int n; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL scrl(int n) -#else -int PDC_CDECL scrl(n) -int n; -#endif /***********************************************************************/ { PDC_LOG(("scrl() - called\n")); diff --git a/pdcurses/slk.c b/pdcurses/slk.c index d65fb8cd..e062369c 100644 --- a/pdcurses/slk.c +++ b/pdcurses/slk.c @@ -42,7 +42,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_slk = "$Id: slk.c,v 1.10 2006/01/28 15:01:41 wmcbrine Exp $"; +char *rcsid_slk = "$Id: slk.c,v 1.11 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -123,13 +123,8 @@ static int labels = 0; static int label_fmt = 0; static int label_line = 0; -#ifdef HAVE_PROTO void (*PDC_initial_slk)(void); static void PDC_slk_init(void); -#else -void (*PDC_initial_slk)(); -static void PDC_slk_init(); -#endif static struct { char label[32]; @@ -151,12 +146,8 @@ static struct { 55 = 5 - 5 format (extended for PC, 10 function keys) */ -#ifdef HAVE_PROTO + int PDC_CDECL slk_init(int fmt) -#else -int PDC_CDECL slk_init(fmt) -int fmt; -#endif /***********************************************************************/ { PDC_LOG(("slk_init() - called\n")); @@ -208,16 +199,9 @@ int fmt; 2 = right save = 1 yes or 0 no */ -#ifdef HAVE_PROTO + static int PDC_slk_set(int label_num, const char *label_str, int label_fmt, int save) -#else -static int PDC_slk_set(label_num, label_str, label_fmt, save) -int label_num; -char *label_str; -int label_fmt; -int save; -#endif /***********************************************************************/ { int i, num, slen, llen, col; @@ -319,14 +303,8 @@ int save; 1 = center 2 = right */ -#ifdef HAVE_PROTO + int PDC_CDECL slk_set(int label_num, const char *label_str, int label_fmt) -#else -int PDC_CDECL slk_set(label_num, label_str, label_fmt) -int label_num; -char *label_str; -int label_fmt; -#endif /***********************************************************************/ { PDC_LOG(("slk_set() - called\n")); @@ -335,11 +313,7 @@ int label_fmt; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL slk_refresh(void) -#else -int PDC_CDECL slk_refresh() -#endif /***********************************************************************/ { PDC_LOG(("slk_refresh() - called\n")); @@ -352,11 +326,7 @@ int PDC_CDECL slk_refresh() } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL slk_noutrefresh(void) -#else -int PDC_CDECL slk_noutrefresh() -#endif /***********************************************************************/ { PDC_LOG(("slk_noutrefresh() - called\n")); @@ -368,12 +338,7 @@ int PDC_CDECL slk_noutrefresh() } /***********************************************************************/ -#ifdef HAVE_PROTO char* PDC_CDECL slk_label(int labnum) -#else -char* PDC_CDECL slk_label(labnum) -int labnum; /* 1 - 8 (or 10) */ -#endif /***********************************************************************/ { PDC_LOG(("slk_label() - called\n")); @@ -388,11 +353,7 @@ int labnum; /* 1 - 8 (or 10) */ } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL slk_clear(void) -#else -int PDC_CDECL slk_clear() -#endif /***********************************************************************/ { int i; @@ -409,11 +370,7 @@ int PDC_CDECL slk_clear() } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL slk_restore(void) -#else -int PDC_CDECL slk_restore() -#endif /***********************************************************************/ { int i; @@ -433,11 +390,7 @@ int PDC_CDECL slk_restore() } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL slk_touch(void) -#else -int PDC_CDECL slk_touch() -#endif /***********************************************************************/ { PDC_LOG(("slk_touch() - called\n")); @@ -446,12 +399,7 @@ int PDC_CDECL slk_touch() } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL slk_attron(const chtype attrs) -#else -int PDC_CDECL slk_attron(attrs) -chtype attrs; -#endif /***********************************************************************/ { int i, rc; @@ -467,12 +415,7 @@ chtype attrs; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL slk_attroff(const chtype attrs) -#else -int PDC_CDECL slk_attroff(attrs) -chtype attrs; -#endif /***********************************************************************/ { int i, rc; @@ -488,12 +431,7 @@ chtype attrs; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL slk_attrset(const chtype attrs) -#else -int PDC_CDECL slk_attrset(attrs) -chtype attrs; -#endif /***********************************************************************/ { int i, rc; @@ -509,12 +447,7 @@ chtype attrs; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL slk_color(short color_pair) -#else -int PDC_CDECL slk_color(color_pair) -short color_pair; -#endif /***********************************************************************/ { int i, rc; @@ -530,11 +463,7 @@ short color_pair; } /***********************************************************************/ -#ifdef HAVE_PROTO static void PDC_slk_init(void) -#else -static void PDC_slk_init() -#endif /***********************************************************************/ { int i; @@ -581,11 +510,7 @@ static void PDC_slk_init() } /***********************************************************************/ -#ifdef HAVE_PROTO void PDC_slk_calc(void) -#else -void PDC_slk_calc() -#endif /***********************************************************************/ { int i, center, col = 0; @@ -705,12 +630,7 @@ void PDC_slk_calc() } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_mouse_in_slk(int y, int x) -#else -int PDC_mouse_in_slk(y, x) -int y, x; -#endif /***********************************************************************/ { int i; diff --git a/pdcurses/termattr.c b/pdcurses/termattr.c index d15478db..243ab0a0 100644 --- a/pdcurses/termattr.c +++ b/pdcurses/termattr.c @@ -41,7 +41,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_termattr = "$Id: termattr.c,v 1.13 2006/01/28 15:01:41 wmcbrine Exp $"; +char *rcsid_termattr = "$Id: termattr.c,v 1.14 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -138,11 +138,7 @@ static char _display[128]; static char _shrtnme[14]; /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL baudrate(void) -#else -int PDC_CDECL baudrate() -#endif /***********************************************************************/ { PDC_LOG(("baudrate() - called\n")); @@ -151,11 +147,7 @@ int PDC_CDECL baudrate() } /***********************************************************************/ -#ifdef HAVE_PROTO char PDC_CDECL erasechar(void) -#else -char PDC_CDECL erasechar() -#endif /***********************************************************************/ { PDC_LOG(("erasechar() - called\n")); @@ -164,11 +156,7 @@ char PDC_CDECL erasechar() } /***********************************************************************/ -#ifdef HAVE_PROTO bool PDC_CDECL has_ic(void) -#else -bool PDC_CDECL has_ic() -#endif /***********************************************************************/ { PDC_LOG(("has_ic() - called\n")); @@ -177,11 +165,7 @@ bool PDC_CDECL has_ic() } /***********************************************************************/ -#ifdef HAVE_PROTO bool PDC_CDECL has_il(void) -#else -bool PDC_CDECL has_il() -#endif /***********************************************************************/ { PDC_LOG(("has_il() - called\n")); @@ -190,11 +174,7 @@ bool PDC_CDECL has_il() } /***********************************************************************/ -#ifdef HAVE_PROTO char PDC_CDECL killchar(void) -#else -char PDC_CDECL killchar() -#endif /***********************************************************************/ { PDC_LOG(("killchar() - called\n")); @@ -203,11 +183,7 @@ char PDC_CDECL killchar() } /***********************************************************************/ -#ifdef HAVE_PROTO char* PDC_CDECL longname(void) -#else -char* PDC_CDECL longname() -#endif /***********************************************************************/ { PDC_LOG(("longname() - called\n")); @@ -298,11 +274,7 @@ char* PDC_CDECL longname() } /***********************************************************************/ -#ifdef HAVE_PROTO chtype PDC_CDECL termattrs(void) -#else -chtype PDC_CDECL termattrs() -#endif /***********************************************************************/ { chtype temp = (A_NORMAL | A_BOLD | A_BLINK | A_REVERSE | @@ -319,11 +291,7 @@ chtype PDC_CDECL termattrs() } /***********************************************************************/ -#ifdef HAVE_PROTO char* PDC_CDECL termname(void) -#else -char* PDC_CDECL termname() -#endif /***********************************************************************/ { PDC_LOG(("termname() - called\n")); @@ -404,11 +372,7 @@ char* PDC_CDECL termname() } /***********************************************************************/ -#ifdef HAVE_PROTO char PDC_CDECL wordchar(void) -#else -char PDC_CDECL wordchar() -#endif /***********************************************************************/ { PDC_LOG(("wordchar() - called\n")); diff --git a/pdcurses/terminfo.c b/pdcurses/terminfo.c index 4d58c82d..1287790b 100644 --- a/pdcurses/terminfo.c +++ b/pdcurses/terminfo.c @@ -32,7 +32,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_terminfo = "$Id: terminfo.c,v 1.10 2006/01/28 15:01:41 wmcbrine Exp $"; +char *rcsid_terminfo = "$Id: terminfo.c,v 1.11 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -82,15 +82,7 @@ char *rcsid_terminfo = "$Id: terminfo.c,v 1.10 2006/01/28 15:01:41 wmcbrine Exp TERMINAL *cur_term = NULL; /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvcur(int oldrow, int oldcol, int newrow, int newcol) -#else -int PDC_CDECL mvcur(oldrow, oldcol, newrow, newcol) -int oldrow; -int oldcol; -int newrow; -int newcol; -#endif /***********************************************************************/ { PDC_LOG(("mvcur() - called: oldrow %d oldcol %d newrow %d newcol %d\n", @@ -108,12 +100,7 @@ int newcol; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL del_curterm(TERMINAL *oterm) -#else -int PDC_CDECL del_curterm(oterm) -TERMINAL *oterm; -#endif /***********************************************************************/ { PDC_LOG(("del_curterm() - called\n")); @@ -122,12 +109,7 @@ TERMINAL *oterm; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL putp(const char *str) -#else -int PDC_CDECL putp(str) -char *str; -#endif /***********************************************************************/ { PDC_LOG(("putp() - called: str %s\n", str)); @@ -136,14 +118,7 @@ char *str; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL restartterm(char *term, int filedes, int *errret) -#else -int PDC_CDECL restartterm(term, filedes, errret) -char *term; -int filedes; -int *errret; -#endif /***********************************************************************/ { PDC_LOG(("restartterm() - called\n")); @@ -155,12 +130,7 @@ int *errret; } /***********************************************************************/ -#ifdef HAVE_PROTO TERMINAL* PDC_CDECL set_curterm(TERMINAL *nterm) -#else -TERMINAL* PDC_CDECL set_curterm(nterm) -TERMINAL *nterm; -#endif /***********************************************************************/ { PDC_LOG(("set_curterm() - called\n")); @@ -169,12 +139,7 @@ TERMINAL *nterm; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL setterm(char *term) -#else -int PDC_CDECL setterm(term) -char *term; -#endif /***********************************************************************/ { PDC_LOG(("setterm() - called\n")); @@ -183,14 +148,7 @@ char *term; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL setupterm(char *term, int filedes, int *errret) -#else -int PDC_CDECL setupterm(term, filedes, errret) -char *term; -int filedes; -int *errret; -#endif /***********************************************************************/ { PDC_LOG(("setupterm() - called\n")); @@ -204,13 +162,7 @@ int *errret; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL tgetent(char *bp, const char *name) -#else -int PDC_CDECL tgetent(bp, name) -char *bp; -char *name; -#endif /***********************************************************************/ { PDC_LOG(("tgetent() - called: name %s\n", name)); @@ -219,12 +171,7 @@ char *name; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL tgetflag(char *id) -#else -int PDC_CDECL tgetflag(id) -char *id; -#endif /***********************************************************************/ { PDC_LOG(("tgetflag() - called: id %s\n", id)); @@ -233,12 +180,7 @@ char *id; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL tgetnum(char *id) -#else -int PDC_CDECL tgetnum(id) -char *id; -#endif /***********************************************************************/ { PDC_LOG(("tgetnum() - called: id %s\n", id)); @@ -247,13 +189,7 @@ char *id; } /***********************************************************************/ -#ifdef HAVE_PROTO char* PDC_CDECL tgetstr(char *id, char **area) -#else -char* PDC_CDECL tgetstr(id, area) -char *id; -char **area; -#endif /***********************************************************************/ { PDC_LOG(("tgetstr() - called: id %s\n", id)); @@ -262,14 +198,7 @@ char **area; } /***********************************************************************/ -#ifdef HAVE_PROTO char* PDC_CDECL tgoto(char *cap, int col, int row) -#else -char* PDC_CDECL tgoto(cap, col, row) -char *cap; -int col; -int row; -#endif /***********************************************************************/ { PDC_LOG(("tgoto() - called\n")); @@ -278,12 +207,7 @@ int row; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL tigetflag(char *capname) -#else -int PDC_CDECL tigetflag(capname) -char *capname; -#endif /***********************************************************************/ { PDC_LOG(("tigetflag() - called: capname %s\n", capname)); @@ -292,12 +216,7 @@ char *capname; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL tigetnum(char *capname) -#else -int PDC_CDECL tigetnum(capname) -char *capname; -#endif /***********************************************************************/ { PDC_LOG(("tigetnum() - called: capname %s\n", capname)); @@ -306,12 +225,7 @@ char *capname; } /***********************************************************************/ -#ifdef HAVE_PROTO char* PDC_CDECL tigetstr(char *capname) -#else -char* PDC_CDECL tigetstr(capname) -char *capname; -#endif /***********************************************************************/ { PDC_LOG(("tigetstr() - called: capname %s\n", capname)); @@ -320,22 +234,8 @@ char *capname; } /***********************************************************************/ -#ifdef HAVE_PROTO char* PDC_CDECL tparm(char *cap, long p1, long p2, long p3, long p4, long p5, long p6, long p7, long p8, long p9) -#else -char* PDC_CDECL tparm(cap, p1, p2, p3, p4, p5, p6, p7, p8, p9) -char *cap; -long p1; -long p2; -long p3; -long p4; -long p5; -long p6; -long p7; -long p8; -long p9; -#endif /***********************************************************************/ { PDC_LOG(("tparm() - called: cap %s\n", cap)); @@ -344,14 +244,7 @@ long p9; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL tputs(const char *str, int affcnt, int (*putfunc)(int)) -#else -int PDC_CDECL tputs(str, affcnt, putfunc) -char *str; -int affcnt; -int (*putfunc)(int); -#endif /***********************************************************************/ { PDC_LOG(("tputs() - called\n")); @@ -360,12 +253,7 @@ int (*putfunc)(int); } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL vidattr(chtype attr) -#else -int PDC_CDECL vidattr(attr) -chtype attr; -#endif /***********************************************************************/ { PDC_LOG(("vidattr() - called: attr %d\n", attr)); @@ -374,13 +262,7 @@ chtype attr; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL vidputs(chtype attr, int (*putfunc)(int)) -#else -int PDC_CDECL vidputs(attr, putfunc) -chtype attr; -int (*putfunc)(); -#endif /***********************************************************************/ { PDC_LOG(("vidputs() - called: attr %d\n", attr)); diff --git a/pdcurses/touch.c b/pdcurses/touch.c index 6c7039af..c6a70af5 100644 --- a/pdcurses/touch.c +++ b/pdcurses/touch.c @@ -37,7 +37,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_touch = "$Id: touch.c,v 1.6 2006/01/28 15:01:41 wmcbrine Exp $"; +char *rcsid_touch = "$Id: touch.c,v 1.7 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -95,12 +95,7 @@ char *rcsid_touch = "$Id: touch.c,v 1.6 2006/01/28 15:01:41 wmcbrine Exp $"; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL touchwin(WINDOW *win) -#else -int PDC_CDECL touchwin(win) -WINDOW *win; -#endif /***********************************************************************/ { int i; @@ -120,14 +115,7 @@ WINDOW *win; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL touchline(WINDOW *win, int start, int count) -#else -int PDC_CDECL touchline(win, start, count) -WINDOW *win; -int start; -int count; -#endif /***********************************************************************/ { int i; @@ -149,12 +137,7 @@ int count; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL untouchwin(WINDOW *win) -#else -int PDC_CDECL untouchwin(win) -WINDOW *win; -#endif /***********************************************************************/ { int i; @@ -174,15 +157,7 @@ WINDOW *win; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL wtouchln(WINDOW *win, int y, int n, int changed) -#else -int PDC_CDECL wtouchln(win, y, n, changed) -WINDOW *win; -int y; -int n; -int changed; -#endif /***********************************************************************/ { int i; @@ -211,13 +186,7 @@ int changed; } /***********************************************************************/ -#ifdef HAVE_PROTO bool PDC_CDECL is_linetouched(WINDOW *win, int line) -#else -bool PDC_CDECL is_linetouched(win, line) -WINDOW *win; -int line; -#endif /***********************************************************************/ { PDC_LOG(("is_linetouched() - called: win=%x line=%d\n", win, line)); @@ -229,12 +198,7 @@ int line; } /***********************************************************************/ -#ifdef HAVE_PROTO bool PDC_CDECL is_wintouched(WINDOW *win) -#else -bool PDC_CDECL is_wintouched(win) -WINDOW *win; -#endif /***********************************************************************/ { int i; diff --git a/pdcurses/util.c b/pdcurses/util.c index 137fec5a..d786a079 100644 --- a/pdcurses/util.c +++ b/pdcurses/util.c @@ -42,7 +42,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_util = "$Id: util.c,v 1.19 2006/01/28 15:01:41 wmcbrine Exp $"; +char *rcsid_util = "$Id: util.c,v 1.20 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -113,12 +113,7 @@ char *rcsid_util = "$Id: util.c,v 1.19 2006/01/28 15:01:41 wmcbrine Exp $"; static char strbuf[3] = {0, 0, 0}; /***********************************************************************/ -#ifdef HAVE_PROTO -char* PDC_CDECL unctrl(chtype c) -#else -char* PDC_CDECL unctrl(c) -chtype c; -#endif +char * PDC_CDECL unctrl(chtype c) /***********************************************************************/ { chtype ic; @@ -210,12 +205,7 @@ static char *key_name[] = { }; /***********************************************************************/ -#ifdef HAVE_PROTO char * PDC_CDECL keyname(int key) -#else -char * PDC_CDECL keyname(key) -int key; -#endif /***********************************************************************/ { PDC_LOG(("keyname() - called: key %d\n", key)); @@ -230,12 +220,7 @@ int key; } /***********************************************************************/ -#ifdef HAVE_PROTO bool PDC_CDECL has_key(int key) -#else -bool PDC_CDECL has_key(key) -int key; -#endif { PDC_LOG(("has_key() - called: key %d\n",key)); @@ -246,36 +231,21 @@ int key; } /***********************************************************************/ -#ifdef HAVE_PROTO void PDC_CDECL filter(void) -#else -void PDC_CDECL filter() -#endif /***********************************************************************/ { PDC_LOG(("filter() - called\n")); } /***********************************************************************/ -#ifdef HAVE_PROTO void PDC_CDECL use_env(bool x) -#else -void PDC_CDECL use_env(x) -bool x; -#endif /***********************************************************************/ { PDC_LOG(("use_env() - called: x %d\n", x)); } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL putwin(WINDOW *win, FILE *filep) -#else -int PDC_CDECL putwin(win, filep) -WINDOW *win; -FILE *filep; -#endif /***********************************************************************/ { PDC_LOG(("putwin() - called\n")); @@ -284,12 +254,7 @@ FILE *filep; } /***********************************************************************/ -#ifdef HAVE_PROTO WINDOW* PDC_CDECL getwin(FILE *filep) -#else -WINDOW* PDC_CDECL getwin(filep) -FILE *filep; -#endif /***********************************************************************/ { PDC_LOG(("getwin() - called\n")); @@ -298,12 +263,7 @@ FILE *filep; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL delay_output(int ms) -#else -int PDC_CDECL delay_output(ms) -int ms; -#endif /***********************************************************************/ { PDC_LOG(("delay_output() - called: ms %d\n", ms)); @@ -312,11 +272,7 @@ int ms; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL flushinp(void) -#else -int PDC_CDECL flushinp() -#endif /***********************************************************************/ { extern int c_pindex; /* putter index */ @@ -355,11 +311,7 @@ int PDC_CDECL flushinp() #undef traceoff /***********************************************************************/ -#ifdef HAVE_PROTO void PDC_CDECL traceon(void) -#else -void PDC_CDECL traceon() -#endif /***********************************************************************/ { PDC_LOG(("traceon() - called\n")); @@ -368,11 +320,7 @@ void PDC_CDECL traceon() } /***********************************************************************/ -#ifdef HAVE_PROTO void PDC_CDECL traceoff(void) -#else -void PDC_CDECL traceoff() -#endif /***********************************************************************/ { PDC_LOG(("traceoff() - called\n")); diff --git a/pdcurses/window.c b/pdcurses/window.c index 1d3c87c1..b62b38a3 100644 --- a/pdcurses/window.c +++ b/pdcurses/window.c @@ -47,7 +47,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_window = "$Id: window.c,v 1.12 2006/01/28 15:01:41 wmcbrine Exp $"; +char *rcsid_window = "$Id: window.c,v 1.13 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -159,24 +159,12 @@ char *rcsid_window = "$Id: window.c,v 1.12 2006/01/28 15:01:41 wmcbrine Exp $"; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO WINDOW* PDC_CDECL newwin(int nlines, int ncols, int begy, int begx) -#else -WINDOW* PDC_CDECL newwin(nlines, ncols, begy, begx) -int nlines; -int ncols; -int begy; -int begx; -#endif /***********************************************************************/ { -#ifdef HAVE_PROTO extern void *(*callc)(size_t, size_t); extern void (*fre)(void *); -#else - extern void *(*callc)(); - extern void (*fre)(); -#endif + WINDOW *win; chtype *ptr; int i, j; @@ -224,19 +212,11 @@ int begx; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL delwin(WINDOW *win) -#else -int PDC_CDECL delwin(win) -WINDOW *win; -#endif /***********************************************************************/ { -#ifdef HAVE_PROTO extern void (*fre)(void*); -#else - extern void (*fre)(); -#endif + int i; PDC_LOG(("delwin() - called\n")); @@ -263,14 +243,7 @@ WINDOW *win; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvwin(WINDOW *win, int y, int x) -#else -int PDC_CDECL mvwin(win, y, x) -WINDOW *win; -int y; -int x; -#endif /***********************************************************************/ { PDC_LOG(("mvwin() - called\n")); @@ -288,17 +261,8 @@ int x; } /***********************************************************************/ -#ifdef HAVE_PROTO WINDOW* PDC_CDECL subwin(WINDOW *orig, int nlines, int ncols, int begin_y, int begin_x) -#else -WINDOW* PDC_CDECL subwin(orig, nlines, ncols, begin_y, begin_x) -WINDOW *orig; -int nlines; -int ncols; -int begin_y; -int begin_x; -#endif /***********************************************************************/ { WINDOW *win; @@ -348,17 +312,8 @@ int begin_x; } /***********************************************************************/ -#ifdef HAVE_PROTO WINDOW* PDC_CDECL derwin(WINDOW *orig, int nlines, int ncols, int begin_y, int begin_x) -#else -WINDOW* PDC_CDECL derwin(orig, nlines, ncols, begin_y, begin_x) -WINDOW *orig; -int nlines; -int ncols; -int begin_y; -int begin_x; -#endif /***********************************************************************/ { return subwin(orig, nlines, ncols, begin_y + orig->_begy, @@ -366,14 +321,7 @@ int begin_x; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL mvderwin(WINDOW* win, int par_y, int par_x) -#else -int PDC_CDECL mvderwin(win, par_y, par_x) -WINDOW *win; -int par_y; -int par_x; -#endif /***********************************************************************/ { int i, j; @@ -401,21 +349,12 @@ int par_x; } /***********************************************************************/ -#ifdef HAVE_PROTO WINDOW* PDC_CDECL dupwin(WINDOW *win) -#else -WINDOW* PDC_CDECL dupwin(win) -WINDOW *win; -#endif /***********************************************************************/ { -#ifdef HAVE_PROTO extern void *(*callc)(size_t, size_t); extern void (*fre)(void *); -#else - extern void *(*callc)(); - extern void (*fre)(); -#endif + WINDOW *new; chtype *ptr, *ptr1; int nlines, ncols, begy, begx, i, j; @@ -503,23 +442,12 @@ WINDOW *win; } /***********************************************************************/ -#ifdef HAVE_PROTO WINDOW * PDC_CDECL resize_window(WINDOW *win, int lins, int cols) -#else -WINDOW * PDC_CDECL resize_window(win, lins, cols) -WINDOW *win; -int lins; -int cols; -#endif /***********************************************************************/ { -#ifdef HAVE_PROTO extern void *(*callc)(size_t, size_t); extern void (*fre)(void *); -#else - extern void *(*callc)(); - extern void (*fre)(); -#endif + WINDOW *new; int i, j, save_cury, save_curx; int new_begy = 0, new_begx = 0; @@ -609,12 +537,7 @@ int cols; } /***********************************************************************/ -#ifdef HAVE_PROTO void PDC_CDECL wsyncup(WINDOW *win) -#else -void PDC_CDECL wsyncup(win) -WINDOW *win; -#endif /***********************************************************************/ { WINDOW *tmp; @@ -626,13 +549,7 @@ WINDOW *win; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL syncok(WINDOW *win, bool bf) -#else -int PDC_CDECL syncok(win, bf) -WINDOW *win; -bool bf; -#endif /***********************************************************************/ { PDC_LOG(("syncok() - called\n")); @@ -646,12 +563,7 @@ bool bf; } /***********************************************************************/ -#ifdef HAVE_PROTO void PDC_CDECL wcursyncup(WINDOW *win) -#else -void PDC_CDECL wcursyncup(win) -WINDOW *win; -#endif /***********************************************************************/ { WINDOW *tmp; @@ -664,12 +576,7 @@ WINDOW *win; } /***********************************************************************/ -#ifdef HAVE_PROTO void PDC_CDECL wsyncdown(WINDOW *win) -#else -void PDC_CDECL wsyncdown(win) -WINDOW *win; -#endif /***********************************************************************/ { WINDOW *tmp; diff --git a/term.h b/term.h index 4986bee5..850185fb 100644 --- a/term.h +++ b/term.h @@ -16,7 +16,7 @@ * See the file maintain.er for details of the current maintainer. **************************************************************************/ -/* $Id: term.h,v 1.3 2006/01/28 13:27:23 wmcbrine Exp $ */ +/* $Id: term.h,v 1.4 2006/01/28 16:53:25 wmcbrine Exp $ */ /* PDCurses doesn't operate with terminfo, but we need these functions for compatibility, to allow some things (notably, interface libraries for @@ -45,31 +45,23 @@ __declspec(dllexport) extern TERMINAL *cur_term; extern TERMINAL *cur_term; #endif -#ifdef HAVE_PROTO -# define Args(x) x -#else -# define Args(x) () -#endif - -int PDC_CDECL del_curterm Args((TERMINAL *)); -int PDC_CDECL putp Args((const char *)); -int PDC_CDECL restartterm Args((char *, int, int *)); -TERMINAL* PDC_CDECL set_curterm Args((TERMINAL *)); -int PDC_CDECL setterm Args((char *)); -int PDC_CDECL setupterm Args((char *, int, int *)); -int PDC_CDECL tgetent Args((char *, const char *)); -int PDC_CDECL tgetflag Args((char *)); -int PDC_CDECL tgetnum Args((char *)); -char * PDC_CDECL tgetstr Args((char *, char **)); -char * PDC_CDECL tgoto Args((char *, int, int)); -int PDC_CDECL tigetflag Args((char *)); -int PDC_CDECL tigetnum Args((char *)); -char * PDC_CDECL tigetstr Args((char *)); -char * PDC_CDECL tparm Args((char *,long, long, long, long, long, - long, long, long, long)); -int PDC_CDECL tputs Args((const char *, int, int (*)(int))); - -#undef Args +int PDC_CDECL del_curterm(TERMINAL *); +int PDC_CDECL putp(const char *); +int PDC_CDECL restartterm(char *, int, int *); +TERMINAL* PDC_CDECL set_curterm(TERMINAL *); +int PDC_CDECL setterm(char *); +int PDC_CDECL setupterm(char *, int, int *); +int PDC_CDECL tgetent(char *, const char *); +int PDC_CDECL tgetflag(char *); +int PDC_CDECL tgetnum(char *); +char * PDC_CDECL tgetstr(char *, char **); +char * PDC_CDECL tgoto(char *, int, int); +int PDC_CDECL tigetflag(char *); +int PDC_CDECL tigetnum(char *); +char * PDC_CDECL tigetstr(char *); +char * PDC_CDECL tparm(char *,long, long, long, long, long, + long, long, long, long); +int PDC_CDECL tputs(const char *, int, int (*)(int)); #endif /* __PDCURSES_TERM_H__ */ diff --git a/x11/pdcdisp.c b/x11/pdcdisp.c index 8a6c6eee..3c0d7cda 100644 --- a/x11/pdcdisp.c +++ b/x11/pdcdisp.c @@ -29,7 +29,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_PDCdisp = "$Id: pdcdisp.c,v 1.8 2006/01/28 13:27:23 wmcbrine Exp $"; +char *rcsid_PDCdisp = "$Id: pdcdisp.c,v 1.9 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -55,12 +55,7 @@ char *rcsid_PDCdisp = "$Id: pdcdisp.c,v 1.8 2006/01/28 13:27:23 wmcbrine Exp $"; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_clr_update(WINDOW *s) -#else -int PDC_clr_update(s) -WINDOW *s; -#endif /***********************************************************************/ { int i; @@ -106,11 +101,7 @@ WINDOW *s; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_cursor_on(void) -#else -int PDC_cursor_on() -#endif /***********************************************************************/ { PDC_LOG(("PDC_cursor_on() - called\n")); @@ -137,11 +128,7 @@ int PDC_cursor_on() **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_cursor_off(void) -#else -int PDC_cursor_off() -#endif /***********************************************************************/ { PDC_LOG(("PDC_cursor_off() - called\n")); @@ -172,13 +159,7 @@ int PDC_cursor_off() **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_gotoxy(int row, int col) -#else -int PDC_gotoxy(row, col) -int row; -int col; -#endif /***********************************************************************/ { PDC_LOG(("PDC_gotoxy() - called: row %d col %d\n", row, col)); @@ -213,12 +194,7 @@ int col; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO bool PDC_transform_line(int lineno) -#else -bool PDC_transform_line(lineno) -int lineno; -#endif /***********************************************************************/ { chtype *dstp; diff --git a/x11/pdcgetsc.c b/x11/pdcgetsc.c index 749805a6..733c82b5 100644 --- a/x11/pdcgetsc.c +++ b/x11/pdcgetsc.c @@ -23,7 +23,7 @@ #include #ifdef PDCDEBUG -char *rcsid_PDCgetsc = "$Id: pdcgetsc.c,v 1.7 2006/01/28 13:27:23 wmcbrine Exp $"; +char *rcsid_PDCgetsc = "$Id: pdcgetsc.c,v 1.8 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -48,11 +48,7 @@ char *rcsid_PDCgetsc = "$Id: pdcgetsc.c,v 1.7 2006/01/28 13:27:23 wmcbrine Exp $ **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_get_columns(void) -#else -int PDC_get_columns() -#endif /***********************************************************************/ { PDC_LOG(("PDC_get_columns() - called\n")); @@ -82,11 +78,7 @@ int PDC_get_columns() **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_get_rows(void) -#else -int PDC_get_rows() -#endif /***********************************************************************/ { PDC_LOG(("PDC_get_rows() - called\n")); @@ -109,11 +101,7 @@ int PDC_get_rows() **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_get_font(void) -#else -int PDC_get_font() -#endif /***********************************************************************/ { PDC_LOG(("PDC_get_font() - called\n")); diff --git a/x11/pdckbd.c b/x11/pdckbd.c index 28191138..17f05289 100644 --- a/x11/pdckbd.c +++ b/x11/pdckbd.c @@ -23,7 +23,7 @@ #include #ifdef PDCDEBUG -char *rcsid_PDCkbd = "$Id: pdckbd.c,v 1.12 2006/01/28 13:27:23 wmcbrine Exp $"; +char *rcsid_PDCkbd = "$Id: pdckbd.c,v 1.13 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -48,11 +48,7 @@ char *rcsid_PDCkbd = "$Id: pdckbd.c,v 1.12 2006/01/28 13:27:23 wmcbrine Exp $"; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO unsigned long PDC_get_input_fd(void) -#else -unsigned long PDC_get_input_fd() -#endif /***********************************************************************/ { PDC_LOG(("PDC_get_input_fd() - called\n")); @@ -82,11 +78,7 @@ unsigned long PDC_get_input_fd() **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO bool PDC_check_bios_key(void) -#else -bool PDC_check_bios_key() -#endif /***********************************************************************/ { PDC_LOG(("PDC_check_bios_key() - called\n")); @@ -116,11 +108,7 @@ bool PDC_check_bios_key() **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO bool PDC_get_ctrl_break(void) -#else -bool PDC_get_ctrl_break() -#endif /***********************************************************************/ { PDC_LOG(("PDC_get_ctrl_break() - called\n")); @@ -156,11 +144,7 @@ bool PDC_get_ctrl_break() **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_rawgetch(void) -#else -int PDC_rawgetch() -#endif /***********************************************************************/ { extern WINDOW *_getch_win_; @@ -200,12 +184,7 @@ int PDC_rawgetch() **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_set_ctrl_break(bool setting) -#else -int PDC_set_ctrl_break(setting) -bool setting; -#endif /***********************************************************************/ { PDC_LOG(("PDC_set_ctrl_break() - called\n")); @@ -238,11 +217,7 @@ bool setting; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO unsigned long PDC_get_key_modifiers(void) -#else -unsigned long PDC_get_key_modifiers() -#endif /***********************************************************************/ { PDC_LOG(("PDC_get_key_modifiers() - called\n")); diff --git a/x11/pdcprint.c b/x11/pdcprint.c index 37de4341..83a62fee 100644 --- a/x11/pdcprint.c +++ b/x11/pdcprint.c @@ -23,7 +23,7 @@ #include #ifdef PDCDEBUG -char *rcsid_PDCprint = "$Id: pdcprint.c,v 1.5 2006/01/28 13:27:23 wmcbrine Exp $"; +char *rcsid_PDCprint = "$Id: pdcprint.c,v 1.6 2006/01/28 16:53:26 wmcbrine Exp $"; #endif @@ -52,14 +52,7 @@ char *rcsid_PDCprint = "$Id: pdcprint.c,v 1.5 2006/01/28 13:27:23 wmcbrine Exp $ **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_print(int cmd, int byte, int port) -#else -int PDC_print(cmd, byte, port) -int cmd; -int byte; -int port; -#endif /***********************************************************************/ { PDC_LOG(("PDC_print() - called\n")); diff --git a/x11/pdcscrn.c b/x11/pdcscrn.c index a889d3c6..373192cb 100644 --- a/x11/pdcscrn.c +++ b/x11/pdcscrn.c @@ -23,7 +23,7 @@ #include #ifdef PDCDEBUG -char *rcsid_PDCscrn = "$Id: pdcscrn.c,v 1.9 2006/01/28 13:27:23 wmcbrine Exp $"; +char *rcsid_PDCscrn = "$Id: pdcscrn.c,v 1.10 2006/01/28 16:53:26 wmcbrine Exp $"; #endif bool GLOBAL_sb_on = FALSE; @@ -78,13 +78,7 @@ int PDC_scr_close(void) **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO bool PDC_scrn_modes_equal(int mode1, int mode2) -#else -bool PDC_scrn_modes_equal(mode1, mode2) -int mode1; -int mode2; -#endif /***********************************************************************/ { PDC_LOG(("PDC_scrn_modes_equal() - called\n")); @@ -112,13 +106,7 @@ int mode2; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_scr_open(SCREEN *internal, bool echo) -#else -int PDC_scr_open(internal, echo) -SCREEN *internal; -bool echo; -#endif /***********************************************************************/ { extern bool sb_started; @@ -186,12 +174,7 @@ bool echo; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_resize_screen(int nlines, int ncols) -#else -int PDC_resize_screen(nlines, ncols) -int nlines, ncols; -#endif /***********************************************************************/ { PDC_LOG(("PDC_resize_screen() - called. Lines: %d Cols: %d\n", diff --git a/x11/pdcsetsc.c b/x11/pdcsetsc.c index 5695662d..0e12626a 100644 --- a/x11/pdcsetsc.c +++ b/x11/pdcsetsc.c @@ -23,7 +23,7 @@ #include #ifdef PDCDEBUG -char *rcsid_PDCsetsc = "$Id: pdcsetsc.c,v 1.7 2006/01/28 13:27:23 wmcbrine Exp $"; +char *rcsid_PDCsetsc = "$Id: pdcsetsc.c,v 1.8 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -51,12 +51,7 @@ char *rcsid_PDCsetsc = "$Id: pdcsetsc.c,v 1.7 2006/01/28 13:27:23 wmcbrine Exp $ **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_set_font(int size) -#else -int PDC_set_font(size) -int size; -#endif /***********************************************************************/ { PDC_LOG(("PDC_set_font() - called\n")); @@ -89,12 +84,7 @@ int size; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_set_rows(int rows) -#else -int PDC_set_rows(rows) -int rows; -#endif /***********************************************************************/ { PDC_LOG(("PDC_set_rows() - called\n")); @@ -103,12 +93,7 @@ int rows; } /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_curs_set(int visibility) -#else -int PDC_curs_set(visibility) -int visibility; -#endif /***********************************************************************/ { int ret_vis = SP->visibility; @@ -145,12 +130,7 @@ int visibility; **man-end**********************************************************************/ /***********************************************************************/ -#ifdef HAVE_PROTO void PDC_set_title(char *title) -#else -void PDC_set_title(title) -char *title; -#endif /***********************************************************************/ { PDC_LOG(("PDC_set_title() - called:<%s>\n", title)); diff --git a/x11/pdcx11.c b/x11/pdcx11.c index 351e0c6d..b1c4fc85 100644 --- a/x11/pdcx11.c +++ b/x11/pdcx11.c @@ -902,32 +902,17 @@ pthread_mutex_t key_queue_mutex = PTHREAD_MUTEX_INITIALIZER; int xerror(); -#ifdef HAVE_PROTO void say(const char *msg) -#else -void say(msg) -char *msg; -#endif { PDC_LOG(("%s:%s", XCLOGMSG, msg)); } -#ifdef HAVE_PROTO void dummy_function(void) -#else -void dummy_function() -#endif { } /***********************************************************************/ -#ifdef HAVE_PROTO signal_handler XCursesSetSignal(int signo, signal_handler action) -#else -signal_handler XCursesSetSignal(signo, action) -int signo; -signal_handler action; -#endif /***********************************************************************/ { #if defined(SA_INTERRUPT) || defined(SA_RESTART) @@ -957,12 +942,7 @@ signal_handler action; } /***********************************************************************/ -#ifdef HAVE_PROTO RETSIGTYPE XCursesSigwinchHandler(int signo) -#else -RETSIGTYPE XCursesSigwinchHandler(signo) -int signo; -#endif /***********************************************************************/ { PDC_LOG(("%s:XCursesSigwinchHandler() - called: SIGNO: %d\n", @@ -982,11 +962,7 @@ int signo; /***********************************************************************/ /* NOT USED */ -#ifdef HAVE_PROTO int XCurses_redraw_curscr(void) -#else -int XCurses_redraw_curscr() -#endif /***********************************************************************/ { int i; @@ -1000,15 +976,8 @@ int XCurses_redraw_curscr() } /***********************************************************************/ -#ifdef HAVE_PROTO int XCursesDisplayText(chtype *ch, int row, int x, int num_cols, bool highlight) -#else -int XCursesDisplayText(ch, row, x, num_cols, highlight) -chtype *ch; -int row, x, num_cols; -bool highlight; -#endif /***********************************************************************/ { char text[300]; @@ -1250,18 +1219,8 @@ bool highlight; } /***********************************************************************/ -#ifdef HAVE_PROTO void get_GC(Display *display, Window win, GC *gc, XFontStruct *font_info, int fore, int back, bool highlight) -#else -void get_GC(display, win, gc, font_info, fore, back, highlight) -Display *display; -Window win; -GC *gc; -XFontStruct *font_info; -int fore, back; -bool highlight; -#endif /***********************************************************************/ { XGCValues values; @@ -1284,12 +1243,7 @@ bool highlight; } /***********************************************************************/ -#ifdef HAVE_PROTO void makeXY(int x, int y, int fontwidth, int fontheight, int *xpos, int *ypos) -#else -void makeXY(x, y, fontwidth, fontheight, xpos, ypos) -int x, y, fontwidth, fontheight, *xpos,* ypos; -#endif /***********************************************************************/ { *xpos = (x * fontwidth) + XCURSESBORDERWIDTH; @@ -1298,11 +1252,7 @@ int x, y, fontwidth, fontheight, *xpos,* ypos; } /***********************************************************************/ -#ifdef HAVE_PROTO int get_colors(void) -#else -int get_colors() -#endif /***********************************************************************/ { #ifdef PDCDEBUG @@ -1333,11 +1283,7 @@ int get_colors() } /***********************************************************************/ -#ifdef HAVE_PROTO int XCursesEndwin(void) -#else -int XCursesEndwin() -#endif /***********************************************************************/ { PDC_LOG(("%s:XCursesEndwin() - called\n", XCLOGMSG)); @@ -1371,11 +1317,7 @@ int XCursesEndwin() } /***********************************************************************/ -#ifdef HAVE_PROTO int XCursesRefreshScrollbar(void) -#else -int XCursesRefreshScrollbar() -#endif /***********************************************************************/ { PDC_SCROLLBAR_TYPE cur_x = @@ -1413,14 +1355,7 @@ int XCursesRefreshScrollbar() } /***********************************************************************/ -#ifdef HAVE_PROTO void SetCursorColor(chtype *ch, short *fore, short *back) -#else -void SetCursorColor(ch, fore, back) -chtype *ch; -short *fore; -short *back; -#endif /***********************************************************************/ { int attr; @@ -1450,11 +1385,7 @@ short *back; } /***********************************************************************/ -#ifdef HAVE_PROTO void XCursesGetIcon(void) -#else -void XCursesGetIcon() -#endif /***********************************************************************/ { XIconSize *icon_size; @@ -1568,16 +1499,8 @@ void XCursesGetIcon() } /***********************************************************************/ -#ifdef HAVE_PROTO void XCursesExpose(Widget w, XtPointer client_data, XEvent *event, Boolean *continue_to_dispatch) -#else -void XCursesExpose(w, client_data, event, continue_to_dispatch) -Widget w; -XtPointer client_data; -XEvent *event; -Boolean *continue_to_dispatch; -#endif /***********************************************************************/ { PDC_LOG(("%s:XCursesExpose called\n", XCLOGMSG)); @@ -1592,16 +1515,8 @@ Boolean *continue_to_dispatch; } /***********************************************************************/ -#ifdef HAVE_PROTO void XCursesNonmaskable(Widget w, XtPointer client_data, XEvent *event, Boolean *continue_to_dispatch) -#else -void XCursesNonmaskable(w, client_data, event, continue_to_dispatch) -Widget w; -XtPointer client_data; -XEvent *event; -Boolean *continue_to_dispatch; -#endif /***********************************************************************/ { XClientMessageEvent *client_event = (XClientMessageEvent *)event; @@ -1625,16 +1540,8 @@ Boolean *continue_to_dispatch; } /***********************************************************************/ -#ifdef HAVE_PROTO void XCursesModifierPress(Widget w, XEvent *event, String *params, Cardinal *nparams) -#else -void XCursesModifierPress(w, event, params, nparams) -Widget w; -XEvent *event; -String *params; -Cardinal *nparams; -#endif /***********************************************************************/ { #define STATE_NORMAL 0 @@ -1690,16 +1597,8 @@ Cardinal *nparams; } /***********************************************************************/ -#ifdef HAVE_PROTO void XCursesKeyPress(Widget w, XEvent *event, String *params, Cardinal *nparams) -#else -void XCursesKeyPress(w, event, params, nparams) -Widget w; -XEvent *event; -String *params; -Cardinal *nparams; -#endif /***********************************************************************/ { #define STATE_NORMAL 0 @@ -2004,16 +1903,8 @@ Cardinal *nparams; } /***********************************************************************/ -#ifdef HAVE_PROTO void XCursesHandleString(Widget w, XEvent *event, String *params, Cardinal *nparams) -#else -void XCursesHandleString(w, event, params, nparams) -Widget w; -XEvent *event; -String *params; -Cardinal *nparams; -#endif /***********************************************************************/ { int i = 0; @@ -2057,13 +1948,7 @@ Cardinal *nparams; } /***********************************************************************/ -#ifdef HAVE_PROTO void XCursesPasteSelection(Widget w, XButtonEvent *button_event) -#else -void XCursesPasteSelection(w, button_event) -Widget w; -XButtonEvent *button_event; -#endif /***********************************************************************/ { PDC_LOG(("%s:XCursesPasteSelection() - called\n", XCLOGMSG)); @@ -2074,22 +1959,10 @@ XButtonEvent *button_event; } /***********************************************************************/ -#ifdef HAVE_PROTO void XCursesRequestorCallbackForPaste(Widget w, XtPointer data, Atom *selection, Atom *type, XtPointer value, unsigned long *length, int *format) -#else -void XCursesRequestorCallbackForPaste(w, data, selection, type, value, - length, format) -Widget w; -XtPointer data; -Atom *selection; -Atom *type; -XtPointer value; -unsigned long *length; -int *format; -#endif /***********************************************************************/ { unsigned long i, key; @@ -2113,21 +1986,9 @@ int *format; } /***********************************************************************/ -#ifdef HAVE_PROTO Boolean XCursesConvertProc(Widget w,Atom *selection, Atom *target, Atom *type_return, XtPointer *value_return, unsigned long *length_return, int *format_return) -#else -Boolean XCursesConvertProc(w, selection, target, type_return, value_return, - length_return, format_return) -Widget w; -Atom *selection; -Atom *target; -Atom *type_return; -XtPointer *value_return; -unsigned long *length_return; -int *format_return; -#endif /***********************************************************************/ { PDC_LOG(("%s:XCursesConvertProc() - called\n", XCLOGMSG)); @@ -2185,13 +2046,7 @@ int *format_return; } /***********************************************************************/ -#ifdef HAVE_PROTO void XCursesLoseOwnership(Widget w, Atom *type) -#else -void XCursesLoseOwnership(w, type) -Widget w; -Atom *type; -#endif /***********************************************************************/ { PDC_LOG(("%s:XCursesLoseOwnership() - called\n", XCLOGMSG)); @@ -2205,14 +2060,8 @@ Atom *type; } /***********************************************************************/ -#ifdef HAVE_PROTO void ShowSelection(int start_x, int start_y, int end_x, int end_y, bool highlight) -#else -void ShowSelection(start_x, start_y, end_x, end_y, highlight) -int start_x, start_y, end_x, end_y; -bool highlight; -#endif /***********************************************************************/ { int i, num_cols, start_col, row; @@ -2265,11 +2114,7 @@ bool highlight; } /***********************************************************************/ -#ifdef HAVE_PROTO void SelectionOff(void) -#else -void SelectionOff() -#endif /***********************************************************************/ { PDC_LOG(("%s:SelectionOff() - called\n", XCLOGMSG)); @@ -2283,12 +2128,7 @@ void SelectionOff() } /***********************************************************************/ -#ifdef HAVE_PROTO void SelectionOn(int x, int y) -#else -void SelectionOn(x, y) -int x, y; -#endif /***********************************************************************/ { PDC_LOG(("%s:SelectionOn() - called\n", XCLOGMSG)); @@ -2298,12 +2138,7 @@ int x, y; } /***********************************************************************/ -#ifdef HAVE_PROTO void SelectionExtend(int x, int y) -#else -void SelectionExtend(x, y) -int x, y; -#endif /***********************************************************************/ { int temp, current_start, current_end, current_start_x, @@ -2385,11 +2220,7 @@ int x, y; } /***********************************************************************/ -#ifdef HAVE_PROTO void SelectionSet(void) -#else -void SelectionSet() -#endif /***********************************************************************/ { int i, j, start, end, start_x, end_x, start_y, end_y, num_cols, @@ -2517,12 +2348,7 @@ void SelectionSet() } /***********************************************************************/ -#ifdef HAVE_PROTO void XCursesDisplayCursor(int old_row, int old_x, int new_row, int new_x) -#else -void XCursesDisplayCursor(old_row, old_x, new_row, new_x) -int old_row, old_x, new_row, new_x; -#endif /***********************************************************************/ { int xpos, ypos, i; @@ -2634,16 +2460,8 @@ int old_row, old_x, new_row, new_x; } /***********************************************************************/ -#ifdef HAVE_PROTO void XCursesEnterLeaveWindow(Widget w, XtPointer client_data, XEvent *event, Boolean *continue_to_dispatch) -#else -void XCursesEnterLeaveWindow(w, client_data, event, continue_to_dispatch) -Widget w; -XtPointer client_data; -XEvent *event; -Boolean *continue_to_dispatch; -#endif /***********************************************************************/ { PDC_LOG(("%s:XCursesEnterLeaveWindow called\n", XCLOGMSG)); @@ -2677,46 +2495,28 @@ Boolean *continue_to_dispatch; } /***********************************************************************/ -#ifdef HAVE_PROTO int XCurses_get_rows(void) -#else -int XCurses_get_rows() -#endif /***********************************************************************/ { return XCursesLINES; } /***********************************************************************/ -#ifdef HAVE_PROTO int XCurses_get_cols(void) -#else -int XCurses_get_cols() -#endif /***********************************************************************/ { return XCursesCOLS; } /***********************************************************************/ -#ifdef HAVE_PROTO unsigned long XCurses_get_key_modifiers(void) -#else -unsigned long XCurses_get_key_modifiers() -#endif /***********************************************************************/ { return pdc_key_modifier; } /***********************************************************************/ -#ifdef HAVE_PROTO int XCursesSendKeyToCurses(unsigned long key, MOUSE_STATUS *ms) -#else -int XCursesSendKeyToCurses(key, ms) -unsigned long key; -MOUSE_STATUS *ms; -#endif /***********************************************************************/ { char buf[100]; /* enough for MOUSE_STATUS */ @@ -2746,13 +2546,7 @@ MOUSE_STATUS *ms; } /***********************************************************************/ -#ifdef HAVE_PROTO void XCursesCursorBlink(XtPointer unused, XtIntervalId *id) -#else -void XCursesCursorBlink(unused, id) -XtPointer unused; -XtIntervalId *id; -#endif /***********************************************************************/ { PDC_LOG(("%s:XCursesCursorBlink() - called:\n", XCLOGMSG)); @@ -2787,15 +2581,7 @@ XtIntervalId *id; } /***********************************************************************/ -#ifdef HAVE_PROTO void XCursesButton(Widget w, XEvent *event, String *params, Cardinal *nparams) -#else -void XCursesButton(w, event, params, nparams) -Widget w; -XEvent *event; -String *params; -Cardinal *nparams; -#endif /***********************************************************************/ { int button_no = 0; @@ -3198,14 +2984,7 @@ Cardinal *nparams; } /***********************************************************************/ -#ifdef HAVE_PROTO void Scroll_up_down(Widget w, XtPointer client_data, XtPointer call_data) -#else -void Scroll_up_down(w, client_data, call_data) -Widget w; -XtPointer client_data; -XtPointer call_data; -#endif /***********************************************************************/ { int pixels = (long) call_data; @@ -3238,14 +3017,7 @@ XtPointer call_data; } /***********************************************************************/ -#ifdef HAVE_PROTO void Scroll_left_right(Widget w, XtPointer client_data, XtPointer call_data) -#else -void Scroll_left_right(w, client_data, call_data) -Widget w; -XtPointer client_data; -XtPointer call_data; -#endif /***********************************************************************/ { int pixels = (long) call_data; @@ -3278,14 +3050,7 @@ XtPointer call_data; } /***********************************************************************/ -#ifdef HAVE_PROTO void Thumb_up_down(Widget w, XtPointer client_data, XtPointer call_data) -#else -void Thumb_up_down(w, client_data, call_data) -Widget w; -XtPointer client_data; -XtPointer call_data; -#endif /***********************************************************************/ { double percent = *(double *) call_data; @@ -3312,14 +3077,7 @@ XtPointer call_data; } /***********************************************************************/ -#ifdef HAVE_PROTO void Thumb_left_right(Widget w, XtPointer client_data, XtPointer call_data) -#else -void Thumb_left_right(w, client_data, call_data) -Widget w; -XtPointer client_data; -XtPointer call_data; -#endif /***********************************************************************/ { double percent = *(double *) call_data; diff --git a/x11/pdcx11.h b/x11/pdcx11.h index 21f26d5a..96a9e1e4 100644 --- a/x11/pdcx11.h +++ b/x11/pdcx11.h @@ -332,7 +332,6 @@ extern Bool vertical_cursor; typedef RETSIGTYPE (*signal_handler)(); -#ifdef HAVE_PROTO void XCursesNonmaskable(Widget w, XtPointer client_data, XEvent *event, Boolean *continue_to_dispatch); void XCursesExpose(Widget w, XtPointer client_data, XEvent *event, @@ -347,17 +346,3 @@ void Scroll_up_down(Widget w, XtPointer client_data, XtPointer call_data); void Scroll_left_right(Widget w, XtPointer client_data, XtPointer call_data); void Thumb_up_down(Widget w, XtPointer client_data, XtPointer call_data); void Thumb_left_right(Widget w, XtPointer client_data, XtPointer call_data); -#else -void XCursesNonmaskable(); -void XCursesExpose(); -signal_handler XCursesSetSignal(); -void XCursesGetIcon(); -int XCursesRefreshScrollbar(); -int XCursesSendKeyToCurses(); -void XCursesButton(); -void XCursesCursorBlink(); -void Scroll_up_down(); -void Scroll_left_right(); -void Thumb_up_down(); -void Thumb_left_right(); -#endif diff --git a/x11/process/x11.c b/x11/process/x11.c index 4dea5205..efdac901 100644 --- a/x11/process/x11.c +++ b/x11/process/x11.c @@ -29,20 +29,10 @@ int visible_cursor = 0; int windowEntered = 1; static char *XCursesProgramName; -#ifdef HAVE_PROTO extern void say(const char *); -#else -extern void say(); -#endif /***********************************************************************/ -#ifdef HAVE_PROTO void XCursesExitXCursesProcess(int rc, int sig, char *msg) -#else -void XCursesExitXCursesProcess(rc, sig, msg) -int rc, sig; -char *msg; -#endif /***********************************************************************/ { if (rc || sig) @@ -75,12 +65,7 @@ char *msg; /* This function redraws the entire screen. */ /***********************************************************************/ -#ifdef HAVE_PROTO void XCursesDisplayScreen(bool highlight) -#else -void XCursesDisplayScreen(highlight) -bool highlight; -#endif /***********************************************************************/ { int row; @@ -118,11 +103,7 @@ bool highlight; /* This function draws those portions of the screen that have changed. */ /***********************************************************************/ -#ifdef HAVE_PROTO int XCursesRefreshScreen(void) -#else -int XCursesRefreshScreen() -#endif /***********************************************************************/ { int row, start_col, num_cols; @@ -162,15 +143,8 @@ int XCursesRefreshScreen() } /***********************************************************************/ -#ifdef HAVE_PROTO void XCursesProcessRequestsFromCurses(XtPointer client_data, int *fid, XtInputId *id) -#else -void XCursesProcessRequestsFromCurses(client_data, fid, id) -XtPointer client_data; -int *fid; -XtInputId *id; -#endif /***********************************************************************/ { int s, idx; @@ -498,14 +472,7 @@ XtInputId *id; } /***********************************************************************/ -#ifdef HAVE_PROTO int XCursesSetupX(char *display_name, int argc, char *argv[]) -#else -int XCursesSetupX(display_name, argc, argv) -char *display_name; -int arc; -char *argv[]; -#endif /***********************************************************************/ { static char *myargv[] = {"PDCurses", NULL}; @@ -941,12 +908,7 @@ char *argv[]; } /***********************************************************************/ -#ifdef HAVE_PROTO RETSIGTYPE XCursesSignalHandler(int signo) -#else -RETSIGTYPE XCursesSignalHandler(signo) -int signo; -#endif /***********************************************************************/ { char buf[10]; @@ -996,22 +958,10 @@ int signo; } /***********************************************************************/ -#ifdef HAVE_PROTO void XCursesRequestorCallbackForGetSelection(Widget w, XtPointer data, Atom *selection, Atom *type, XtPointer value, unsigned long *length, int *format) -#else -void XCursesRequestorCallbackForGetSelection(w, data, selection, type, - value, length, format) -Widget w; -XtPointer data; -Atom *selection; -Atom *type; -XtPointer value; -unsigned long *length; -int *format; -#endif /***********************************************************************/ { int rc; @@ -1053,16 +1003,8 @@ int *format; } /***********************************************************************/ -#ifdef HAVE_PROTO void XCursesStructureNotify(Widget w, XtPointer client_data, XEvent *event, Boolean *continue_to_dispatch) -#else -void XCursesStructureNotify(w, client_data, event, continue_to_dispatch) -Widget w; -XtPointer client_data; -XEvent *event; -Boolean *continue_to_dispatch; -#endif /***********************************************************************/ { PDC_LOG(("%s:XCursesStructureNotify called\n", XCLOGMSG)); diff --git a/x11/process/x11.h b/x11/process/x11.h index e1d7e647..cd21bb51 100644 --- a/x11/process/x11.h +++ b/x11/process/x11.h @@ -1,5 +1,3 @@ -#ifdef HAVE_PROTO - void dummy_function(void); void get_GC(Display *, Window, GC *, XFontStruct *, int, int, bool); void makeXY(int, int, int, int, int *, int *); @@ -38,45 +36,6 @@ int read_socket(int, char *, int); int XCursesSetupX(char *display_name, int argc, char *argv[]); RETSIGTYPE XCursesSigwinchHandler(int signo); -#else - -void dummy_function(void); -void get_GC(); -void makeXY(); -int get_colors(); -void start_event_handler(); - -int XCursesTransformLine(); -int XCursesDisplayText(); -void XCursesDisplayScreen(); -void XCursesDisplayCursor(); -void XCursesStructureNotify(); -void XCursesEnterLeaveWindow(); -void XCursesHandleString(); -void XCursesKeyPress(); -void XCursesModifierPress(); -void XCursesButton(); -void XCursesPasteSelection(); -Boolean XCursesConvertProc(); -void XCursesLoseOwnership(); -void XCursesRequestorCallbackForPaste(); -void XCursesRequestorCallbackForGetSelection(); -RETSIGTYPE XCursesSignalHandler(); -void XCursesExitXCursesProcess(); - -void SelectionOff(); -void SelectionOn(); -void SelectionExtend(); -void SelectionSet(); - -int write_socket(); -int read_socket(); - -int XCursesSetupX(); -RETSIGTYPE XCursesSigwinchHandler(); - -#endif - #ifdef _HPUX_SOURCE # define FD_SET_CAST int * #else diff --git a/x11/process/x11common.c b/x11/process/x11common.c index 0a183951..b2184110 100644 --- a/x11/process/x11common.c +++ b/x11/process/x11common.c @@ -45,14 +45,7 @@ fd_set writefds; struct timeval socket_timeout; /***********************************************************************/ -#ifdef HAVE_PROTO int write_socket(int sock_num, char *buf, int len) -#else -int write_socket(sock_num, buf, len) -int sock_num; -char *buf; -int len; -#endif /***********************************************************************/ { int start = 0, rc; @@ -77,14 +70,7 @@ int len; } /***********************************************************************/ -#ifdef HAVE_PROTO int read_socket(int sock_num, char *buf, int len) -#else -int read_socket(sock_num, buf, len) -int sock_num; -char *buf; -int len; -#endif /***********************************************************************/ { int start = 0, length = len, rc; diff --git a/x11/process/x11curses.c b/x11/process/x11curses.c index 1877f6b3..7b9b7fcf 100644 --- a/x11/process/x11curses.c +++ b/x11/process/x11curses.c @@ -35,12 +35,7 @@ static void XCursesExitCursesProcess(); #endif /***********************************************************************/ -#ifdef HAVE_PROTO int XCursesResizeScreen(int nlines, int ncols) -#else -int XCursesResizeScreen(nlines, ncols) -int nlines, ncols; -#endif /***********************************************************************/ { PDC_LOG(("%s:XCursesResizeScreen() - called: Lines: %d Cols: %d\n", @@ -72,13 +67,8 @@ int nlines, ncols; } /***********************************************************************/ -#ifdef HAVE_PROTO int XCurses_display_cursor(int oldrow, int oldcol, int newrow, int newcol, int visibility) -#else -int XCurses_display_cursor(oldrow, oldcol, newrow, newcol, visibility) -int oldrow, oldcol, newrow, newcol, visibility; -#endif /***********************************************************************/ { char buf[30]; @@ -119,12 +109,7 @@ int oldrow, oldcol, newrow, newcol, visibility; } /***********************************************************************/ -#ifdef HAVE_PROTO void XCurses_set_title(char *title) -#else -void XCurses_set_title(title) -char *title; -#endif /***********************************************************************/ { char buf[30]; @@ -150,11 +135,7 @@ char *title; } /***********************************************************************/ -#ifdef HAVE_PROTO int XCurses_refresh_scrollbar(void) -#else -int XCurses_refresh_scrollbar() -#endif /***********************************************************************/ { char buf[30]; @@ -174,12 +155,7 @@ int XCurses_refresh_scrollbar() } /***********************************************************************/ -#ifdef HAVE_PROTO int XCurses_rawgetch(int delaytenths) -#else -int XCurses_rawgetch(delaytenths) -int delaytenths; -#endif /***********************************************************************/ { unsigned long newkey = 0; @@ -245,11 +221,7 @@ int delaytenths; } /***********************************************************************/ -#ifdef HAVE_PROTO int XCurses_get_input_fd(void) -#else -int XCurses_get_input_fd() -#endif /***********************************************************************/ { PDC_LOG(("%s:XCurses_get_input_fd() - called\n", XCLOGMSG)); @@ -260,11 +232,7 @@ int XCurses_get_input_fd() } /***********************************************************************/ -#ifdef HAVE_PROTO bool XCurses_kbhit(void) -#else -bool XCurses_kbhit() -#endif /***********************************************************************/ { int s; @@ -291,12 +259,7 @@ bool XCurses_kbhit() } /***********************************************************************/ -#ifdef HAVE_PROTO int XCursesInstruct(int flag) -#else -int XCursesInstruct(flag) -int flag; -#endif /***********************************************************************/ { char buf[10]; @@ -314,12 +277,7 @@ int flag; } /***********************************************************************/ -#ifdef HAVE_PROTO int XCursesInstructAndWait(int flag) -#else -int XCursesInstructAndWait(flag) -int flag; -#endif /***********************************************************************/ { int result; @@ -347,13 +305,7 @@ int flag; } /***********************************************************************/ -#ifdef HAVE_PROTO int XCurses_transform_line(chtype *ch, int row, int start_col, int num_cols) -#else -int XCurses_transform_line(ch, row, start_col, num_cols) -chtype *ch; -int row,start_col,num_cols; -#endif /***********************************************************************/ { PDC_LOG(("%s:XCurses_transform_line() called: row %d start_col %d num_cols %d flag %d\n", @@ -379,11 +331,7 @@ int row,start_col,num_cols; } /***********************************************************************/ -#ifdef HAVE_PROTO static int XCursesSetupCurses(void) -#else -static int XCursesSetupCurses() -#endif /***********************************************************************/ { char wait_buf[5]; @@ -449,14 +397,7 @@ static int XCursesSetupCurses() } /***********************************************************************/ -#ifdef HAVE_PROTO int XCursesInitscr(char *display_name, int argc, char *argv[]) -#else -int XCursesInitscr(display_name, argc,argv) -char *display_name; -int argc; -char *argv[]; -#endif /***********************************************************************/ { int pid, rc; @@ -531,13 +472,7 @@ char *argv[]; } /***********************************************************************/ -#ifdef HAVE_PROTO int XCurses_getclipboard(char **contents, long *length) -#else -int XCurses_getclipboard(contents, length) -char **contents; -long *length; -#endif /***********************************************************************/ { int result = 0; @@ -582,13 +517,7 @@ long *length; } /***********************************************************************/ -#ifdef HAVE_PROTO int XCurses_setclipboard(char *contents, long length) -#else -int XCurses_setclipboard(contents, length) -char *contents; -long length; -#endif /***********************************************************************/ { int rc; @@ -619,11 +548,7 @@ long length; } /***********************************************************************/ -#ifdef HAVE_PROTO int XCurses_clearclipboard(void) -#else -int XCurses_clearclipboard() -#endif /***********************************************************************/ { int rc; @@ -650,12 +575,7 @@ int XCurses_clearclipboard() } /***********************************************************************/ -#ifdef HAVE_PROTO void XCursesCleanupCursesProcess(int rc) -#else -void XCursesCleanupCursesProcess(rc) -int rc; -#endif /***********************************************************************/ { PDC_LOG(("%s:XCursesCleanupCursesProcess() - called: %d\n", @@ -675,13 +595,7 @@ int rc; } /***********************************************************************/ -#ifdef HAVE_PROTO static void XCursesExitCursesProcess(int rc, char *msg) -#else -static void XCursesExitCursesProcess(rc, msg) -int rc; -char *msg; -#endif /***********************************************************************/ { PDC_LOG(("%s:XCursesExitCursesProcess() - called: %d %s\n", @@ -692,11 +606,7 @@ char *msg; } /***********************************************************************/ -#ifdef HAVE_PROTO void XCursesExit(void) -#else -void XCursesExit() -#endif /***********************************************************************/ { PDC_LOG(("%s:XCursesExit() - called\n", XCLOGMSG)); diff --git a/x11/sb.c b/x11/sb.c index b85346dd..e1f91a12 100644 --- a/x11/sb.c +++ b/x11/sb.c @@ -35,7 +35,7 @@ #endif #ifdef PDCDEBUG -char *rcsid_sb = "$Id: sb.c,v 1.6 2006/01/28 13:27:23 wmcbrine Exp $"; +char *rcsid_sb = "$Id: sb.c,v 1.7 2006/01/28 16:53:26 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -73,11 +73,7 @@ bool sb_started = FALSE; This must be called before initscr(). */ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL sb_init(void) -#else -int PDC_CDECL sb_init() -#endif /***********************************************************************/ { PDC_LOG(("sb_init() - called\n")); @@ -97,12 +93,7 @@ int PDC_CDECL sb_init() cur = current column in total */ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL sb_set_horz(int total, int viewport, int cur) -#else -int PDC_CDECL sb_set_horz(total, viewport, cur) -int total, viewport, cur; -#endif /***********************************************************************/ { PDC_LOG(("sb_set_horz() - called: total %d viewport %d cur %d\n", @@ -125,12 +116,7 @@ int total, viewport, cur; cur = current column in total */ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL sb_set_vert(int total, int viewport, int cur) -#else -int PDC_CDECL sb_set_vert(total, viewport, cur) -int total, viewport, cur; -#endif /***********************************************************************/ { PDC_LOG(("sb_set_vert() - called: total %d viewport %d cur %d\n", @@ -153,12 +139,7 @@ int total, viewport, cur; cur = current line in total */ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL sb_get_horz(int *total, int *viewport, int *cur) -#else -int PDC_CDECL sb_get_horz(total, viewport, cur) -int *total, *viewport, *cur; -#endif /***********************************************************************/ { PDC_LOG(("sb_get_horz() - called\n")); @@ -183,12 +164,7 @@ int *total, *viewport, *cur; cur = current line in total */ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL sb_get_vert(int *total, int *viewport, int *cur) -#else -int PDC_CDECL sb_get_vert(total, viewport, cur) -int *total, *viewport, *cur; -#endif /***********************************************************************/ { PDC_LOG(("sb_get_vert() - called\n")); @@ -209,11 +185,7 @@ int *total, *viewport, *cur; /* sb_refresh() - Used to draw the scrollbars. */ /***********************************************************************/ -#ifdef HAVE_PROTO int PDC_CDECL sb_refresh(void) -#else -int PDC_CDECL sb_refresh() -#endif /***********************************************************************/ { PDC_LOG(("sb_refresh() - called\n"));