Qt4: Tell the window manager to keep the fullscreen controller window on top.

[vlc] / modules / video_output / msw / glwin32.c

diff --git a/modules/video_output/msw/glwin32.c b/modules/video_output/msw/glwin32.c
index 7601fd9403bf09ac1488f4f7d0995dd323dd035d..7a76f3187fa038b4905f8b7a22505e64631b60a6 100644 (file)
--- a/modules/video_output/msw/glwin32.c
+++ b/modules/video_output/msw/glwin32.c
@@ -32,7 +32,6 @@
 #include <ddraw.h>
 #include <commctrl.h>
 
-#include <multimon.h>
 #undef GetSystemMetrics
 
 #ifndef MONITOR_DEFAULTTONEAREST
@@ -53,34 +52,21 @@ vlc_module_begin()
     set_subcategory(SUBCAT_VIDEO_VOUT)
     set_shortname("OpenGL")
     set_description(N_("OpenGL video output"))
-    set_capability("vout display", 20)
-    add_shortcut("glwin32")
-    add_shortcut("opengl")
+    set_capability("vout display", 160)
+    add_shortcut("glwin32", "opengl")
     set_callbacks(Open, Close)
-
-    /* FIXME: Hack to avoid unregistering our window class */
-    linked_with_a_crap_library_which_uses_atexit ()
 vlc_module_end()
 
-#if 0 /* FIXME */
-    /* check if we registered a window class because we need to
-     * unregister it */
-    WNDCLASS wndclass;
-    if(GetClassInfo(GetModuleHandle(NULL), "VLC DirectX", &wndclass))
-        UnregisterClass("VLC DirectX", GetModuleHandle(NULL));
-#endif
-
-
 /*****************************************************************************
  * Local prototypes.
  *****************************************************************************/
-static picture_t *Get    (vout_display_t *);
-static void       Prepare(vout_display_t *, picture_t *);
-static void       Display(vout_display_t *, picture_t *);
-static int        Control(vout_display_t *, int, va_list);
-static void       Manage (vout_display_t *);
+static picture_pool_t *Pool  (vout_display_t *, unsigned);
+static void           Prepare(vout_display_t *, picture_t *, subpicture_t *);
+static void           Display(vout_display_t *, picture_t *, subpicture_t *);
+static int            Control(vout_display_t *, int, va_list);
+static void           Manage (vout_display_t *);
 
-static void       Swap   (vout_opengl_t *);
+static void           Swap   (vlc_gl_t *);
 
 /**
  * It creates an OpenGL vout display.
@@ -133,14 +119,15 @@ static int Open(vlc_object_t *object)
 
     vout_display_info_t info = vd->info;
     info.has_double_click = true;
-    info.has_hide_mouse = true;
+    info.has_hide_mouse = false;
     info.has_pictures_invalid = true;
+    info.has_event_thread = true;
 
    /* Setup vout_display now that everything is fine */
     vd->fmt  = fmt;
     vd->info = info;
 
-    vd->get     = Get;
+    vd->pool    = Pool;
     vd->prepare = Prepare;
     vd->display = Display;
     vd->control = Control;
@@ -177,32 +164,32 @@ static void Close(vlc_object_t *object)
 }
 
 /* */
-static picture_t *Get(vout_display_t *vd)
+static picture_pool_t *Pool(vout_display_t *vd, unsigned count)
 {
     vout_display_sys_t *sys = vd->sys;
+    VLC_UNUSED(count);
 
-    if (!sys->pool) {
+    if (!sys->pool)
         sys->pool = vout_display_opengl_GetPool(&sys->vgl);
-        if (!sys->pool)
-            return NULL;
-    }
-    return picture_pool_Get(sys->pool);
+    return sys->pool;
 }
 
-static void Prepare(vout_display_t *vd, picture_t *picture)
+static void Prepare(vout_display_t *vd, picture_t *picture, subpicture_t *subpicture)
 {
     vout_display_sys_t *sys = vd->sys;
 
     vout_display_opengl_Prepare(&sys->vgl, picture);
+    VLC_UNUSED(subpicture);
 }
 
-static void Display(vout_display_t *vd, picture_t *picture)
+static void Display(vout_display_t *vd, picture_t *picture, subpicture_t *subpicture)
 {
     vout_display_sys_t *sys = vd->sys;
 
     vout_display_opengl_Display(&sys->vgl, &vd->source);
 
     picture_Release(picture);
+    VLC_UNUSED(subpicture);
 
     CommonDisplay(vd);
 }
@@ -211,8 +198,10 @@ static int Control(vout_display_t *vd, int query, va_list args)
 {
     switch (query) {
     case VOUT_DISPLAY_GET_OPENGL: {
-        vout_opengl_t **gl = va_arg(args, vout_opengl_t **);
+        vlc_gl_t **gl = va_arg(args, vlc_gl_t **);
         *gl = &vd->sys->gl;
+
+        CommonDisplay(vd);
         return VLC_SUCCESS;
     }
     default:
@@ -231,7 +220,7 @@ static void Manage (vout_display_t *vd)
     glViewport(0, 0, width, height);
 }
 
-static void Swap(vout_opengl_t *gl)
+static void Swap(vlc_gl_t *gl)
 {
     vout_display_t *vd = gl->sys;