mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

backing out regression-causing changes to reopen tree

This commit is contained in:
leaf%mozilla.org 2000-12-20 18:09:53 +00:00
Родитель 2ab9b3a14d
Коммит c7984c2caa
14 изменённых файлов: 319 добавлений и 801 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

18
content/base/public/nsISelectionPrivate.idl
Просмотреть файл

@ -53,23 +53,5 @@ interface nsISelectionPrivate : nsISupports
wstring toStringWithFormat(in string formatType, in unsigned long flags, in PRInt32 wrapCount);
void addSelectionListener(in nsISelectionListener newListener);
void removeSelectionListener(in nsISelectionListener listenerToRemove);
/* Table selection stuff
We should probably move this and table-related
items in nsIFrameSelection to a
new nsITableSelection interface
*/
const long TABLESELECTION_NONE = 0;
const long TABLESELECTION_CELL = 1;
const long TABLESELECTION_ROW = 2;
const long TABLESELECTION_COLUMN = 3;
const long TABLESELECTION_TABLE = 4;
const long TABLESELECTION_ALLCELLS = 5;
/** Test if supplied range points to a single table element:
* Result is one of above constants. "None" means
* a table element isn't selected.
*/
long getTableSelectionType(in nsIDOMRange range);
};

322
content/base/src/nsSelection.cpp
Просмотреть файл

