there was some left-over k&r code in win/chain

This commit is contained in:
nhmall
2022-02-07 14:58:16 -05:00
parent 96c71660c6
commit 5ac860bdc7
5 changed files with 695 additions and 514 deletions
+241 -186
View File
@@ -7,6 +7,78 @@
#include "hack.h"
void chainout_init_nhwindows(void *,int *, char **);
void chainout_player_selection(void *);
void chainout_askname(void *);
void chainout_get_nh_event(void *);
void chainout_exit_nhwindows(void *,const char *);
void chainout_suspend_nhwindows(void *,const char *);
void chainout_resume_nhwindows(void *);
winid chainout_create_nhwindow(void *,int);
void chainout_clear_nhwindow(void *,winid);
void chainout_display_nhwindow(void *,winid, boolean);
void chainout_destroy_nhwindow(void *,winid);
void chainout_curs(void *,winid, int, int);
void chainout_putstr(void *,winid, int, const char *);
void chainout_putmixed(void *,winid, int, const char *);
void chainout_display_file(void *,const char *, boolean);
void chainout_start_menu(void *,winid, unsigned long);
void chainout_add_menu(void *,winid, const glyph_info *, const ANY_P *,
char, char, int,
const char *, unsigned int);
void chainout_end_menu(void *,winid, const char *);
int chainout_select_menu(void *,winid, int, MENU_ITEM_P **);
char chainout_message_menu(void *,char, int, const char *);
void chainout_update_inventory(void *,int);
void chainout_mark_synch(void *);
void chainout_wait_synch(void *);
#ifdef CLIPPING
void chainout_cliparound(void *,int, int);
#endif
#ifdef POSITIONBAR
void chainout_update_positionbar(void *,char *);
#endif
void chainout_print_glyph(void *,winid, xchar, xchar,
const glyph_info *, const glyph_info *);
void chainout_raw_print(void *,const char *);
void chainout_raw_print_bold(void *,const char *);
int chainout_nhgetch(void *);
int chainout_nh_poskey(void *,int *, int *, int *);
void chainout_nhbell(void *);
int chainout_doprev_message(void *);
char chainout_yn_function(void *,const char *, const char *, char);
void chainout_getlin(void *,const char *, char *);
int chainout_get_ext_cmd(void *);
void chainout_number_pad(void *,int);
void chainout_delay_output(void *);
#ifdef CHANGE_COLOR
void chainout_change_color(void *,int, long, int);
#ifdef MAC
void chainout_change_background(void *,int);
short chainout_set_font_name(void *,winid, char *);
#endif
char *chainout_get_color_string(void *);
#endif
/* other defs that really should go away (they're tty specific) */
void chainout_start_screen(void *);
void chainout_end_screen(void *);
void chainout_outrip(void *,winid, int, time_t);
void chainout_preference_update(void *,const char *);
char *chainout_getmsghistory(void *,boolean);
void chainout_putmsghistory(void *,const char *, boolean);
void chainout_status_init(void *);
void chainout_status_finish(void *);
void chainout_status_enablefield(void *,int, const char *, const char *,
boolean);
void chainout_status_update(void *,int, genericptr_t, int, int, int,
unsigned long *);
boolean chainout_can_suspend(void *);
void chainout_procs_init(int dir);
void *chainout_procs_chain(int cmd, int n, void *me, void *nextprocs, void *nextdata);
struct chainout_data {
struct window_procs *nprocs;
#if 0
@@ -17,12 +89,12 @@ struct chainout_data {
};
void *
chainout_procs_chain(cmd, n, me, nextprocs, nextdata)
int cmd;
int n;
void *me;
void *nextprocs;
void *nextdata UNUSED;
chainout_procs_chain(
int cmd,
int n,
void *me,
void *nextprocs,
void *nextdata UNUSED)
{
struct chainout_data *tdp = 0;
@@ -45,8 +117,7 @@ void *nextdata UNUSED;
/* XXX if we don't need this, take it out of the table */
void
chainout_procs_init(dir)
int dir UNUSED;
chainout_procs_init(int dir UNUSED)
{
}
@@ -55,10 +126,10 @@ int dir UNUSED;
***/
void
chainout_init_nhwindows(vp, argcp, argv)
void *vp;
int *argcp;
char **argv;
chainout_init_nhwindows(
void *vp,
int *argcp,
char **argv)
{
struct chainout_data *tdp = vp;
@@ -66,8 +137,7 @@ char **argv;
}
void
chainout_player_selection(vp)
void *vp;
chainout_player_selection(void *vp)
{
struct chainout_data *tdp = vp;
@@ -75,8 +145,7 @@ void *vp;
}
void
chainout_askname(vp)
void *vp;
chainout_askname(void *vp)
{
struct chainout_data *tdp = vp;
@@ -84,8 +153,7 @@ void *vp;
}
void
chainout_get_nh_event(vp)
void *vp;
chainout_get_nh_event(void *vp)
{
struct chainout_data *tdp = vp;
@@ -93,9 +161,9 @@ void *vp;
}
void
chainout_exit_nhwindows(vp, str)
void *vp;
const char *str;
chainout_exit_nhwindows(
void *vp,
const char *str)
{
struct chainout_data *tdp = vp;
@@ -103,9 +171,9 @@ const char *str;
}
void
chainout_suspend_nhwindows(vp, str)
void *vp;
const char *str;
chainout_suspend_nhwindows(
void *vp,
const char *str)
{
struct chainout_data *tdp = vp;
@@ -113,8 +181,7 @@ const char *str;
}
void
chainout_resume_nhwindows(vp)
void *vp;
chainout_resume_nhwindows(void *vp)
{
struct chainout_data *tdp = vp;
@@ -122,9 +189,9 @@ void *vp;
}
winid
chainout_create_nhwindow(vp, type)
void *vp;
int type;
chainout_create_nhwindow(
void *vp,
int type)
{
struct chainout_data *tdp = vp;
winid rv;
@@ -135,9 +202,9 @@ int type;
}
void
chainout_clear_nhwindow(vp, window)
void *vp;
winid window;
chainout_clear_nhwindow(
void *vp,
winid window)
{
struct chainout_data *tdp = vp;
@@ -145,10 +212,10 @@ winid window;
}
void
chainout_display_nhwindow(vp, window, blocking)
void *vp;
winid window;
boolean blocking;
chainout_display_nhwindow(
void *vp,
winid window,
boolean blocking)
{
struct chainout_data *tdp = vp;
@@ -156,9 +223,9 @@ boolean blocking;
}
void
chainout_destroy_nhwindow(vp, window)
void *vp;
winid window;
chainout_destroy_nhwindow(
void *vp,
winid window)
{
struct chainout_data *tdp = vp;
@@ -166,11 +233,11 @@ winid window;
}
void
chainout_curs(vp, window, x, y)
void *vp;
winid window;
int x;
int y;
chainout_curs(
void *vp,
winid window,
int x,
int y)
{
struct chainout_data *tdp = vp;
@@ -178,11 +245,11 @@ int y;
}
void
chainout_putstr(vp, window, attr, str)
void *vp;
winid window;
int attr;
const char *str;
chainout_putstr(
void *vp,
winid window,
int attr,
const char *str)
{
struct chainout_data *tdp = vp;
@@ -190,11 +257,11 @@ const char *str;
}
void
chainout_putmixed(vp, window, attr, str)
void *vp;
winid window;
int attr;
const char *str;
chainout_putmixed(
void *vp,
winid window,
int attr,
const char *str)
{
struct chainout_data *tdp = vp;
@@ -202,10 +269,10 @@ const char *str;
}
void
chainout_display_file(vp, fname, complain)
void *vp;
const char *fname;
boolean complain;
chainout_display_file(
void *vp,
const char *fname,
boolean complain)
{
struct chainout_data *tdp = vp;
@@ -213,10 +280,10 @@ boolean complain;
}
void
chainout_start_menu(vp, window, mbehavior)
void *vp;
winid window;
unsigned long mbehavior;
chainout_start_menu(
void *vp,
winid window,
unsigned long mbehavior)
{
struct chainout_data *tdp = vp;
@@ -224,17 +291,16 @@ unsigned long mbehavior;
}
void
chainout_add_menu(vp, window, glyphinfo, identifier, ch, gch, attr, str,
itemflags)
void *vp;
winid window; /* window to use, must be of type NHW_MENU */
const glyph_info *glyphinfo /* glyph plus glyph info to display with item */
const anything *identifier; /* what to return if selected */
char ch; /* keyboard accelerator (0 = pick our own) */
char gch; /* group accelerator (0 = no group) */
int attr; /* attribute for string (like tty_putstr()) */
const char *str; /* menu string */
unsigned int itemflags; /* itemflags such as marked as selected */
chainout_add_menu(
void *vp,
winid window, /* window to use, must be of type NHW_MENU */
const glyph_info *glyphinfo, /* glyph plus info to display with item */
const anything *identifier, /* what to return if selected */
char ch, /* keyboard accelerator (0 = pick our own) */
char gch, /* group accelerator (0 = no group) */
int attr, /* attribute for string (like tty_putstr()) */
const char *str, /* menu string */
unsigned int itemflags) /* itemflags such as marked as selected */
{
struct chainout_data *tdp = vp;
@@ -243,10 +309,10 @@ unsigned int itemflags; /* itemflags such as marked as selected */
}
void
chainout_end_menu(vp, window, prompt)
void *vp;
winid window;
const char *prompt;
chainout_end_menu(
void *vp,
winid window,
const char *prompt)
{
struct chainout_data *tdp = vp;
@@ -254,11 +320,11 @@ const char *prompt;
}
int
chainout_select_menu(vp, window, how, menu_list)
void *vp;
winid window;
int how;
menu_item **menu_list;
chainout_select_menu(
void *vp,
winid window,
int how,
menu_item **menu_list)
{
struct chainout_data *tdp = vp;
int rv;
@@ -269,11 +335,11 @@ menu_item **menu_list;
}
char
chainout_message_menu(vp, let, how, mesg)
void *vp;
char let;
int how;
const char *mesg;
chainout_message_menu(
void *vp,
char let,
int how,
const char *mesg)
{
struct chainout_data *tdp = vp;
char rv;
@@ -292,8 +358,7 @@ chainout_update_inventory(void *vp, int arg)
}
void
chainout_mark_synch(vp)
void *vp;
chainout_mark_synch(void *vp)
{
struct chainout_data *tdp = vp;
@@ -301,8 +366,7 @@ void *vp;
}
void
chainout_wait_synch(vp)
void *vp;
chainout_wait_synch(void *vp)
{
struct chainout_data *tdp = vp;
@@ -311,10 +375,10 @@ void *vp;
#ifdef CLIPPING
void
chainout_cliparound(vp, x, y)
void *vp;
int x;
int y;
chainout_cliparound(
void *vp,
int x,
int y)
{
struct chainout_data *tdp = vp;
@@ -324,9 +388,9 @@ int y;
#ifdef POSITIONBAR
void
chainout_update_positionbar(vp, posbar)
void *vp;
char *posbar;
chainout_update_positionbar(
void *vp,
char *posbar)
{
struct chainout_data *tdp = vp;
@@ -335,12 +399,13 @@ char *posbar;
#endif
void
chainout_print_glyph(vp, window, x, y, glyphinfo, bkglyphinfo)
void *vp;
winid window;
xchar x, y;
const glyph_info *glyphinfo;
const glyph_info *bkglyphinfo;
chainout_print_glyph(
void *vp,
winid window,
xchar x,
xchar y,
const glyph_info *glyphinfo,
const glyph_info *bkglyphinfo)
{
struct chainout_data *tdp = vp;
@@ -348,9 +413,9 @@ const glyph_info *bkglyphinfo;
}
void
chainout_raw_print(vp, str)
void *vp;
const char *str;
chainout_raw_print(
void *vp,
const char *str)
{
struct chainout_data *tdp = vp;
@@ -358,9 +423,7 @@ const char *str;
}
void
chainout_raw_print_bold(vp, str)
void *vp;
const char *str;
chainout_raw_print_bold(void *vp, const char *str)
{
struct chainout_data *tdp = vp;
@@ -368,8 +431,7 @@ const char *str;
}
int
chainout_nhgetch(vp)
void *vp;
chainout_nhgetch(void *vp)
{
struct chainout_data *tdp = vp;
int rv;
@@ -380,11 +442,11 @@ void *vp;
}
int
chainout_nh_poskey(vp, x, y, mod)
void *vp;
int *x;
int *y;
int *mod;
chainout_nh_poskey(
void *vp,
int *x,
int *y,
int *mod)
{
struct chainout_data *tdp = vp;
int rv;
@@ -395,8 +457,7 @@ int *mod;
}
void
chainout_nhbell(vp)
void *vp;
chainout_nhbell(void *vp)
{
struct chainout_data *tdp = vp;
@@ -404,8 +465,7 @@ void *vp;
}
int
chainout_doprev_message(vp)
void *vp;
chainout_doprev_message(void *vp)
{
struct chainout_data *tdp = vp;
int rv;
@@ -416,10 +476,11 @@ void *vp;
}
char
chainout_yn_function(vp, query, resp, def)
void *vp;
const char *query, *resp;
char def;
chainout_yn_function(
void *vp,
const char *query,
const char *resp,
char def)
{
struct chainout_data *tdp = vp;
int rv;
@@ -430,10 +491,10 @@ char def;
}
void
chainout_getlin(vp, query, bufp)
void *vp;
const char *query;
char *bufp;
chainout_getlin(
void *vp,
const char *query,
char *bufp)
{
struct chainout_data *tdp = vp;
@@ -441,8 +502,7 @@ char *bufp;
}
int
chainout_get_ext_cmd(vp)
void *vp;
chainout_get_ext_cmd(void *vp)
{
struct chainout_data *tdp = vp;
int rv;
@@ -453,9 +513,7 @@ void *vp;
}
void
chainout_number_pad(vp, state)
void *vp;
int state;
chainout_number_pad(void *vp, int state)
{
struct chainout_data *tdp = vp;
@@ -463,8 +521,7 @@ int state;
}
void
chainout_delay_output(vp)
void *vp;
chainout_delay_output(void *vp)
{
struct chainout_data *tdp = vp;
@@ -473,11 +530,11 @@ void *vp;
#ifdef CHANGE_COLOR
void
chainout_change_color(vp, color, value, reverse)
void *vp;
int color;
long value;
int reverse;
chainout_change_color(
void *vp,
int color,
long value,
int reverse)
{
struct chainout_data *tdp = vp;
@@ -486,9 +543,9 @@ int reverse;
#ifdef MAC
void
chainout_change_background(vp, bw)
void *vp;
int bw;
chainout_change_background(
void *vp,
int bw)
{
struct chainout_data *tdp = vp;
@@ -496,10 +553,10 @@ int bw;
}
short
chainout_set_font_name(vp, window, font)
void *vp;
winid window;
char *font;
chainout_set_font_name(
void *vp,
winid window,
char *font)
{
struct chainout_data *tdp = vp;
short rv;
@@ -511,8 +568,7 @@ char *font;
#endif
char *
trace_get_color_string(vp)
void *vp;
trace_get_color_string(void *vp)
{
struct chainout_data *tdp = vp;
char *rv;
@@ -526,8 +582,7 @@ void *vp;
/* other defs that really should go away (they're tty specific) */
void
chainout_start_screen(vp)
void *vp;
chainout_start_screen(void *vp)
{
struct chainout_data *tdp = vp;
@@ -535,8 +590,7 @@ void *vp;
}
void
chainout_end_screen(vp)
void *vp;
chainout_end_screen(void *vp)
{
struct chainout_data *tdp = vp;
@@ -544,11 +598,11 @@ void *vp;
}
void
chainout_outrip(vp, tmpwin, how, when)
void *vp;
winid tmpwin;
int how;
time_t when;
chainout_outrip(
void *vp,
winid tmpwin,
int how,
time_t when)
{
struct chainout_data *tdp = vp;
@@ -556,9 +610,9 @@ time_t when;
}
void
chainout_preference_update(vp, pref)
void *vp;
const char *pref;
chainout_preference_update(
void *vp,
const char *pref)
{
struct chainout_data *tdp = vp;
@@ -566,9 +620,9 @@ const char *pref;
}
char *
chainout_getmsghistory(vp, init)
void *vp;
boolean init;
chainout_getmsghistory(
void *vp,
boolean init)
{
struct chainout_data *tdp = vp;
char *rv;
@@ -579,10 +633,10 @@ boolean init;
}
void
chainout_putmsghistory(vp, msg, is_restoring)
void *vp;
const char *msg;
boolean is_restoring;
chainout_putmsghistory(
void *vp,
const char *msg,
boolean is_restoring)
{
struct chainout_data *tdp = vp;
@@ -590,8 +644,7 @@ boolean is_restoring;
}
void
chainout_status_init(vp)
void *vp;
chainout_status_init(void *vp)
{
struct chainout_data *tdp = vp;
@@ -599,8 +652,7 @@ void *vp;
}
void
chainout_status_finish(vp)
void *vp;
chainout_status_finish(void *vp)
{
struct chainout_data *tdp = vp;
@@ -608,12 +660,12 @@ void *vp;
}
void
chainout_status_enablefield(vp, fieldidx, nm, fmt, enable)
void *vp;
int fieldidx;
const char *nm;
const char *fmt;
boolean enable;
chainout_status_enablefield(
void *vp,
int fieldidx,
const char *nm,
const char *fmt,
boolean enable)
{
struct chainout_data *tdp = vp;
@@ -621,11 +673,14 @@ boolean enable;
}
void
chainout_status_update(vp, idx, ptr, chg, percent, color, colormasks)
void *vp;
int idx, chg, percent, color;
genericptr_t ptr;
unsigned long *colormasks;
chainout_status_update(
void *vp,
int idx,
genericptr_t ptr,
int chg,
int percent,
int color,
unsigned long *colormasks)
{
struct chainout_data *tdp = vp;
@@ -633,8 +688,7 @@ unsigned long *colormasks;
}
boolean
chainout_can_suspend(vp)
void *vp;
chainout_can_suspend(void *vp)
{
struct chainout_data *tdp = vp;
boolean rv;
@@ -647,6 +701,7 @@ void *vp;
struct chain_procs chainout_procs = {
"-chainout", 0, /* wincap */
0, /* wincap2 */
{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, /* color availability */
/*
XXX problem - the above need to come from the real window port, possibly
modified. May need to do something to call an additional init fn later