added key shortcuts for window scaling and toggling fullscreen mode

[rocksndiamonds.git] / src / events.c

diff --git a/src/events.c b/src/events.c
index 62d146fa2a508bd2998b9feec57258010fc48146..ffded62abfc922aa998935ab315f9c4421b0d283 100644 (file)
--- a/src/events.c
+++ b/src/events.c
@@ -175,6 +175,13 @@ void EventLoop(void)
          case EVENT_TEXTINPUT:
            HandleTextEvent((TextEvent *) &event);
            break;
+
+         case SDL_APP_WILLENTERBACKGROUND:
+         case SDL_APP_DIDENTERBACKGROUND:
+         case SDL_APP_WILLENTERFOREGROUND:
+         case SDL_APP_DIDENTERFOREGROUND:
+           HandlePauseResumeEvent((PauseResumeEvent *) &event);
+           break;
 #endif
 
          case EVENT_KEYPRESS:
@@ -363,14 +370,6 @@ void SleepWhileUnmapped()
 
 void HandleExposeEvent(ExposeEvent *event)
 {
-#if !defined(TARGET_SDL)
-#if 1
-  RedrawPlayfield();
-#else
-  RedrawPlayfield(FALSE, event->x, event->y, event->width, event->height);
-#endif
-  FlushDisplay();
-#endif
 }
 
 void HandleButtonEvent(ButtonEvent *event)
@@ -984,6 +983,19 @@ void HandleTextEvent(TextEvent *event)
     HandleKey(key, KEY_RELEASED);
   }
 }
+
+void HandlePauseResumeEvent(PauseResumeEvent *event)
+{
+  if (event->type == SDL_APP_WILLENTERBACKGROUND)
+  {
+    Mix_PauseMusic();
+  }
+  else if (event->type == SDL_APP_DIDENTERFOREGROUND)
+  {
+    Mix_ResumeMusic();
+  }
+}
+
 #endif
 
 void HandleKeyEvent(KeyEvent *event)
@@ -1479,8 +1491,10 @@ void HandleKey(Key key, int key_status)
   if (key_status == KEY_RELEASED)
     return;
 
-  if ((key == KSYM_Return || key == KSYM_KP_Enter) &&
-      (GetKeyModState() & KMOD_Alt) && video.fullscreen_available)
+  if ((key == KSYM_F11 ||
+       ((key == KSYM_Return ||
+        key == KSYM_KP_Enter) && (GetKeyModState() & KMOD_Alt))) &&
+      video.fullscreen_available)
   {
     setup.fullscreen = !setup.fullscreen;
 
@@ -1496,8 +1510,12 @@ void HandleKey(Key key, int key_status)
     return;
   }
 
-  if ((key == KSYM_minus || key == KSYM_plus || key == KSYM_0) &&
-      (GetKeyModState() & KMOD_Alt) && video.window_scaling_available &&
+  if ((key == KSYM_minus ||
+       key == KSYM_plus ||
+       key == KSYM_0) &&
+      ((GetKeyModState() & KMOD_Control) ||
+       (GetKeyModState() & KMOD_Alt)) &&
+      video.window_scaling_available &&
       !video.fullscreen_enabled)
   {
     if (key == KSYM_0)