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

bypass curses_putmixed if -DCURSES_GENL_PUTMIXED is defined

Browse Source
This commit is contained in:
nhmall
2023-06-11 09:23:07 -04:00
parent c4c31ae6a8
commit 37b21dd9fd
4 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
win/curses/cursmain.c
View File

@@ -72,10 +72,10 @@ struct window_procs curses_procs = {
curses_destroy_nhwindow,
curses_curs,
curses_putstr,
#if !defined(PDCURSES) || defined(PDC_WIDE)
curses_putmixed,
#else
#if defined(CURSES_GENL_PUTMIXED) || (defined(PDCURSES) && !defined(PDC_WIDE))
genl_putmixed,
#else
curses_putmixed,
#endif
curses_display_file,
curses_start_menu,

18
win/curses/cursmesg.c
View File

@@ -46,7 +46,9 @@ static void unscroll_window(winid wid);
static void directional_scroll(winid wid, int nlines);
static void mesg_add_line(const char *mline);
static nhprev_mesg *get_msg_line(boolean reverse, int mindex);
#if !defined(CURSES_GENL_PUTMIXED) || (defined(PDCURSES) && !defined(PDC_WIDE))
static int curscolor(int nhcolor, boolean *boldon);
#endif
static int turn_lines = 0;
static int mx = 0;
@@ -66,9 +68,10 @@ curses_message_win_puts(const char *message, boolean recursed)
char *tmpstr;
WINDOW *win = curses_get_nhwin(MESSAGE_WIN);
boolean bold, border = curses_window_has_border(MESSAGE_WIN),
have_mixed_leadin = FALSE, adjustbold = FALSE;
adjustbold = FALSE;
int message_length = (int) strlen(message);
#if !defined(PDCURSES) || defined(PDC_WIDE)
#if !defined(CURSES_GENL_PUTMIXED) || (defined(PDCURSES) && !defined(PDC_WIDE))
boolean have_mixed_leadin = FALSE;
cchar_t mixed_leadin_cchar[2];
#endif
@@ -120,7 +123,7 @@ curses_message_win_puts(const char *message, boolean recursed)
linespace -= 2;
bold = (height > 1 && !last_messages);
#if !defined(PDCURSES) || defined(PDC_WIDE)
#if !defined(CURSES_GENL_PUTMIXED) || (defined(PDCURSES) && !defined(PDC_WIDE))
if (mesg_mixed) {
wchar_t w[2];
int leadin_color;
@@ -149,7 +152,7 @@ curses_message_win_puts(const char *message, boolean recursed)
message_length++; /* account for that additional column */
}
}
#endif /* !PDCURSES || PDC_WIDE */
#endif /* CURSES_GENL_PUTMIXED || PDCURSES without PDC_WIDE */
if (linespace < message_length) {
if (my - border_space >= height - 1) {
@@ -190,7 +193,7 @@ curses_message_win_puts(const char *message, boolean recursed)
if (mx == border_space && message_length > width - 3) {
/* split needed */
tmpstr = curses_break_str(message, (width - 3), 1);
#if !defined(PDCURSES) || defined(PDC_WIDE)
#if !defined(CURSES_GENL_PUTMIXED) || (defined(PDCURSES) && !defined(PDC_WIDE))
if (have_mixed_leadin) {
mvwadd_wch(win, my, mx, mixed_leadin_cchar);
++mx;
@@ -211,7 +214,7 @@ curses_message_win_puts(const char *message, boolean recursed)
curses_message_win_puts(tmpstr, TRUE);
free(tmpstr);
} else {
#if !defined(PDCURSES) || defined(PDC_WIDE)
#if !defined(CURSES_GENL_PUTMIXED) || (defined(PDCURSES) && !defined(PDC_WIDE))
if (have_mixed_leadin) {
mvwadd_wch(win, my, mx, mixed_leadin_cchar);
++mx;
@@ -227,7 +230,7 @@ curses_message_win_puts(const char *message, boolean recursed)
wrefresh(win);
}
#if !defined(CURSES_GENL_PUTMIXED) || (defined(PDCURSES) && !defined(PDC_WIDE))
static int
curscolor(int nhcolor, boolean *boldon)
{
@@ -255,6 +258,7 @@ curscolor(int nhcolor, boolean *boldon)
}
return curses_color;
}
#endif
void curses_got_input(void)
{