atari:events: remove proxy Atari events driver

It was more confusing than helping. Atari_InitOSKeymap() set this->InitOSKeymap and then called it immediately afterwards and Atari_PumpEvents() was never even called.
de4me · Jun 29, 2024 · 30e74f7 · 30e74f7
1 parent 975e4d8
commit 30e74f7
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 28 deletions.
diff --git a/src/video/ataricommon/SDL_atarievents.c b/src/video/ataricommon/SDL_atarievents.c
@@ -26,7 +26,7 @@
  *
  *	Patrice Mandin
  *
- *	This routines choose what the final event manager will be
+ *	These routines choose what the final event manager will be
  */
 
 #include <mint/osbind.h>
@@ -40,8 +40,8 @@
 
 #include "SDL_atarikeys.h"
 #include "SDL_atarievents_c.h"
-#include "SDL_xbiosevents_c.h"
 #include "SDL_ikbdevents_c.h"
+#include "SDL_xbiosevents_c.h"
 
 /* from src/audio/mint/SDL_mintaudio.c */
 void SDL_AtariMint_UpdateAudio(void);
@@ -58,7 +58,7 @@ static const char *keytab_shift;
 static SDL_bool conterm_set;
 static char old_conterm;
 
-static void Atari_InitializeEvents(_THIS)
+void SDL_Atari_InitializeEvents(_THIS)
 {
 	const char *envr;
 
@@ -90,16 +90,8 @@ static void Atari_InitializeEvents(_THIS)
 		this->PumpEvents=AtariXbios_PumpEvents;
 		XBIOS_ShutdownEvents=AtariXbios_ShutdownEvents;
 	}
-}
-
-void Atari_InitOSKeymap(_THIS)
-{
-	Atari_InitializeEvents(this);
 
 	SDL_Atari_InitInternalKeymap(this);
-
-	/* Call choosen routine */
-	this->InitOSKeymap(this);
 }
 
 void SDL_Atari_InitConsoleSettings(void)
@@ -173,14 +165,6 @@ void SDL_Atari_InitInternalKeymap(_THIS)
 	keymap[SCANCODE_ALTGR] = SDLK_MODE;
 }
 
-void Atari_PumpEvents(_THIS)
-{
-	Atari_InitializeEvents(this);
-
-	/* Call choosen routine */
-	this->PumpEvents(this);
-}
-
 /* Atari to Unicode charset translation table */
 const static Uint16 SDL_AtariToUnicodeTable[256]={
 	/* Standard ASCII characters from 0x00 to 0x7e */

diff --git a/src/video/ataricommon/SDL_atarievents_c.h b/src/video/ataricommon/SDL_atarievents_c.h
@@ -38,10 +38,9 @@
 
 #define ATARIBIOS_MAXKEYS 128
 
-extern void Atari_InitOSKeymap(_THIS);
-extern void Atari_PumpEvents(_THIS);
+extern void SDL_Atari_InitializeEvents(_THIS);
 
-extern void SDL_Atari_InitConsoleSettings(void);
+extern void SDL_Atari_InitializeConsoleSettings(void);
 extern void SDL_Atari_RestoreConsoleSettings(void);
 
 extern void SDL_Atari_InitInternalKeymap(_THIS);

diff --git a/src/video/gem/SDL_gemevents.c b/src/video/gem/SDL_gemevents.c
@@ -223,7 +223,7 @@ static int do_messages(_THIS, short *message, short latest_msg_id)
 		case WM_ONTOP:
 			SDL_PrivateAppActive(1, SDL_APPINPUTFOCUS);
 			VDI_setpalette(this, VDI_curpalette);
-			SDL_Atari_InitConsoleSettings();
+			SDL_Atari_InitializeConsoleSettings();
 			break;
 		case WM_REDRAW:
 			if (!GEM_lock_redraw) {

diff --git a/src/video/gem/SDL_gemvideo.c b/src/video/gem/SDL_gemvideo.c
@@ -512,7 +512,7 @@ int GEM_VideoInit(_THIS, SDL_PixelFormat *vformat)
 	this->info.wm_available = 1;
 
 	/* Save & init CON: */
-	SDL_Atari_InitConsoleSettings();
+	SDL_Atari_InitializeConsoleSettings();
 
 	/* We're done! */
 	return(0);

diff --git a/src/video/xbios/SDL_xbios.c b/src/video/xbios/SDL_xbios.c
@@ -195,9 +195,8 @@ static SDL_VideoDevice *XBIOS_CreateDevice(int devindex)
 	device->GL_SwapBuffers = XBIOS_GL_SwapBuffers;
 #endif
 
-	/* Events */
-	device->InitOSKeymap = Atari_InitOSKeymap;
-	device->PumpEvents = Atari_PumpEvents;
+	/* Events (XBIOS/IKBD driver) */
+	SDL_Atari_InitializeEvents(device);
 
 	device->free = XBIOS_DeleteDevice;
 
@@ -382,7 +381,7 @@ static int XBIOS_VideoInit(_THIS, SDL_PixelFormat *vformat)
 	}
 
 	/* Save & init CON: */
-	SDL_Atari_InitConsoleSettings();
+	SDL_Atari_InitializeConsoleSettings();
 
 	/* We're done! */
 	return(0);