Commit Graph

1734 Commits

Author SHA1 Message Date
PatR
31046826f5 couple of missing Qt prototypes
Shut up two missing prototype warnings.
2021-01-23 15:58:23 -08:00
PatR
ab74ed2c20 SELECTSAVED handling
By default, enable the SELECTSAVED option for everyone instead
of just for Windows or Qt.  And make Qt obey the 'selectsaved'
run-time option.

It can be disabled in config.h if necessary.
2021-01-23 15:02:11 -08:00
Bart House
a124114bce NetHackW: fix rendering of animations
Animations render by changing map state and calling delay.  When we delay,
we must ensure map windoow has been updated to show latest state before
we delay.
2021-01-23 12:04:16 -08:00
Bart House
d6b435a1d8 NetHackW: fix focus flashing when using far look
Changed when we update the map window back buffer.  We now defer all
back buffer renderig until mswin_map_update is called.  We update
the window only within the main message loop thus we should only
get fully coherent map state rendered prior to getting input.
2021-01-23 11:44:35 -08:00
Pasi Kallinen
2b525aab02 Fix missing proto 2021-01-23 10:56:56 +02:00
Pasi Kallinen
ad0c701127 Fix unused param 2021-01-22 18:16:08 +02:00
Pasi Kallinen
8681aec71b Fix uninitialized variable 2021-01-22 17:58:54 +02:00
Pasi Kallinen
44bb68fe82 Curses: Select menu items via mouse 2021-01-21 12:53:02 +02:00
Bart House
2b91931207 Fix delayed rendering of cursor with farlook in NetHackW. 2021-01-19 19:09:40 -08:00
PatR
891b8e3913 X11 selectsaved followup 2021-01-19 17:15:51 -08:00
PatR
d1e4623a0e X11: selectsaved
Implement the 'selectsaved' option for X11.  Requires that
SELECTSAVED be defined at compile time.

Behaves the same as for tty and curses except that if you
choose 'quit', the intended "until next time..." message doesn't
get delivered anywhere.
2021-01-19 16:59:36 -08:00
nhmall
cea4c8c488 another Microsoft compiler warning
win/curses/cursmain.c(760): warning C4189: 'win': local variable is initialized but not referenced
2021-01-17 23:14:13 -05:00
Dean Luick
3ef0f889e6 Fix gcc sprintf warnings
Gcc 9 has become more vocal with sprintf buffer overflow
checking.  Remove these sprintf warnings by changing the
offending calls to a snprintf wrapper that will explicitly
check the result.
2021-01-16 19:44:56 -06:00
PatR
648162b536 fix github issue #400 - Qt text windows hanging
Text windows only accept a few keys (<escape>, <return>, ':', now
<space>) and if they got other keys they passed those up the call
chain, arriving at the map where they were treated as commands
and were executed while the text window was still displayed.  The
cited example was ',' for pickup while the "things that are here"
popup was shown.  The 'foreign' key's command might be executed
successfully but the undismissed popup could become hung.

This fixes that ('foreign' keys will be ignored).  It also lets
<space> be used to dismiss text windows.

Slightly better but far from perfect:  if you perform a search,
then after it runs you need to type <escape> once, or <return>
or <space> twice, or else search again and pick [done] on the
search popup and then <return> or <space> once, to dismiss a
text window via keyboard.  (Prior to this, typing <escape> or
searching again and picking [done] followed by <return> were the
only ways.)  Also, searching for an empty string will now be
treated as if [done] had been picked.

Fixes #400
2021-01-14 15:10:41 -08:00
PatR
05c7a21756 curses: fix unused label 'bail'
when SELECTSAVED isn't defined by using a goto for it even when
an 'if' was easily avoiding the need for that.
2021-01-08 13:57:52 -08:00
PatR
2c02d5daac Qt key handling
Fix the popup versions of qt_yn_function() to handle control
characters by using the same key press event decoding routine
and menus and extended commands.  Moves 'keyValue()' to
qt_key.cpp and its declaration to qt_key.h, requring several
files to start using #include "qt_key.h".

