X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fevents.c;h=f2f645933e6be727a2e8bb39a4637fffe4740e59;hb=bd2ecae48512ac6b6f79f404b1190bb259ac52c8;hp=24106461affff97d5be9f3fef5ac0134b6ea4db2;hpb=343ecd1bed93fa862903ff981ede342825f14401;p=rocksndiamonds.git

diff --git a/src/events.c b/src/events.c
index 24106461..f2f64593 100644
--- a/src/events.c
+++ b/src/events.c
@@ -43,6 +43,7 @@ static boolean stop_processing_events = FALSE;
 
 
 // forward declarations for internal use
+static void ClearTouchInfo(void);
 static void HandleNoEvent(void);
 static void HandleEventActions(void);
 
@@ -407,6 +408,7 @@ void ClearEventQueue(void)
 	button_status = MB_RELEASED;
 	break;
 
+      case EVENT_FINGERRELEASE:
       case EVENT_KEYRELEASE:
 	ClearPlayerAction();
 	break;
@@ -442,6 +444,10 @@ void ClearPlayerAction(void)
     stored_player[i].snap_action = 0;
   }
 
+  // simulate finger release events for still pressed virtual buttons
+  overlay.grid_button_action = JOY_NO_ACTION;
+
+  ClearTouchInfo();
   ClearJoystickState();
   ClearPlayerMouseAction();
 }
@@ -667,19 +673,10 @@ void HandleWindowEvent(WindowEvent *event)
 	// check if screen orientation has changed (should always be true here)
 	if (nr != GRID_ACTIVE_NR())
 	{
-	  int x, y;
-
 	  if (game_status == GAME_MODE_SETUP)
 	    RedrawSetupScreenAfterScreenRotation(nr);
 
-	  nr = GRID_ACTIVE_NR();
-
-	  overlay.grid_xsize = setup.touch.grid_xsize[nr];
-	  overlay.grid_ysize = setup.touch.grid_ysize[nr];
-
-	  for (x = 0; x < MAX_GRID_XSIZE; x++)
-	    for (y = 0; y < MAX_GRID_YSIZE; y++)
-	      overlay.grid_button[x][y] = setup.touch.grid_button[nr][x][y];
+	  SetOverlayGridSizeAndButtons();
 	}
       }
     }
@@ -698,6 +695,24 @@ static struct
   byte action;
 } touch_info[NUM_TOUCH_FINGERS];
 
+static void SetTouchInfo(int pos, SDL_FingerID finger_id, int counter,
+			 Key key, byte action)
+{
+  touch_info[pos].touched = (action != JOY_NO_ACTION);
+  touch_info[pos].finger_id = finger_id;
+  touch_info[pos].counter = counter;
+  touch_info[pos].key = key;
+  touch_info[pos].action = action;
+}
+
+static void ClearTouchInfo(void)
+{
+  int i;
+
+  for (i = 0; i < NUM_TOUCH_FINGERS; i++)
+    SetTouchInfo(i, 0, 0, 0, JOY_NO_ACTION);
+}
+
 static void HandleFingerEvent_VirtualButtons(FingerEvent *event)
 {
   int x = event->x * overlay.grid_xsize;
@@ -807,11 +822,7 @@ static void HandleFingerEvent_VirtualButtons(FingerEvent *event)
 	}
       }
 
-      touch_info[i].touched = TRUE;
-      touch_info[i].finger_id = event->fingerId;
-      touch_info[i].counter = Counter();
-      touch_info[i].key = key;
-      touch_info[i].action = grid_button_action;
+      SetTouchInfo(i, event->fingerId, Counter(), key, grid_button_action);
     }
     else
     {
@@ -823,11 +834,7 @@ static void HandleFingerEvent_VirtualButtons(FingerEvent *event)
 	      getKeyNameFromKey(touch_info[i].key), "KEY_RELEASED", i);
       }
 
-      touch_info[i].touched = FALSE;
-      touch_info[i].finger_id = 0;
-      touch_info[i].counter = 0;
-      touch_info[i].key = 0;
-      touch_info[i].action = JOY_NO_ACTION;
+      SetTouchInfo(i, 0, 0, 0, JOY_NO_ACTION);
     }
   }
 }
@@ -1386,6 +1393,10 @@ static boolean checkTextInputKey(Key key)
   if (game_status == GAME_MODE_PLAYING)
     return FALSE;
 
+  // if Shift or right Alt key is pressed, handle key as text input
+  if ((GetKeyModState() & KMOD_TextInput) != KMOD_None)
+    return TRUE;
+
   // ignore raw keys as text input when not in text input mode
   if (KSYM_RAW(key) && !textinput_status)
     return FALSE;
@@ -1738,7 +1749,7 @@ void HandleButton(int mx, int my, int button, int button_nr)
       break;
 
     case GAME_MODE_PSEUDO_TYPENAME:
-      HandleTypeName(0, KSYM_Return);
+      HandleTypeName(KSYM_Return);
       break;
 
     case GAME_MODE_LEVELS:
@@ -1879,6 +1890,10 @@ static void HandleKeysSpecial(Key key)
     {
       global.show_frames_per_second = !global.show_frames_per_second;
     }
+    else if (strSuffix(cheat_input, ":xsn"))
+    {
+      tile_cursor.xsn_debug = TRUE;
+    }
   }
   else if (game_status == GAME_MODE_PLAYING)
   {
@@ -2282,7 +2297,7 @@ void HandleKey(Key key, int key_status)
   switch (game_status)
   {
     case GAME_MODE_PSEUDO_TYPENAME:
-      HandleTypeName(0, key);
+      HandleTypeName(key);
       break;
 
     case GAME_MODE_TITLE: