Removes trailing spaces. Removes tabs.

[vlc] / modules / gui / skins2 / utils / var_tree.cpp

diff --git a/modules/gui/skins2/utils/var_tree.cpp b/modules/gui/skins2/utils/var_tree.cpp
index 931e06db36b7b0c70b97d6a4289d163c6ff40157..a7454e5847514b80de34051248d59f022b358526 100644 (file)
--- a/modules/gui/skins2/utils/var_tree.cpp
+++ b/modules/gui/skins2/utils/var_tree.cpp
@@ -1,10 +1,11 @@
 /*****************************************************************************
  * var_tree.cpp
  *****************************************************************************
- * Copyright (C) 2005 VideoLAN
+ * Copyright (C) 2005 the VideoLAN team
  * $Id$
  *
  * Authors: Antoine Cellerier <dionoea@videolan.org>
+ *          Clément Stenac <zorglub@videolan.org>
  *
  * 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
@@ -28,8 +29,8 @@ const string VarTree::m_type = "tree";
 
 VarTree::VarTree( intf_thread_t *pIntf )
     : Variable( pIntf ), m_id( 0 ), m_selected( false ), m_playing( false ),
-    m_expanded( false ), m_deleted( false ), m_readonly( false),
-    m_pData( NULL ), m_pParent( NULL )
+    m_expanded( false ), m_deleted( false ),
+    m_pData( NULL ), m_pParent( NULL ), m_readonly( false )
 {
     // Create the position variable
     m_cPosition = VariablePtr( new VarPercent( pIntf ) );
@@ -42,8 +43,8 @@ VarTree::VarTree( intf_thread_t *pIntf, VarTree *pParent, int id,
                   void *pData )
     : Variable( pIntf ), m_id( id ), m_cString( rcString ),
     m_selected( selected ), m_playing( playing ), m_expanded( expanded ),
-    m_deleted( false ), m_readonly( readonly ),
-    m_pData( pData ), m_pParent( pParent )
+    m_deleted( false ), m_pData( pData ), m_pParent( pParent ),
+    m_readonly( readonly )
 {
     // Create the position variable
     m_cPosition = VariablePtr( new VarPercent( pIntf ) );
@@ -225,10 +226,12 @@ VarTree::Iterator VarTree::getVisibleItem( int n )
     while( it != end() )
     {
         n--;
-        if( n <= 0 ) return it;
+        if( n <= 0 )
+            return it;
         if( it->m_expanded )
         {
-            int i = n - it->visibleItems();
+            int i;
+            i = n - it->visibleItems();
             if( i <= 0 ) return it->getVisibleItem( n );
             n = i;
         }
@@ -237,6 +240,29 @@ VarTree::Iterator VarTree::getVisibleItem( int n )
     return end();
 }
 
+VarTree::Iterator VarTree::getLeaf( int n )
+{
+    Iterator it = begin();
+    while( it != end() )
+    {
+        if( it->size() )
+        {
+            int i;
+            i = n - it->countLeafs();
+            if( i <= 0 ) return it->getLeaf( n );
+            n = i;
+        }
+        else
+        {
+            n--;
+            if( n <= 0 )
+                return it;
+        }
+        it++;
+    }
+    return end();
+}
+
 VarTree::Iterator VarTree::getNextVisibleItem( Iterator it )
 {
     if( it->m_expanded && it->size() )
@@ -260,15 +286,13 @@ VarTree::Iterator VarTree::getPrevVisibleItem( Iterator it )
 {
     VarTree::Iterator it_old = it;
     if( it == root()->begin() || it == ++(root()->begin()) ) return it;
-    if( it->parent() )
-    {
-    }
+
     /* Was it the first child of its parent ? */
     if( it->parent() && it == it->parent()->begin() )
     {
         /* Yes, get previous uncle */
         it = it_old->prev_uncle();
-   }
+    }
     else
         it--;
 
@@ -300,6 +324,49 @@ VarTree::Iterator VarTree::getNextItem( Iterator it )
     return it;
 }
 
+VarTree::Iterator VarTree::getPrevItem( Iterator it )
+{
+    VarTree::Iterator it_old = it;
+    if( it == root()->begin() || it == ++(root()->begin()) ) return it;
+
+    /* Was it the first child of its parent ? */
+    if( it->parent() && it == it->parent()->begin() )
+    {
+        /* Yes, get previous uncle */
+        it = it_old->prev_uncle();
+    }
+    else
+        it--;
+
+    /* We have found an expanded uncle, take its last child */
+    while( it != root()->begin() && it->size() )
+    {
+            it = it->end();
+            it--;
+    }
+    return it;
+}
+
+VarTree::Iterator VarTree::getNextLeaf( Iterator it )
+{
+    do
+    {
+        it = getNextItem( it );
+    }
+    while( it != root()->end() && it->size() );
+    return it;
+}
+
+VarTree::Iterator VarTree::getPrevLeaf( Iterator it )
+{
+    do
+    {
+        it = getPrevItem( it );
+    }
+    while( it != root()->begin() && it->size() ); /* FIXME ? */
+    if( it == root()->begin() ) it = firstLeaf();
+    return it;
+}
 
 VarTree::Iterator VarTree::findById( int id )
 {
@@ -327,3 +394,25 @@ void VarTree::ensureExpanded( VarTree::Iterator it )
         current = current->parent();
     }
 }
+
+int VarTree::countLeafs()
+{
+    if( size() == 0 ) return 1;
+
+    int i_count = 0;
+    Iterator it = begin();
+    while( it != end() )
+    {
+        i_count += it->countLeafs();
+        it++;
+    }
+    return i_count;
+}
+
+VarTree::Iterator VarTree::firstLeaf()
+{
+    Iterator b = root()->begin();
+    if( b->size() ) return getNextLeaf( b );
+    return b;
+}
+