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

Amiga: deduplicate amii_procs and amiv_procs

Browse Source 
Factor common body into AMI_WIN_PROCS_BODY.  The POSITIONBAR / CLIPPING /
CHANGE_COLOR guards in the original were dead.
This commit is contained in:
Ingo Paschke
2026-05-11 20:51:06 +02:00
parent c85a8cf607
commit 8dbbbc2fef
1 changed files with 28 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys/amiga/winami.c
+28 -69
View File
@@ -32,76 +32,35 @@ long amii_scrnmode;
/* Interface definition, for use by windows.c and winprocs.h to provide /* Interface definition, for use by windows.c and winprocs.h to provide
* the intuition interface for the amiga... * the intuition interface for the amiga...
*/ */
struct window_procs amii_procs = { /* Both windowports share the same function table -- the AMII (text) /
WPID(amii), * AMIV (tile) split happens at runtime based on WINVERS_AMIV checks. */
WC_COLOR | WC_HILITE_PET | WC_INVERSE, #define AMI_WIN_PROCS_BODY \
0L, WC_COLOR | WC_HILITE_PET | WC_INVERSE, \
{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, /* color availability */ 0L, \
amii_init_nhwindows, { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }, /* has_color */ \
amii_player_selection, amii_askname, amii_get_nh_event, amii_init_nhwindows, \
amii_exit_nhwindows, amii_suspend_nhwindows, amii_resume_nhwindows, amii_player_selection, amii_askname, amii_get_nh_event, \
amii_create_nhwindow, amii_clear_nhwindow, amii_display_nhwindow, amii_exit_nhwindows, amii_suspend_nhwindows, amii_resume_nhwindows, \
amii_destroy_nhwindow, amii_curs, amii_putstr, genl_putmixed, amii_create_nhwindow, amii_clear_nhwindow, amii_display_nhwindow, \
amii_display_file, amii_start_menu, amii_add_menu, amii_end_menu, amii_destroy_nhwindow, amii_curs, amii_putstr, genl_putmixed, \
amii_select_menu, genl_message_menu, amii_display_file, amii_start_menu, amii_add_menu, amii_end_menu, \
amii_mark_synch, amii_wait_synch, amii_select_menu, genl_message_menu, \
#ifdef CLIPPING amii_mark_synch, amii_wait_synch, \
amii_cliparound, amii_cliparound, \
#endif amii_print_glyph, amii_raw_print, amii_raw_print_bold, amii_nhgetch,\
#ifdef POSITIONBAR amii_nh_poskey, amii_bell, amii_doprev_message, amii_yn_function, \
donull, amii_getlin, amii_get_ext_cmd, amii_number_pad, amii_delay_output, \
#endif amii_change_color, amii_get_color_string, \
amii_print_glyph, amii_raw_print, amii_raw_print_bold, amii_nhgetch, amii_outrip, genl_preference_update, \
amii_nh_poskey, amii_bell, amii_doprev_message, amii_yn_function, genl_getmsghistory, genl_putmsghistory, \
amii_getlin, amii_get_ext_cmd, amii_number_pad, amii_delay_output, genl_status_init, genl_status_finish, genl_status_enablefield, \
#ifdef CHANGE_COLOR /* only a Mac option currently */ genl_status_update, \
amii_change_color, amii_get_color_string, genl_can_suspend_yes, \
#endif amii_update_inventory, \
amii_outrip, genl_preference_update, amii_ctrl_nhwindow
genl_getmsghistory, genl_putmsghistory,
genl_status_init, genl_status_finish, genl_status_enablefield,
genl_status_update,
genl_can_suspend_yes,
amii_update_inventory,
amii_ctrl_nhwindow,
};
/* The view window layout uses the same function names so we can use struct window_procs amii_procs = { WPID(amii), AMI_WIN_PROCS_BODY };
* a shared library to allow the executable to be smaller. struct window_procs amiv_procs = { WPID(amiv), AMI_WIN_PROCS_BODY };
*/
struct window_procs amiv_procs = {
WPID(amiv),
WC_COLOR | WC_HILITE_PET | WC_INVERSE,
0L,
{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, /* color availability */
amii_init_nhwindows,
amii_player_selection, amii_askname, amii_get_nh_event,
amii_exit_nhwindows, amii_suspend_nhwindows, amii_resume_nhwindows,
amii_create_nhwindow, amii_clear_nhwindow, amii_display_nhwindow,
amii_destroy_nhwindow, amii_curs, amii_putstr, genl_putmixed,
amii_display_file, amii_start_menu, amii_add_menu, amii_end_menu,
amii_select_menu, genl_message_menu,
amii_mark_synch, amii_wait_synch,
#ifdef CLIPPING
amii_cliparound,
#endif
#ifdef POSITIONBAR
donull,
#endif
amii_print_glyph, amii_raw_print, amii_raw_print_bold, amii_nhgetch,
amii_nh_poskey, amii_bell, amii_doprev_message, amii_yn_function,
amii_getlin, amii_get_ext_cmd, amii_number_pad, amii_delay_output,
#ifdef CHANGE_COLOR /* only a Mac option currently */
amii_change_color, amii_get_color_string,
#endif
amii_outrip, genl_preference_update,
genl_getmsghistory, genl_putmsghistory,
genl_status_init, genl_status_finish, genl_status_enablefield,
genl_status_update,
genl_can_suspend_yes,
amii_update_inventory,
amii_ctrl_nhwindow,
};
unsigned short amii_initmap[AMII_MAXCOLORS]; unsigned short amii_initmap[AMII_MAXCOLORS];
/* Default pens used unless user overides in nethack.cnf. */ /* Default pens used unless user overides in nethack.cnf. */