Changeset 24648f43cf4371f6c6d6d78db2f5ae755f810cc8

Timestamp:

06/04/06 01:57:40 (2 years ago)

Author:

Olivier Teulière <ipkiss@videolan.org>

git-committer:

Olivier Teulière <ipkiss@videolan.org> 1149379060 +0000

git-parent:

[fef44fa9395f5d7c7fa1a80c6725f877affa3fad]

git-author:

Olivier Teulière <ipkiss@videolan.org> 1149379060 +0000

Message:

• modules/gui/skins2/*:
  
  • anchors have a new "lefttop" attribute, allowing them to follow the
    border of the window when resizing
    
  • the resizing is now handled by the WindowManager? class (to enforce the
    mediator pattern). This makes it possible to handle tricky cases,
    such as:
    

window B is anchored to window A, and A is resized
==> B moves accordingly, and can still be anchored by other windows

Files:

• doc/skins/skins2-howto.xml (modified) (1 diff)
• modules/gui/skins2/commands/cmd_resize.cpp (modified) (2 diffs)
• modules/gui/skins2/commands/cmd_resize.hpp (modified) (3 diffs)
• modules/gui/skins2/controls/ctrl_resize.cpp (modified) (6 diffs)
• modules/gui/skins2/controls/ctrl_resize.hpp (modified) (4 diffs)
• modules/gui/skins2/controls/ctrl_video.cpp (modified) (2 diffs)
• modules/gui/skins2/parser/builder.cpp (modified) (3 diffs)
• modules/gui/skins2/parser/builder_data.def (modified) (1 diff)
• modules/gui/skins2/parser/builder_data.hpp (modified) (1 diff)
• modules/gui/skins2/parser/skin_parser.cpp (modified) (1 diff)
• modules/gui/skins2/src/anchor.hpp (modified) (4 diffs)
• modules/gui/skins2/src/generic_layout.cpp (modified) (1 diff)
• modules/gui/skins2/src/window_manager.cpp (modified) (4 diffs)
• modules/gui/skins2/src/window_manager.hpp (modified) (5 diffs)
• modules/gui/skins2/utils/position.hpp (modified) (1 diff)
• share/skins2/skin.dtd (modified) (1 diff)

doc/skins/skins2-howto.xml

@@ -380 +380 @@
-    <para>Default value: 0</para>
-  </sect4>
+  <sect4 id="anchorlefttop">
+    <title>lefttop</title>
+    <para>Indicate to which corner of the Layout the top-left-hand corner of this anchor is attached, in case of resizing. Possible values are 'lefttop', 'leftbottom', 'righttop' and 'rightbottom'.</para>
+    <para>Note that there is no "rightbottom" attribute for the anchors (contrarily to normal controls), because an anchor is not resizable (even when the anchor is not ponctual and follows a Bezier curve).</para>
+    <para>Default value: lefttop</para>
+  </sect4>
-  <sect4 id="anchorpriority">
-    <title>priority</title>

modules/gui/skins2/commands/cmd_resize.cpp

@@ -25 +25 @@
-#include "cmd_resize.hpp"
-#include "../src/generic_layout.hpp"
+#include "../src/window_manager.hpp"
-#include "../src/vlcproc.hpp"
-
-
-GenericLayout &rLayout, int width
-
-Layout( rLayout ), m_width( width
-
+const WindowManager &rWindowManager
+GenericLayout &rLayout, int width, 
+WindowManager( rWindowManager
+rLayout( rLayout ), m_width( width ), m_
-{
-}
@@ -39 +40 @@
-{
-    // Resize the layout
-Layout.resize(
+WindowManager.resize( m_rLayout,
-}
-

modules/gui/skins2/commands/cmd_resize.hpp

@@ -28 +28 @@
-#include "cmd_generic.hpp"
-
+class WindowManager;
-class GenericLayout;
-
@@ -36 +37 @@
-    public:
-        /// Resize the given layout
-GenericLayout &rLayout, int width
-
+const WindowManager &rWindowManager
+GenericLayout &rLayout, int width, 
-        virtual ~CmdResize() {}
-
@@ -47 +48 @@
-
-    private:
+        const WindowManager &m_rWindowManager;
-        GenericLayout &m_rLayout;
-        int m_width, m_height;

modules/gui/skins2/controls/ctrl_resize.cpp

@@ -34 +34 @@
-
-
-
-
-
-
+
+
+
+
+
+
-    m_rLayout( rLayout ), m_direction( direction ),  m_cmdOutStill( this ),
-    m_cmdStillOut( this ),
@@ -104 +106 @@
-
-
-
+WindowManager::
-{
-    OSFactory *pOsFactory = OSFactory::instance( getIntf() );
-
+WindowManager::
-        pOsFactory->changeCursor( OSFactory::kResizeNWSE );
-
+WindowManager::
-        pOsFactory->changeCursor( OSFactory::kResizeNS );
-
+WindowManager::
-        pOsFactory->changeCursor( OSFactory::kResizeWE );
-
+WindowManager::
-        pOsFactory->changeCursor( OSFactory::kDefaultArrow );
-}
@@ -126 +128 @@
-void CtrlResize::CmdStillOut::execute()
-{
-
+WindowManager::
-}
-
@@ -150 +152 @@
-    m_pParent->m_width = m_pParent->m_rLayout.getWidth();
-    m_pParent->m_height = m_pParent->m_rLayout.getHeight();
+
+    m_pParent->m_rWindowManager.startResize( m_pParent->m_rLayout,
+                                             m_pParent->m_direction);
-}
-
@@ -159 +164 @@
-
-    m_pParent->releaseMouse();
+
+    m_pParent->m_rWindowManager.stopResize();
-}
-
@@ -170 +177 @@
-
-    int newWidth = m_pParent->m_width;
+    newWidth += pEvtMotion->getXPos() - m_pParent->m_xPos;
-    int newHeight = m_pParent->m_height;
-
-
-
-
+
-
-
+
+
+
-    CmdGeneric *pCmd = new CmdResize( m_pParent->getIntf(),
+                                      m_pParent->m_rWindowManager,
-                                      m_pParent->m_rLayout,
-                                      newWidth, newHeight );
-    // Push the command in the asynchronous command queue
-m_pParent->
+
-    pQueue->push( CmdGenericPtr( pCmd ) );
-}

modules/gui/skins2/controls/ctrl_resize.hpp

@@ -28 +28 @@
-#include "ctrl_flat.hpp"
-#include "../commands/cmd_generic.hpp"
+#include "../src/window_manager.hpp"
-#include "../utils/fsm.hpp"
+
+class WindowManager;
-
-
@@ -35 +38 @@
-{
-    public:
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-        virtual ~CtrlResize() {}
-
@@ -69 +65 @@
-    private:
-        FSM m_fsm;
+        /// Window manager
+        WindowManager &m_rWindowManager;
-        /// Decorated CtrlFlat
-        CtrlFlat &m_rCtrl;
@@ -78 +76 @@
-        int m_xPos, m_yPos;
-        /// Direction of the resizing
-
+WindowManager::
-
-        /// Change the cursor, based on the given direction
-
+WindowManager::
-
-        /// Callback objects

modules/gui/skins2/controls/ctrl_video.cpp

@@ -27 +27 @@
-#include "../src/os_graphics.hpp"
-#include "../src/vlcproc.hpp"
+#include "../src/window_manager.hpp"
-#include "../commands/async_queue.hpp"
-#include "../commands/cmd_resize.hpp"
@@ -107 +108 @@
-
-    // Create a resize command
-
-
+
+
+
+
+
+
-    // Push the command in the asynchronous command queue
-    AsyncQueue *pQueue = AsyncQueue::instance( getIntf() );
-    pQueue->push( CmdGenericPtr( pCmd ) );
+
+    // FIXME: this should be a command too
+    rWindowManager.stopResize();
-}
-

modules/gui/skins2/parser/builder.cpp

@@ -39 +39 @@
-#include "../src/popup.hpp"
-#include "../src/theme.hpp"
+#include "../src/window_manager.hpp"
-#include "../commands/cmd_generic.hpp"
-#include "../controls/ctrl_button.hpp"
@@ -378 +379 @@
-    m_pTheme->m_curves.push_back( BezierPtr( pCurve ) );
-
-
-
+
+
+
+
+
+
+
-                               *pCurve, *pLayout );
-    pLayout->addAnchor( pAnc );
@@ -560 +566 @@
-    else if( rData.m_actionId == "resizeS" )
-    {
-
+
+
-                UString( getIntf(), rData.m_help.c_str() ), pVisible,
-CtrlResize
+WindowManager
-        pLayout->addControl( pResize, pos, rData.m_layer );
-    }
-    else if( rData.m_actionId == "resizeE" )
-    {
-
+
+
-                UString( getIntf(), rData.m_help.c_str() ), pVisible,
-CtrlResize
+WindowManager
-        pLayout->addControl( pResize, pos, rData.m_layer );
-    }
-    else if( rData.m_actionId == "resizeSE" )
-    {
-
+
+
-                UString( getIntf(), rData.m_help.c_str() ), pVisible,
-CtrlResize
+WindowManager
-        pLayout->addControl( pResize, pos, rData.m_layer );
-    }

modules/gui/skins2/parser/builder_data.def

@@ -9 +9 @@
-Window id:string xPos:int yPos:int visible:bool dragDrop:bool playOnDrop:bool
-Layout id:string width:int height:int minWidth:int maxWidth:int minHeight:int maxHeight:int windowId:string
-
+leftTop:string 
-Button id:string xPos:int yPos:int leftTop:string rightBottom:string visible:string upId:string downId:string overId:string actionId:string tooltip:string help:string layer:int windowId:string layoutId:string
-Checkbox id:string xPos:int yPos:int leftTop:string rightBottom:string visible:string up1Id:string down1Id:string over1Id:string up2Id:string down2Id:string over2Id:string state:string action1:string action2:string tooltip1:string tooltip2:string help:string layer:int windowId:string layoutId:string

modules/gui/skins2/parser/builder_data.hpp

@@ -187 +187 @@
-    struct Anchor
-    {
-
-
-
-
-
+
+
+
+
+
+
-        int m_range;
-        int m_priority;

modules/gui/skins2/parser/skin_parser.cpp

@@ -89 +89 @@
-        CheckDefault( "x", "0" );
-        CheckDefault( "y", "0" );
+        CheckDefault( "lefttop", "lefttop" );
-        CheckDefault( "points", "(0,0)" );
-        CheckDefault( "range", "10" );
-
-        const BuilderData::Anchor anchor( atoi( attr["x"] ) + m_xOffset,
-
-
+
+
+
-        m_pData->m_listAnchor.push_back( anchor );
-    }

modules/gui/skins2/src/anchor.hpp

@@ -29 +29 @@
-#include "generic_layout.hpp"
-#include "../utils/bezier.hpp"
+#include "../utils/position.hpp"
-
-
@@ -35 +36 @@
-{
-    public:
-int xPos, int yPos
+const Position &rPosition
-                int priority, const Bezier &rCurve, GenericLayout &rLayout ):
-xPos( xPos ), m_yPos( yPos
+position( rPosition
-            m_rCurve( rCurve ), m_range( range ), m_priority( priority ),
-            m_rLayout( rLayout ) {}
-        virtual ~Anchor() {}
-
-
-
-
-
-
+
+
+
+
+
+
+
-        bool isHanging( const Anchor &rOther ) const;
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        bool canHang( const Anchor &rOther, int &xOffset, int &yOffset ) const;
-
@@ -63 +68 @@
-
-        // Getters
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-    private:
-Coordinates relative to the window
-int m_xPos, m_yPos
+Position in the layout
+Position m_position
-
-        /// Curve of the anchor
@@ -79 +93 @@
-        int m_priority;
-
-window
+layout
-        GenericLayout &m_rLayout;
-};

modules/gui/skins2/src/generic_layout.cpp

@@ -159 +159 @@
-void GenericLayout::resize( int width, int height )
-{
-    // Check boundaries
-    if( width < m_minWidth )
-    {
-        width = m_minWidth;
-    }
-    if( width > m_maxWidth )
-    {
-        width = m_maxWidth;
-    }
-    if( height < m_minHeight )
-    {
-        height = m_minHeight;
-    }
-    if( height > m_maxHeight )
-    {
-        height = m_maxHeight;
-    }
-
-    if( width == m_width && height == m_height )
-    {
-        return;
-    }
-
-    // Update the window size
-    m_width = width;

modules/gui/skins2/src/window_manager.cpp

@@ -29 +29 @@
-#include "anchor.hpp"
-#include "tooltip.hpp"
+#include "var_manager.hpp"
-#include "../utils/position.hpp"
-#include "../src/var_manager.hpp"
-
-
-WindowManager::WindowManager( intf_thread_t *pIntf ):
-
+
+
-{
-    // Create and register a variable for the "on top" status
@@ -171 +172 @@
-
-
+void WindowManager::startResize( GenericLayout &rLayout, Direction_t direction )
+{
+    m_direction = direction;
+
+    // Rebuild the set of moving windows.
+    // From the resized window, we only take into account the anchors which
+    // are mobile with the current type of resizing, and that are hanging a
+    // window. The hanged windows will come will all their dependencies.
+
+    m_resizeMovingE.clear();
+    m_resizeMovingS.clear();
+    m_resizeMovingSE.clear();
+
+    WinSet_t::const_iterator itWin;
+    AncList_t::const_iterator itAnc1, itAnc2;
+    // Get the anchors of the layout
+    const AncList_t &ancList1 = rLayout.getAnchorList();
+
+    // Iterate through all the hanged windows
+    for( itWin = m_dependencies[rLayout.getWindow()].begin();
+         itWin != m_dependencies[rLayout.getWindow()].end(); itWin++ )
+    {
+        // Now, check for anchoring between the 2 windows
+        const AncList_t &ancList2 =
+            (*itWin)->getActiveLayout().getAnchorList();
+        for( itAnc1 = ancList1.begin(); itAnc1 != ancList1.end(); itAnc1++ )
+        {
+            for( itAnc2 = ancList2.begin();
+                 itAnc2 != ancList2.end(); itAnc2++ )
+            {
+                if( (*itAnc1)->isHanging( **itAnc2 ) )
+                {
+                    // Add the dependencies of the hanged window to one of the
+                    // lists of moving windows
+                    Position::Ref_t aRefPos =
+                        (*itAnc1)->getPosition().getRefLeftTop();
+                    if( aRefPos == Position::kRightTop )
+                        buildDependSet( m_resizeMovingE, *itWin );
+                    else if( aRefPos == Position::kLeftBottom )
+                        buildDependSet( m_resizeMovingS, *itWin );
+                    else if( aRefPos == Position::kRightBottom )
+                        buildDependSet( m_resizeMovingSE, *itWin );
+                    break;
+                }
+            }
+        }
+    }
+
+    // The checkAnchors() method will need to have m_movingWindows properly set
+    // so let's insert in it the contents of the other sets
+    m_movingWindows.clear();
+    m_movingWindows.insert( rLayout.getWindow() );
+    m_movingWindows.insert( m_resizeMovingE.begin(), m_resizeMovingE.end() );
+    m_movingWindows.insert( m_resizeMovingS.begin(), m_resizeMovingS.end() );
+    m_movingWindows.insert( m_resizeMovingSE.begin(), m_resizeMovingSE.end() );
+}
+
+
+void WindowManager::stopResize()
+{
+    // Nothing different from stopMove(), luckily
+    stopMove();
+}
+
+
+void WindowManager::resize( GenericLayout &rLayout,
+                            int width, int height ) const
+{
+    // TODO: handle anchored windows
+    // Compute the real resizing offset
+    int xOffset = width - rLayout.getWidth();
+    int yOffset = height - rLayout.getHeight();
+
+    // Check anchoring; this can change the values of xOffset and yOffset
+    checkAnchors( rLayout.getWindow(), xOffset, yOffset );
+    if( m_direction == kResizeS )
+        xOffset = 0;
+    if( m_direction == kResizeE )
+        yOffset = 0;
+
+    int newWidth = rLayout.getWidth() + xOffset;
+    int newHeight = rLayout.getHeight() + yOffset;
+
+    // Check boundaries
+    if( newWidth < rLayout.getMinWidth() )
+    {
+        newWidth = rLayout.getMinWidth();
+    }
+    if( newWidth > rLayout.getMaxWidth() )
+    {
+        newWidth = rLayout.getMaxWidth();
+    }
+    if( newHeight < rLayout.getMinHeight() )
+    {
+        newHeight = rLayout.getMinHeight();
+    }
+    if( newHeight > rLayout.getMaxHeight() )
+    {
+        newHeight = rLayout.getMaxHeight();
+    }
+
+    if( newWidth == rLayout.getWidth() && newHeight == rLayout.getHeight() )
+    {
+        return;
+    }
+
+    // New offset, after the last corrections
+    int xNewOffset = newWidth - rLayout.getWidth();
+    int yNewOffset = newHeight - rLayout.getHeight();
+
+    // Do the actual resizing
+    rLayout.resize( newWidth, newHeight );
+
+    // Move all the anchored windows
+    WinSet_t::const_iterator it;
+    if( m_direction == kResizeE ||
+        m_direction == kResizeSE )
+    {
+        for( it = m_resizeMovingE.begin(); it != m_resizeMovingE.end(); it++ )
+        {
+            (*it)->move( (*it)->getLeft() + xNewOffset,
+                         (*it)->getTop() );
+        }
+    }
+    if( m_direction == kResizeE ||
+        m_direction == kResizeSE )
+    {
+        for( it = m_resizeMovingS.begin(); it != m_resizeMovingS.end(); it++ )
+        {
+            (*it)->move( (*it)->getLeft(),
+                         (*it)->getTop( )+ yNewOffset );
+        }
+    }
+    if( m_direction == kResizeE ||
+        m_direction == kResizeS ||
+        m_direction == kResizeSE )
+    {
+        for( it = m_resizeMovingSE.begin(); it != m_resizeMovingSE.end(); it++ )
+        {
+            (*it)->move( (*it)->getLeft() + xNewOffset,
+                         (*it)->getTop() + yNewOffset );
+        }
+    }
+}
+
+
-void WindowManager::synchVisibility() const
-{
@@ -204 +351 @@
-        // When the theme is opened for the first time,
-        // only show the window if set as visible in the XML
- ((*it)->isVisible() || !firstTime
+( (*it)->isVisible() || !firstTime 
-        {
-            (*it)->show();
@@ -382 +529 @@
-    else
-    {
-
+ 
-    }
-}

modules/gui/skins2/src/window_manager.hpp

@@ -45 +45 @@
-{
-    public:
+        /// Direction of the resizing
+        enum Direction_t
+        {
+            kResizeE,   // East
+            kResizeSE,  // South-East
+            kResizeS,   // South
+            kNone       // Reserved for internal use
+        };
+
-        /// Constructor
-        WindowManager( intf_thread_t *pIntf);
@@ -58 +67 @@
-        void unregisterWindow( TopWindow &rWindow );
-
-pWindow.
+rWindow
-        void startMove( TopWindow &rWindow );
-
-.
+
-        void stopMove();
-
-
-
-
+
+
+
+
+
-        void move( TopWindow &rWindow, int left, int top ) const;
+
+        /// Tell the window manager that a resize is initiated for rWindow
+        void startResize( GenericLayout &rLayout, Direction_t direction );
+
+        /// Tell the window manager that the current resizing ended
+        void stopResize();
+
+        /**
+         * Resize the rWindow window to (width, height), and move all its
+         * anchored windows, if some anchors are moved during the resizing.
+         * If a new anchoring is detected, the windows will move (or resize)
+         * accordingly.
+         */
+        void resize( GenericLayout &rLayout, int width, int height ) const;
-
-        /// Raise all the registered windows
@@ -73 +98 @@
-
-        /// Show all the registered windows
-bool firstTime = false
+ bool firstTime = false 
-
-        /// Hide all the registered windows
@@ -143 +168 @@
-        /// move.
-        WinSet_t m_movingWindows;
+        /**
+         * Store the moving windows in the context of resizing
+         * These sets are updated at every start of move
+         */
+        //@{
+        WinSet_t m_resizeMovingE;
+        WinSet_t m_resizeMovingS;
+        WinSet_t m_resizeMovingSE;
+        //@}
-        /// Indicate whether the windows are currently on top
-        VariablePtr m_cVarOnTop;
@@ -151 +185 @@
-        /// Alpha value of the moving windows
-        int m_moveAlpha;
+        /// Direction of the current resizing
+        Direction_t m_direction;
-        /// Tooltip
-        Tooltip *m_pTooltip;

modules/gui/skins2/utils/position.hpp

@@ -96 +96 @@
-        int getWidth() const;
-        int getHeight() const;
+        /// Get the reference corners
+        Ref_t getRefLeftTop() const { return m_refLeftTop; }
+        Ref_t getRefRightBottom() const { return m_refRighBottom; }
-
-    private:

share/skins2/skin.dtd

@@ -100 +100 @@
-        x           CDATA   "0"
-        y           CDATA   "0"
+        lefttop     CDATA   "lefttop"
-        priority    CDATA   #REQUIRED
-        points      CDATA   "(0,0)"