Win32 skins: reorder includes to fix warnings

[vlc] / modules / gui / skins2 / x11 / x11_window.hpp

diff --git a/modules/gui/skins2/x11/x11_window.hpp b/modules/gui/skins2/x11/x11_window.hpp
index e616710ce2cb06314ac74a96018770d397f007c1..c8ffa96e490d19f3ac15d58daf4b941ccef88c43 100644 (file)
--- a/modules/gui/skins2/x11/x11_window.hpp
+++ b/modules/gui/skins2/x11/x11_window.hpp
@@ -5,7 +5,7 @@
  * $Id$
  *
  * Authors: Cyril Deguet     <asmax@via.ecp.fr>
- *          Olivier Teulière <ipkiss@via.ecp.fr>
+ *          Olivier Teulière <ipkiss@via.ecp.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,16 +17,18 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef X11_WINDOW_HPP
 #define X11_WINDOW_HPP
 
 #include <X11/Xlib.h>
+#include <X11/Xatom.h>
 
+#include "../src/generic_window.hpp"
 #include "../src/os_window.hpp"
 
 class X11Display;
@@ -36,46 +38,64 @@ class X11DragDrop;
 /// X11 implementation of OSWindow
 class X11Window: public OSWindow
 {
-    public:
-        X11Window( intf_thread_t *pIntf, GenericWindow &rWindow,
-                   X11Display &rDisplay, bool dragDrop, bool playOnDrop,
-                   X11Window *pParentWindow );
-
-        virtual ~X11Window();
-
-        // Show the window
-        virtual void show( int left, int top ) const;
-
-        // Hide the window
-        virtual void hide() const;
-
-        /// Move the window
-        virtual void moveResize( int left, int top,
-                                 int width, int height ) const;
-
-        /// Bring the window on top
-        virtual void raise() const;
-
-        /// Set the opacity of the window (0 = transparent, 255 = opaque)
-        virtual void setOpacity( uint8_t value ) const;
-
-        /// Toggle the window on top
-        virtual void toggleOnTop( bool onTop ) const;
-
-        /// Get the window ID
-        Window getDrawable() const { return m_wnd; }
-
-    private:
-        /// X11 display
-        X11Display &m_rDisplay;
-        /// Window ID
-        Window m_wnd;
-        /// Parent window
-        X11Window *m_pParent;
-        /// Indicates whether the window handles drag&drop events
-        bool m_dragDrop;
-        /// Drop target
-        X11DragDrop *m_pDropTarget;
+public:
+    X11Window( intf_thread_t *pIntf, GenericWindow &rWindow,
+               X11Display &rDisplay, bool dragDrop, bool playOnDrop,
+               X11Window *pParentWindow, GenericWindow::WindowType_t );
+
+    virtual ~X11Window();
+
+    // Show the window
+    virtual void show() const;
+
+    // Hide the window
+    virtual void hide() const;
+
+    /// Move the window
+    virtual void moveResize( int left, int top,
+                             int width, int height ) const;
+
+    /// Bring the window on top
+    virtual void raise() const;
+
+    /// Set the opacity of the window (0 = transparent, 255 = opaque)
+    virtual void setOpacity( uint8_t value ) const;
+
+    /// Toggle the window on top
+    virtual void toggleOnTop( bool onTop ) const;
+
+    /// Get the window ID
+    Window getDrawable() const { return m_wnd; }
+
+    /// Getter for the handler
+    uint32_t getOSHandle() const { return m_wnd; }
+
+    /// Getter for the handler
+    uint32_t getParentOSHandle() const { return m_wnd_parent; }
+
+    /// reparent the window
+    void reparent( uint32_t OSHandle, int x, int y, int w, int h );
+
+    /// invalidate a window surface
+    bool invalidateRect( int x, int y, int w, int h ) const;
+
+    void setFullscreen() const;
+
+private:
+    /// X11 display
+    X11Display &m_rDisplay;
+    /// Window ID
+    Window m_wnd;
+    /// Window ID
+    Window m_wnd_parent;
+    /// Parent window
+    X11Window *m_pParent;
+    /// Indicates whether the window handles drag&drop events
+    bool m_dragDrop;
+    /// Drop target
+    X11DragDrop *m_pDropTarget;
+    /// window type
+    GenericWindow::WindowType_t m_type;
 };