nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

rework TTY_PERM_INVENT; update window port interface

Browse Source 
Change the inner workings of the experimental TTY_PERM_INVENT.

Switch to delivering the content to tty for the experimental perm_invent
via the existing window port interface (start_menu(), add_menu(), end_menu).

This also adds a new window port interface call ctrl_nhwindow() for
delivering information to the window port, and/or obtaining specific
information from the window port. The information and requests can
be extended as required. To be documented later once the changes settle
down.

Due to the intrusive nature of these changes and the possibility of
some bugs in the new code, I'm going to leave TTY_PERM_INVENT commented
out in the repository for a day or two.  Anyone wishing to test it out
can do so by uncommenting TTY_PERM_INVENT in config.h.
This commit is contained in:
nhmall
2022-07-03 00:35:32 -04:00
parent 67e80cc329
commit c84e0ba6e1
28 changed files with 602 additions and 616 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/shim/winshim.c
+10 -12
View File
@@ -183,21 +183,19 @@ void shim_update_inventory(int a1 UNUSED) {
display_inventory(NULL, FALSE);
}
}
perminvent_info *
shim_update_invent_slot(
winid window UNUSED, /* window to use, must be of type NHW_MENU */
int inventory_slot UNUSED, /* slot id: 0 - info return to core */
/* 1 - gold slot */
/* 2 - 29 obj slots */
perminvent_info *pi UNUSED) {
return (perminvent_info *) 0;
win_request_info *
shim_ctrl_nhwindow(
winid window UNUSED,
int request,
win_request_info *wri UNUSED) {
return (win_request_info *) 0;
}
#else /* !__EMSCRIPTEN__ */
VDECLCB(shim_update_inventory,(int a1 UNUSED)
DECLB(perminvent_info *, shim_update_invent_slot,
(winid window, int inventory_slot, perminvent_info *pi),
DECLB(win_request_info *, shim_ctrl_nhwindow,
(winid window, int request, win_request_info *wri),
"viip",
A2P window UNUSED, A2P inventory_slot UNUSED, P2V pi UNUSED)
A2P window UNUSED, A2P request UNUSED, P2V wri UNUSED)
#endif
/* Interface definition used in windows.c */
@@ -257,7 +255,7 @@ struct window_procs shim_procs = {
#endif
genl_can_suspend_yes,
shim_update_inventory,
shim_update_invent_slot,
shim_ctrl_nhwindow,
};
#ifdef __EMSCRIPTEN__