Update MZX to work with SDL3 8ea38ebe.

Author: AliceLR

src/SDLmzx.h

@@ -319,7 +319,6 @@ static inline void SDL_SetJoystickEventsEnabled(SDL_bool enabled)
 #define SDL_KMOD_ALT          KMOD_ALT
 #define SDL_KMOD_NUM          KMOD_NUM
 #define SDL_KMOD_CAPS         KMOD_CAPS
-#define SDL_TextInputActive(w) SDL_IsTextInputActive()
 #endif
 
 /**

src/audio/driver_sdl3.c

@@ -50,7 +50,7 @@ static void sdl_audio_callback(void *userdata, SDL_AudioStream *stream,
 
 void init_audio_platform(struct config_info *conf)
 {
-  SDL_AudioDeviceID audio_device = SDL_AUDIO_DEVICE_DEFAULT_OUTPUT;
+  SDL_AudioDeviceID audio_device = SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK;
   int frames = 0;
   char hint[16];
   void *tmp;
@@ -59,7 +59,7 @@ void init_audio_platform(struct config_info *conf)
   audio_format = SAMPLE_S16;
 
   memset(&audio_settings, 0, sizeof(audio_settings));
-  if(SDL_GetAudioDeviceFormat(audio_device, &audio_settings, &frames) < 0)
+  if(!SDL_GetAudioDeviceFormat(audio_device, &audio_settings, &frames))
   {
     // Can't query, try to continue anyway...
     audio_settings.freq = 48000;

src/editor/clipboard_sdl2.c

@@ -44,7 +44,11 @@ void copy_buffer_to_clipboard(char **buffer, int lines, int total_length)
   }
 
   dest_ptr[-1] = 0;
+#if SDL_VERSION_ATLEAST(3,0,0)
+  if(!SDL_SetClipboardText(dest_data))
+#else
   if(SDL_SetClipboardText(dest_data) < 0)
+#endif
     warn("SDL_SetClipboardText failed: %s\n", SDL_GetError());
 
   free(dest_data);

src/event_sdl.c

@@ -974,11 +974,13 @@ static boolean process_event(SDL_Event *event)
   struct buffered_status *status = store_status();
   enum keycode ckey;
 
-#if SDL_VERSION_ATLEAST(2,0,0)
+#if SDL_VERSION_ATLEAST(3,0,0)
+  boolean unicode_fallback = false; // FIXME: this is per-window now
+#elif SDL_VERSION_ATLEAST(2,0,0)
   /* Enable converting keycodes to fake unicode presses when text input isn't
    * active. Enabling text input also enables an onscreen keyboard in some
    * ports, so it isn't always desired. */
-  boolean unicode_fallback = !SDL_TextInputActive(NULL); // FIXME
+  boolean unicode_fallback = !SDL_IsTextInputActive();
 #else
   /* SDL 1.2 might also need this (Pandora? doesn't generate unicode presses). */
   static boolean unicode_fallback = true;

src/platform_sdl.c

@@ -164,7 +164,9 @@ boolean platform_init(void)
     }
   }
 
-#if SDL_VERSION_ATLEAST(2,0,0)
+#if SDL_VERSION_ATLEAST(3,0,0)
+  // FIXME: Can't do this here, because it is per-window.
+#elif SDL_VERSION_ATLEAST(2,0,0)
   /* Most platforms want text input events always on so they can generate
    * convenient unicode text values, but in Android this causes some problems:
    *
@@ -178,7 +180,7 @@ boolean platform_init(void)
    * TODO: this probably redundant with behavior already in SDL.
    */
   if(!SDL_HasScreenKeyboardSupport())
-    SDL_StartTextInput(NULL); // FIXME
+    SDL_StartTextInput();
 #else
   SDL_EnableUNICODE(1);
 #endif

src/render_sdl.c

@@ -81,7 +81,11 @@ static boolean sdl_get_desktop_display_mode(SDL_DisplayMode *display_mode)
   const SDL_DisplayMode *mode;
   int count;
 
