Fixed #11 so that we can close the window while editing text

only small problem is that alt+enter will switch fullscreen and end
editing at the same time

diff --git a/Source/Game.cpp b/Source/Game.cpp
index ca2cb5df914734cc6a6a5ca415ee722ed625128c..5b816b54bd7349350c4637dd9c571629f64a7476 100644 (file)
--- a/Source/Game.cpp
+++ b/Source/Game.cpp
@@ -166,6 +166,10 @@ void Game::inputText(string& str, unsigned* charselected)
     }
 
     while (SDL_PollEvent(&evenement)) {
     }
 
     while (SDL_PollEvent(&evenement)) {

+        if (!sdlEventProc(evenement)) {
+            tryquit = 1;
+            break;
+        }

         switch (evenement.type) {
         case SDL_TEXTEDITING:
             /* FIXME - We should handle this for complete input method support */
         switch (evenement.type) {
         case SDL_TEXTEDITING:
             /* FIXME - We should handle this for complete input method support */

diff --git a/Source/Game.h b/Source/Game.h
index c5f37cb7310c0f2c6a53ee5c92baa941cd1e7c5a..b5a16c6bf2fec9b1e04381f8e381d3fda424ae87 100644 (file)
--- a/Source/Game.h
+++ b/Source/Game.h
@@ -237,4 +237,7 @@ extern const char *wolfskin[3];
 
 extern const char **creatureskin[2];
 
 
 extern const char **creatureskin[2];
 

+SDL_bool sdlEventProc(const SDL_Event &e);
+
+

 #endif
 #endif

diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp
index de18d4a945646cd476fb0fb550f6799ced6ef663..c78dc28755817be7376ad9edb5c1d5cedeb76800 100644 (file)
--- a/Source/OpenGL_Windows.cpp
+++ b/Source/OpenGL_Windows.cpp
@@ -202,7 +202,7 @@ void toggleFullscreen()
     SDL_SetWindowFullscreen(sdlwindow, flags);
 }
 
     SDL_SetWindowFullscreen(sdlwindow, flags);
 }
 

-static SDL_bool sdlEventProc(const SDL_Event &e)
+SDL_bool sdlEventProc(const SDL_Event &e)

 {
     switch (e.type) {
         case SDL_QUIT:
 {
     switch (e.type) {
         case SDL_QUIT: