Not part of build.

content/shared/public/nsXULAtomList.h

@@ -80,6 +80,7 @@ XUL_ATOM(outlinerbody, "outlinerbody")
 XUL_ATOM(outlinercol, "outlinercol")
 XUL_ATOM(cycler, "cycler")
 XUL_ATOM(primary, "primary")
+XUL_ATOM(current, "current")
 XUL_ATOM(mozoutlinerrow, ":-moz-outliner-row")
 XUL_ATOM(mozoutlinercell, ":-moz-outliner-cell")
 XUL_ATOM(mozoutlinercolumn, ":-moz-outliner-column")

layout/xul/base/src/outliner/outliner.css

@@ -8,6 +8,11 @@ outlinerbody {
 {
 }
 
+:-moz-outliner-row(current)
+{
+  border: 1px black dotted;
+}
+
 :-moz-outliner-row(selected)
 {
   background-color: blue;

layout/xul/base/src/outliner/public/nsIOutlinerSelection.idl

@@ -39,6 +39,9 @@ interface nsIOutlinerSelection : nsISecurityCheckedComponent
   // Deselect all rows and select the row at the specified index. 
   void select(in long index);
 
+  // Perform a timed select.
+  void timedSelect(in long index, in long delay);
+
   // Toggle the selection state of the row at the specified index.
   void toggleSelect(in long index);
 

layout/xul/base/src/outliner/src/nsOutlinerBodyFrame.cpp

@@ -476,12 +476,20 @@ nsOutlinerBodyFrame::PrefillPropertyArray(PRInt32 aRowIndex, const PRUnichar* aC
   // And colID too, if it is non-empty.
   mScratchArray->Clear();
   
-  nsCOMPtr<nsIOutlinerSelection> selection;
-  mView->GetSelection(getter_AddRefs(selection));
-  PRBool isSelected;
-  selection->IsSelected(aRowIndex, &isSelected);
-  if (isSelected)
-    mScratchArray->AppendElement(nsHTMLAtoms::selected);
+  if (aRowIndex != -1) {
+    nsCOMPtr<nsIOutlinerSelection> selection;
+    mView->GetSelection(getter_AddRefs(selection));
+  
+    PRBool isSelected;
+    selection->IsSelected(aRowIndex, &isSelected);
+    if (isSelected)
+      mScratchArray->AppendElement(nsHTMLAtoms::selected);
+
+    PRInt32 currentIndex;
+    selection->GetCurrentIndex(&currentIndex);
+    if (aRowIndex == currentIndex)
+      mScratchArray->AppendElement(nsXULAtoms::current);
+  }
 }
 
 

layout/xul/base/src/outliner/src/nsOutlinerSelection.cpp

@@ -101,10 +101,15 @@ struct nsOutlinerRange
           mPrev->mNext = mNext;
         else
           mSelection->mFirstRange = mNext;
-        if (mNext)
-          mNext->mPrev = mPrev;
+        
+        nsOutlinerRange* next = mNext;
+        if (next)
+          next->mPrev = mPrev;
         mPrev = mNext = nsnull;
         delete this;
+        if (next)
+          next->RemoveRange(aStart, aEnd);
+        return;
       }
 
       if (mNext)
@@ -227,6 +232,8 @@ nsOutlinerSelection::nsOutlinerSelection(nsIOutlinerBoxObject* aOutliner)
   mOutliner = aOutliner;
   mSuppressed = PR_FALSE;
   mFirstRange = nsnull;
+  mShiftSelectPivot = -1;
+  mCurrentIndex = -1;
 }
 
 nsOutlinerSelection::~nsOutlinerSelection()
@@ -258,8 +265,46 @@ NS_IMETHODIMP nsOutlinerSelection::IsSelected(PRInt32 aIndex, PRBool* aResult)
   return NS_OK;
 }
 