'make depend' update to follow.
2021-01-08 13:47:34 -08:00
PatR
2f76d0e701 Qt: ^V on OSX
I can't take credit for this and still have no idea why it is
needed, but it fixes use of ^V as a command and as input to
to the regular version of yn_function().  In particular, '&'
command reports it as ^V.  Unfortunately when 'popup_dialog' is
set, no control characters seem to be accepted by the part of
NetHackQtYnDialog(Exec+KeyPressEvent) responsible for arbitrary
input.

It also causes getlin() to terminate but I can't think of any
situation where ^V would be considered to be valid input for
getlin() so won't worry about that.

I put it in as '#if MACOSX' because I don't know whether any
other Qt platforms need it.
2021-01-08 01:37:38 -08:00
PatR
7ba7873a41 curses line-of-input prompting
Redo the fake ESC handling for curses' wgetnstr() so that it
applies to all popup prompts rather than just to "Who are you?",
in case the player sets the 'popup_dialog' option.
2021-01-06 15:59:55 -08:00
nhmall
c6306e1117 adjust some disabled code in curses window port 2021-01-05 16:06:58 -05:00
nhmall
4cbf95b350 typo in comments 2021-01-05 10:44:19 -05:00
nhmall
3efc3c0bc8 MSDOS and TTY_TILES_ESCCODES bit 2021-01-05 10:28:43 -05:00
nhmall
c9673b3d9e more window port interface adjustments
further adjustments to the window port interface to pass a pointer
to a glyph_info struct which describes not just the glyph number
itself, but also the ttychar, the color, the glyphflags, and the
symset index.

This affects two existing window port calls that get passed glyphs
and does the parameter consistently for both of them using the
glyph_info struct pointer:
	print_glyph()
	add_menu().

The recently added glyphmod parameter is now unnecessary and has been
removed.
2021-01-05 10:09:37 -05:00
PatR
2a9a18fa2f curses askname()
Noticed when implementing restore-via-menu for curses a couple
of days ago:  The "Who are you?" prompt wouldn't let me cancel
out via <escape>.  I created a character named '\033' which was
displayed as "^[" during play and produced a save file shown by
'ls' as "501?.Z".

To fix this properly, we will need to replace use of wgetnstr()
with something of our own.  That's more work than I feel like
tackling.  This fakes ESC handling if the player is willing to
type <escape><return> rather than just <escape> when terminating
the prompt.
2021-01-04 18:01:49 -08:00
PatR
46460255ef curses: restoring via menu
Clone the tty SELECTSAVED code in curses.  If you would be getting
the "who are you?" prompt (perhaps via 'nethack -u player') and
you have at least one save file, you'll get a menu of save files
(plus entries for 'new game' and 'quit') to choose from.  Requires
'#define SELECTDSAVED' at build time (only ntconf.h does that by
default) and when present, can be disabled by setting 'selectsaved'
to False in NETHACKOPTIONS or .nethackrc.
2021-01-02 18:50:04 -08:00
PatR
b815c470ec remove mapglyph() remnants from win/curses/
Remove a couple of leftover references to mapglyph() from the
curses code (present inside '#if 0' blocks).  I've tried to
substitute code which should work but have no idea whether it
actually will.
2021-01-02 10:46:17 -08:00
nhmall
10dfceac7b another unused variable 2021-01-02 09:44:09 -05:00
nhmall
5910f86c19 unused variables 2021-01-02 09:35:56 -05:00
nhmall
1d94e65e45 finish mapglyph() removal 2021-01-02 09:22:53 -05:00
nhmall
18116d4a7b update for 2021 2021-01-01 22:07:54 -05:00
PatR
db673ab791 termcap followup
A little more testing for ANSI_DEFAULT forced on has revealed
that hilites[Black] has also been left Null, a problem that
MS-DOS hid.
2020-12-31 16:09:46 -08:00
PatR
e7e07cb067 pull request #411 - freeing termcap hilite entries
(strings to switch color) for ANSI_DEFAULT.  Instead of lumping
more conditional code into tty_shutdown() I put the new code
into a separate routine and also pulled the existing setup code
out of tty_startup() into a separate routine too.

