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

SAFERHANGUP support for win/Qt.

Browse Source 
Now all the current Unix window-ports support it.
This commit is contained in:
cohrs
2003-09-19 04:08:37 +00:00
parent d66bd647e6
commit 22fe9838f3
2 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/qt_win.h
+3
View File
@@ -309,6 +309,9 @@ signals:
private slots: private slots:
void updateTiles(); void updateTiles();
void moveMessages(int x, int y); void moveMessages(int x, int y);
#ifdef SAFERHANGUP
void timeout();
#endif
protected: protected:
virtual void paintEvent(QPaintEvent*); virtual void paintEvent(QPaintEvent*);
win/Qt/qt_win.cpp
+37 -2
View File
@@ -133,6 +133,10 @@ extern "C" {
extern "C" void play_sound_for_message(const char* str); extern "C" void play_sound_for_message(const char* str);
#endif #endif
#ifdef SAFERHANGUP
#include <qtimer.h>
#endif
// Warwick prefers it this way... // Warwick prefers it this way...
#define QT_CHOOSE_RACE_FIRST #define QT_CHOOSE_RACE_FIRST
@@ -1478,8 +1482,18 @@ NetHackQtMapWindow::NetHackQtMapWindow(NetHackQtClickBuffer& click_sink) :
updateTiles(); updateTiles();
//setFocusPolicy(StrongFocus); //setFocusPolicy(StrongFocus);
#ifdef SAFERHANGUP
QTimer* deadman = new QTimer(this);
connect(deadman, SIGNAL(timeout()), SLOT(timeout()));
deadman->start(2000); // deadman timer every 2 seconds
#endif
} }
#ifdef SAFERHANGUP
// The "deadman" timer is received by this slot
void NetHackQtMapWindow::timeout() {}
#endif
void NetHackQtMapWindow::moveMessages(int x, int y) void NetHackQtMapWindow::moveMessages(int x, int y)
{ {
QRect u = messages_rect; QRect u = messages_rect;
@@ -4883,10 +4897,17 @@ int NetHackQtBind::qt_nhgetch()
// Process events until a key arrives. // Process events until a key arrives.
// //
while (keybuffer.Empty()) { while (keybuffer.Empty()
#ifdef SAFERHANGUP
&& !program_state.done_hup
#endif
) {
qApp->enter_loop(); qApp->enter_loop();
} }
#ifdef SAFERHANGUP
if (program_state.done_hup && keybuffer.Empty()) return '\033';
#endif
return keybuffer.GetAscii(); return keybuffer.GetAscii();
} }
@@ -4897,9 +4918,16 @@ int NetHackQtBind::qt_nh_poskey(int *x, int *y, int *mod)
// Process events until a key or map-click arrives. // Process events until a key or map-click arrives.
// //
while (keybuffer.Empty() && clickbuffer.Empty()) { while (keybuffer.Empty() && clickbuffer.Empty()
#ifdef SAFERHANGUP
&& !program_state.done_hup
#endif
) {
qApp->enter_loop(); qApp->enter_loop();
} }
#ifdef SAFERHANGUP
if (program_state.done_hup && keybuffer.Empty()) return '\033';
#endif
if (!keybuffer.Empty()) { if (!keybuffer.Empty()) {
return keybuffer.GetAscii(); return keybuffer.GetAscii();
} else { } else {
@@ -5143,6 +5171,13 @@ bool NetHackQtBind::notify(QObject *receiver, QEvent *event)
return TRUE; return TRUE;
bool result=QApplication::notify(receiver,event); bool result=QApplication::notify(receiver,event);
#ifdef SAFERHANGUP
if (program_state.done_hup) {
keybuffer.Put('\033');
qApp->exit_loop();
return TRUE;
}
#endif
if (event->type()==QEvent::KeyPress) { if (event->type()==QEvent::KeyPress) {
QKeyEvent* key_event=(QKeyEvent*)event; QKeyEvent* key_event=(QKeyEvent*)event;