X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_vout_window.h;h=14e6db7c669aaad6bef36e6e74b739624b743881;hb=bf7822fe956f24303563b040156f6c4abaf75df6;hp=ee54e31772fa7569687cd2946a290a1a73404eee;hpb=1329ce1e1cf65d99ac6a3f1cc4ccd3d0da42d010;p=vlc

diff --git a/include/vlc_vout_window.h b/include/vlc_vout_window.h
index ee54e31772..14e6db7c66 100644
--- a/include/vlc_vout_window.h
+++ b/include/vlc_vout_window.h
@@ -49,8 +49,9 @@ enum {
  * Control query for vout_window_t
  */
 enum {
-    VOUT_WINDOW_SET_ON_TOP, /* int b_on_top */
-    VOUT_WINDOW_SET_SIZE,   /* int i_width, int i_height */
+    VOUT_WINDOW_SET_STATE, /* unsigned state */
+    VOUT_WINDOW_SET_SIZE,   /* unsigned i_width, unsigned i_height */
+    VOUT_WINDOW_SET_FULLSCREEN, /* int b_fullscreen */
 };
 
 typedef struct {
@@ -77,9 +78,6 @@ typedef struct {
 struct vout_window_t {
     VLC_COMMON_MEMBERS
 
-    /* Module */
-    module_t *module;
-
     /* Initial state (reserved).
      * Once the open function is called, it will be set to NULL
      */
@@ -92,7 +90,12 @@ struct vout_window_t {
     union {
         void     *hwnd;   /* Win32 window handle */
         uint32_t xid;     /* X11 windows ID */
-    } handle;
+    };
+
+    /* display server (mandatory) */
+    union {
+        char     *x11_display; /* X11 display (NULL = use default) */
+    };
 
     /* Control on the module (mandatory)
      *
@@ -131,20 +134,29 @@ VLC_EXPORT( void, vout_window_Delete, (vout_window_t *) );
 VLC_EXPORT( int, vout_window_Control, (vout_window_t *, int query, ...) );
 
 /**
- * Configure the "On Top" properties of a windows.
+ * Configure the window management state of a windows.
  */
-static inline int vout_window_SetOnTop(vout_window_t *window, bool is_on_top)
+static inline int vout_window_SetState(vout_window_t *window, unsigned state)
 {
-    return vout_window_Control(window, VOUT_WINDOW_SET_ON_TOP, is_on_top);
+    return vout_window_Control(window, VOUT_WINDOW_SET_STATE, state);
 }
 
 /**
  * Configure the windows display size.
  */
-static inline int vout_window_SetSize(vout_window_t *window, int width, int height)
+static inline int vout_window_SetSize(vout_window_t *window,
+                                      unsigned width, unsigned height)
 {
     return vout_window_Control(window, VOUT_WINDOW_SET_SIZE, width, height);
 }
 
+/**
+ * Configure the windows fullscreen mode.
+ */
+static inline int vout_window_SetFullScreen(vout_window_t *window, bool full)
+{
+    return vout_window_Control(window, VOUT_WINDOW_SET_FULLSCREEN, full);
+}
+
 #endif /* VLC_VOUT_WINDOW_H */