+NS_IMETHODIMP nsOutlinerSelection::TimedSelect(PRInt32 aIndex, PRInt32 aMsec)
+{
+  PRBool suppressSelect = mSuppressed;
+
+  if (aMsec != -1)
+    mSuppressed = PR_TRUE;
+
+  nsresult rv = Select(aIndex);
+  if (NS_FAILED(rv))
+    return rv;
+
+  if (aMsec != -1) {
+    mSuppressed = suppressSelect;
+    if (!mSuppressed) {
+      if (mSelectTimer)
+        mSelectTimer->Cancel();
+
+      mSelectTimer = do_CreateInstance("@mozilla.org/timer;1");
+      mSelectTimer->Init(SelectCallback, this, aMsec, NS_PRIORITY_HIGH);
+    }
+  }
+
+  return NS_OK;
+}
+
+void
+nsOutlinerSelection::SelectCallback(nsITimer *aTimer, void *aClosure)
+{
+  nsOutlinerSelection* self = NS_STATIC_CAST(nsOutlinerSelection*, aClosure);
+  if (self) {
+    self->FireOnSelectHandler();
+    aTimer->Cancel();
+    self->mSelectTimer = nsnull;
+  }
+}
+
 NS_IMETHODIMP nsOutlinerSelection::Select(PRInt32 aIndex)
 {
+  mShiftSelectPivot = -1;
+
   if (mFirstRange) {
     PRBool alreadySelected = mFirstRange->Contains(aIndex);
 
@@ -279,6 +324,8 @@ NS_IMETHODIMP nsOutlinerSelection::Select(PRInt32 aIndex)
     }
   }
 
+  SetCurrentIndex(aIndex);
+  
   // Create our new selection.
   mFirstRange = new nsOutlinerRange(this, aIndex);
   mFirstRange->Invalidate();
@@ -298,6 +345,9 @@ NS_IMETHODIMP nsOutlinerSelection::ToggleSelect(PRInt32 aIndex)
   // (4) The item is removed from an existing range.
   // (5) The addition of the item causes two ranges to be merged.
   // (6) The removal of the item causes two ranges to be split.
