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

^X on MacOSX Qt

Browse Source 
Add Michael's fix for control+x.

The enum name of the argument suggests that option+x should have
been sending control characters but that wasn't the case for me.

Before this fix, both control+x and option+x behaved like dead
keys, not transmitting anything for nethack to use.  After this
fix, control+x sends ^X as desired but option+x is still dead.
This commit is contained in:
PatR
2020-08-05 11:26:25 -07:00
parent be3edcd097
commit f4cee951ca
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/fixes37.0
View File

@@ -1,4 +1,4 @@
NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.271 $ $NHDT-Date: 1596494524 2020/08/03 22:42:04 $ NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.272 $ $NHDT-Date: 1596651973 2020/08/05 18:26:13 $
General Fixes and Modified Features General Fixes and Modified Features
----------------------------------- -----------------------------------
@@ -350,6 +350,7 @@ Qt: switch to fixed-width font for menus
Qt: don't disable [cancel] button when viewing inventory or other pick-none Qt: don't disable [cancel] button when viewing inventory or other pick-none
menus; ESC works to dismiss those and [cancel] should be the same menus; ESC works to dismiss those and [cancel] should be the same
Qt: bring status conditions up to 3.6 levels but new ones lack pictures Qt: bring status conditions up to 3.6 levels but new ones lack pictures
Qt: fix control key on OSX
tiles: add indicator of thonged portion to aklys tile tiles: add indicator of thonged portion to aklys tile
tty: role and race selection menus weren't filtering out potential choices tty: role and race selection menus weren't filtering out potential choices
which got excluded by OPTIONS=align:!lawful or !neutral or !chaotic which got excluded by OPTIONS=align:!lawful or !neutral or !chaotic

5
win/Qt/qt_main.cpp
View File

@@ -520,6 +520,11 @@ NetHackQtMainWindow::NetHackQtMainWindow(NetHackQtKeyBuffer& ks) :
QCoreApplication::setOrganizationName("The NetHack DevTeam"); QCoreApplication::setOrganizationName("The NetHack DevTeam");
QCoreApplication::setOrganizationDomain("nethack.org"); QCoreApplication::setOrganizationDomain("nethack.org");
QCoreApplication::setApplicationName("NetHack"); QCoreApplication::setApplicationName("NetHack");
#ifdef MACOSX
/* without this, neither control+x nor option+x do anything;
with it, control+x is ^X and option+x still does nothing */
QCoreApplication::setAttribute(Qt::AA_MacDontSwapCtrlAndMeta);
#endif
setWindowTitle("Qt NetHack"); setWindowTitle("Qt NetHack");
if ( qt_compact_mode ) if ( qt_compact_mode )