@ -156,7 +156,6 @@ public:
NS_IMETHOD GetRangeCount(PRInt32* aRangeCount);
NS_IMETHOD GetRangeAt(PRInt32 aIndex, nsIDOMRange** aReturn);
NS_IMETHOD RemoveAllRanges();
NS_IMETHOD GetTableSelectionType(nsIDOMRange* aRange, PRInt32* aTableSelectionType);
NS_IMETHOD Collapse(nsIDOMNode* aParentNode, PRInt32 aOffset);
NS_IMETHOD CollapseToStart();
NS_IMETHOD CollapseToEnd();
@ -250,8 +249,6 @@ private:
void setAnchorFocusRange(PRInt32 aIndex); //pass in index into FrameSelection
NS_IMETHOD selectFrames(nsIPresContext* aPresContext, nsIContentIterator *aInnerIter, nsIContent *aContent, nsIDOMRange *aRange, nsIPresShell *aPresShell, PRBool aFlags);
NS_IMETHOD selectFrames(nsIPresContext* aPresContext, nsIDOMRange *aRange, PRBool aSelect);
nsresult getTableCellLocationFromRange(nsIDOMRange *aRange, PRInt32 *aSelectionType, PRInt32 *aRow, PRInt32 *aCol);
nsresult addTableCellRange(nsIDOMRange *aRange, PRBool *aDidAddRange);
#if OLD_SELECTION
NS_IMETHOD FixupSelectionPoints(nsIDOMRange *aRange, nsDirection *aDir, PRBool *aFixupState);
@ -305,7 +302,7 @@ public:
NS_IMETHOD HandleClick(nsIContent *aNewFocus, PRUint32 aContentOffset, PRUint32 aContentEndOffset,
PRBool aContinueSelection, PRBool aMultipleSelection,PRBool aHint);
NS_IMETHOD HandleDrag(nsIPresContext *aPresContext, nsIFrame *aFrame, nsPoint& aPoint);
NS_IMETHOD HandleTableSelection(nsIContent *aParentContent, PRInt32 aContentOffset, PRInt32 aTarget, nsMouseEvent *aMouseEvent);
NS_IMETHOD HandleTableSelection(nsIContent *aParentContent, PRInt32 aContentOffset, PRUint32 aTarget, nsMouseEvent *aMouseEvent);
NS_IMETHOD StartAutoScrollTimer(nsIPresContext *aPresContext, nsIFrame *aFrame, nsPoint& aPoint, PRUint32 aDelay);
NS_IMETHOD StopAutoScrollTimer();
NS_IMETHOD EnableFrameNotification(PRBool aEnable){mNotifyFrames = aEnable; return NS_OK;}
@ -352,7 +349,6 @@ public:
NS_IMETHOD DeleteFromDocument();
nsIFocusTracker *GetTracker(){return mTracker;}
private:
NS_IMETHOD TakeFocus(nsIContent *aNewFocus, PRUint32 aContentOffset, PRUint32 aContentEndOffset,
PRBool aContinueSelection, PRBool aMultipleSelection);
@ -394,7 +390,6 @@ private:
// Interfaces that let us get info based on cellmap locations
nsITableLayout* GetTableLayout(nsIContent *aTableContent);
nsITableCellLayout* GetCellLayout(nsIContent *aCellContent);
nsresult SelectBlockOfCells(nsIContent *aEndNode);
nsresult SelectRowOrColumn(nsIContent *aCellContent, PRUint32 aTarget);
nsresult GetCellIndexes(nsIContent *aCell, PRInt32 &aRowIndex, PRInt32 &aColIndex);
@ -414,7 +409,7 @@ private:
nsCOMPtr<nsIContent> mAppendStartSelectedCell;
nsCOMPtr<nsIContent> mUnselectCellOnMouseUp;
PRBool mSelectingTableCells;
PRInt32 mSelectingTableCellMode;
PRUint32 mSelectingTableCellMode;
PRInt32 mSelectedCellIndex;
//batching
@ -2190,9 +2185,9 @@ nsSelection::FrameOrParentHasSpecialSelectionStyle(nsIFrame* aFrame, PRUint8 aSe
static PRBool IsCell(nsIContent *aContent)
{
nsCOMPtr<nsIAtom> tag;
aContent->GetTag(*getter_AddRefs(tag));
return (tag != 0 && tag.get() == nsSelection::sCellAtom);
nsIAtom *tag;
aContent->GetTag(tag);
return (tag != 0 && tag == nsSelection::sCellAtom);
}
nsITableCellLayout*
@ -2228,13 +2223,11 @@ nsSelection::ClearNormalSelection()
return mDomSelections[index]->RemoveAllRanges();
}
// Table selection support.
// TODO: Separate table methods into a separate nsITableSelection interface
nsresult
nsSelection::HandleTableSelection(nsIContent *aParentContent, PRInt32 aContentOffset, PRInt32 aTarget, nsMouseEvent *aMouseEvent)
nsSelection::HandleTableSelection(nsIContent *aParentContent, PRInt32 aContentOffset, PRUint32 aTarget, nsMouseEvent *aMouseEvent)
{
if (!aParentContent) return NS_ERROR_NULL_POINTER;
if (mSelectingTableCells && (aTarget & nsISelectionPrivate::TABLESELECTION_TABLE))
if (mSelectingTableCells && (aTarget & TABLESELECTION_TABLE))
{
// We were selecting cells and user drags mouse in table border or inbetween cells,
// just do nothing
@ -2266,7 +2259,7 @@ nsSelection::HandleTableSelection(nsIContent *aParentContent, PRInt32 aContentOf
{
// We are drag-selecting
if (aTarget != nsISelectionPrivate::TABLESELECTION_TABLE)
if (aTarget != TABLESELECTION_TABLE)
{
// If dragging in the same cell as last event, do nothing
if (mEndSelectedCell == childContent)
@ -2278,8 +2271,8 @@ nsSelection::HandleTableSelection(nsIContent *aParentContent, PRInt32 aContentOf
// we can drift into any cell to stay in that mode
// even if aTarget = TABLESELECTION_CELL
if (mSelectingTableCellMode == nsISelectionPrivate::TABLESELECTION_ROW ||
mSelectingTableCellMode == nsISelectionPrivate::TABLESELECTION_COLUMN)
if (mSelectingTableCellMode == TABLESELECTION_ROW ||
mSelectingTableCellMode == TABLESELECTION_COLUMN)
{
if (mEndSelectedCell)
{
@ -2289,8 +2282,8 @@ nsSelection::HandleTableSelection(nsIContent *aParentContent, PRInt32 aContentOf
result = GetCellIndexes(childContent, curRowIndex, curColIndex);
if (NS_FAILED(result)) return result;
if ((mSelectingTableCellMode == nsISelectionPrivate::TABLESELECTION_ROW && startRowIndex == curRowIndex) ||
(mSelectingTableCellMode == nsISelectionPrivate::TABLESELECTION_COLUMN && startColIndex == curColIndex))
if ((mSelectingTableCellMode == TABLESELECTION_ROW && startRowIndex == curRowIndex) ||
(mSelectingTableCellMode == TABLESELECTION_COLUMN && startColIndex == curColIndex))
return NS_OK;
}
#ifdef DEBUG_TABLE_SELECTION
@ -2299,7 +2292,7 @@ printf("HandleTableSelection: Dragged into a new column or row\n");
// Continue dragging row or column selection
return SelectRowOrColumn(childContent, mSelectingTableCellMode);
}
else if (mSelectingTableCellMode == nsISelectionPrivate::TABLESELECTION_CELL)
else if (mSelectingTableCellMode == TABLESELECTION_CELL)
{
#ifdef DEBUG_TABLE_SELECTION
printf("HandleTableSelection: Dragged into a new cell\n");
@ -2325,10 +2318,8 @@ printf("HandleTableSelection: Dragged into a new cell\n");
mStartSelectedCell = nsnull;
mDomSelections[index]->RemoveAllRanges();
if (startRowIndex == curRowIndex)
mSelectingTableCellMode = nsISelectionPrivate::TABLESELECTION_ROW;
else
mSelectingTableCellMode = nsISelectionPrivate::TABLESELECTION_COLUMN;
mSelectingTableCellMode =
(startRowIndex == curRowIndex) ? TABLESELECTION_ROW : TABLESELECTION_COLUMN;
return SelectRowOrColumn(childContent, mSelectingTableCellMode);
}
@ -2353,7 +2344,7 @@ printf("HandleTableSelection: Mouse down event\n");
// Clear cell we stored in mouse-down
mUnselectCellOnMouseUp = nsnull;
if (aTarget == nsISelectionPrivate::TABLESELECTION_CELL)
if (aTarget == TABLESELECTION_CELL)
{
PRBool isSelected = PR_FALSE;
@ -2410,7 +2401,7 @@ printf("HandleTableSelection: Saving mUnselectCellOnMouseUp\n");
return NS_OK;
}
else if (aTarget == nsISelectionPrivate::TABLESELECTION_TABLE)
else if (aTarget == TABLESELECTION_TABLE)
{
//TODO: We currently select entire table when clicked between cells,
// should we restrict to only around border?
@ -2423,7 +2414,7 @@ printf("HandleTableSelection: Saving mUnselectCellOnMouseUp\n");
mDomSelections[index]->RemoveAllRanges();
return CreateAndAddRange(parentNode, aContentOffset);
}
else if (aTarget == nsISelectionPrivate::TABLESELECTION_ROW || aTarget == nsISelectionPrivate::TABLESELECTION_COLUMN)
else if (aTarget == TABLESELECTION_ROW || aTarget == TABLESELECTION_COLUMN)
{
// Start drag-selecting mode so multiple rows/cols can be selected
// Note: Currently, nsFrame::GetDataForTableSelection
@ -2694,9 +2685,9 @@ nsSelection::SelectRowOrColumn(nsIContent *aCellContent, PRUint32 aTarget)
// Be sure we start at proper beginning
// (This allows us to select row or col given ANY cell!)
if (aTarget == nsISelectionPrivate::TABLESELECTION_ROW)
if (aTarget == TABLESELECTION_ROW)
colIndex = 0;
if (aTarget == nsISelectionPrivate::TABLESELECTION_COLUMN)
if (aTarget == TABLESELECTION_COLUMN)
rowIndex = 0;
nsCOMPtr<nsIDOMElement> cellElement;
@ -2720,7 +2711,7 @@ nsSelection::SelectRowOrColumn(nsIContent *aCellContent, PRUint32 aTarget)
lastCell = cellElement;
// Move to next cell in cellmap, skipping spanned locations
if (aTarget == nsISelectionPrivate::TABLESELECTION_ROW)
if (aTarget == TABLESELECTION_ROW)
colIndex += actualColSpan;
else
rowIndex += actualRowSpan;
@ -2768,7 +2759,7 @@ nsSelection::SelectRowOrColumn(nsIContent *aCellContent, PRUint32 aTarget)
if (NS_FAILED(result)) return result;
}
// Move to next row or column in cellmap, skipping spanned locations
if (aTarget == nsISelectionPrivate::TABLESELECTION_ROW)
if (aTarget == TABLESELECTION_ROW)
colIndex += actualColSpan;
else
rowIndex += actualRowSpan;
@ -2984,184 +2975,6 @@ nsSelection::SelectCellElement(nsIDOMElement *aCellElement)
return CreateAndAddRange(parent, offset);
}
nsresult
nsTypedSelection::getTableCellLocationFromRange(nsIDOMRange *aRange, PRInt32 *aSelectionType, PRInt32 *aRow, PRInt32 *aCol)
{
if (!aRange || !aSelectionType || !aRow || !aCol)
return NS_ERROR_NULL_POINTER;
*aSelectionType = 0;
*aRow = 0;
*aCol = 0;
// Must have access to frame selection
if (!mFrameSelection)
return NS_ERROR_FAILURE;
nsresult result = GetTableSelectionType(aRange, aSelectionType);
if (NS_FAILED(result)) return result;
// Don't fail if range does not point to a single table cell,
// let aSelectionType tell user if we don't have a cell
if (*aSelectionType != nsISelectionPrivate::TABLESELECTION_CELL)
return NS_OK;
// Get the child content (the cell) pointed to by starting node of range
// We do minimal checking since GetTableSelectionType assures
// us that this really is a table cell
nsCOMPtr<nsIDOMNode> startNode;
result = aRange->GetStartContainer(getter_AddRefs(startNode));
if (NS_FAILED(result)) return result;
nsCOMPtr<nsIContent> content(do_QueryInterface(startNode));
if (!content) return NS_ERROR_FAILURE;
PRInt32 startOffset;
result = aRange->GetStartOffset(&startOffset);
if (NS_FAILED(result)) return result;
nsCOMPtr<nsIContent> child;
result = content->ChildAt(startOffset, *getter_AddRefs(child));
if (NS_FAILED(result)) return result;
if (!child) return NS_ERROR_FAILURE;
//Note: This is a non-ref-counted pointer to the frame
nsITableCellLayout *cellLayout = mFrameSelection->GetCellLayout(child);
if (NS_FAILED(result)) return result;
if (!cellLayout) return NS_ERROR_FAILURE;
return cellLayout->GetCellIndexes(*aRow, *aCol);
}
nsresult
nsTypedSelection::addTableCellRange(nsIDOMRange *aRange, PRBool *aDidAddRange)
{
if (!mRangeArray || !mFrameSelection)
return NS_ERROR_FAILURE;
if (!aRange || !aDidAddRange)
return NS_ERROR_NULL_POINTER;
*aDidAddRange = PR_FALSE;
nsresult result;
nsCOMPtr<nsISupports> isupp = do_QueryInterface(aRange, &result);
if (NS_FAILED(result)) return result;
// Get row, col of cell we will add
// and set the FrameSelection's selection mode value
PRInt32 newRow, newCol;
result = getTableCellLocationFromRange(aRange, &mFrameSelection->mSelectingTableCellMode, &newRow, &newCol);
if (NS_FAILED(result)) return result;
// Don't fail if range isn't a selected cell, aDidAddRange tells caller if we didn't proceed
if (mFrameSelection->mSelectingTableCellMode != nsISelectionPrivate::TABLESELECTION_CELL)
return NS_OK;
PRUint32 count;
result = mRangeArray->Count(&count);
if (NS_FAILED(result)) return result;
if (count > 0)
{
// Adding a cell range to existing list of cell ranges
PRUint32 index;
PRInt32 row, col;
// Insert range at appropriate location
for (index = 0; index < count; index++)
{
nsCOMPtr<nsISupports> element = dont_AddRef(mRangeArray->ElementAt(index));
nsCOMPtr<nsIDOMRange> range = do_QueryInterface(element);
if (!range) return NS_ERROR_FAILURE;
PRInt32 selectionMode;
result = getTableCellLocationFromRange(range, &selectionMode, &row, &col);
if (NS_FAILED(result)) return result;
// Don't proceed if range not a table cell
if (selectionMode != nsISelectionPrivate::TABLESELECTION_CELL)
return NS_OK;
if (row > newRow ||
(row == newRow && col > newCol))
{
// Existing selected cell is after cell to add,
// so insert at this index
result = mRangeArray->InsertElementAt(isupp, index);
*aDidAddRange = NS_SUCCEEDED(result);
return result;
}
}
}
// If here, we are adding a selected cell range
// to end of range array or it's the first selected range
result = mRangeArray->AppendElement(isupp);
*aDidAddRange = NS_SUCCEEDED(result);
return result;
}
//TODO: Figure out TABLESELECTION_COLUMN and TABLESELECTION_ALLCELLS
NS_IMETHODIMP
nsTypedSelection::GetTableSelectionType(nsIDOMRange* aRange, PRInt32* aTableSelectionType)
{
if (!aRange || !aTableSelectionType)
return NS_ERROR_NULL_POINTER;
*aTableSelectionType = nsISelectionPrivate::TABLESELECTION_NONE;
if(!mFrameSelection)// don't assume we have a FrameSelection
return NS_ERROR_FAILURE;
nsCOMPtr<nsIDOMNode> startNode;
nsresult result = aRange->GetStartContainer(getter_AddRefs(startNode));
if (NS_FAILED(result)) return result;
if (!startNode) return NS_ERROR_FAILURE;
nsCOMPtr<nsIDOMNode> endNode;
result = aRange->GetEndContainer(getter_AddRefs(endNode));
if (NS_FAILED(result)) return result;
if (!endNode) return NS_ERROR_FAILURE;
// Not a single selected node
if (startNode != endNode) return NS_OK;
nsCOMPtr<nsIContent> content = do_QueryInterface(startNode);
if (!content) return NS_ERROR_FAILURE;
PRInt32 startOffset;
PRInt32 endOffset;
result = aRange->GetEndOffset(&endOffset);
if (NS_FAILED(result)) return result;
result = aRange->GetStartOffset(&startOffset);
if (NS_FAILED(result)) return result;
// Not a single selected node
if ((endOffset - startOffset) != 1)
return NS_OK;
nsCOMPtr<nsIAtom> atom;
content->GetTag(*getter_AddRefs(atom));
if (!atom) return NS_ERROR_FAILURE;
if (atom.get() == nsSelection::sRowAtom)
{
*aTableSelectionType = nsISelectionPrivate::TABLESELECTION_CELL;
}
else //check to see if we are selecting a table or row (column and all cells not done yet)
{
nsCOMPtr<nsIContent> child;
result = content->ChildAt(startOffset, *getter_AddRefs(child));
if (NS_FAILED(result)) return result;
if (!child) return NS_ERROR_FAILURE;
child->GetTag(*getter_AddRefs(atom));
if (!atom) return NS_ERROR_FAILURE;
if (atom.get() == nsSelection::sTableAtom)
*aTableSelectionType = nsISelectionPrivate::TABLESELECTION_TABLE;
else if (atom.get() == nsSelection::sRowAtom)
*aTableSelectionType = nsISelectionPrivate::TABLESELECTION_ROW;
}
return result;
}
nsresult
nsSelection::CreateAndAddRange(nsIDOMNode *aParentNode, PRInt32 aOffset)
{
@ -4769,24 +4582,14 @@ nsTypedSelection::RemoveAllRanges()
NS_IMETHODIMP
nsTypedSelection::AddRange(nsIDOMRange* aRange)
{
if (!aRange) return NS_ERROR_NULL_POINTER;
// This inserts a table cell range in proper document order
// and returns NS_ERROR_FAILURE if range doesn't contain just one table cell
PRBool didAddRange;
nsresult result = addTableCellRange(aRange, &didAddRange);
if (NS_FAILED(result)) return result;
if (!didAddRange)
{
result = AddItem(aRange);
if (NS_FAILED(result)) return result;
}
nsresult result = AddItem(aRange);
if (NS_FAILED(result))
return result;
PRInt32 count;
result = GetRangeCount(&count);
if (NS_FAILED(result)) return result;
if (NS_FAILED(result))
return result;
if (count <= 0)
{
NS_ASSERTION(0,"bad count after additem\n");
@ -4794,14 +4597,62 @@ nsTypedSelection::AddRange(nsIDOMRange* aRange)
}
setAnchorFocusRange(count -1);
//TABLE CELL CHECK
if(mFrameSelection)// don't assume we have a FrameSelection
{
nsCOMPtr<nsIDOMNode> startNode;
result = aRange->GetStartContainer(getter_AddRefs(startNode));
if (NS_SUCCEEDED(result))
{
nsCOMPtr<nsIDOMNode> endNode;
result = aRange->GetEndContainer(getter_AddRefs(endNode));
if (NS_SUCCEEDED(result))
{
if (startNode == endNode)
{//check for table row
nsCOMPtr<nsIContent> content(do_QueryInterface(startNode));
if (content)
{
nsIAtom *atom;
if (NS_SUCCEEDED(content->GetTag(atom)) && atom == nsSelection::sRowAtom)
{//we are selecting a talble cell!
mFrameSelection->mSelectingTableCellMode = TABLESELECTION_CELL;
}
else //check to see if we are selecting a table
{
PRInt32 startOffset;
PRInt32 endOffset;
result = aRange->GetEndOffset(&endOffset);
result &= aRange->GetStartOffset(&startOffset);
if (NS_SUCCEEDED(result))
{
if ((endOffset - startOffset) == 1) //1 child selected
{
nsCOMPtr<nsIContent> childAt;
if (NS_SUCCEEDED(content->ChildAt(startOffset, *getter_AddRefs(childAt))))
{
if ( (childAt) &&
(NS_SUCCEEDED(childAt->GetTag(atom)) && atom == nsSelection::sTableAtom) )
{
mFrameSelection->mSelectingTableCellMode = TABLESELECTION_TABLE;
}
}
}
}
}
}
}
}
}
}
nsCOMPtr<nsIPresContext> presContext;
GetPresContext(getter_AddRefs(presContext));
selectFrames(presContext, aRange, PR_TRUE);
//ScrollIntoView(); this should not happen automatically
if (!mFrameSelection)
return NS_OK;//nothing to do
return mFrameSelection->NotifySelectionListeners(GetType());
}
@ -4872,8 +4723,8 @@ nsTypedSelection::Collapse(nsIDOMNode* aParentNode, PRInt32 aOffset)
content = do_QueryInterface(aParentNode);
if (!content)
return NS_ERROR_FAILURE;
nsCOMPtr<nsIAtom> tag;
content->GetTag(*getter_AddRefs(tag));
nsIAtom *tag;
content->GetTag(tag);
if (tag)
{
nsAutoString tagString;
@ -4911,8 +4762,8 @@ nsTypedSelection::CollapseToStart()
if (NS_FAILED(rv) || cnt<=0 || !mRangeArray)
return NS_ERROR_FAILURE;
// Get the first range
nsCOMPtr<nsISupports> element = dont_AddRef(mRangeArray->ElementAt(0));
// Get the first range (from GetRangeAt)
nsISupports* element = mRangeArray->ElementAt(0);
nsCOMPtr<nsIDOMRange> firstRange = do_QueryInterface(element);
if (!firstRange)
return NS_ERROR_FAILURE;
@ -4946,8 +4797,8 @@ nsTypedSelection::CollapseToEnd()
if (NS_FAILED(rv) || cnt<=0 || !mRangeArray)
return NS_ERROR_FAILURE;
// Get the last range
nsCOMPtr<nsISupports> element = dont_AddRef(mRangeArray->ElementAt(cnt-1));
// Get the last range (from GetRangeAt)
nsISupports* element = mRangeArray->ElementAt(cnt-1);
nsCOMPtr<nsIDOMRange> lastRange = do_QueryInterface(element);
if (!lastRange)
return NS_ERROR_FAILURE;
@ -5688,8 +5539,8 @@ nsTypedSelection::Extend(nsIDOMNode* aParentNode, PRInt32 aOffset)
{
nsCOMPtr<nsIContent>content;
content = do_QueryInterface(aParentNode);
nsCOMPtr<nsIAtom> tag;
content->GetTag(*getter_AddRefs(tag));
nsIAtom *tag;
content->GetTag(tag);
if (tag)
{
nsAutoString tagString;
@ -6625,3 +6476,4 @@ nsTypedSelection::CanSetProperty(const nsIID * iid, const PRUnichar *propertyNam
}
return NS_OK;
}

25
editor/base/nsTableEditor.cpp
Просмотреть файл

@ -41,7 +41,7 @@
#include "nsITableCellLayout.h" // For efficient access to table cell
#include "nsITableLayout.h" // data owned by the table and cell frames
#include "nsHTMLEditor.h"
#include "nsISelectionPrivate.h" // For nsISelectionPrivate::TABLESELECTION_ defines
#include "nsIFrameSelection.h" // For TABLESELECTION_ defines
#include "nsVoidArray.h"
#include "nsEditorUtils.h"
@ -254,7 +254,7 @@ nsHTMLEditor::GetFirstRow(nsIDOMElement* aTableElement, nsIDOMElement* &aRow)
if (!tableNode) return NS_ERROR_NULL_POINTER;
nsCOMPtr<nsIDOMNode> tableChild;
res = GetFirstEditableChild(tableNode, &tableChild);
res = tableNode->GetFirstChild(getter_AddRefs(tableChild));
if (NS_FAILED(res)) return res;
while (tableChild)
@ -283,7 +283,7 @@ nsHTMLEditor::GetFirstRow(nsIDOMElement* aTableElement, nsIDOMElement* &aRow)
{
nsCOMPtr<nsIDOMNode> rowNode;
// All children should be rows
res = GetFirstEditableChild(tableChild, &rowNode);
res = tableChild->GetFirstChild(getter_AddRefs(rowNode));
if (NS_FAILED(res)) return res;
if (rowNode && IsRowNode(rowNode))
{
@ -300,11 +300,7 @@ nsHTMLEditor::GetFirstRow(nsIDOMElement* aTableElement, nsIDOMElement* &aRow)
// Here if table child was a CAPTION or COLGROUP
// or child of a row-conainer wasn't a row (bad HTML)
// Look in next table child
nsCOMPtr<nsIDOMNode> nextChild;
res = tableChild->GetNextSibling(getter_AddRefs(nextChild));
if (NS_FAILED(res)) return res;
//Note that if nextChild is null it will simply abort the loop
tableChild = nextChild;
res = tableChild->GetNextSibling(getter_AddRefs(tableChild));
};
return res;
}
@ -426,11 +422,6 @@ nsHTMLEditor::InsertTableColumn(PRInt32 aNumber, PRBool aAfter)
if (startColIndex >= colCount)
NormalizeTable(table);
#ifdef DEBUG_cmanske
printf("GetFirstRow: aTableElement = %x\n\n", table);
#endif
nsCOMPtr<nsIDOMElement> rowElement;
for ( rowIndex = 0; rowIndex < rowCount; rowIndex++)
{
@ -472,7 +463,7 @@ nsHTMLEditor::InsertTableColumn(PRInt32 aNumber, PRBool aAfter)
nsCOMPtr<nsIDOMNode> lastCell;
nsCOMPtr<nsIDOMNode> rowNode = do_QueryInterface(rowElement);
if (!rowNode) return NS_ERROR_FAILURE;
if (!rowElement) return NS_ERROR_FAILURE;
res = rowElement->GetLastChild(getter_AddRefs(lastCell));
if (NS_FAILED(res)) return res;
@ -3250,7 +3241,7 @@ nsHTMLEditor::GetSelectedCellsType(nsIDOMElement *aElement, PRUint32 &aSelection
if (res == NS_EDITOR_ELEMENT_NOT_FOUND) return NS_OK;
// We have at least one selected cell, so set return value
aSelectionType = nsISelectionPrivate::TABLESELECTION_CELL;
aSelectionType = TABLESELECTION_CELL;
// Store indexes of each row/col to avoid duplication of searches
nsVoidArray indexArray;
@ -3276,7 +3267,7 @@ nsHTMLEditor::GetSelectedCellsType(nsIDOMElement *aElement, PRUint32 &aSelection
if (allCellsInRowAreSelected)
{
aSelectionType = nsISelectionPrivate::TABLESELECTION_ROW;
aSelectionType = TABLESELECTION_ROW;
return NS_OK;
}
// Test for columns
@ -3303,7 +3294,7 @@ nsHTMLEditor::GetSelectedCellsType(nsIDOMElement *aElement, PRUint32 &aSelection
res = GetNextSelectedCell(getter_AddRefs(selectedCell), nsnull);
}
if (allCellsInColAreSelected)
aSelectionType = nsISelectionPrivate::TABLESELECTION_COLUMN;
aSelectionType = TABLESELECTION_COLUMN;
return NS_OK;
}

25
editor/libeditor/html/nsTableEditor.cpp
Просмотреть файл

@ -41,7 +41,7 @@
#include "nsITableCellLayout.h" // For efficient access to table cell
#include "nsITableLayout.h" // data owned by the table and cell frames
#include "nsHTMLEditor.h"
#include "nsISelectionPrivate.h" // For nsISelectionPrivate::TABLESELECTION_ defines
#include "nsIFrameSelection.h" // For TABLESELECTION_ defines
#include "nsVoidArray.h"
#include "nsEditorUtils.h"
@ -254,7 +254,7 @@ nsHTMLEditor::GetFirstRow(nsIDOMElement* aTableElement, nsIDOMElement* &aRow)
if (!tableNode) return NS_ERROR_NULL_POINTER;
nsCOMPtr<nsIDOMNode> tableChild;
res = GetFirstEditableChild(tableNode, &tableChild);
res = tableNode->GetFirstChild(getter_AddRefs(tableChild));
if (NS_FAILED(res)) return res;
while (tableChild)
@ -283,7 +283,7 @@ nsHTMLEditor::GetFirstRow(nsIDOMElement* aTableElement, nsIDOMElement* &aRow)
{
nsCOMPtr<nsIDOMNode> rowNode;
// All children should be rows
res = GetFirstEditableChild(tableChild, &rowNode);
res = tableChild->GetFirstChild(getter_AddRefs(rowNode));
if (NS_FAILED(res)) return res;
if (rowNode && IsRowNode(rowNode))
{
@ -300,11 +300,7 @@ nsHTMLEditor::GetFirstRow(nsIDOMElement* aTableElement, nsIDOMElement* &aRow)
// Here if table child was a CAPTION or COLGROUP
// or child of a row-conainer wasn't a row (bad HTML)
// Look in next table child
nsCOMPtr<nsIDOMNode> nextChild;
res = tableChild->GetNextSibling(getter_AddRefs(nextChild));
if (NS_FAILED(res)) return res;
//Note that if nextChild is null it will simply abort the loop
tableChild = nextChild;
res = tableChild->GetNextSibling(getter_AddRefs(tableChild));
};
return res;
}
@ -426,11 +422,6 @@ nsHTMLEditor::InsertTableColumn(PRInt32 aNumber, PRBool aAfter)
if (startColIndex >= colCount)
NormalizeTable(table);
#ifdef DEBUG_cmanske
printf("GetFirstRow: aTableElement = %x\n\n", table);
#endif
nsCOMPtr<nsIDOMElement> rowElement;
for ( rowIndex = 0; rowIndex < rowCount; rowIndex++)
{
@ -472,7 +463,7 @@ nsHTMLEditor::InsertTableColumn(PRInt32 aNumber, PRBool aAfter)
nsCOMPtr<nsIDOMNode> lastCell;
nsCOMPtr<nsIDOMNode> rowNode = do_QueryInterface(rowElement);
if (!rowNode) return NS_ERROR_FAILURE;
if (!rowElement) return NS_ERROR_FAILURE;
res = rowElement->GetLastChild(getter_AddRefs(lastCell));
if (NS_FAILED(res)) return res;
@ -3250,7 +3241,7 @@ nsHTMLEditor::GetSelectedCellsType(nsIDOMElement *aElement, PRUint32 &aSelection
if (res == NS_EDITOR_ELEMENT_NOT_FOUND) return NS_OK;
// We have at least one selected cell, so set return value
aSelectionType = nsISelectionPrivate::TABLESELECTION_CELL;
aSelectionType = TABLESELECTION_CELL;
// Store indexes of each row/col to avoid duplication of searches
nsVoidArray indexArray;
@ -3276,7 +3267,7 @@ nsHTMLEditor::GetSelectedCellsType(nsIDOMElement *aElement, PRUint32 &aSelection
if (allCellsInRowAreSelected)
{
aSelectionType = nsISelectionPrivate::TABLESELECTION_ROW;
aSelectionType = TABLESELECTION_ROW;
return NS_OK;
}
// Test for columns
@ -3303,7 +3294,7 @@ nsHTMLEditor::GetSelectedCellsType(nsIDOMElement *aElement, PRUint32 &aSelection
res = GetNextSelectedCell(getter_AddRefs(selectedCell), nsnull);
}
if (allCellsInColAreSelected)
aSelectionType = nsISelectionPrivate::TABLESELECTION_COLUMN;
aSelectionType = TABLESELECTION_COLUMN;
return NS_OK;
}

13
layout/base/nsIFrameSelection.h
Просмотреть файл

@ -101,6 +101,15 @@ struct nsPeekOffsetStruct
PRBool mJumpLines;
};
// Values for aFlag parameter in HandleTableSelection
enum {
TABLESELECTION_CELL=1,
TABLESELECTION_ROW,
TABLESELECTION_COLUMN,
TABLESELECTION_TABLE,
TABLESELECTION_ALLCELLS
};
class nsIScrollableView;
@ -170,7 +179,7 @@ public:
* depending on information contained in aFlags
* @param aParentContent is the paretent of either a table or cell that user clicked or dragged the mouse in
* @param aContentOffset is the offset of the table or cell
* @param aTarget indicates what to select (defined in nsISelectionPrivate.idl/nsISelectionPrivate.h):
* @param aTarget indicates what to select:
* TABLESELECTION_CELL We should select a cell (content points to the cell)
* TABLESELECTION_ROW We should select a row (content points to any cell in row)
* TABLESELECTION_COLUMN We should select a row (content points to any cell in column)
@ -178,7 +187,7 @@ public:
* TABLESELECTION_ALLCELLS We should select all cells (content points to any cell in table)
* @param aMouseEvent passed in so we we can get where event occured and what keys are pressed
*/
NS_IMETHOD HandleTableSelection(nsIContent *aParentContent, PRInt32 aContentOffset, PRInt32 aTarget, nsMouseEvent *aMouseEvent) = 0;
NS_IMETHOD HandleTableSelection(nsIContent *aParentContent, PRInt32 aContentOffset, PRUint32 aTarget, nsMouseEvent *aMouseEvent) = 0;
/** StartAutoScrollTimer is responsible for scrolling the view so that aPoint is always
* visible, and for selecting any frame that contains aPoint. The timer will also reset

13
layout/base/public/nsIFrameSelection.h
Просмотреть файл

@ -101,6 +101,15 @@ struct nsPeekOffsetStruct
PRBool mJumpLines;
};
// Values for aFlag parameter in HandleTableSelection
enum {
TABLESELECTION_CELL=1,
TABLESELECTION_ROW,
TABLESELECTION_COLUMN,
TABLESELECTION_TABLE,
TABLESELECTION_ALLCELLS
};
class nsIScrollableView;
@ -170,7 +179,7 @@ public:
* depending on information contained in aFlags
* @param aParentContent is the paretent of either a table or cell that user clicked or dragged the mouse in
* @param aContentOffset is the offset of the table or cell
* @param aTarget indicates what to select (defined in nsISelectionPrivate.idl/nsISelectionPrivate.h):
* @param aTarget indicates what to select:
* TABLESELECTION_CELL We should select a cell (content points to the cell)
* TABLESELECTION_ROW We should select a row (content points to any cell in row)
* TABLESELECTION_COLUMN We should select a row (content points to any cell in column)
@ -178,7 +187,7 @@ public:
* TABLESELECTION_ALLCELLS We should select all cells (content points to any cell in table)
* @param aMouseEvent passed in so we we can get where event occured and what keys are pressed
*/
NS_IMETHOD HandleTableSelection(nsIContent *aParentContent, PRInt32 aContentOffset, PRInt32 aTarget, nsMouseEvent *aMouseEvent) = 0;
NS_IMETHOD HandleTableSelection(nsIContent *aParentContent, PRInt32 aContentOffset, PRUint32 aTarget, nsMouseEvent *aMouseEvent) = 0;
/** StartAutoScrollTimer is responsible for scrolling the view so that aPoint is always
* visible, and for selecting any frame that contains aPoint. The timer will also reset

18
layout/base/public/nsISelectionPrivate.idl
Просмотреть файл

@ -53,23 +53,5 @@ interface nsISelectionPrivate : nsISupports
wstring toStringWithFormat(in string formatType, in unsigned long flags, in PRInt32 wrapCount);
void addSelectionListener(in nsISelectionListener newListener);
void removeSelectionListener(in nsISelectionListener listenerToRemove);
/* Table selection stuff
We should probably move this and table-related
items in nsIFrameSelection to a
new nsITableSelection interface
*/
const long TABLESELECTION_NONE = 0;
const long TABLESELECTION_CELL = 1;
const long TABLESELECTION_ROW = 2;
const long TABLESELECTION_COLUMN = 3;
const long TABLESELECTION_TABLE = 4;
const long TABLESELECTION_ALLCELLS = 5;
/** Test if supplied range points to a single table element:
* Result is one of above constants. "None" means
* a table element isn't selected.
*/
long getTableSelectionType(in nsIDOMRange range);
};

322
layout/base/src/nsSelection.cpp
Просмотреть файл

@ -156,7 +156,6 @@ public:
NS_IMETHOD GetRangeCount(PRInt32* aRangeCount);
NS_IMETHOD GetRangeAt(PRInt32 aIndex, nsIDOMRange** aReturn);
NS_IMETHOD RemoveAllRanges();
NS_IMETHOD GetTableSelectionType(nsIDOMRange* aRange, PRInt32* aTableSelectionType);
NS_IMETHOD Collapse(nsIDOMNode* aParentNode, PRInt32 aOffset);
NS_IMETHOD CollapseToStart();
NS_IMETHOD CollapseToEnd();
@ -250,8 +249,6 @@ private:
void setAnchorFocusRange(PRInt32 aIndex); //pass in index into FrameSelection
NS_IMETHOD selectFrames(nsIPresContext* aPresContext, nsIContentIterator *aInnerIter, nsIContent *aContent, nsIDOMRange *aRange, nsIPresShell *aPresShell, PRBool aFlags);
NS_IMETHOD selectFrames(nsIPresContext* aPresContext, nsIDOMRange *aRange, PRBool aSelect);
nsresult getTableCellLocationFromRange(nsIDOMRange *aRange, PRInt32 *aSelectionType, PRInt32 *aRow, PRInt32 *aCol);
nsresult addTableCellRange(nsIDOMRange *aRange, PRBool *aDidAddRange);
#if OLD_SELECTION
NS_IMETHOD FixupSelectionPoints(nsIDOMRange *aRange, nsDirection *aDir, PRBool *aFixupState);
@ -305,7 +302,7 @@ public:
NS_IMETHOD HandleClick(nsIContent *aNewFocus, PRUint32 aContentOffset, PRUint32 aContentEndOffset,
PRBool aContinueSelection, PRBool aMultipleSelection,PRBool aHint);
NS_IMETHOD HandleDrag(nsIPresContext *aPresContext, nsIFrame *aFrame, nsPoint& aPoint);
NS_IMETHOD HandleTableSelection(nsIContent *aParentContent, PRInt32 aContentOffset, PRInt32 aTarget, nsMouseEvent *aMouseEvent);
NS_IMETHOD HandleTableSelection(nsIContent *aParentContent, PRInt32 aContentOffset, PRUint32 aTarget, nsMouseEvent *aMouseEvent);
NS_IMETHOD StartAutoScrollTimer(nsIPresContext *aPresContext, nsIFrame *aFrame, nsPoint& aPoint, PRUint32 aDelay);
NS_IMETHOD StopAutoScrollTimer();
NS_IMETHOD EnableFrameNotification(PRBool aEnable){mNotifyFrames = aEnable; return NS_OK;}
@ -352,7 +349,6 @@ public:
NS_IMETHOD DeleteFromDocument();
nsIFocusTracker *GetTracker(){return mTracker;}
private:
NS_IMETHOD TakeFocus(nsIContent *aNewFocus, PRUint32 aContentOffset, PRUint32 aContentEndOffset,
PRBool aContinueSelection, PRBool aMultipleSelection);
@ -394,7 +390,6 @@ private:
// Interfaces that let us get info based on cellmap locations
nsITableLayout* GetTableLayout(nsIContent *aTableContent);
nsITableCellLayout* GetCellLayout(nsIContent *aCellContent);
nsresult SelectBlockOfCells(nsIContent *aEndNode);
nsresult SelectRowOrColumn(nsIContent *aCellContent, PRUint32 aTarget);
nsresult GetCellIndexes(nsIContent *aCell, PRInt32 &aRowIndex, PRInt32 &aColIndex);
@ -414,7 +409,7 @@ private:
nsCOMPtr<nsIContent> mAppendStartSelectedCell;
nsCOMPtr<nsIContent> mUnselectCellOnMouseUp;
PRBool mSelectingTableCells;
PRInt32 mSelectingTableCellMode;
PRUint32 mSelectingTableCellMode;
PRInt32 mSelectedCellIndex;
//batching
@ -2190,9 +2185,9 @@ nsSelection::FrameOrParentHasSpecialSelectionStyle(nsIFrame* aFrame, PRUint8 aSe
static PRBool IsCell(nsIContent *aContent)
{
nsCOMPtr<nsIAtom> tag;
aContent->GetTag(*getter_AddRefs(tag));
return (tag != 0 && tag.get() == nsSelection::sCellAtom);
nsIAtom *tag;
aContent->GetTag(tag);
return (tag != 0 && tag == nsSelection::sCellAtom);
}
nsITableCellLayout*
@ -2228,13 +2223,11 @@ nsSelection::ClearNormalSelection()
return mDomSelections[index]->RemoveAllRanges();
}
// Table selection support.
// TODO: Separate table methods into a separate nsITableSelection interface
nsresult
nsSelection::HandleTableSelection(nsIContent *aParentContent, PRInt32 aContentOffset, PRInt32 aTarget, nsMouseEvent *aMouseEvent)
nsSelection::HandleTableSelection(nsIContent *aParentContent, PRInt32 aContentOffset, PRUint32 aTarget, nsMouseEvent *aMouseEvent)
{
if (!aParentContent) return NS_ERROR_NULL_POINTER;
if (mSelectingTableCells && (aTarget & nsISelectionPrivate::TABLESELECTION_TABLE))
if (mSelectingTableCells && (aTarget & TABLESELECTION_TABLE))
{
// We were selecting cells and user drags mouse in table border or inbetween cells,
// just do nothing
@ -2266,7 +2259,7 @@ nsSelection::HandleTableSelection(nsIContent *aParentContent, PRInt32 aContentOf
{
// We are drag-selecting
if (aTarget != nsISelectionPrivate::TABLESELECTION_TABLE)
if (aTarget != TABLESELECTION_TABLE)
{
// If dragging in the same cell as last event, do nothing
if (mEndSelectedCell == childContent)
@ -2278,8 +2271,8 @@ nsSelection::HandleTableSelection(nsIContent *aParentContent, PRInt32 aContentOf
// we can drift into any cell to stay in that mode
// even if aTarget = TABLESELECTION_CELL
if (mSelectingTableCellMode == nsISelectionPrivate::TABLESELECTION_ROW ||
mSelectingTableCellMode == nsISelectionPrivate::TABLESELECTION_COLUMN)
if (mSelectingTableCellMode == TABLESELECTION_ROW ||
mSelectingTableCellMode == TABLESELECTION_COLUMN)
{
if (mEndSelectedCell)
{
@ -2289,8 +2282,8 @@ nsSelection::HandleTableSelection(nsIContent *aParentContent, PRInt32 aContentOf
result = GetCellIndexes(childContent, curRowIndex, curColIndex);
if (NS_FAILED(result)) return result;
if ((mSelectingTableCellMode == nsISelectionPrivate::TABLESELECTION_ROW && startRowIndex == curRowIndex) ||
(mSelectingTableCellMode == nsISelectionPrivate::TABLESELECTION_COLUMN && startColIndex == curColIndex))
if ((mSelectingTableCellMode == TABLESELECTION_ROW && startRowIndex == curRowIndex) ||
(mSelectingTableCellMode == TABLESELECTION_COLUMN && startColIndex == curColIndex))
return NS_OK;
}
#ifdef DEBUG_TABLE_SELECTION
@ -2299,7 +2292,7 @@ printf("HandleTableSelection: Dragged into a new column or row\n");
// Continue dragging row or column selection
return SelectRowOrColumn(childContent, mSelectingTableCellMode);
}
else if (mSelectingTableCellMode == nsISelectionPrivate::TABLESELECTION_CELL)
else if (mSelectingTableCellMode == TABLESELECTION_CELL)
{
#ifdef DEBUG_TABLE_SELECTION
printf("HandleTableSelection: Dragged into a new cell\n");
@ -2325,10 +2318,8 @@ printf("HandleTableSelection: Dragged into a new cell\n");
mStartSelectedCell = nsnull;
mDomSelections[index]->RemoveAllRanges();
if (startRowIndex == curRowIndex)
mSelectingTableCellMode = nsISelectionPrivate::TABLESELECTION_ROW;
else
mSelectingTableCellMode = nsISelectionPrivate::TABLESELECTION_COLUMN;
mSelectingTableCellMode =
(startRowIndex == curRowIndex) ? TABLESELECTION_ROW : TABLESELECTION_COLUMN;
return SelectRowOrColumn(childContent, mSelectingTableCellMode);
}
@ -2353,7 +2344,7 @@ printf("HandleTableSelection: Mouse down event\n");
// Clear cell we stored in mouse-down
mUnselectCellOnMouseUp = nsnull;
if (aTarget == nsISelectionPrivate::TABLESELECTION_CELL)
if (aTarget == TABLESELECTION_CELL)
{
PRBool isSelected = PR_FALSE;
@ -2410,7 +2401,7 @@ printf("HandleTableSelection: Saving mUnselectCellOnMouseUp\n");
return NS_OK;
}
else if (aTarget == nsISelectionPrivate::TABLESELECTION_TABLE)
else if (aTarget == TABLESELECTION_TABLE)
{
//TODO: We currently select entire table when clicked between cells,
// should we restrict to only around border?
@ -2423,7 +2414,7 @@ printf("HandleTableSelection: Saving mUnselectCellOnMouseUp\n");
mDomSelections[index]->RemoveAllRanges();
return CreateAndAddRange(parentNode, aContentOffset);
}
else if (aTarget == nsISelectionPrivate::TABLESELECTION_ROW || aTarget == nsISelectionPrivate::TABLESELECTION_COLUMN)
else if (aTarget == TABLESELECTION_ROW || aTarget == TABLESELECTION_COLUMN)
{
// Start drag-selecting mode so multiple rows/cols can be selected
// Note: Currently, nsFrame::GetDataForTableSelection
@ -2694,9 +2685,9 @@ nsSelection::SelectRowOrColumn(nsIContent *aCellContent, PRUint32 aTarget)
// Be sure we start at proper beginning
// (This allows us to select row or col given ANY cell!)
if (aTarget == nsISelectionPrivate::TABLESELECTION_ROW)
if (aTarget == TABLESELECTION_ROW)
colIndex = 0;
if (aTarget == nsISelectionPrivate::TABLESELECTION_COLUMN)
if (aTarget == TABLESELECTION_COLUMN)
rowIndex = 0;
nsCOMPtr<nsIDOMElement> cellElement;
@ -2720,7 +2711,7 @@ nsSelection::SelectRowOrColumn(nsIContent *aCellContent, PRUint32 aTarget)
lastCell = cellElement;
// Move to next cell in cellmap, skipping spanned locations
if (aTarget == nsISelectionPrivate::TABLESELECTION_ROW)
if (aTarget == TABLESELECTION_ROW)
colIndex += actualColSpan;
else
rowIndex += actualRowSpan;
@ -2768,7 +2759,7 @@ nsSelection::SelectRowOrColumn(nsIContent *aCellContent, PRUint32 aTarget)
if (NS_FAILED(result)) return result;
}
// Move to next row or column in cellmap, skipping spanned locations
if (aTarget == nsISelectionPrivate::TABLESELECTION_ROW)
if (aTarget == TABLESELECTION_ROW)
colIndex += actualColSpan;
else
rowIndex += actualRowSpan;
@ -2984,184 +2975,6 @@ nsSelection::SelectCellElement(nsIDOMElement *aCellElement)
return CreateAndAddRange(parent, offset);
}
nsresult
nsTypedSelection::getTableCellLocationFromRange(nsIDOMRange *aRange, PRInt32 *aSelectionType, PRInt32 *aRow, PRInt32 *aCol)
{
if (!aRange || !aSelectionType || !aRow || !aCol)
return NS_ERROR_NULL_POINTER;
*aSelectionType = 0;
*aRow = 0;
*aCol = 0;
// Must have access to frame selection
if (!mFrameSelection)
return NS_ERROR_FAILURE;
nsresult result = GetTableSelectionType(aRange, aSelectionType);
if (NS_FAILED(result)) return result;
// Don't fail if range does not point to a single table cell,
// let aSelectionType tell user if we don't have a cell
if (*aSelectionType != nsISelectionPrivate::TABLESELECTION_CELL)
return NS_OK;
// Get the child content (the cell) pointed to by starting node of range
// We do minimal checking since GetTableSelectionType assures
// us that this really is a table cell
nsCOMPtr<nsIDOMNode> startNode;
result = aRange->GetStartContainer(getter_AddRefs(startNode));
if (NS_FAILED(result)) return result;
nsCOMPtr<nsIContent> content(do_QueryInterface(startNode));
if (!content) return NS_ERROR_FAILURE;
PRInt32 startOffset;
result = aRange->GetStartOffset(&startOffset);
if (NS_FAILED(result)) return result;
nsCOMPtr<nsIContent> child;
result = content->ChildAt(startOffset, *getter_AddRefs(child));
if (NS_FAILED(result)) return result;
if (!child) return NS_ERROR_FAILURE;
//Note: This is a non-ref-counted pointer to the frame
nsITableCellLayout *cellLayout = mFrameSelection->GetCellLayout(child);
if (NS_FAILED(result)) return result;
if (!cellLayout) return NS_ERROR_FAILURE;
return cellLayout->GetCellIndexes(*aRow, *aCol);
}
nsresult
nsTypedSelection::addTableCellRange(nsIDOMRange *aRange, PRBool *aDidAddRange)
{
if (!mRangeArray || !mFrameSelection)
return NS_ERROR_FAILURE;
if (!aRange || !aDidAddRange)
return NS_ERROR_NULL_POINTER;
*aDidAddRange = PR_FALSE;
nsresult result;
nsCOMPtr<nsISupports> isupp = do_QueryInterface(aRange, &result);
if (NS_FAILED(result)) return result;
// Get row, col of cell we will add
// and set the FrameSelection's selection mode value
PRInt32 newRow, newCol;
result = getTableCellLocationFromRange(aRange, &mFrameSelection->mSelectingTableCellMode, &newRow, &newCol);
if (NS_FAILED(result)) return result;
// Don't fail if range isn't a selected cell, aDidAddRange tells caller if we didn't proceed
if (mFrameSelection->mSelectingTableCellMode != nsISelectionPrivate::TABLESELECTION_CELL)
return NS_OK;
PRUint32 count;
result = mRangeArray->Count(&count);
if (NS_FAILED(result)) return result;
if (count > 0)
{
// Adding a cell range to existing list of cell ranges
PRUint32 index;
PRInt32 row, col;
// Insert range at appropriate location
for (index = 0; index < count; index++)
{
nsCOMPtr<nsISupports> element = dont_AddRef(mRangeArray->ElementAt(index));
nsCOMPtr<nsIDOMRange> range = do_QueryInterface(element);
if (!range) return NS_ERROR_FAILURE;
PRInt32 selectionMode;
result = getTableCellLocationFromRange(range, &selectionMode, &row, &col);
if (NS_FAILED(result)) return result;
// Don't proceed if range not a table cell
if (selectionMode != nsISelectionPrivate::TABLESELECTION_CELL)
return NS_OK;
if (row > newRow ||
(row == newRow && col > newCol))
{
// Existing selected cell is after cell to add,
// so insert at this index
result = mRangeArray->InsertElementAt(isupp, index);
*aDidAddRange = NS_SUCCEEDED(result);
return result;
}
}
}
// If here, we are adding a selected cell range
// to end of range array or it's the first selected range
result = mRangeArray->AppendElement(isupp);
*aDidAddRange = NS_SUCCEEDED(result);
return result;
}
//TODO: Figure out TABLESELECTION_COLUMN and TABLESELECTION_ALLCELLS
NS_IMETHODIMP
nsTypedSelection::GetTableSelectionType(nsIDOMRange* aRange, PRInt32* aTableSelectionType)
{
if (!aRange || !aTableSelectionType)
return NS_ERROR_NULL_POINTER;
*aTableSelectionType = nsISelectionPrivate::TABLESELECTION_NONE;
if(!mFrameSelection)// don't assume we have a FrameSelection
return NS_ERROR_FAILURE;
nsCOMPtr<nsIDOMNode> startNode;
nsresult result = aRange->GetStartContainer(getter_AddRefs(startNode));
if (NS_FAILED(result)) return result;
if (!startNode) return NS_ERROR_FAILURE;
nsCOMPtr<nsIDOMNode> endNode;
result = aRange->GetEndContainer(getter_AddRefs(endNode));
if (NS_FAILED(result)) return result;
if (!endNode) return NS_ERROR_FAILURE;
// Not a single selected node
if (startNode != endNode) return NS_OK;
nsCOMPtr<nsIContent> content = do_QueryInterface(startNode);
if (!content) return NS_ERROR_FAILURE;
PRInt32 startOffset;
PRInt32 endOffset;
result = aRange->GetEndOffset(&endOffset);
if (NS_FAILED(result)) return result;
result = aRange->GetStartOffset(&startOffset);
if (NS_FAILED(result)) return result;
// Not a single selected node
if ((endOffset - startOffset) != 1)
return NS_OK;
nsCOMPtr<nsIAtom> atom;
content->GetTag(*getter_AddRefs(atom));
if (!atom) return NS_ERROR_FAILURE;
if (atom.get() == nsSelection::sRowAtom)
{
*aTableSelectionType = nsISelectionPrivate::TABLESELECTION_CELL;
}
else //check to see if we are selecting a table or row (column and all cells not done yet)
{
nsCOMPtr<nsIContent> child;
result = content->ChildAt(startOffset, *getter_AddRefs(child));
if (NS_FAILED(result)) return result;
if (!child) return NS_ERROR_FAILURE;
child->GetTag(*getter_AddRefs(atom));
if (!atom) return NS_ERROR_FAILURE;
if (atom.get() == nsSelection::sTableAtom)
*aTableSelectionType = nsISelectionPrivate::TABLESELECTION_TABLE;
else if (atom.get() == nsSelection::sRowAtom)
*aTableSelectionType = nsISelectionPrivate::TABLESELECTION_ROW;
}
return result;
}
nsresult
nsSelection::CreateAndAddRange(nsIDOMNode *aParentNode, PRInt32 aOffset)
{
@ -4769,24 +4582,14 @@ nsTypedSelection::RemoveAllRanges()
NS_IMETHODIMP
nsTypedSelection::AddRange(nsIDOMRange* aRange)
{
if (!aRange) return NS_ERROR_NULL_POINTER;
// This inserts a table cell range in proper document order
// and returns NS_ERROR_FAILURE if range doesn't contain just one table cell
PRBool didAddRange;
nsresult result = addTableCellRange(aRange, &didAddRange);
if (NS_FAILED(result)) return result;
if (!didAddRange)
{
result = AddItem(aRange);
if (NS_FAILED(result)) return result;
}
nsresult result = AddItem(aRange);
if (NS_FAILED(result))
return result;
PRInt32 count;
result = GetRangeCount(&count);
if (NS_FAILED(result)) return result;
if (NS_FAILED(result))
return result;
if (count <= 0)
{
NS_ASSERTION(0,"bad count after additem\n");
@ -4794,14 +4597,62 @@ nsTypedSelection::AddRange(nsIDOMRange* aRange)
}
setAnchorFocusRange(count -1);
//TABLE CELL CHECK
if(mFrameSelection)// don't assume we have a FrameSelection
{
nsCOMPtr<nsIDOMNode> startNode;
result = aRange->GetStartContainer(getter_AddRefs(startNode));
if (NS_SUCCEEDED(result))
{
nsCOMPtr<nsIDOMNode> endNode;
result = aRange->GetEndContainer(getter_AddRefs(endNode));
if (NS_SUCCEEDED(result))
{
if (startNode == endNode)
{//check for table row
nsCOMPtr<nsIContent> content(do_QueryInterface(startNode));
if (content)
{
nsIAtom *atom;
if (NS_SUCCEEDED(content->GetTag(atom)) && atom == nsSelection::sRowAtom)
{//we are selecting a talble cell!
mFrameSelection->mSelectingTableCellMode = TABLESELECTION_CELL;
}
else //check to see if we are selecting a table
{
PRInt32 startOffset;
PRInt32 endOffset;
result = aRange->GetEndOffset(&endOffset);
result &= aRange->GetStartOffset(&startOffset);
if (NS_SUCCEEDED(result))
{
if ((endOffset - startOffset) == 1) //1 child selected
{
nsCOMPtr<nsIContent> childAt;
if (NS_SUCCEEDED(content->ChildAt(startOffset, *getter_AddRefs(childAt))))
{
if ( (childAt) &&
(NS_SUCCEEDED(childAt->GetTag(atom)) && atom == nsSelection::sTableAtom) )
{
mFrameSelection->mSelectingTableCellMode = TABLESELECTION_TABLE;
}
}
}
}
}
}
}
}
}
}
nsCOMPtr<nsIPresContext> presContext;
GetPresContext(getter_AddRefs(presContext));
selectFrames(presContext, aRange, PR_TRUE);
//ScrollIntoView(); this should not happen automatically
if (!mFrameSelection)
return NS_OK;//nothing to do
return mFrameSelection->NotifySelectionListeners(GetType());
}
@ -4872,8 +4723,8 @@ nsTypedSelection::Collapse(nsIDOMNode* aParentNode, PRInt32 aOffset)
content = do_QueryInterface(aParentNode);
if (!content)
return NS_ERROR_FAILURE;
nsCOMPtr<nsIAtom> tag;
content->GetTag(*getter_AddRefs(tag));
nsIAtom *tag;
content->GetTag(tag);
if (tag)
{
nsAutoString tagString;
@ -4911,8 +4762,8 @@ nsTypedSelection::CollapseToStart()
if (NS_FAILED(rv) || cnt<=0 || !mRangeArray)
return NS_ERROR_FAILURE;
// Get the first range
nsCOMPtr<nsISupports> element = dont_AddRef(mRangeArray->ElementAt(0));
// Get the first range (from GetRangeAt)
nsISupports* element = mRangeArray->ElementAt(0);
nsCOMPtr<nsIDOMRange> firstRange = do_QueryInterface(element);
if (!firstRange)
return NS_ERROR_FAILURE;
@ -4946,8 +4797,8 @@ nsTypedSelection::CollapseToEnd()
if (NS_FAILED(rv) || cnt<=0 || !mRangeArray)
return NS_ERROR_FAILURE;
// Get the last range
nsCOMPtr<nsISupports> element = dont_AddRef(mRangeArray->ElementAt(cnt-1));
// Get the last range (from GetRangeAt)
nsISupports* element = mRangeArray->ElementAt(cnt-1);
nsCOMPtr<nsIDOMRange> lastRange = do_QueryInterface(element);
if (!lastRange)
return NS_ERROR_FAILURE;
@ -5688,8 +5539,8 @@ nsTypedSelection::Extend(nsIDOMNode* aParentNode, PRInt32 aOffset)
{
nsCOMPtr<nsIContent>content;
content = do_QueryInterface(aParentNode);
nsCOMPtr<nsIAtom> tag;
content->GetTag(*getter_AddRefs(tag));
nsIAtom *tag;
content->GetTag(tag);
if (tag)
{
nsAutoString tagString;
@ -6625,3 +6476,4 @@ nsTypedSelection::CanSetProperty(const nsIID * iid, const PRUnichar *propertyNam
}
return NS_OK;
}

17
layout/generic/nsFrame.cpp
Просмотреть файл

@ -50,7 +50,6 @@
#include "nsHTMLIIDs.h"
#include "nsIEventStateManager.h"
#include "nsISelection.h"
#include "nsISelectionPrivate.h"
#include "nsIFrameSelection.h"
#include "nsHTMLParts.h"
#include "nsLayoutAtoms.h"
@ -786,7 +785,7 @@ nsFrame::HandleEvent(nsIPresContext* aPresContext,
NS_IMETHODIMP
nsFrame::GetDataForTableSelection(nsIFrameSelection *aFrameSelection, nsMouseEvent *aMouseEvent,
nsIContent **aParentContent, PRInt32 *aContentOffset, PRInt32 *aTarget)
nsIContent **aParentContent, PRInt32 *aContentOffset, PRUint32 *aTarget)
{
if (!aFrameSelection || !aMouseEvent || !aParentContent || !aContentOffset || !aTarget)
return NS_ERROR_NULL_POINTER;
@ -895,15 +894,15 @@ nsFrame::GetDataForTableSelection(nsIFrameSelection *aFrameSelection, nsMouseEve
#if 0
if (selectRow)
*aTarget = nsISelectionPrivate::TABLESELECTION_ROW;
*aTarget = TABLESELECTION_ROW;
else if (selectColumn)
*aTarget = nsISelectionPrivate::TABLESELECTION_COLUMN;
*aTarget = TABLESELECTION_COLUMN;
else
#endif
if (foundCell)
*aTarget = nsISelectionPrivate::TABLESELECTION_CELL;
*aTarget = TABLESELECTION_CELL;
else if (foundTable)
*aTarget = nsISelectionPrivate::TABLESELECTION_TABLE;
*aTarget = TABLESELECTION_TABLE;
return NS_OK;
}
@ -1130,7 +1129,7 @@ nsFrame::HandlePress(nsIPresContext* aPresContext,
// Let Ctrl/Cmd+mouse down do table selection instead of drag initiation
nsCOMPtr<nsIContent>parentContent;
PRInt32 contentOffset;
PRInt32 target;
PRUint32 target;
rv = GetDataForTableSelection(frameselection, me, getter_AddRefs(parentContent), &contentOffset, &target);
if (NS_SUCCEEDED(rv) && parentContent)
{
@ -1382,7 +1381,7 @@ NS_IMETHODIMP nsFrame::HandleDrag(nsIPresContext* aPresContext,
// Check if we are dragging in a table cell
nsCOMPtr<nsIContent> parentContent;
PRInt32 contentOffset;
PRInt32 target;
PRUint32 target;
nsMouseEvent *me = (nsMouseEvent *)aEvent;
result = GetDataForTableSelection(frameselection, me, getter_AddRefs(parentContent), &contentOffset, &target);
if (NS_SUCCEEDED(result) && parentContent)
@ -1491,7 +1490,7 @@ NS_IMETHODIMP nsFrame::HandleRelease(nsIPresContext* aPresContext,
me = (nsMouseEvent *)aEvent;
nsCOMPtr<nsIContent>parentContent;
PRInt32 contentOffset;
PRInt32 target;
PRUint32 target;
result = GetDataForTableSelection(frameselection, me, getter_AddRefs(parentContent), &contentOffset, &target);
if (NS_SUCCEEDED(result) && parentContent)

2
layout/generic/nsFrame.h
Просмотреть файл

@ -437,7 +437,7 @@ protected:
// aTarget tells us what table element to select (currently only cell and table supported)
// (enums for this are defined in nsIFrame.h)
NS_IMETHOD GetDataForTableSelection(nsIFrameSelection *aFrameSelection, nsMouseEvent *aMouseEvent,
nsIContent **aParentContent, PRInt32 *aContentOffset, PRInt32 *aTarget);
nsIContent **aParentContent, PRInt32 *aContentOffset, PRUint32 *aTarget);
static void XMLQuote(nsString& aString);

322
layout/generic/nsSelection.cpp
Просмотреть файл

@ -156,7 +156,6 @@ public:
NS_IMETHOD GetRangeCount(PRInt32* aRangeCount);
NS_IMETHOD GetRangeAt(PRInt32 aIndex, nsIDOMRange** aReturn);
NS_IMETHOD RemoveAllRanges();
NS_IMETHOD GetTableSelectionType(nsIDOMRange* aRange, PRInt32* aTableSelectionType);
NS_IMETHOD Collapse(nsIDOMNode* aParentNode, PRInt32 aOffset);
NS_IMETHOD CollapseToStart();
NS_IMETHOD CollapseToEnd();
@ -250,8 +249,6 @@ private:
void setAnchorFocusRange(PRInt32 aIndex); //pass in index into FrameSelection
NS_IMETHOD selectFrames(nsIPresContext* aPresContext, nsIContentIterator *aInnerIter, nsIContent *aContent, nsIDOMRange *aRange, nsIPresShell *aPresShell, PRBool aFlags);
NS_IMETHOD selectFrames(nsIPresContext* aPresContext, nsIDOMRange *aRange, PRBool aSelect);
nsresult getTableCellLocationFromRange(nsIDOMRange *aRange, PRInt32 *aSelectionType, PRInt32 *aRow, PRInt32 *aCol);
nsresult addTableCellRange(nsIDOMRange *aRange, PRBool *aDidAddRange);
#if OLD_SELECTION
NS_IMETHOD FixupSelectionPoints(nsIDOMRange *aRange, nsDirection *aDir, PRBool *aFixupState);
@ -305,7 +302,7 @@ public:
NS_IMETHOD HandleClick(nsIContent *aNewFocus, PRUint32 aContentOffset, PRUint32 aContentEndOffset,
PRBool aContinueSelection, PRBool aMultipleSelection,PRBool aHint);
NS_IMETHOD HandleDrag(nsIPresContext *aPresContext, nsIFrame *aFrame, nsPoint& aPoint);
NS_IMETHOD HandleTableSelection(nsIContent *aParentContent, PRInt32 aContentOffset, PRInt32 aTarget, nsMouseEvent *aMouseEvent);
NS_IMETHOD HandleTableSelection(nsIContent *aParentContent, PRInt32 aContentOffset, PRUint32 aTarget, nsMouseEvent *aMouseEvent);
NS_IMETHOD StartAutoScrollTimer(nsIPresContext *aPresContext, nsIFrame *aFrame, nsPoint& aPoint, PRUint32 aDelay);
NS_IMETHOD StopAutoScrollTimer();
NS_IMETHOD EnableFrameNotification(PRBool aEnable){mNotifyFrames = aEnable; return NS_OK;}
@ -352,7 +349,6 @@ public:
NS_IMETHOD DeleteFromDocument();
nsIFocusTracker *GetTracker(){return mTracker;}
private:
NS_IMETHOD TakeFocus(nsIContent *aNewFocus, PRUint32 aContentOffset, PRUint32 aContentEndOffset,
PRBool aContinueSelection, PRBool aMultipleSelection);
@ -394,7 +390,6 @@ private:
// Interfaces that let us get info based on cellmap locations
nsITableLayout* GetTableLayout(nsIContent *aTableContent);
nsITableCellLayout* GetCellLayout(nsIContent *aCellContent);
nsresult SelectBlockOfCells(nsIContent *aEndNode);
nsresult SelectRowOrColumn(nsIContent *aCellContent, PRUint32 aTarget);
nsresult GetCellIndexes(nsIContent *aCell, PRInt32 &aRowIndex, PRInt32 &aColIndex);
@ -414,7 +409,7 @@ private:
nsCOMPtr<nsIContent> mAppendStartSelectedCell;
nsCOMPtr<nsIContent> mUnselectCellOnMouseUp;
PRBool mSelectingTableCells;
PRInt32 mSelectingTableCellMode;
PRUint32 mSelectingTableCellMode;
PRInt32 mSelectedCellIndex;
//batching
@ -2190,9 +2185,9 @@ nsSelection::FrameOrParentHasSpecialSelectionStyle(nsIFrame* aFrame, PRUint8 aSe
static PRBool IsCell(nsIContent *aContent)
{
nsCOMPtr<nsIAtom> tag;
aContent->GetTag(*getter_AddRefs(tag));
return (tag != 0 && tag.get() == nsSelection::sCellAtom);
nsIAtom *tag;
aContent->GetTag(tag);
return (tag != 0 && tag == nsSelection::sCellAtom);
}
nsITableCellLayout*
@ -2228,13 +2223,11 @@ nsSelection::ClearNormalSelection()
return mDomSelections[index]->RemoveAllRanges();
}
// Table selection support.
// TODO: Separate table methods into a separate nsITableSelection interface
nsresult
nsSelection::HandleTableSelection(nsIContent *aParentContent, PRInt32 aContentOffset, PRInt32 aTarget, nsMouseEvent *aMouseEvent)
nsSelection::HandleTableSelection(nsIContent *aParentContent, PRInt32 aContentOffset, PRUint32 aTarget, nsMouseEvent *aMouseEvent)
{
if (!aParentContent) return NS_ERROR_NULL_POINTER;
if (mSelectingTableCells && (aTarget & nsISelectionPrivate::TABLESELECTION_TABLE))
if (mSelectingTableCells && (aTarget & TABLESELECTION_TABLE))
{
// We were selecting cells and user drags mouse in table border or inbetween cells,
// just do nothing
@ -2266,7 +2259,7 @@ nsSelection::HandleTableSelection(nsIContent *aParentContent, PRInt32 aContentOf
{
// We are drag-selecting
if (aTarget != nsISelectionPrivate::TABLESELECTION_TABLE)
if (aTarget != TABLESELECTION_TABLE)
{
// If dragging in the same cell as last event, do nothing
if (mEndSelectedCell == childContent)
@ -2278,8 +2271,8 @@ nsSelection::HandleTableSelection(nsIContent *aParentContent, PRInt32 aContentOf
// we can drift into any cell to stay in that mode
// even if aTarget = TABLESELECTION_CELL
if (mSelectingTableCellMode == nsISelectionPrivate::TABLESELECTION_ROW ||
mSelectingTableCellMode == nsISelectionPrivate::TABLESELECTION_COLUMN)
if (mSelectingTableCellMode == TABLESELECTION_ROW ||
mSelectingTableCellMode == TABLESELECTION_COLUMN)
{
if (mEndSelectedCell)
{
@ -2289,8 +2282,8 @@ nsSelection::HandleTableSelection(nsIContent *aParentContent, PRInt32 aContentOf
result = GetCellIndexes(childContent, curRowIndex, curColIndex);
if (NS_FAILED(result)) return result;
if ((mSelectingTableCellMode == nsISelectionPrivate::TABLESELECTION_ROW && startRowIndex == curRowIndex) ||
(mSelectingTableCellMode == nsISelectionPrivate::TABLESELECTION_COLUMN && startColIndex == curColIndex))
if ((mSelectingTableCellMode == TABLESELECTION_ROW && startRowIndex == curRowIndex) ||
(mSelectingTableCellMode == TABLESELECTION_COLUMN && startColIndex == curColIndex))
return NS_OK;
}
#ifdef DEBUG_TABLE_SELECTION
@ -2299,7 +2292,7 @@ printf("HandleTableSelection: Dragged into a new column or row\n");
// Continue dragging row or column selection
return SelectRowOrColumn(childContent, mSelectingTableCellMode);
}
else if (mSelectingTableCellMode == nsISelectionPrivate::TABLESELECTION_CELL)
else if (mSelectingTableCellMode == TABLESELECTION_CELL)
{
#ifdef DEBUG_TABLE_SELECTION
printf("HandleTableSelection: Dragged into a new cell\n");
@ -2325,10 +2318,8 @@ printf("HandleTableSelection: Dragged into a new cell\n");
mStartSelectedCell = nsnull;
mDomSelections[index]->RemoveAllRanges();
if (startRowIndex == curRowIndex)
mSelectingTableCellMode = nsISelectionPrivate::TABLESELECTION_ROW;
else
mSelectingTableCellMode = nsISelectionPrivate::TABLESELECTION_COLUMN;
mSelectingTableCellMode =
(startRowIndex == curRowIndex) ? TABLESELECTION_ROW : TABLESELECTION_COLUMN;
return SelectRowOrColumn(childContent, mSelectingTableCellMode);
}
@ -2353,7 +2344,7 @@ printf("HandleTableSelection: Mouse down event\n");
// Clear cell we stored in mouse-down
mUnselectCellOnMouseUp = nsnull;
if (aTarget == nsISelectionPrivate::TABLESELECTION_CELL)
if (aTarget == TABLESELECTION_CELL)
{
PRBool isSelected = PR_FALSE;
@ -2410,7 +2401,7 @@ printf("HandleTableSelection: Saving mUnselectCellOnMouseUp\n");
return NS_OK;
}
else if (aTarget == nsISelectionPrivate::TABLESELECTION_TABLE)
else if (aTarget == TABLESELECTION_TABLE)
{
//TODO: We currently select entire table when clicked between cells,
// should we restrict to only around border?
@ -2423,7 +2414,7 @@ printf("HandleTableSelection: Saving mUnselectCellOnMouseUp\n");
mDomSelections[index]->RemoveAllRanges();
return CreateAndAddRange(parentNode, aContentOffset);
}
else if (aTarget == nsISelectionPrivate::TABLESELECTION_ROW || aTarget == nsISelectionPrivate::TABLESELECTION_COLUMN)
else if (aTarget == TABLESELECTION_ROW || aTarget == TABLESELECTION_COLUMN)
{
// Start drag-selecting mode so multiple rows/cols can be selected
// Note: Currently, nsFrame::GetDataForTableSelection
@ -2694,9 +2685,9 @@ nsSelection::SelectRowOrColumn(nsIContent *aCellContent, PRUint32 aTarget)
// Be sure we start at proper beginning
// (This allows us to select row or col given ANY cell!)
if (aTarget == nsISelectionPrivate::TABLESELECTION_ROW)
if (aTarget == TABLESELECTION_ROW)
colIndex = 0;
if (aTarget == nsISelectionPrivate::TABLESELECTION_COLUMN)
if (aTarget == TABLESELECTION_COLUMN)
rowIndex = 0;
nsCOMPtr<nsIDOMElement> cellElement;
@ -2720,7 +2711,7 @@ nsSelection::SelectRowOrColumn(nsIContent *aCellContent, PRUint32 aTarget)
lastCell = cellElement;
// Move to next cell in cellmap, skipping spanned locations
if (aTarget == nsISelectionPrivate::TABLESELECTION_ROW)
if (aTarget == TABLESELECTION_ROW)
colIndex += actualColSpan;
else
rowIndex += actualRowSpan;
@ -2768,7 +2759,7 @@ nsSelection::SelectRowOrColumn(nsIContent *aCellContent, PRUint32 aTarget)
if (NS_FAILED(result)) return result;
}
// Move to next row or column in cellmap, skipping spanned locations
if (aTarget == nsISelectionPrivate::TABLESELECTION_ROW)
if (aTarget == TABLESELECTION_ROW)
colIndex += actualColSpan;
else
rowIndex += actualRowSpan;
@ -2984,184 +2975,6 @@ nsSelection::SelectCellElement(nsIDOMElement *aCellElement)
return CreateAndAddRange(parent, offset);
}
nsresult
nsTypedSelection::getTableCellLocationFromRange(nsIDOMRange *aRange, PRInt32 *aSelectionType, PRInt32 *aRow, PRInt32 *aCol)
{
if (!aRange || !aSelectionType || !aRow || !aCol)
return NS_ERROR_NULL_POINTER;
*aSelectionType = 0;
*aRow = 0;
*aCol = 0;
// Must have access to frame selection
if (!mFrameSelection)
return NS_ERROR_FAILURE;
nsresult result = GetTableSelectionType(aRange, aSelectionType);
if (NS_FAILED(result)) return result;
// Don't fail if range does not point to a single table cell,
// let aSelectionType tell user if we don't have a cell
if (*aSelectionType != nsISelectionPrivate::TABLESELECTION_CELL)
return NS_OK;
// Get the child content (the cell) pointed to by starting node of range
// We do minimal checking since GetTableSelectionType assures
// us that this really is a table cell
nsCOMPtr<nsIDOMNode> startNode;
result = aRange->GetStartContainer(getter_AddRefs(startNode));
if (NS_FAILED(result)) return result;
nsCOMPtr<nsIContent> content(do_QueryInterface(startNode));
if (!content) return NS_ERROR_FAILURE;
PRInt32 startOffset;
result = aRange->GetStartOffset(&startOffset);
if (NS_FAILED(result)) return result;
nsCOMPtr<nsIContent> child;
result = content->ChildAt(startOffset, *getter_AddRefs(child));
if (NS_FAILED(result)) return result;
if (!child) return NS_ERROR_FAILURE;
//Note: This is a non-ref-counted pointer to the frame
nsITableCellLayout *cellLayout = mFrameSelection->GetCellLayout(child);
if (NS_FAILED(result)) return result;
if (!cellLayout) return NS_ERROR_FAILURE;
return cellLayout->GetCellIndexes(*aRow, *aCol);
}
nsresult
nsTypedSelection::addTableCellRange(nsIDOMRange *aRange, PRBool *aDidAddRange)
{
if (!mRangeArray || !mFrameSelection)
return NS_ERROR_FAILURE;
if (!aRange || !aDidAddRange)
return NS_ERROR_NULL_POINTER;
*aDidAddRange = PR_FALSE;
nsresult result;
nsCOMPtr<nsISupports> isupp = do_QueryInterface(aRange, &result);
if (NS_FAILED(result)) return result;
// Get row, col of cell we will add
// and set the FrameSelection's selection mode value
PRInt32 newRow, newCol;
result = getTableCellLocationFromRange(aRange, &mFrameSelection->mSelectingTableCellMode, &newRow, &newCol);
if (NS_FAILED(result)) return result;
// Don't fail if range isn't a selected cell, aDidAddRange tells caller if we didn't proceed
if (mFrameSelection->mSelectingTableCellMode != nsISelectionPrivate::TABLESELECTION_CELL)
return NS_OK;
PRUint32 count;
result = mRangeArray->Count(&count);
if (NS_FAILED(result)) return result;
if (count > 0)
{
// Adding a cell range to existing list of cell ranges
PRUint32 index;
PRInt32 row, col;
// Insert range at appropriate location
for (index = 0; index < count; index++)
{
nsCOMPtr<nsISupports> element = dont_AddRef(mRangeArray->ElementAt(index));
nsCOMPtr<nsIDOMRange> range = do_QueryInterface(element);
if (!range) return NS_ERROR_FAILURE;
PRInt32 selectionMode;
result = getTableCellLocationFromRange(range, &selectionMode, &row, &col);
if (NS_FAILED(result)) return result;
// Don't proceed if range not a table cell
if (selectionMode != nsISelectionPrivate::TABLESELECTION_CELL)
return NS_OK;
if (row > newRow ||
(row == newRow && col > newCol))
{
// Existing selected cell is after cell to add,
// so insert at this index
result = mRangeArray->InsertElementAt(isupp, index);
*aDidAddRange = NS_SUCCEEDED(result);
return result;
}
}
}
// If here, we are adding a selected cell range
// to end of range array or it's the first selected range
result = mRangeArray->AppendElement(isupp);
*aDidAddRange = NS_SUCCEEDED(result);
return result;
}
//TODO: Figure out TABLESELECTION_COLUMN and TABLESELECTION_ALLCELLS
NS_IMETHODIMP
nsTypedSelection::GetTableSelectionType(nsIDOMRange* aRange, PRInt32* aTableSelectionType)
{
if (!aRange || !aTableSelectionType)
return NS_ERROR_NULL_POINTER;
*aTableSelectionType = nsISelectionPrivate::TABLESELECTION_NONE;
if(!mFrameSelection)// don't assume we have a FrameSelection
return NS_ERROR_FAILURE;
nsCOMPtr<nsIDOMNode> startNode;
nsresult result = aRange->GetStartContainer(getter_AddRefs(startNode));
if (NS_FAILED(result)) return result;
if (!startNode) return NS_ERROR_FAILURE;
nsCOMPtr<nsIDOMNode> endNode;
result = aRange->GetEndContainer(getter_AddRefs(endNode));
if (NS_FAILED(result)) return result;
if (!endNode) return NS_ERROR_FAILURE;
// Not a single selected node
if (startNode != endNode) return NS_OK;
nsCOMPtr<nsIContent> content = do_QueryInterface(startNode);
if (!content) return NS_ERROR_FAILURE;
PRInt32 startOffset;
PRInt32 endOffset;
result = aRange->GetEndOffset(&endOffset);
if (NS_FAILED(result)) return result;
result = aRange->GetStartOffset(&startOffset);
if (NS_FAILED(result)) return result;
// Not a single selected node
if ((endOffset - startOffset) != 1)
return NS_OK;
nsCOMPtr<nsIAtom> atom;
content->GetTag(*getter_AddRefs(atom));
if (!atom) return NS_ERROR_FAILURE;
if (atom.get() == nsSelection::sRowAtom)
{
*aTableSelectionType = nsISelectionPrivate::TABLESELECTION_CELL;
}
else //check to see if we are selecting a table or row (column and all cells not done yet)
{
nsCOMPtr<nsIContent> child;
result = content->ChildAt(startOffset, *getter_AddRefs(child));
if (NS_FAILED(result)) return result;
if (!child) return NS_ERROR_FAILURE;
child->GetTag(*getter_AddRefs(atom));
if (!atom) return NS_ERROR_FAILURE;
if (atom.get() == nsSelection::sTableAtom)
*aTableSelectionType = nsISelectionPrivate::TABLESELECTION_TABLE;
else if (atom.get() == nsSelection::sRowAtom)
*aTableSelectionType = nsISelectionPrivate::TABLESELECTION_ROW;
}
return result;
}
nsresult
nsSelection::CreateAndAddRange(nsIDOMNode *aParentNode, PRInt32 aOffset)
{
@ -4769,24 +4582,14 @@ nsTypedSelection::RemoveAllRanges()
NS_IMETHODIMP
nsTypedSelection::AddRange(nsIDOMRange* aRange)
{
if (!aRange) return NS_ERROR_NULL_POINTER;
// This inserts a table cell range in proper document order
// and returns NS_ERROR_FAILURE if range doesn't contain just one table cell
PRBool didAddRange;
nsresult result = addTableCellRange(aRange, &didAddRange);
if (NS_FAILED(result)) return result;
if (!didAddRange)
{
result = AddItem(aRange);
if (NS_FAILED(result)) return result;
}
nsresult result = AddItem(aRange);
if (NS_FAILED(result))
return result;
PRInt32 count;
result = GetRangeCount(&count);
if (NS_FAILED(result)) return result;
if (NS_FAILED(result))
return result;
if (count <= 0)
{
NS_ASSERTION(0,"bad count after additem\n");
@ -4794,14 +4597,62 @@ nsTypedSelection::AddRange(nsIDOMRange* aRange)
}
setAnchorFocusRange(count -1);
//TABLE CELL CHECK
if(mFrameSelection)// don't assume we have a FrameSelection
{
nsCOMPtr<nsIDOMNode> startNode;
result = aRange->GetStartContainer(getter_AddRefs(startNode));
if (NS_SUCCEEDED(result))
{
nsCOMPtr<nsIDOMNode> endNode;
result = aRange->GetEndContainer(getter_AddRefs(endNode));
if (NS_SUCCEEDED(result))
{
if (startNode == endNode)
{//check for table row
nsCOMPtr<nsIContent> content(do_QueryInterface(startNode));
if (content)
{
nsIAtom *atom;
if (NS_SUCCEEDED(content->GetTag(atom)) && atom == nsSelection::sRowAtom)
{//we are selecting a talble cell!
mFrameSelection->mSelectingTableCellMode = TABLESELECTION_CELL;
}
else //check to see if we are selecting a table
{
PRInt32 startOffset;
PRInt32 endOffset;
result = aRange->GetEndOffset(&endOffset);
result &= aRange->GetStartOffset(&startOffset);
if (NS_SUCCEEDED(result))
{
if ((endOffset - startOffset) == 1) //1 child selected
{
nsCOMPtr<nsIContent> childAt;
if (NS_SUCCEEDED(content->ChildAt(startOffset, *getter_AddRefs(childAt))))
{
if ( (childAt) &&
(NS_SUCCEEDED(childAt->GetTag(atom)) && atom == nsSelection::sTableAtom) )
{
mFrameSelection->mSelectingTableCellMode = TABLESELECTION_TABLE;
}
}
}
}
}
}
}
}
}
}
nsCOMPtr<nsIPresContext> presContext;
GetPresContext(getter_AddRefs(presContext));
selectFrames(presContext, aRange, PR_TRUE);
//ScrollIntoView(); this should not happen automatically
if (!mFrameSelection)
return NS_OK;//nothing to do
return mFrameSelection->NotifySelectionListeners(GetType());
}
@ -4872,8 +4723,8 @@ nsTypedSelection::Collapse(nsIDOMNode* aParentNode, PRInt32 aOffset)
content = do_QueryInterface(aParentNode);
if (!content)
return NS_ERROR_FAILURE;
nsCOMPtr<nsIAtom> tag;
content->GetTag(*getter_AddRefs(tag));
nsIAtom *tag;
content->GetTag(tag);
if (tag)
{
nsAutoString tagString;
@ -4911,8 +4762,8 @@ nsTypedSelection::CollapseToStart()
if (NS_FAILED(rv) || cnt<=0 || !mRangeArray)
return NS_ERROR_FAILURE;
// Get the first range
nsCOMPtr<nsISupports> element = dont_AddRef(mRangeArray->ElementAt(0));
// Get the first range (from GetRangeAt)
nsISupports* element = mRangeArray->ElementAt(0);
nsCOMPtr<nsIDOMRange> firstRange = do_QueryInterface(element);
if (!firstRange)
return NS_ERROR_FAILURE;
@ -4946,8 +4797,8 @@ nsTypedSelection::CollapseToEnd()
if (NS_FAILED(rv) || cnt<=0 || !mRangeArray)
return NS_ERROR_FAILURE;
// Get the last range
nsCOMPtr<nsISupports> element = dont_AddRef(mRangeArray->ElementAt(cnt-1));
// Get the last range (from GetRangeAt)
nsISupports* element = mRangeArray->ElementAt(cnt-1);
nsCOMPtr<nsIDOMRange> lastRange = do_QueryInterface(element);
if (!lastRange)
return NS_ERROR_FAILURE;
@ -5688,8 +5539,8 @@ nsTypedSelection::Extend(nsIDOMNode* aParentNode, PRInt32 aOffset)
{
nsCOMPtr<nsIContent>content;
content = do_QueryInterface(aParentNode);
nsCOMPtr<nsIAtom> tag;
content->GetTag(*getter_AddRefs(tag));
nsIAtom *tag;
content->GetTag(tag);
if (tag)
{
nsAutoString tagString;
@ -6625,3 +6476,4 @@ nsTypedSelection::CanSetProperty(const nsIID * iid, const PRUnichar *propertyNam
}
return NS_OK;
}

17
layout/html/base/src/nsFrame.cpp
Просмотреть файл

@ -50,7 +50,6 @@
#include "nsHTMLIIDs.h"
#include "nsIEventStateManager.h"
#include "nsISelection.h"
#include "nsISelectionPrivate.h"
#include "nsIFrameSelection.h"
#include "nsHTMLParts.h"
#include "nsLayoutAtoms.h"
@ -786,7 +785,7 @@ nsFrame::HandleEvent(nsIPresContext* aPresContext,
NS_IMETHODIMP
nsFrame::GetDataForTableSelection(nsIFrameSelection *aFrameSelection, nsMouseEvent *aMouseEvent,
nsIContent **aParentContent, PRInt32 *aContentOffset, PRInt32 *aTarget)
nsIContent **aParentContent, PRInt32 *aContentOffset, PRUint32 *aTarget)
{
if (!aFrameSelection || !aMouseEvent || !aParentContent || !aContentOffset || !aTarget)
return NS_ERROR_NULL_POINTER;
@ -895,15 +894,15 @@ nsFrame::GetDataForTableSelection(nsIFrameSelection *aFrameSelection, nsMouseEve
#if 0
if (selectRow)
*aTarget = nsISelectionPrivate::TABLESELECTION_ROW;
*aTarget = TABLESELECTION_ROW;
else if (selectColumn)
*aTarget = nsISelectionPrivate::TABLESELECTION_COLUMN;
*aTarget = TABLESELECTION_COLUMN;
else
#endif
if (foundCell)
*aTarget = nsISelectionPrivate::TABLESELECTION_CELL;
*aTarget = TABLESELECTION_CELL;
else if (foundTable)
*aTarget = nsISelectionPrivate::TABLESELECTION_TABLE;
*aTarget = TABLESELECTION_TABLE;
return NS_OK;
}
@ -1130,7 +1129,7 @@ nsFrame::HandlePress(nsIPresContext* aPresContext,
// Let Ctrl/Cmd+mouse down do table selection instead of drag initiation
nsCOMPtr<nsIContent>parentContent;
PRInt32 contentOffset;
PRInt32 target;
PRUint32 target;
rv = GetDataForTableSelection(frameselection, me, getter_AddRefs(parentContent), &contentOffset, &target);
if (NS_SUCCEEDED(rv) && parentContent)
{
@ -1382,7 +1381,7 @@ NS_IMETHODIMP nsFrame::HandleDrag(nsIPresContext* aPresContext,
// Check if we are dragging in a table cell
nsCOMPtr<nsIContent> parentContent;
PRInt32 contentOffset;
PRInt32 target;
PRUint32 target;
nsMouseEvent *me = (nsMouseEvent *)aEvent;
result = GetDataForTableSelection(frameselection, me, getter_AddRefs(parentContent), &contentOffset, &target);
if (NS_SUCCEEDED(result) && parentContent)
@ -1491,7 +1490,7 @@ NS_IMETHODIMP nsFrame::HandleRelease(nsIPresContext* aPresContext,
me = (nsMouseEvent *)aEvent;
nsCOMPtr<nsIContent>parentContent;
PRInt32 contentOffset;
PRInt32 target;
PRUint32 target;
result = GetDataForTableSelection(frameselection, me, getter_AddRefs(parentContent), &contentOffset, &target);
if (NS_SUCCEEDED(result) && parentContent)

2
layout/html/base/src/nsFrame.h
Просмотреть файл

@ -437,7 +437,7 @@ protected:
// aTarget tells us what table element to select (currently only cell and table supported)
// (enums for this are defined in nsIFrame.h)
NS_IMETHOD GetDataForTableSelection(nsIFrameSelection *aFrameSelection, nsMouseEvent *aMouseEvent,
nsIContent **aParentContent, PRInt32 *aContentOffset, PRInt32 *aTarget);
nsIContent **aParentContent, PRInt32 *aContentOffset, PRUint32 *aTarget);
static void XMLQuote(nsString& aString);

4
layout/html/forms/src/nsGfxTextControlFrame2.cpp
Просмотреть файл

@ -590,7 +590,7 @@ public:
NS_IMETHOD HandleClick(nsIContent *aNewFocus, PRUint32 aContentOffset, PRUint32 aContentEndOffset ,
PRBool aContinueSelection, PRBool aMultipleSelection, PRBool aHint);
NS_IMETHOD HandleDrag(nsIPresContext *aPresContext, nsIFrame *aFrame, nsPoint& aPoint);
NS_IMETHOD HandleTableSelection(nsIContent *aParentContent, PRInt32 aContentOffset, PRInt32 aTarget, nsMouseEvent *aMouseEvent);
NS_IMETHOD HandleTableSelection(nsIContent *aParentContent, PRInt32 aContentOffset, PRUint32 aTarget, nsMouseEvent *aMouseEvent);
NS_IMETHOD StartAutoScrollTimer(nsIPresContext *aPresContext, nsIFrame *aFrame, nsPoint& aPoint, PRUint32 aDelay);
NS_IMETHOD StopAutoScrollTimer();
NS_IMETHOD EnableFrameNotification(PRBool aEnable);
@ -901,7 +901,7 @@ nsTextInputSelectionImpl::HandleDrag(nsIPresContext *aPresContext, nsIFrame *aFr
NS_IMETHODIMP
nsTextInputSelectionImpl::HandleTableSelection(nsIContent *aParentContent, PRInt32 aContentOffset, PRInt32 aTarget, nsMouseEvent *aMouseEvent)
nsTextInputSelectionImpl::HandleTableSelection(nsIContent *aParentContent, PRInt32 aContentOffset, PRUint32 aTarget, nsMouseEvent *aMouseEvent)
{
// We should never have a table inside a text control frame!
NS_ASSERTION(PR_TRUE, "Calling HandleTableSelection inside nsGfxTextControlFrame!");