-  mode = SDL_GetDesktopDisplayMode(0);
+  SDL_DisplayID id = SDL_GetPrimaryDisplay();
+  if(id == 0)
+    return false;
+
+  mode = SDL_GetDesktopDisplayMode(id);
   if(mode)
   {
     *display_mode = *mode;
@@ -129,8 +133,12 @@ static boolean sdl_get_smallest_usable_display_mode(SDL_DisplayMode *display_mod
   int count;
   int i;
 
-  const SDL_DisplayMode **list =
-   (const SDL_DisplayMode **)SDL_GetFullscreenDisplayModes(0, &count);
+  const SDL_DisplayMode **list;
+  SDL_DisplayID id = SDL_GetPrimaryDisplay();
+  if(id == 0)
+    return false;
+
+  list = (const SDL_DisplayMode **)SDL_GetFullscreenDisplayModes(id, &count);
   if(!list)
     return false;
 
@@ -402,9 +410,12 @@ void sdl_destruct_window(struct graphics_data *graphics)
   }
 
   // Used for 8bpp support for the software renderer.
+  // This is attached to the surface in SDL3 and should not be destroyed.
   if(render_data->palette)
   {
+#if !SDL_VERSION_ATLEAST(3,0,0)
     SDL_DestroyPalette(render_data->palette);
+#endif
     render_data->palette = NULL;
   }
 
@@ -544,7 +555,7 @@ boolean sdl_set_video_mode(struct graphics_data *graphics, int width,
   struct sdl_render_data *render_data = graphics->render_data;
 
 #if SDL_VERSION_ATLEAST(2,0,0)
-  SDL_PixelFormatDetails *format;
+  SDL_Surface *target;
   boolean fullscreen_windowed = graphics->fullscreen_windowed;
   boolean matched = false;
   Uint32 fmt;
@@ -620,35 +631,49 @@ boolean sdl_set_video_mode(struct graphics_data *graphics, int width,
     render_data->shadow = NULL;
   }
 
-  format = render_data->shadow ? render_data->shadow->format :
-                                 render_data->screen->format;
-  render_data->flat_format = format;
+  target = render_data->shadow ? render_data->shadow : render_data->screen;
+#if SDL_VERSION_ATLEAST(3,0,0)
+  render_data->flat_format = SDL_GetPixelFormatDetails(target->format);
+#else
+  render_data->flat_format = target->format;
+#endif
 
   if(fmt == SDL_PIXELFORMAT_INDEX8)
   {
-    render_data->palette = SDL_CreatePalette(SMZX_PAL_SIZE);
+#if SDL_VERSION_ATLEAST(3,0,0)
+    render_data->palette = SDL_CreateSurfacePalette(target);
     if(!render_data->palette)
     {
       warn("Failed to allocate palette: %s\n", SDL_GetError());
       goto err_free;
     }
-    render_data->palette_colors =
-     (SDL_Color *)ccalloc(SMZX_PAL_SIZE, sizeof(SDL_Color));
-    if(!render_data->palette_colors)
+#else
+    render_data->palette = SDL_CreatePalette(SMZX_PAL_SIZE);
+    if(!render_data->palette)
     {
-      warn("Failed to allocate palette colors\n");
+      warn("Failed to allocate palette: %s\n", SDL_GetError());
       goto err_free;
     }
 
-    if(SDL_SetPixelFormatPalette(format, render_data->palette))
+    if(SDL_SetPixelFormatPalette(target->format, render_data->palette))
     {
       warn("Failed to set pixel format palette: %s\n", SDL_GetError());
       goto err_free;
     }
+#endif
+
+    render_data->palette_colors =
+     (SDL_Color *)ccalloc(SMZX_PAL_SIZE, sizeof(SDL_Color));
+    if(!render_data->palette_colors)
+    {
+      warn("Failed to allocate palette colors\n");
+      goto err_free;
+    }
   }
   else
   {
     render_data->palette = NULL;
+    render_data->palette_colors = NULL;
   }
 
   sdl_window_id = SDL_GetWindowID(render_data->window);
@@ -964,7 +989,8 @@ boolean sdlrender_set_video_mode(struct graphics_data *graphics,
   if(!render_data->rgb_to_yuv)
   {
 #if SDL_VERSION_ATLEAST(3,0,0)
-#error wtf
+    render_data->flat_format =
+     SDL_GetPixelFormatDetails(render_data->texture_format);
 #else
     // This is required for SDL_MapRGBA to work, but YUV formats can ignore it.
     render_data->pixel_format = SDL_AllocFormat(render_data->texture_format);