Ticket #8194: quitdialog.diff

Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.cpp,v
retrieving revision 1.43
diff -u -r1.43 dialogs.cpp
--- dialogs.cpp 30 Apr 2003 13:23:26 -0000      1.43
+++ dialogs.cpp 4 May 2003 01:00:47 -0000
@@ -662,6 +662,10 @@
        : InfoDialog(gui, scumm, 10) {
 }
 
+ConfirmExitDialog::ConfirmExitDialog(NewGui *gui, Scumm *scumm)
+       : InfoDialog(gui, scumm, "Are you sure you want to quit (y/n)?") {
+}
+
 #ifdef _WIN32_WCE
 
 #pragma mark -
Index: dialogs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.h,v
retrieving revision 1.17
diff -u -r1.17 dialogs.h
--- dialogs.h   25 Mar 2003 15:32:36 -0000      1.17
+++ dialogs.h   4 May 2003 01:00:47 -0000
@@ -137,6 +137,27 @@
                }
 };
 
+class ConfirmExitDialog : public InfoDialog {
+public:
+       ConfirmExitDialog(NewGui *gui, Scumm *scumm);
+       virtual void handleKeyDown(uint16 ascii, int keycode, int modifiers) {
+                       if (tolower(ascii) == 'n') { // Close exit dialog if n key is pressed
+                               result = ascii;
+                               close();
+                       }
+                       if (tolower(ascii) == 'y') { // Quit engine if y key is pressed
+                               result = ascii;
+                               close();
+                       }
+                       else
+                               ScummDialog::handleKeyDown(ascii, keycode, modifiers);
+       }
+
+       int getResult() {return result;};
+private:
+       int result;
+};
+
 #ifdef _WIN32_WCE
 
 class KeysDialog : public ScummDialog {
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.177
diff -u -r1.177 scumm.h
--- scumm.h     3 May 2003 20:49:53 -0000       1.177
+++ scumm.h     4 May 2003 01:00:48 -0000
@@ -359,6 +359,7 @@
        Dialog *_pauseDialog;
        Dialog *_optionsDialog;
        Dialog *_saveLoadDialog;
+       Dialog *_confirmExitDialog;
        // Debugger access this one, too...
        ConsoleDialog *_debuggerDialog;
 
@@ -366,6 +367,7 @@
        void pauseDialog();
        void saveloadDialog();
        void optionsDialog();
+       void confirmexitDialog();
        char displayError(bool showCancel, const char *message, ...);
 
 protected:
@@ -999,6 +1001,7 @@
        byte _charsetBuffer[512];
 
        bool _noSubtitles;      // Skip all subtitles?
+       bool _confirm_on_exit;
 
        void initCharset(int charset);
        void restoreCharsetBg();
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.122
diff -u -r2.122 scummvm.cpp
--- scummvm.cpp 3 May 2003 21:15:24 -0000       2.122
+++ scummvm.cpp 4 May 2003 01:00:49 -0000
@@ -385,6 +385,7 @@
        _charsetBufPos = 0;
        memset(_charsetBuffer,0,sizeof(_charsetBuffer));
        _noSubtitles = false;
+       _confirm_on_exit = false;
        _numInMsgStack = 0;
        _msgPtrToAdd = NULL;
        _messagePtr = NULL;
@@ -410,6 +411,7 @@
        _gameId = detector->_gameId;
        _features = detector->_features;
        _noSubtitles = detector->_noSubtitles;
+       _confirm_on_exit = detector->_confirm_on_exit;
        _defaultTalkDelay = detector->_talkSpeed;
        _use_adlib = detector->_use_adlib;
        _language = detector->_language;
@@ -1547,6 +1549,17 @@
        runDialog(_optionsDialog);
 }
 
+void Scumm::confirmexitDialog() {
+       if (!_confirmExitDialog)
+               _confirmExitDialog = new ConfirmExitDialog(_newgui, this);
+       runDialog(_confirmExitDialog);
+
+       if (tolower(((ConfirmExitDialog*)_confirmExitDialog)->getResult()) == 'y') {
+               shutDown(0);
+               _system->quit();                //  TODO: This can be removed when shutDown is implemented
+       }
+}
+
 char Scumm::displayError(bool showCancel, const char *message, ...) {
 #ifdef __PALM_OS__
        char buf[256], result; // 1024 is too big overflow the stack
@@ -1916,9 +1929,21 @@
                                        g_debugger->attach(this, NULL);
                                else if (event.kbd.keycode == 's')
                                        resourceStats();
+                               else if (event.kbd.keycode == 'z') {
+                                       if(_confirm_on_exit)
+                                               confirmexitDialog();
+                                       else
+                                               _system->quit();        //  TODO: change to shutDown() when implemented
+                               }
                                else
Index: sdl/sdl-common.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl-common.cpp,v
retrieving revision 1.45
diff -u -r1.45 sdl-common.cpp
--- sdl/sdl-common.cpp  1 May 2003 12:42:46 -0000       1.45
+++ sdl/sdl-common.cpp  4 May 2003 01:03:42 -0000
@@ -532,15 +532,23 @@
                        }
 
                        // Ctrl-z and Alt-X quit
+                       // Let the game loop quit, without pulling the rug out from under it using quit()
                        if ((b == KBD_CTRL && ev.key.keysym.sym=='z') || (b == KBD_ALT && ev.key.keysym.sym=='x')) {
-                               quit();
+                               event->event_code = EVENT_KEYDOWN;
+                               event->kbd.flags = b;
+                               event->kbd.keycode = ev.key.keysym.sym;
+                               return true;
                                break;
                        }
 
 #ifdef MACOSX
                        // On Macintosh', Cmd-Q quits
+                       // (re-map to alt-x, and sent it back)
                        if ((ev.key.keysym.mod & KMOD_META) && ev.key.keysym.sym=='q') {
-                               quit();
+                               event->event_code = EVENT_KEYDOWN;
+                               event->kbd.flags = KBD_ALT;
+                               event->kbd.keycode = 'x';
+                               return true;
                                break;
                        }
 #endif
Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/gameDetector.cpp,v
retrieving revision 1.88
diff -u -r1.88 gameDetector.cpp
--- gameDetector.cpp    30 Apr 2003 12:43:54 -0000      1.88
+++ gameDetector.cpp    4 May 2003 01:07:41 -0000
@@ -165,6 +165,7 @@
        _save_slot = 0;
        
        _saveconfig = false;
+       _confirm_on_exit = false;
        
 #ifndef _WIN32_WCE
        _gfx_mode = GFX_DOUBLESIZE;
@@ -270,6 +271,8 @@
                _gameTempo = strtol(val, NULL, 0);
 
        _talkSpeed = g_config->getInt("talkspeed", _talkSpeed);
+
+       _confirm_on_exit = g_config->getBool("confirm_on_exit", _confirm_on_exit ? true : false);
 }
 
 void GameDetector::list_games() {
Index: gameDetector.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/gameDetector.h,v
retrieving revision 1.36
diff -u -r1.36 gameDetector.h
--- gameDetector.h      6 Apr 2003 19:41:34 -0000       1.36
+++ gameDetector.h      4 May 2003 01:07:41 -0000
@@ -174,6 +174,7 @@
        int _save_slot;
        
        bool _saveconfig;
+       bool _confirm_on_exit;
 
 public:
        OSystem *createSystem();