From a1b62b2a71f3c7b60f6e72cbae08007038fb5e00 Mon Sep 17 00:00:00 2001
From: notaz <notasas@gmail.com>
Date: Sun, 4 May 2025 18:47:32 +0300
Subject: [PATCH] don't pretend SDL_REDRAW_EVT can be disabled

in_sdl_update_analog() relies on it
---
 in_sdl.c | 8 --------
 input.c  | 4 ----
 2 files changed, 12 deletions(-)

diff --git a/in_sdl.c b/in_sdl.c
index 64df96d..df94b91 100644
--- a/in_sdl.c
+++ b/in_sdl.c
@@ -24,10 +24,8 @@ struct in_sdl_state {
 	SDL_Joystick *joy;
 	int joy_id;
 	int axis_keydown[2];
-#ifdef SDL_REDRAW_EVT
 	int redraw;
 	SDL_Event revent;
-#endif
 	SDL_Event mevent; // last mouse event
 	keybits_t keystate[SDLK_LAST / KEYBITS_WORD_BITS + 1];
 	// emulator keys should always be processed immediately lest one is lost
@@ -383,7 +381,6 @@ static int collect_events(struct in_sdl_state *state, int *one_kc, int *one_down
 						SDL_PushEvent(event);
 						break;
 					default:
-#ifdef SDL_REDRAW_EVT
 						if (event->type == SDL_VIDEORESIZE) {
 							state->redraw = 1;
 							state->revent = *event;
@@ -393,7 +390,6 @@ static int collect_events(struct in_sdl_state *state, int *one_kc, int *one_down
 								state->revent.type = SDL_VIDEOEXPOSE;
 							}
 						} else
-#endif
 						if ((event->type == SDL_MOUSEBUTTONDOWN) ||
 						    (event->type == SDL_MOUSEBUTTONUP)) {
 							int mask = SDL_BUTTON(event->button.button);
@@ -420,7 +416,6 @@ static int collect_events(struct in_sdl_state *state, int *one_kc, int *one_down
 		}
 	}
 
-#ifdef SDL_REDRAW_EVT
 	// if the event queue has been emptied and resize/expose events were in it
 	if (state->redraw && count == 0) {
 		if (ext_event_handler != NULL)
@@ -436,7 +431,6 @@ static int collect_events(struct in_sdl_state *state, int *one_kc, int *one_down
 		if (one_down != NULL)
 			*one_down = 1;
 	} else
-#endif
 		i++;
 	// don't lose events other devices might want to handle
 	if (i < count)
@@ -569,11 +563,9 @@ static int in_sdl_menu_translate(void *drv_data, int keycode, char *charcode)
 	}
 	else
 	{
-#ifdef SDL_REDRAW_EVT
 		if (keycode == SDLK_UNKNOWN)
 			ret = PBTN_RDRAW;
 		else
-#endif
 		for (i = 0; i < map_len; i++) {
 			if (map[i].key == keycode) {
 				ret = map[i].pbtn;
diff --git a/input.c b/input.c
index bf05773..b170a47 100644
--- a/input.c
+++ b/input.c
@@ -398,10 +398,8 @@ int in_update_keycode(int *dev_id_out, int *is_down_out, char *charcode, int tim
 	if (in_have_async_devs) {
 		result = in_update_kc_async(&dev_id, &is_down, timeout_ms);
 		if (result == -1) {
-#ifdef SDL_REDRAW_EVT
 			// no key up event for RDRAW, clear to avoid key repeat
 			menu_key_state &= ~PBTN_RDRAW;
-#endif
 			return -1;
 		}
 		drv = &DRV(in_devices[dev_id].drv_id);
@@ -504,9 +502,7 @@ int in_menu_wait(int interesting, char *charcode, int autorep_delay_ms)
 		wait = autorep_delay_ms;
 
 	/* wait until either key repeat or a new key has been pressed */
-#ifdef SDL_REDRAW_EVT
 	interesting |= PBTN_RDRAW;
-#endif
 	do {
 		ret = in_menu_wait_any(charcode, wait);
 		if (ret == 0 || ret != menu_key_prev)
-- 
2.39.5