Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

82993,52868,79511,82101 a=asa sr=kin. bugs that cross files. stopped generated content entrys into frames with caret and mouse navigation. and table cell navigation.

Browse Source
This commit is contained in:
mjudge%netscape.com 2001-06-20 04:48:10 +00:00
parent 3dadb0fce8
commit 18f1ea4a52
7 changed files with 114 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
content/base/src/nsSelection.cpp
View File

@ -1640,33 +1640,6 @@ nsSelection::MoveCaret(PRUint32 aKeycode, PRBool aContinue, nsSelectionAmount aA
#endif // IBMBIDI
result = TakeFocus(pos.mResultContent, pos.mContentOffset, pos.mContentOffset, aContinue, PR_FALSE);
}
if (NS_FAILED(result))
{
if (nsIDOMKeyEvent::DOM_VK_UP == aKeycode)
{
pos.mPreferLeft = HINTRIGHT;
pos.mAmount = eSelectBeginLine;
InvalidateDesiredX();
}
else if(nsIDOMKeyEvent::DOM_VK_DOWN == aKeycode)
{
pos.mPreferLeft = HINTLEFT;
pos.mAmount = eSelectEndLine;
InvalidateDesiredX();
}
if (nsIDOMKeyEvent::DOM_VK_UP == aKeycode || nsIDOMKeyEvent::DOM_VK_DOWN == aKeycode )
{
if (NS_SUCCEEDED(result = frame->PeekOffset(context, &pos)) && pos.mResultContent)
{
#ifdef IBMBIDI
BidiLevelFromMove(context, shell, pos.mResultContent, pos.mContentOffset, aKeycode);
#endif // IBMBIDI
tHint = (HINT)pos.mPreferLeft;
PostReason(nsISelectionListener::MOUSEUP_REASON);//force an update as though we used the mouse.
result = TakeFocus(pos.mResultContent, pos.mContentOffset, pos.mContentOffset, aContinue, PR_FALSE);
}
}
}
if (NS_SUCCEEDED(result))
{
mHint = tHint; //save the hint parameter now for the next time

60
layout/base/nsPresShell.cpp
View File

@ -2976,7 +2976,12 @@ PresShell::WordMove(PRBool aForward, PRBool aExtend)
NS_IMETHODIMP
PresShell::LineMove(PRBool aForward, PRBool aExtend)
{
return mSelection->LineMove(aForward, aExtend);
nsresult result = mSelection->LineMove(aForward, aExtend);
// if we cant go down/up any more we must then move caret completely to
// end/beginning respectively.
if (NS_FAILED(result))
result = CompleteMove(aForward,aExtend);
return result;
}
NS_IMETHODIMP
@ -3105,9 +3110,9 @@ PresShell::CompleteMove(PRBool aForward, PRBool aExtend)
if (!doc)
return NS_ERROR_FAILURE;
nsresult result = doc->GetElementsByTagName(bodyTag, getter_AddRefs(nodeList));
if (NS_FAILED(result) ||!nodeList)
return result?result:NS_ERROR_FAILURE;
if (NS_FAILED(result) || !nodeList)
return result?result:NS_ERROR_NULL_POINTER;
PRUint32 count;
nodeList->GetLength(&count);
@ -3128,12 +3133,53 @@ PresShell::CompleteMove(PRBool aForward, PRBool aExtend)
nsCOMPtr<nsIContent> bodyContent = do_QueryInterface(bodyElement);
if (bodyContent)
{
PRInt32 offset = 0;
if (aForward)
nsIFrame *frame = nsnull;
result = GetPrimaryFrameFor(bodyContent, &frame);
if (frame)
{
bodyContent->ChildCount(offset);
PRInt32 offset;
PRInt32 offsetend;
PRBool beginFrameContent;
PRInt8 outsideLimit = -1;//search from beginning
nsPeekOffsetStruct pos;
pos.mAmount = eSelectLine;
pos.mTracker = this;
pos.mContentOffset = 0;
pos.mContentOffsetEnd = 0;
if (aForward)
{
outsideLimit = 1;//search from end
nsRect rect;
frame->GetRect(rect);
pos.mDesiredX = rect.width * 2;//search way off to right of line
pos.mDirection = eDirPrevious; //seach backwards from the end
}
else
{
pos.mDesiredX = -1; //start before line
pos.mDirection = eDirNext; //search forwards from before beginning
}
do
{
result = nsFrame::GetNextPrevLineFromeBlockFrame(mPresContext,
&pos,
frame,
0, //irrelavent since we set outsidelimit
outsideLimit
);
if (NS_OK != result || !pos.mResultFrame ) //NS_COMFALSE should ALSO break
return result?result:NS_ERROR_FAILURE;
nsCOMPtr<nsILineIteratorNavigator> newIt;
//check to see if this is ANOTHER blockframe inside the other one if so then call into its lines
result = pos.mResultFrame->QueryInterface(NS_GET_IID(nsILineIteratorNavigator),getter_AddRefs(newIt));
if (NS_SUCCEEDED(result) && newIt)
frame = pos.mResultFrame;
}
while (NS_SUCCEEDED(result));//end 'do'
result = mSelection->HandleClick(pos.mResultContent ,pos.mContentOffset ,pos.mContentOffsetEnd ,aExtend, PR_FALSE, pos.mPreferLeft);
}
result = mSelection->HandleClick(bodyContent,offset,offset,aExtend, PR_FALSE,aExtend);
// if we got this far, attempt to scroll no matter what the above result is
CompleteScroll(aForward);
}

27
layout/generic/nsSelection.cpp
View File

@ -1640,33 +1640,6 @@ nsSelection::MoveCaret(PRUint32 aKeycode, PRBool aContinue, nsSelectionAmount aA
#endif // IBMBIDI
result = TakeFocus(pos.mResultContent, pos.mContentOffset, pos.mContentOffset, aContinue, PR_FALSE);
}
if (NS_FAILED(result))
{
if (nsIDOMKeyEvent::DOM_VK_UP == aKeycode)
{
pos.mPreferLeft = HINTRIGHT;
pos.mAmount = eSelectBeginLine;
InvalidateDesiredX();
}
else if(nsIDOMKeyEvent::DOM_VK_DOWN == aKeycode)
{
pos.mPreferLeft = HINTLEFT;
pos.mAmount = eSelectEndLine;
InvalidateDesiredX();
}
if (nsIDOMKeyEvent::DOM_VK_UP == aKeycode || nsIDOMKeyEvent::DOM_VK_DOWN == aKeycode )
{
if (NS_SUCCEEDED(result = frame->PeekOffset(context, &pos)) && pos.mResultContent)
{
#ifdef IBMBIDI
BidiLevelFromMove(context, shell, pos.mResultContent, pos.mContentOffset, aKeycode);
#endif // IBMBIDI
tHint = (HINT)pos.mPreferLeft;
PostReason(nsISelectionListener::MOUSEUP_REASON);//force an update as though we used the mouse.
result = TakeFocus(pos.mResultContent, pos.mContentOffset, pos.mContentOffset, aContinue, PR_FALSE);
}
}
}
if (NS_SUCCEEDED(result))
{
mHint = tHint; //save the hint parameter now for the next time

5
layout/generic/nsTextFrame.cpp
View File

@ -1864,10 +1864,7 @@ nsTextFrame::GetContentAndOffsetsForSelection(nsIPresContext *aPresContext, nsIC
nsresult rv = GetParent(&parent);
if (NS_SUCCEEDED(rv) && parent)
{
nsFrameState parentFrameState;
parent->GetFrameState(&parentFrameState);
if ((parentFrameState & NS_FRAME_GENERATED_CONTENT) != 0)//parent is generated so so are we.
if ((mState & NS_FRAME_GENERATED_CONTENT) != 0)//parent is generated so so are we.
{
//we COULD check the previous sibling but I dont think that is reliable
rv = parent->GetContent(aContent);

60
layout/html/base/src/nsPresShell.cpp
View File

@ -2976,7 +2976,12 @@ PresShell::WordMove(PRBool aForward, PRBool aExtend)
NS_IMETHODIMP
PresShell::LineMove(PRBool aForward, PRBool aExtend)
{
return mSelection->LineMove(aForward, aExtend);
nsresult result = mSelection->LineMove(aForward, aExtend);
// if we cant go down/up any more we must then move caret completely to
// end/beginning respectively.
if (NS_FAILED(result))
result = CompleteMove(aForward,aExtend);
return result;
}
NS_IMETHODIMP
@ -3105,9 +3110,9 @@ PresShell::CompleteMove(PRBool aForward, PRBool aExtend)
if (!doc)
return NS_ERROR_FAILURE;
nsresult result = doc->GetElementsByTagName(bodyTag, getter_AddRefs(nodeList));
if (NS_FAILED(result) ||!nodeList)
return result?result:NS_ERROR_FAILURE;
if (NS_FAILED(result) || !nodeList)
return result?result:NS_ERROR_NULL_POINTER;
PRUint32 count;
nodeList->GetLength(&count);
@ -3128,12 +3133,53 @@ PresShell::CompleteMove(PRBool aForward, PRBool aExtend)
nsCOMPtr<nsIContent> bodyContent = do_QueryInterface(bodyElement);
if (bodyContent)
{
PRInt32 offset = 0;
if (aForward)
nsIFrame *frame = nsnull;
result = GetPrimaryFrameFor(bodyContent, &frame);
if (frame)
{
bodyContent->ChildCount(offset);
PRInt32 offset;
PRInt32 offsetend;
PRBool beginFrameContent;
PRInt8 outsideLimit = -1;//search from beginning
nsPeekOffsetStruct pos;
pos.mAmount = eSelectLine;
pos.mTracker = this;
pos.mContentOffset = 0;
pos.mContentOffsetEnd = 0;
if (aForward)
{
outsideLimit = 1;//search from end
nsRect rect;
frame->GetRect(rect);
pos.mDesiredX = rect.width * 2;//search way off to right of line
pos.mDirection = eDirPrevious; //seach backwards from the end
}
else
{
pos.mDesiredX = -1; //start before line
pos.mDirection = eDirNext; //search forwards from before beginning
}
do
{
result = nsFrame::GetNextPrevLineFromeBlockFrame(mPresContext,
&pos,
frame,
0, //irrelavent since we set outsidelimit
outsideLimit
);
if (NS_OK != result || !pos.mResultFrame ) //NS_COMFALSE should ALSO break
return result?result:NS_ERROR_FAILURE;
nsCOMPtr<nsILineIteratorNavigator> newIt;
//check to see if this is ANOTHER blockframe inside the other one if so then call into its lines
result = pos.mResultFrame->QueryInterface(NS_GET_IID(nsILineIteratorNavigator),getter_AddRefs(newIt));
if (NS_SUCCEEDED(result) && newIt)
frame = pos.mResultFrame;
}
while (NS_SUCCEEDED(result));//end 'do'
result = mSelection->HandleClick(pos.mResultContent ,pos.mContentOffset ,pos.mContentOffsetEnd ,aExtend, PR_FALSE, pos.mPreferLeft);
}
result = mSelection->HandleClick(bodyContent,offset,offset,aExtend, PR_FALSE,aExtend);
// if we got this far, attempt to scroll no matter what the above result is
CompleteScroll(aForward);
}

5
layout/html/base/src/nsTextFrame.cpp
View File

@ -1864,10 +1864,7 @@ nsTextFrame::GetContentAndOffsetsForSelection(nsIPresContext *aPresContext, nsIC
nsresult rv = GetParent(&parent);
if (NS_SUCCEEDED(rv) && parent)
{
nsFrameState parentFrameState;
parent->GetFrameState(&parentFrameState);
if ((parentFrameState & NS_FRAME_GENERATED_CONTENT) != 0)//parent is generated so so are we.
if ((mState & NS_FRAME_GENERATED_CONTENT) != 0)//parent is generated so so are we.
{
//we COULD check the previous sibling but I dont think that is reliable
rv = parent->GetContent(aContent);

7
layout/html/forms/src/nsGfxTextControlFrame2.cpp
View File

@ -848,7 +848,12 @@ NS_IMETHODIMP
nsTextInputSelectionImpl::LineMove(PRBool aForward, PRBool aExtend)
{
if (mFrameSelection)
return mFrameSelection->LineMove(aForward, aExtend);
{
nsresult result = mFrameSelection->LineMove(aForward, aExtend);
if (NS_FAILED(result))
result = CompleteMove(aForward,aExtend);
return result;
}
return NS_ERROR_NULL_POINTER;
}