casa-mp-base

Index: src/gui/sdlmain.cpp

===================================================================

--- src/gui/sdlmain.cpp (Revision 3776)

+++ src/gui/sdlmain.cpp (Revision 3777)

@@ -246,6 +246,12 @@

    SDL_WM_SetCaption(title,VERSION);

 }

+static void KillSwitch(bool pressed) {

+   if (!pressed)

+       return;

+   throw 1;

+}

+

 static void PauseDOSBox(bool pressed) {

    if (!pressed)

        return;

@@ -262,15 +268,22 @@

        SDL_WaitEvent(&event);    // since we're not polling, cpu usage drops to 0.

        switch (event.type) {

-           case SDL_QUIT: throw(0); break;

+           case SDL_QUIT: KillSwitch(true); break;

            case SDL_KEYDOWN:   // Must use Pause/Break Key to resume.

            case SDL_KEYUP:

-           if(event.key.keysym.sym==SDLK_PAUSE) {

+           if(event.key.keysym.sym == SDLK_PAUSE) {

-               paused=false;

+               paused = false;

                GFX_SetTitle(-1,-1,false);

                break;

            }

+#if defined (MACOSX)

+           if (event.key.keysym.sym == SDLK_q && (event.key.keysym.mod == KMOD_RMETA || event.key.keysym.mod == KMOD_LMETA) ) {

+               /* On macs, all aps exit when pressing cmd-q */

+               KillSwitch(true);

+               break;

+           } 

+#endif

        }

    }

 }

@@ -991,11 +1004,6 @@

    if (sdl.desktop.fullscreen) GFX_SwitchFullScreen();

 }

-static void KillSwitch(bool pressed) {

-   if (!pressed)

-       return;

-   throw 1;

-}

 static void SetPriority(PRIORITY_LEVELS level) {

@@ -1513,6 +1521,15 @@

            if (((event.key.keysym.sym==SDLK_TAB)) &&

                ((sdl.laltstate==SDL_KEYDOWN) || (sdl.raltstate==SDL_KEYDOWN))) break;

 #endif

+#if defined (MACOSX)           

+       case SDL_KEYDOWN:

+       case SDL_KEYUP:

+           /* On macs CMD-Q is the default key to close an application */