Ticket #2213: beastd-mplayer-vo-gl-sdl2-hack.diff

Makefile

@@ -545 +545 @@
 SRCS_MPLAYER-$(QUARTZ)        += libvo/vo_quartz.c libvo/osx_common.c
 SRCS_MPLAYER-$(S3FB)          += libvo/vo_s3fb.c
 SRCS_MPLAYER-$(SDL)           += libao2/ao_sdl.c                        \
-                                 libvo/vo_sdl.c                         \
                                  libvo/sdl_common.c
 SRCS_MPLAYER-$(SGIAUDIO)      += libao2/ao_sgi.c
 SRCS_MPLAYER-$(SNDIO)         += libao2/ao_sndio.c

configure

@@ -5374 +5374 @@
 def_sdl_sdl_h="#undef CONFIG_SDL_SDL_H"
 if test -z "$_sdlconfig" ; then
   if ( sdl-config --version ) >>"$TMPLOG" 2>&1 ; then
-    _sdlconfig="sdl-config"
+    _sdlconfig="pkg-config sdl2"
   else
     _sdlconfig=false
   fi
@@ -5391 +5391 @@
 #undef main
 #endif
 int main(int argc, char *argv[]) {
-  SDL_Init(SDL_INIT_VIDEO|SDL_INIT_NOPARACHUTE);
-  return 0;
+  SDL_Init(SDL_INIT_VIDEO);
+  return SDLK_KP_0; // will only be defined in SDL2
 }
 EOF
   _sdl=no
@@ -5403 +5403 @@
       break
     fi
   done
-  if test "$_sdl" = no && "$_sdlconfig" --version >>"$TMPLOG" 2>&1 ; then
+  if test "$_sdl" = no && $_sdlconfig --version >>"$TMPLOG" 2>&1 ; then
     res_comment="using $_sdlconfig"
     if cygwin ; then
       inc_tmp="$($_sdlconfig --cflags | cut -d " " -f 1,5,6 | sed s/no-cygwin/cygwin/)"
@@ -5483 +5483 @@
   HDC dc;
   wglCreateContext(dc);
 #elif defined(GL_SDL)
-  SDL_GL_SwapBuffers();
+  SDL_GL_SwapWindow(NULL);
 #elif defined(GL_EGL_X11) || defined(GL_EGL_ANDROID)
   EGLDisplay eglDisplay = EGL_NO_DISPLAY;
   eglInitialize(eglDisplay, NULL, NULL);

libvo/gl_common.c

@@ -2384 +2384 @@
 #ifdef CONFIG_GL_SDL
 #include "sdl_common.h"
 
+extern SDL_Window *sdl_wnd;
 static void swapGlBuffers_sdl(MPGLContext *ctx) {
-  SDL_GL_SwapBuffers();
+  SDL_GL_SwapWindow(sdl_wnd);
 }
 
 static void *sdlgpa(const GLubyte *name) {
   return SDL_GL_GetProcAddress(name);
 }
 
+extern SDL_GLContext *sdl_glctx;
 static int setGlWindow_sdl(MPGLContext *ctx) {
-  if (!sdl_set_mode(0, SDL_OPENGL | SDL_RESIZABLE))
+  if (!sdl_set_mode(0, SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE))
     return SET_WINDOW_FAILED;
-  SDL_GL_LoadLibrary(NULL);
+  if (!SDL_GL_CreateContext(sdl_wnd)) {
+    return SET_WINDOW_FAILED;
+  }
   getFunctions(sdlgpa, NULL);
   gpu_def_sl_program = 0;
   gpu_yuv_sl_program = 0;
@@ -2408 +2412 @@
   while (SDL_PollEvent(&event)) {
     res |= sdl_default_handle_event(&event);
   }
-  // poll "events" from within MPlayer code
-  res |= sdl_default_handle_event(NULL);
   if (res & VO_EVENT_RESIZE)
-    sdl_set_mode(0, SDL_OPENGL | SDL_RESIZABLE);
+    sdl_set_mode(0, SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE);
   return res;
 }
 
@@ -2655 +2657 @@
   aspect_save_screenres(vo_screenwidth, vo_screenheight);
 }
 
