SAFERHANGUP support for win/Qt.

Now all the current Unix window-ports support it.

diff --git a/include/qt_win.h b/include/qt_win.h
index 2dedce2f77530a2fa3262ab080675f23b93049ce..098865ad460eac3ccc90a6fab274ab707d321679 100644 (file)
--- a/include/qt_win.h
+++ b/include/qt_win.h
@@ -309,6 +309,9 @@ signals:
 private slots:
        void updateTiles();
        void moveMessages(int x, int y);
+#ifdef SAFERHANGUP
+       void timeout();
+#endif
 
 protected:
        virtual void paintEvent(QPaintEvent*);

diff --git a/win/Qt/qt_win.cpp b/win/Qt/qt_win.cpp
index 37573c18f1bd97f3eaf4c098f08b40e43694ef37..7fcafb9e46d57e0ea5a779440e5cb7a1e8128aab 100644 (file)
--- a/win/Qt/qt_win.cpp
+++ b/win/Qt/qt_win.cpp
@@ -133,6 +133,10 @@ extern "C" {
 extern "C" void play_sound_for_message(const char* str);
 #endif
 
+#ifdef SAFERHANGUP
+#include <qtimer.h>
+#endif
+
 // Warwick prefers it this way...
 #define QT_CHOOSE_RACE_FIRST
 
@@ -1478,8 +1482,18 @@ NetHackQtMapWindow::NetHackQtMapWindow(NetHackQtClickBuffer& click_sink) :
 
     updateTiles();
     //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)
 {
     QRect u = messages_rect;
@@ -4883,10 +4897,17 @@ int NetHackQtBind::qt_nhgetch()
 
     // Process events until a key arrives.
     //
-    while (keybuffer.Empty()) {
+    while (keybuffer.Empty()
+#ifdef SAFERHANGUP
+          && !program_state.done_hup
+#endif
+          ) {
        qApp->enter_loop();
     }
 
+#ifdef SAFERHANGUP
+    if (program_state.done_hup && keybuffer.Empty()) return '\033';
+#endif
     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.
     //
-    while (keybuffer.Empty() && clickbuffer.Empty()) {
+    while (keybuffer.Empty() && clickbuffer.Empty()
+#ifdef SAFERHANGUP
+          && !program_state.done_hup
+#endif
+          ) {
        qApp->enter_loop();
     }
+#ifdef SAFERHANGUP
+    if (program_state.done_hup && keybuffer.Empty()) return '\033';
+#endif
     if (!keybuffer.Empty()) {
        return keybuffer.GetAscii();
     } else {
@@ -5143,6 +5171,13 @@ bool NetHackQtBind::notify(QObject *receiver, QEvent *event)
        return TRUE;
 
     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) {
        QKeyEvent* key_event=(QKeyEvent*)event;