+  mShiftSelectPivot = -1;
+  SetCurrentIndex(aIndex);
+
   if (!mFirstRange)
     Select(aIndex);
   else {
@@ -322,9 +372,15 @@ NS_IMETHODIMP nsOutlinerSelection::RangedSelect(PRInt32 aStartIndex, PRInt32 aEn
     delete mFirstRange;
   }
 
-  if (aStartIndex == -1)
-    aStartIndex = mCurrentIndex;
-    
+  if (aStartIndex == -1) {
+    if (mShiftSelectPivot != -1)
+      aStartIndex = mShiftSelectPivot;
+    else aStartIndex = mCurrentIndex;
+  }
+
+  mShiftSelectPivot = aStartIndex;
+  SetCurrentIndex(aEndIndex);
+  
   PRInt32 start = aStartIndex < aEndIndex ? aStartIndex : aEndIndex;
   PRInt32 end = aStartIndex < aEndIndex ? aEndIndex : aStartIndex;
 
@@ -352,6 +408,7 @@ NS_IMETHODIMP nsOutlinerSelection::ClearSelection()
   mFirstRange->Invalidate();
   delete mFirstRange;
   mFirstRange = nsnull;
+  mShiftSelectPivot = -1;
 
   FireOnSelectHandler();
 
@@ -365,6 +422,8 @@ NS_IMETHODIMP nsOutlinerSelection::InvertSelection()
 
 NS_IMETHODIMP nsOutlinerSelection::SelectAll()
 {
+  mShiftSelectPivot = -1;
+
   // Invalidate not necessary when clearing selection, since 
   // we're going to invalidate the world on the SelectAll.
   delete mFirstRange;
@@ -428,6 +487,8 @@ NS_IMETHODIMP nsOutlinerSelection::GetSelectEventsSuppressed(PRBool *aSelectEven
 NS_IMETHODIMP nsOutlinerSelection::SetSelectEventsSuppressed(PRBool aSelectEventsSuppressed)
 {
   mSuppressed = aSelectEventsSuppressed;
+  if (!mSuppressed)
+    FireOnSelectHandler();
   return NS_OK;
 }
 
@@ -437,9 +498,16 @@ NS_IMETHODIMP nsOutlinerSelection::GetCurrentIndex(PRInt32 *aCurrentIndex)
   return NS_OK;
 }
 
-NS_IMETHODIMP nsOutlinerSelection::SetCurrentIndex(PRInt32 aCurrentIndex)
+NS_IMETHODIMP nsOutlinerSelection::SetCurrentIndex(PRInt32 aIndex)
 {
-  mCurrentIndex = aCurrentIndex;
+  if (mCurrentIndex != -1)
+    mOutliner->InvalidateRow(mCurrentIndex);
+  
+  mCurrentIndex = aIndex;
+  
+  if (aIndex != -1)
+    mOutliner->InvalidateRow(aIndex);
+
   return NS_OK;
 }
 

layout/xul/base/src/outliner/src/nsOutlinerSelection.h

@@ -24,6 +24,7 @@
 #define nsOutlinerSelection_h__
 
 #include "nsIOutlinerSelection.h"
+#include "nsITimer.h"
 
 class nsIOutlinerBoxObject;
 struct nsOutlinerRange;
@@ -42,6 +43,7 @@ public:
 
 protected:
   nsresult FireOnSelectHandler();
+  static void SelectCallback(nsITimer *aTimer, void *aClosure);
 
 protected:
   // Members
@@ -49,8 +51,11 @@ protected:
 
   PRBool mSuppressed; // Whether or not we should be firing onselect events.
   PRInt32 mCurrentIndex; // The item to draw the rect around. The last one clicked, etc.
+  PRInt32 mShiftSelectPivot; // Used when multiple SHIFT+selects are performed to pivot on.
 
   nsOutlinerRange* mFirstRange; // Our list of ranges.
+
+  nsCOMPtr<nsITimer> mSelectTimer;
 };
 
 extern nsresult

layout/xul/base/src/tree/public/nsITreeSelection.idl

@@ -39,6 +39,9 @@ interface nsIOutlinerSelection : nsISecurityCheckedComponent
   // Deselect all rows and select the row at the specified index. 
   void select(in long index);
 
+  // Perform a timed select.
+  void timedSelect(in long index, in long delay);
+
   // Toggle the selection state of the row at the specified index.
   void toggleSelect(in long index);
 

layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp

@@ -476,12 +476,20 @@ nsOutlinerBodyFrame::PrefillPropertyArray(PRInt32 aRowIndex, const PRUnichar* aC
   // And colID too, if it is non-empty.
   mScratchArray->Clear();
   
-  nsCOMPtr<nsIOutlinerSelection> selection;
-  mView->GetSelection(getter_AddRefs(selection));
-  PRBool isSelected;
-  selection->IsSelected(aRowIndex, &isSelected);
-  if (isSelected)
-    mScratchArray->AppendElement(nsHTMLAtoms::selected);
+  if (aRowIndex != -1) {
+    nsCOMPtr<nsIOutlinerSelection> selection;
+    mView->GetSelection(getter_AddRefs(selection));
+  
+    PRBool isSelected;
+    selection->IsSelected(aRowIndex, &isSelected);
+    if (isSelected)
+      mScratchArray->AppendElement(nsHTMLAtoms::selected);
+
+    PRInt32 currentIndex;
+    selection->GetCurrentIndex(&currentIndex);
+    if (aRowIndex == currentIndex)
+      mScratchArray->AppendElement(nsXULAtoms::current);
+  }
 }
 
 

layout/xul/base/src/tree/src/nsTreeSelection.cpp

@@ -101,10 +101,15 @@ struct nsOutlinerRange
           mPrev->mNext = mNext;
         else
           mSelection->mFirstRange = mNext;
-        if (mNext)
-          mNext->mPrev = mPrev;
+        
+        nsOutlinerRange* next = mNext;
+        if (next)
+          next->mPrev = mPrev;
         mPrev = mNext = nsnull;
         delete this;
+        if (next)
+          next->RemoveRange(aStart, aEnd);
+        return;
       }
 
       if (mNext)