+//XXX: There seems to a bug if this function returns -1
 int init_mpglcontext(MPGLContext *ctx, enum MPGLType type) {
   if (type == GLTYPE_AUTO) {
     int res = init_mpglcontext(ctx, GLTYPE_W32);

libvo/sdl_common.c

@@ -31 +31 @@
 static int old_w;
 static int old_h;
 static int mode_flags;
-static int reinit;
+SDL_Window  *sdl_wnd; //XXX: should rather be private
 
 /**
  * Update vo_screenwidth and vo_screenheight.
@@ -43 +43 @@
  * update_xinerama_info function.
  */
 static void get_screensize(void) {
-    const SDL_VideoInfo *vi;
-    // TODO: better to use a check that gets the runtime version instead?
-#if SDL_VERSION_ATLEAST(1, 2, 10)
-    // Keep user-provided settings
+    SDL_DisplayMode mode;
+    int num_displays;
+
     if (vo_screenwidth > 0 || vo_screenheight > 0) return;
-    vi = SDL_GetVideoInfo();
-    vo_screenwidth  = vi->current_w;
-    vo_screenheight = vi->current_h;
-#endif
+
+    num_displays = SDL_GetNumVideoDisplays();
+    mp_msg(MSGT_VO, MSGL_INFO, "[sdl] Number of displays: %d\n", num_displays);
+    if (num_displays <= 0) return;
+
+    if (SDL_GetDesktopDisplayMode(0, &mode) < 0) {
+      mp_msg(MSGT_VO, MSGL_ERR, "[sdl] Could not get display mode: %s\n", SDL_GetError());
+    }
+    mp_msg(MSGT_VO, MSGL_INFO, "[sdl] Size of display #0: %dx%d\n", mode.w, mode.h);
+    vo_screenwidth  = mode.w;
+    vo_screenheight = mode.h;
 }
 
 int vo_sdl_init(void)
 {
-    reinit = 0;
-
     if (!SDL_WasInit(SDL_INIT_VIDEO)) {
-        // Unfortunately SDL_WINDOWID must be set at SDL_Init
-        // and is ignored afterwards, thus it cannot work per-file.
-        // Also, a value of 0 does not work for selecting the root window.
-        if (WinID > 0) {
-            char envstr[20];
-            snprintf(envstr, sizeof(envstr), "0x%"PRIx64, WinID);
-            setenv("SDL_WINDOWID", envstr, 1);
-        }
         if (SDL_Init(SDL_INIT_VIDEO|SDL_INIT_NOPARACHUTE) < 0)
             return 0;
     }
 
-    // Setup Keyrepeats (500/30 are defaults)
-    SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, 100 /*SDL_DEFAULT_REPEAT_INTERVAL*/);
-
-    // Easiest way to get uppercase characters
-    SDL_EnableUNICODE(1);
-
     // We don't want those in our event queue.
-    SDL_EventState(SDL_ACTIVEEVENT, SDL_IGNORE);
     SDL_EventState(SDL_SYSWMEVENT, SDL_IGNORE);
     SDL_EventState(SDL_USEREVENT, SDL_IGNORE);
 
@@ -96 +85 @@
 
 int vo_sdl_config(int w, int h, int flags, const char *title)
 {
-    SDL_WM_SetCaption(title, NULL);
+    SDL_SetWindowTitle(sdl_wnd, title);
     vo_dwidth  = old_w = w;
     vo_dheight = old_h = h;
     vo_fs = !!(flags & VOFLAG_FULLSCREEN);
@@ -110 +99 @@
 
 void vo_sdl_fullscreen(void)
 {
+    SDL_SetWindowFullscreen(sdl_wnd, vo_fs ? 0 : SDL_WINDOW_FULLSCREEN_DESKTOP);
+    SDL_ShowCursor(vo_fs ? SDL_ENABLE : SDL_DISABLE);
     if (vo_fs) {
         vo_dwidth  = old_w;
         vo_dheight = old_h;
     } else {
+        SDL_DisplayMode mode;
+        SDL_GetWindowDisplayMode(sdl_wnd, &mode);
+        vo_screenwidth  = mode.w;
+        vo_screenheight = mode.h;
         old_w = vo_dwidth;
         old_h = vo_dheight;
         vo_dwidth  = vo_screenwidth;
         vo_dheight = vo_screenheight;
     }
     vo_fs = !vo_fs;
-    sdl_set_mode(0, mode_flags);
-    // on OSX at least we now need to do a full reinit.
-    // TODO: this should only be set if really necessary.
-    reinit = 1;
 }
 
 SDL_Surface *sdl_set_mode(int bpp, uint32_t flags)
 {
-    SDL_Surface *s;
     mode_flags = flags;
-    if (vo_fs) flags |= SDL_FULLSCREEN;
-    // doublebuf with opengl creates flickering
-#if !defined( __AMIGAOS4__ ) && !defined( __APPLE__ )
-    if (vo_doublebuffering && !(flags & SDL_OPENGL))
-        flags |= SDL_DOUBLEBUF;
-#endif
     if (!vo_border)
-        flags |= SDL_NOFRAME;
+        flags |= SDL_WINDOW_BORDERLESS;
     if (geometry_xy_changed) {
         char envstr[20];
         snprintf(envstr, sizeof(envstr), "%i,%i", vo_dx, vo_dy);
         setenv("SDL_VIDEO_WINDOW_POS", envstr, 1);
     }
-    s = SDL_SetVideoMode(vo_dwidth, vo_dheight, bpp, flags);
-    if (!s) {
+    if (sdl_wnd)
+        SDL_DestroyWindow(sdl_wnd);
+    sdl_wnd = SDL_CreateWindow(
+      "SDL2",
+      SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
+      vo_dwidth, vo_dheight,
+      flags
+    );
+    if (!sdl_wnd) {
       mp_msg(MSGT_VO, MSGL_FATAL, "SDL SetVideoMode failed: %s\n", SDL_GetError());
       return NULL;
     }
-    vo_dwidth  = s->w;
-    vo_dheight = s->h;
-    return s;
+    SDL_GetWindowSize(sdl_wnd, &vo_dwidth, &vo_dheight);
+    return (SDL_Surface *)sdl_wnd; // XXX/FIXME: actually plain wrong, but we won't end up in an endless loop initing vo gl
 }
 
 static const struct mp_keymap keysym_map[] = {
@@ -164 +154 @@
     {SDLK_UP, KEY_UP}, {SDLK_DOWN, KEY_DOWN},
     {SDLK_LEFT, KEY_LEFT}, {SDLK_RIGHT, KEY_RIGHT},
     {SDLK_KP_MULTIPLY, '*'}, {SDLK_KP_DIVIDE, '/'},
-    {SDLK_KP0, KEY_KP0}, {SDLK_KP1, KEY_KP1}, {SDLK_KP2, KEY_KP2},
-    {SDLK_KP3, KEY_KP3}, {SDLK_KP4, KEY_KP4}, {SDLK_KP5, KEY_KP5},
-    {SDLK_KP6, KEY_KP6}, {SDLK_KP7, KEY_KP7}, {SDLK_KP8, KEY_KP8},
-    {SDLK_KP9, KEY_KP9},
+    {SDLK_KP_0, KEY_KP0}, {SDLK_KP_1, KEY_KP1}, {SDLK_KP_2, KEY_KP2},
+    {SDLK_KP_3, KEY_KP3}, {SDLK_KP_4, KEY_KP4}, {SDLK_KP_5, KEY_KP5},
+    {SDLK_KP_6, KEY_KP6}, {SDLK_KP_7, KEY_KP7}, {SDLK_KP_8, KEY_KP8},
+    {SDLK_KP_9, KEY_KP9},
     {SDLK_KP_PERIOD, KEY_KPDEC}, {SDLK_KP_ENTER, KEY_KPENTER},
     {0, 0}
 };
@@ -175 +165 @@
 int sdl_default_handle_event(SDL_Event *event)
 {
     int mpkey;
-    if (!event) {
-        int res = reinit ? VO_EVENT_REINIT : 0;
-        reinit = 0;
-        return res;
-    }
     switch (event->type) {
-    case SDL_VIDEORESIZE:
-        vo_dwidth  = event->resize.w;
-        vo_dheight = event->resize.h;
+    case SDL_WINDOWEVENT_RESIZED:
+        vo_dwidth  = event->window.data1;
+        vo_dheight = event->window.data2;
         return VO_EVENT_RESIZE;
 
-    case SDL_VIDEOEXPOSE:
+    case SDL_WINDOWEVENT_EXPOSED:
         return VO_EVENT_EXPOSE;
 
     case SDL_MOUSEMOTION:
@@ -206 +191 @@
     case SDL_KEYDOWN:
         mpkey = lookup_keymap_table(keysym_map, event->key.keysym.sym);
         if (!mpkey &&
-            event->key.keysym.unicode > 0 &&
-            event->key.keysym.unicode < 128)
-            mpkey = event->key.keysym.unicode;
+            event->key.keysym.sym > 0 &&
+            event->key.keysym.sym < 128)
+            mpkey = (char)event->key.keysym.sym;
+            if (mpkey >= 'a' && mpkey <= 'z' &&
+                event->key.keysym.mod & KMOD_SHIFT) {
+                mpkey -= 32;
+            }
         if (mpkey)
             mplayer_put_key(mpkey);
         break;

libvo/sdl_common.h

@@ -24 +24 @@
 #include "config.h"
 #include <stdint.h>
 #ifdef CONFIG_SDL_SDL_H
-#include <SDL/SDL.h>
+#include <SDL2/SDL.h>
 #else
 #include <SDL.h>
 #endif

libvo/video_out.c

@@ -208 +208 @@
         &video_out_x11,
         &video_out_xover,
 #endif
-#ifdef CONFIG_SDL
-        &video_out_sdl,
-#endif
 #ifdef CONFIG_GL
         &video_out_gl,
 #endif