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

tty_curs() again

Browse Source 
Honor the objection to an earlier change to tty_curs(), despite the
fact that it seems delusional.  Four integer comparisons per cursor
positioning call affect the throughput of cmov(), but only if the
program is built without DEBUG defined?
This commit is contained in:
PatR
2024-06-03 23:23:14 -07:00
parent ad0153a328
commit 6f8ed4c589
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/tty/wintty.c
+13 -7
View File
@@ -1,4 +1,4 @@
/* NetHack 3.7 wintty.c $NHDT-Date: 1715979847 2024/05/17 21:04:07 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.406 $ */ /* NetHack 3.7 wintty.c $NHDT-Date: 1717482166 2024/06/04 06:22:46 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.408 $ */
/* Copyright (c) David Cohrs, 1991 */ /* Copyright (c) David Cohrs, 1991 */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -2052,8 +2052,8 @@ tty_curs(
adjust_cursor_flags(cw); adjust_cursor_flags(cw);
#endif #endif
if (x < 1 || y < 0 || y >= cw->rows || x > cw->cols) {
#ifdef DEBUG #ifdef DEBUG
if (x < 1 || y < 0 || y >= cw->rows || x > cw->cols) {
const char *s = "[unknown type]"; const char *s = "[unknown type]";
switch (cw->type) { switch (cw->type) {
@@ -2076,12 +2076,18 @@ tty_curs(
s = "[base window]"; s = "[base window]";
break; break;
} }
debugpline4("bad curs positioning win %d %s (%d,%d)", window, s, x, y); /* avoid sending a line to the message window if we're complaining
#endif about cursor positioning in message window; perhaps raw_printf?
/* for a while this 'return' was commented out, but that resulted in this ought to be using impossible() so that someone might
using x,y as if they're good after discovering that they're bad */ actually see it */
return; if (cw->type != NHW_MESSAGE)
debugpline4("tty_curs: bad positioning win %d %s <%d,%d>",
window, s, x, y);
/* don't try to fix up x,y here because then tty_curs() would
behave differently depending on whether DEBUG is defined;
garbage in, garbage out is the order of the day... */
} }
#endif /* DEBUG */
cw->curx = --x; /* column 0 is not used */ cw->curx = --x; /* column 0 is not used */
cw->cury = y; cw->cury = y;