@@ -227,6 +232,8 @@ nsOutlinerSelection::nsOutlinerSelection(nsIOutlinerBoxObject* aOutliner)
   mOutliner = aOutliner;
   mSuppressed = PR_FALSE;
   mFirstRange = nsnull;
+  mShiftSelectPivot = -1;
+  mCurrentIndex = -1;
 }
 
 nsOutlinerSelection::~nsOutlinerSelection()
@@ -258,8 +265,46 @@ NS_IMETHODIMP nsOutlinerSelection::IsSelected(PRInt32 aIndex, PRBool* aResult)
   return NS_OK;
 }
 
+NS_IMETHODIMP nsOutlinerSelection::TimedSelect(PRInt32 aIndex, PRInt32 aMsec)
+{
+  PRBool suppressSelect = mSuppressed;
+
+  if (aMsec != -1)
+    mSuppressed = PR_TRUE;
+
+  nsresult rv = Select(aIndex);
+  if (NS_FAILED(rv))
+    return rv;
+
+  if (aMsec != -1) {
+    mSuppressed = suppressSelect;
+    if (!mSuppressed) {
+      if (mSelectTimer)
+        mSelectTimer->Cancel();
+
+      mSelectTimer = do_CreateInstance("@mozilla.org/timer;1");
+      mSelectTimer->Init(SelectCallback, this, aMsec, NS_PRIORITY_HIGH);
+    }
+  }
+
+  return NS_OK;
+}
+
+void
+nsOutlinerSelection::SelectCallback(nsITimer *aTimer, void *aClosure)
+{
+  nsOutlinerSelection* self = NS_STATIC_CAST(nsOutlinerSelection*, aClosure);
+  if (self) {
+    self->FireOnSelectHandler();
+    aTimer->Cancel();
+    self->mSelectTimer = nsnull;
+  }
+}
+
 NS_IMETHODIMP nsOutlinerSelection::Select(PRInt32 aIndex)
 {
+  mShiftSelectPivot = -1;
+
   if (mFirstRange) {
     PRBool alreadySelected = mFirstRange->Contains(aIndex);
 
@@ -279,6 +324,8 @@ NS_IMETHODIMP nsOutlinerSelection::Select(PRInt32 aIndex)
     }
   }
 
+  SetCurrentIndex(aIndex);
+  
   // Create our new selection.
   mFirstRange = new nsOutlinerRange(this, aIndex);
   mFirstRange->Invalidate();
@@ -298,6 +345,9 @@ NS_IMETHODIMP nsOutlinerSelection::ToggleSelect(PRInt32 aIndex)
   // (4) The item is removed from an existing range.
   // (5) The addition of the item causes two ranges to be merged.
   // (6) The removal of the item causes two ranges to be split.