It will be a miracle if this doesn't break anything due to the
crazy amount of convoluted conditionals present in termcap.c.

On the other hand, I found and fixed a bug while trying to test.
The ANSI_DEFAULT hilites for Gray and No_Color were null instead
of an empty string.  MS-DOS stdio apparently fixes that up, but
on OSX (after #undef UNIX and TERMLIB and TERMINFO and #define
ANSI_DEFAULT in termcap.c) I started seeing instances of "(null)"
on the map (OSX stdio does a different fix up for Null pointers)
as soon as I enabled 'color'.  It was an attempt to set No_Color.

Closes #411
2020-12-31 14:49:21 -08:00
nhmall
1c2c5dae1b remove vision tables from Windows and msdos builds 2020-12-28 22:07:00 -05:00
PatR
524f9dd82b Qt map's "ttychar"
Change the glyphttychar[ROWNO][COLNO] array from uchar to
unsighed short.  DrawWalls() has handling for values in over 2000.

This also reformats pretty much all of the NetHackQtMapViewport
portion of qt_map.cpp.
2020-12-28 10:01:43 -08:00
nhmall
c31047984b typo in tilemap.c update 2020-12-28 09:19:07 -05:00
nhmall
30fe65b5e0 fix tilemap.c compile when STATUES_LOOK_LIKE_MONSTERS wasn't defined 2020-12-28 09:14:39 -05:00
nhmall
19583adca9 another extraneous file 2020-12-27 21:31:31 -05:00
nhmall
51e5e9c998 extraneous file 2020-12-27 21:28:50 -05:00
nhmall
aad56ab5d8 Merge branch 'NetHack-3.7' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.7 2020-12-27 21:22:48 -05:00
nhmall
881eccca9e some tile processing fix-ups.
Some of the new colors added to some monster tiles did not
have gray scale mappings. This fixes the processing by
mapping them to *something*, but optimal gray scale mappings
for the new colors will require follow-up evaluation at some
point.
2020-12-27 21:20:44 -05:00
PatR
953f0652c4 reformat Qt/qt_clust.cpp 2020-12-27 17:01:33 -08:00
nhmall
86141b3196 Merge branch 'feature/gendered-tiles' of https://github.com/NullCGT/NetHack into NullCGT-feature/gendered-tiles 2020-12-27 17:50:29 -05:00
PatR
6499fc4dd9 some code cleanup, mostly Qt map
The Qt routine NetHackQtMapViewport::Clear() was broken, but
fixing it hasn't changed the glyph display issue.  None of the
other changes here would be expected to affect that but they
are in/among the sections of code under investigation.
2020-12-27 12:33:03 -08:00
Kestrel
5d0c1a94f4 More monster gender tiles additions. 2020-12-27 13:01:27 -06:00
nhmall
ea1ffe5112 tty unused parameter under some configs 2020-12-27 12:51:40 -05:00
Kestrel
f83b3e038a Differentiate male and female ant tiles.
Female ants are larger than male ants. I could have added wings to the male ants, but I felt that doing so would lead to a loss in visual clarity.
2020-12-27 10:56:30 -06:00
nhmall
fd13f2a2f2 monster gender-related follow-ups
remove unintentionally left M2_MALE flag on dwarf lord/lady/leader

provide a way to verify gender information relayed from the core
in debug mode on tty via #wizmgender debugging extended command
2020-12-27 10:45:13 -05:00
PatR
8ccb5985d4 curses comment bit
Don't require c99, even in code that's suppressed via #if 0.
2020-12-27 05:09:44 -08:00
nhmall
ec889df4d3 another follow-up bit - punctuation consistency
an uppercase entry was left in the monsters.txt tile file, but
changed elsewhere
2020-12-26 19:21:37 -05:00
nhmall
772e876e44 incorporate some pmnames feedback
Also an update to a fixes37.0 entry
2020-12-26 19:07:19 -05:00
nhmall
a7c63f8abc switch curses port to use the new tty_print_glyph argument 2020-12-26 18:35:09 -05:00