From 586a805c8f20acbf3f430dfb1a7857012cd775ae Mon Sep 17 00:00:00 2001 From: "nethack.allison" Date: Sun, 23 Nov 2003 06:47:13 +0000 Subject: [PATCH] status display - port modules (trunk only) Introduction of a new set of window port status display routines. The new routines are conditional on STATUS_VIA_WINDOWPORT being defined in config.h. See the experimental section, where the #define resides for the time being. --- sys/amiga/winami.c | 16 ++++++++++++++-- sys/mac/macwin.c | 6 ++++++ sys/wince/mswproc.c | 6 ++++++ sys/winnt/Makefile.msc | 2 +- win/Qt/qt_win.cpp | 6 ++++++ win/X11/winX.c | 6 ++++++ win/gem/wingem.c | 6 ++++++ win/gnome/gnbind.c | 6 ++++++ win/tty/wintty.c | 9 +++++++++ win/win32/mswproc.c | 6 ++++++ 10 files changed, 66 insertions(+), 3 deletions(-) diff --git a/sys/amiga/winami.c b/sys/amiga/winami.c index e5eccec62..d3a771527 100644 --- a/sys/amiga/winami.c +++ b/sys/amiga/winami.c @@ -81,7 +81,13 @@ struct window_procs amii_procs = amii_outrip, genl_preference_update, genl_getmsghistory, - genl_putmsghistory + genl_putmsghistory, +#ifdef STATUS_VIA_WINDOWPORT + genl_status_init, + genl_status_finish, + genl_status_enablefield, + genl_status_update, +#endif }; /* The view window layout uses the same function names so we can use @@ -142,7 +148,13 @@ struct window_procs amiv_procs = amii_outrip, genl_preference_update, genl_getmsghistory, - genl_putmsghistory + genl_putmsghistory, +#ifdef STATUS_VIA_WINDOWPORT + genl_status_init, + genl_status_finish, + genl_status_enablefield, + genl_status_update, +#endif }; unsigned short amii_initmap[ AMII_MAXCOLORS ]; diff --git a/sys/mac/macwin.c b/sys/mac/macwin.c index 72ade1731..c41e2e96b 100644 --- a/sys/mac/macwin.c +++ b/sys/mac/macwin.c @@ -2647,6 +2647,12 @@ struct window_procs mac_procs = { genl_preference_update, genl_getmsghistory, genl_putmsghistory, +#ifdef STATUS_VIA_WINDOWPORT + genl_status_init, + genl_status_finish, + genl_status_enablefield, + genl_status_update, +#endif }; /*macwin.c*/ diff --git a/sys/wince/mswproc.c b/sys/wince/mswproc.c index 53a0f9e71..6c4a7cb9a 100644 --- a/sys/wince/mswproc.c +++ b/sys/wince/mswproc.c @@ -97,6 +97,12 @@ struct window_procs mswin_procs = { mswin_preference_update, genl_getmsghistory, genl_putmsghistory, +#ifdef STATUS_VIA_WINDOWPORT + genl_status_init, + genl_status_finish, + genl_status_enablefield, + genl_status_update, +#endif }; /* diff --git a/sys/winnt/Makefile.msc b/sys/winnt/Makefile.msc index 03a251728..fe6d64b66 100644 --- a/sys/winnt/Makefile.msc +++ b/sys/winnt/Makefile.msc @@ -418,7 +418,7 @@ HACK_H = $(INCL)\hack.h $(CONFIG_H) $(INCL)\align.h $(INCL)\context.h \ $(INCL)\skills.h $(INCL)\onames.h $(INCL)\timeout.h \ $(INCL)\trap.h $(INCL)\flag.h $(INCL)\rm.h \ $(INCL)\vision.h $(INCL)\display.h $(INCL)\engrave.h \ - $(INCL)\rect.h $(INCL)\region.h $(INCL)\winprocs.h \ + $(INCL)\rect.h $(INCL)\region.h $(INCL)\winprocs.h $(INCL)\botl.h \ $(INCL)\wintty.h $(INCL)\trampoli.h LEV_H = $(INCL)\lev.h diff --git a/win/Qt/qt_win.cpp b/win/Qt/qt_win.cpp index 39d47416b..8f7fb0ac2 100644 --- a/win/Qt/qt_win.cpp +++ b/win/Qt/qt_win.cpp @@ -5281,6 +5281,12 @@ struct window_procs Qt_procs = { genl_preference_update, genl_getmsghistory, genl_putmsghistory, +#ifdef STATUS_VIA_WINDOWPORT + genl_status_init, + genl_status_finish, + genl_status_enablefield, + genl_status_update, +#endif }; extern "C" void play_usersound(const char* filename, int volume) diff --git a/win/X11/winX.c b/win/X11/winX.c index e04d04d4c..9805b9a4a 100644 --- a/win/X11/winX.c +++ b/win/X11/winX.c @@ -159,6 +159,12 @@ struct window_procs X11_procs = { X11_preference_update, genl_getmsghistory, genl_putmsghistory, +#ifdef STATUS_VIA_WINDOWPORT + genl_status_init, + genl_status_finish, + genl_status_enablefield, + genl_status_update, +#endif }; /* diff --git a/win/gem/wingem.c b/win/gem/wingem.c index d5afcb562..d987d681b 100644 --- a/win/gem/wingem.c +++ b/win/gem/wingem.c @@ -100,6 +100,12 @@ struct window_procs Gem_procs = { Gem_preference_update, genl_getmsghistory, genl_putmsghistory +#ifdef STATUS_VIA_WINDOWPORT + genl_status_init, + genl_status_finish, + genl_status_enablefield, + genl_status_update, +#endif }; #ifdef MAC diff --git a/win/gnome/gnbind.c b/win/gnome/gnbind.c index 6527edcb2..108b3574e 100644 --- a/win/gnome/gnbind.c +++ b/win/gnome/gnbind.c @@ -76,6 +76,12 @@ struct window_procs Gnome_procs = { genl_preference_update, genl_getmsghistory, genl_putmsghistory, +#ifdef STATUS_VIA_WINDOWPORT + genl_status_init, + genl_status_finish, + genl_status_enablefield, + genl_status_update, +#endif }; /* diff --git a/win/tty/wintty.c b/win/tty/wintty.c index 26ce38882..7770003c7 100644 --- a/win/tty/wintty.c +++ b/win/tty/wintty.c @@ -40,6 +40,9 @@ extern void msmsg(const char *,...); extern char mapped_menu_cmds[]; /* from options.c */ +/* this is only needed until tty_status_* routines are written */ +extern NEARDATA winid WIN_STATUS; + /* Interface definition, for windows.c */ struct window_procs tty_procs = { "tty", @@ -111,6 +114,12 @@ struct window_procs tty_procs = { #endif tty_getmsghistory, tty_putmsghistory, +#ifdef STATUS_VIA_WINDOWPORT + genl_status_init, + genl_status_finish, + genl_status_enablefield, + genl_status_update, +#endif }; static int maxwin = 0; /* number of windows in use */ diff --git a/win/win32/mswproc.c b/win/win32/mswproc.c index 18317a284..93edd9146 100644 --- a/win/win32/mswproc.c +++ b/win/win32/mswproc.c @@ -123,6 +123,12 @@ struct window_procs mswin_procs = { mswin_preference_update, mswin_getmsghistory, mswin_putmsghistory, +#ifdef STATUS_VIA_WINDOWPORT + genl_status_init, + genl_status_finish, + genl_status_enablefield, + genl_status_update, +#endif }; -- 2.40.0