+  mShiftSelectPivot = -1;
+  SetCurrentIndex(aIndex);
+
   if (!mFirstRange)
     Select(aIndex);
   else {
@@ -322,9 +372,15 @@ NS_IMETHODIMP nsOutlinerSelection::RangedSelect(PRInt32 aStartIndex, PRInt32 aEn
     delete mFirstRange;
   }
 
-  if (aStartIndex == -1)
-    aStartIndex = mCurrentIndex;
-    
+  if (aStartIndex == -1) {
+    if (mShiftSelectPivot != -1)
+      aStartIndex = mShiftSelectPivot;
+    else aStartIndex = mCurrentIndex;
+  }
+
+  mShiftSelectPivot = aStartIndex;
+  SetCurrentIndex(aEndIndex);
+  
   PRInt32 start = aStartIndex < aEndIndex ? aStartIndex : aEndIndex;
   PRInt32 end = aStartIndex < aEndIndex ? aEndIndex : aStartIndex;
 
@@ -352,6 +408,7 @@ NS_IMETHODIMP nsOutlinerSelection::ClearSelection()
   mFirstRange->Invalidate();
   delete mFirstRange;
   mFirstRange = nsnull;
+  mShiftSelectPivot = -1;
 
   FireOnSelectHandler();
 
@@ -365,6 +422,8 @@ NS_IMETHODIMP nsOutlinerSelection::InvertSelection()
 
 NS_IMETHODIMP nsOutlinerSelection::SelectAll()
 {
+  mShiftSelectPivot = -1;
+
   // Invalidate not necessary when clearing selection, since 
   // we're going to invalidate the world on the SelectAll.
   delete mFirstRange;
@@ -428,6 +487,8 @@ NS_IMETHODIMP nsOutlinerSelection::GetSelectEventsSuppressed(PRBool *aSelectEven
 NS_IMETHODIMP nsOutlinerSelection::SetSelectEventsSuppressed(PRBool aSelectEventsSuppressed)
 {
   mSuppressed = aSelectEventsSuppressed;
+  if (!mSuppressed)
+    FireOnSelectHandler();
   return NS_OK;
 }
 
@@ -437,9 +498,16 @@ NS_IMETHODIMP nsOutlinerSelection::GetCurrentIndex(PRInt32 *aCurrentIndex)
   return NS_OK;
 }
 
-NS_IMETHODIMP nsOutlinerSelection::SetCurrentIndex(PRInt32 aCurrentIndex)
+NS_IMETHODIMP nsOutlinerSelection::SetCurrentIndex(PRInt32 aIndex)
 {
-  mCurrentIndex = aCurrentIndex;
+  if (mCurrentIndex != -1)
+    mOutliner->InvalidateRow(mCurrentIndex);
+  
+  mCurrentIndex = aIndex;
+  
+  if (aIndex != -1)
+    mOutliner->InvalidateRow(aIndex);
+
   return NS_OK;
 }
 

layout/xul/base/src/tree/src/nsTreeSelection.h

@@ -24,6 +24,7 @@
 #define nsOutlinerSelection_h__
 
 #include "nsIOutlinerSelection.h"
+#include "nsITimer.h"
 
 class nsIOutlinerBoxObject;
 struct nsOutlinerRange;
@@ -42,6 +43,7 @@ public:
 
 protected:
   nsresult FireOnSelectHandler();
+  static void SelectCallback(nsITimer *aTimer, void *aClosure);
 
 protected:
   // Members
@@ -49,8 +51,11 @@ protected:
 
   PRBool mSuppressed; // Whether or not we should be firing onselect events.
   PRInt32 mCurrentIndex; // The item to draw the rect around. The last one clicked, etc.
+  PRInt32 mShiftSelectPivot; // Used when multiple SHIFT+selects are performed to pivot on.
 
   nsOutlinerRange* mFirstRange; // Our list of ranges.
+
+  nsCOMPtr<nsITimer> mSelectTimer;
 };
 
 extern nsresult

layout/xul/content/src/nsXULAtomList.h

@@ -80,6 +80,7 @@ XUL_ATOM(outlinerbody, "outlinerbody")
 XUL_ATOM(outlinercol, "outlinercol")
 XUL_ATOM(cycler, "cycler")
 XUL_ATOM(primary, "primary")
+XUL_ATOM(current, "current")
 XUL_ATOM(mozoutlinerrow, ":-moz-outliner-row")
 XUL_ATOM(mozoutlinercell, ":-moz-outliner-cell")
 XUL_ATOM(mozoutlinercolumn, ":-moz-outliner-column")