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

Solve a number of MacOSX problems.

Browse Source
This commit is contained in:
warwick
2003-09-11 04:25:52 +00:00
parent 0460cc9824
commit 9d83d474f4
1 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/Qt/qt_win.cpp
+14 -11
View File
@@ -57,6 +57,7 @@ extern "C" {
#include "dlb.h" #include "dlb.h"
#include "patchlevel.h" #include "patchlevel.h"
#include "tile2x11.h" #include "tile2x11.h"
#undef Invisible
#undef Warning #undef Warning
#undef red #undef red
#undef green #undef green
@@ -72,9 +73,6 @@ extern "C" {
#undef yn #undef yn
} }
#ifdef yn
#undef yn
#endif
#include "qt_win.h" #include "qt_win.h"
#include <qregexp.h> #include <qregexp.h>
@@ -980,7 +978,7 @@ public:
}; };
NetHackQtPlayerSelector::NetHackQtPlayerSelector(NetHackQtKeyBuffer& ks) : NetHackQtPlayerSelector::NetHackQtPlayerSelector(NetHackQtKeyBuffer& ks) :
QDialog(0,"plsel",TRUE), QDialog(qApp->mainWidget(),"plsel",TRUE),
keysource(ks), keysource(ks),
fully_specified_role(TRUE) fully_specified_role(TRUE)
{ {
@@ -1333,7 +1331,7 @@ bool NetHackQtPlayerSelector::Choose()
NetHackQtStringRequestor::NetHackQtStringRequestor(NetHackQtKeyBuffer& ks, const char* p, const char* cancelstr) : NetHackQtStringRequestor::NetHackQtStringRequestor(NetHackQtKeyBuffer& ks, const char* p, const char* cancelstr) :
QDialog(0,"string",FALSE), QDialog(qApp->mainWidget(),"string",FALSE),
prompt(p,this,"prompt"), prompt(p,this,"prompt"),
input(this,"input"), input(this,"input"),
keysource(ks) keysource(ks)
@@ -2645,7 +2643,7 @@ void NetHackQtStatusWindow::checkTurnEvents()
NetHackQtMenuDialog::NetHackQtMenuDialog() : NetHackQtMenuDialog::NetHackQtMenuDialog() :
QDialog(0,0,FALSE) QDialog(qApp->mainWidget(),0,FALSE)
{ {
} }
@@ -3222,7 +3220,7 @@ void NetHackQtRIP::paintEvent(QPaintEvent* event)
} }
NetHackQtTextWindow::NetHackQtTextWindow(NetHackQtKeyBuffer& ks) : NetHackQtTextWindow::NetHackQtTextWindow(NetHackQtKeyBuffer& ks) :
QDialog(0,0,FALSE), QDialog(qApp->mainWidget(),0,FALSE),
keysource(ks), keysource(ks),
use_rip(FALSE), use_rip(FALSE),
str_fixed(FALSE), str_fixed(FALSE),
@@ -3632,6 +3630,7 @@ NetHackQtMainWindow::NetHackQtMainWindow(NetHackQtKeyBuffer& ks) :
{ act2, "Search\ts", "s", 3}, { act2, "Search\ts", "s", 3},
{ act2, "Sit\tAlt+S", "\363", 3}, { act2, "Sit\tAlt+S", "\363", 3},
{ act2, "Throw\tt", "t", 2}, { act2, "Throw\tt", "t", 2},
{ act2, "Untrap\t#u", "#u", 3},
{ act2, "Up\t<", "<", 3}, { act2, "Up\t<", "<", 3},
{ act2, "Wipe face\tAlt+W", "\367", 3}, { act2, "Wipe face\tAlt+W", "\367", 3},
@@ -4082,7 +4081,7 @@ void NetHackQtMainWindow::ShowIfReady()
NetHackQtYnDialog::NetHackQtYnDialog(NetHackQtKeyBuffer& keysrc,const char* q,const char* ch,char df) : NetHackQtYnDialog::NetHackQtYnDialog(NetHackQtKeyBuffer& keysrc,const char* q,const char* ch,char df) :
QDialog(0,0,FALSE), QDialog(qApp->mainWidget(),0,FALSE),
keysource(keysrc), keysource(keysrc),
question(q), choices(ch), def(df) question(q), choices(ch), def(df)
{ {
@@ -4553,7 +4552,7 @@ void NetHackQtBind::qt_player_selection()
} }
NetHackQtSavedGameSelector::NetHackQtSavedGameSelector(const char** saved) : NetHackQtSavedGameSelector::NetHackQtSavedGameSelector(const char** saved) :
QDialog(0,"sgsel",TRUE) QDialog(qApp->mainWidget(),"sgsel",TRUE)
{ {
QVBoxLayout *vbl = new QVBoxLayout(this,6); QVBoxLayout *vbl = new QVBoxLayout(this,6);
QHBox* hb; QHBox* hb;
@@ -5005,7 +5004,7 @@ void NetHackQtBind::qt_getlin(const char *prompt, char *line)
} }
NetHackQtExtCmdRequestor::NetHackQtExtCmdRequestor(NetHackQtKeyBuffer& ks) : NetHackQtExtCmdRequestor::NetHackQtExtCmdRequestor(NetHackQtKeyBuffer& ks) :
QDialog(0, "ext-cmd", FALSE), QDialog(qApp->mainWidget(), "ext-cmd", FALSE),
keysource(ks) keysource(ks)
{ {
int marg=4; int marg=4;
@@ -5159,8 +5158,12 @@ bool NetHackQtBind::notify(QObject *receiver, QEvent *event)
} }
} }
char ch=key_event->ascii(); char ch=key_event->ascii();
if ( !ch && (key_event->state() & Qt::ControlButton) ) {
// On Mac, it aint-ncessarily-control
if ( k>=Qt::Key_A && k<=Qt::Key_Z )
ch = k - Qt::Key_A + 1;
}
if (!macro && ch) { if (!macro && ch) {
int k = key_event->key();
bool alt = (key_event->state()&AltButton) || bool alt = (key_event->state()&AltButton) ||
(k >= Key_0 && k <= Key_9 && (key_event->state()&ControlButton)); (k >= Key_0 && k <= Key_9 && (key_event->state()&ControlButton));
keybuffer.Put(key_event->key(),ch + (alt ? 128 : 0), keybuffer.Put(key_event->key(),ch + (alt ? 128 : 0),