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

changing selection code

This commit is contained in:
mjudge%netscape.com 1998-12-03 21:43:32 +00:00
Родитель 26d932ee59
Коммит 4ac456fec2
6 изменённых файлов: 189 добавлений и 16 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -54,6 +54,13 @@
#include "nsIDOMText.h"
#include "nsDocumentFragment.h"
#if XP_NEW_SELECTION
#include "nsLayoutCID.h"
#include "nsIDOMRange.h"
#include "nsICollection.h"
#include "nsIEnumerator.h"
#endif //XP_NEW_SELECTION
static NS_DEFINE_IID(kIDOMTextIID, NS_IDOMTEXT_IID);
static NS_DEFINE_IID(kIDocumentIID, NS_IDOCUMENT_IID);
@ -71,6 +78,14 @@ static NS_DEFINE_IID(kIDOMStyleSheetIID, NS_IDOMSTYLESHEET_IID);
static NS_DEFINE_IID(kIDocumentObserverIID, NS_IDOCUMENT_OBSERVER_IID);
static NS_DEFINE_IID(kICSSStyleSheetIID, NS_ICSS_STYLE_SHEET_IID);
#if XP_NEW_SELECTION
static NS_DEFINE_IID(kCRangeCID, NS_RANGE_CID);
static NS_DEFINE_IID(kIDOMRange, NS_IDOMRANGE_IID);
static NS_DEFINE_IID(kCRangeListCID, NS_RANGELIST_CID);
static NS_DEFINE_IID(kICollectionIID, NS_ICOLLECTION_IID);
static NS_DEFINE_IID(kIEnumeratorIID, NS_IENUMERATOR_IID);
#endif //XP_NEW_SELECION
class nsDOMStyleSheetCollection : public nsIDOMStyleSheetCollection,
public nsIScriptObjectOwner,
public nsIDocumentObserver
@ -400,7 +415,11 @@ nsDocument::nsDocument()
mListenerManager = nsnull;
mDisplaySelection = PR_FALSE;
mInDestructor = PR_FALSE;
#if XP_NEW_SELECTION
if (!NS_SUCCEEDED(nsRepository::CreateInstance(kCRangeListCID, nsnull, kICollectionIID, (void **)&mSelection))){
#else
if (NS_OK != NS_NewSelection(&mSelection)) {
#endif
printf("*************** Error: nsDocument::nsDocument - Creation of Selection failed!\n");
}
mDOMStyleSheets = nsnull;
@ -1513,6 +1532,20 @@ void nsDocument::Finalize(JSContext *aContext)
/**
* Returns the Selection Object
*/
#if XP_NEW_SELECTION
NS_IMETHODIMP nsDocument::GetSelection(nsICollection ** aSelection) {
if (!aSelection)
return NS_ERROR_NULL_POINTER;
if (mSelection != nsnull) {
NS_ADDREF(mSelection);
*aSelection = mSelection;
return NS_OK;
} else {
*aSelection = nsnull;
}
return NS_ERROR_FAILURE;
}
#else
NS_IMETHODIMP nsDocument::GetSelection(nsISelection *& aSelection) {
if (mSelection != nsnull) {
NS_ADDREF(mSelection);
@ -1523,7 +1556,7 @@ NS_IMETHODIMP nsDocument::GetSelection(nsISelection *& aSelection) {
}
return NS_ERROR_FAILURE;
}
#endif //XP_NEW_SELECTION
/**
* Selects all the Content
@ -1584,12 +1617,38 @@ NS_IMETHODIMP nsDocument::SelectAll() {
//NS_RELEASE(start);
//NS_RELEASE(end);
#if XP_NEW_SELECTION
mSelection->Clear();//clear all old selection
nsIDOMRange *range = nsnull;
if (NS_SUCCEEDED(nsRepository::CreateInstance(kCRangeCID, nsnull, kIDOMRange, (void **)&range))){ //create an irange
nsIDOMDocument *domDoc;
if (NS_SUCCEEDED(QueryInterface(kIDOMDocumentIID, (void **)&domDoc))){//get the dom doc from this
nsIDOMElement *domElement = nsnull;
if (NS_SUCCEEDED(domDoc->GetDocumentElement(&domElement))) {//get the first element from the dom
nsIDOMNode *domNode;
if (NS_SUCCEEDED(domElement->QueryInterface(kIDOMNodeIID,(void **)&domNode))) {//get the node interface for the range object
range->SetStart(domNode,0);
range->SetEnd(domNode,0);
nsISupports *rangeISupports;
if (NS_SUCCEEDED(range->QueryInterface(kISupportsIID,(void **)&rangeISupports))) {
mSelection->AddItem(rangeISupports);
NS_IF_RELEASE(rangeISupports);
}
NS_IF_RELEASE(domNode);
}
NS_IF_RELEASE(domElement);
}
NS_IF_RELEASE(domDoc);
}
NS_IF_RELEASE(range);//allready referenced in the selection now.
}
#else
nsSelectionRange * range = mSelection->GetRange();
nsSelectionPoint * startPnt = range->GetStartPoint();
nsSelectionPoint * endPnt = range->GetEndPoint();
startPnt->SetPoint(start, -1, PR_TRUE);
endPnt->SetPoint(end, -1, PR_FALSE);
#endif
SetDisplaySelection(PR_TRUE);
return NS_OK;
@ -1773,6 +1832,20 @@ PRBool nsDocument::IsInSelection(const nsIContent* aContent) const
{
PRBool result = PR_FALSE;
#if XP_NEW_SELECTION
//travers through an iterator to see if the acontent is in the ranges
if (mSelection != nsnull)
{
nsIEnumerator *enumerator;
if (NS_SUCCEEDED(mSelection->QueryInterface(kIEnumeratorIID, (void **)&enumerator))){
for (enumerator->First();NS_COMFALSE == enumerator->IsDone(); enumerator->Next())
{
}
NS_IF_RELEASE(enumerator);
}
}
#else
if (mSelection != nsnull)
{
nsSelectionRange* range = mSelection->GetRange();
@ -1788,6 +1861,7 @@ PRBool nsDocument::IsInSelection(const nsIContent* aContent) const
NS_IF_RELEASE(endContent);
}
}
#endif
return result;
}

14
content/base/src/nsDocument.h
Просмотреть файл

@ -29,7 +29,11 @@
#include "nsIJSScriptObject.h"
#include "nsIContent.h"
#if XP_NEW_SELECTION
class nsICollection;
#else
class nsISelection;
#endif
class nsIEventListenerManager;
class nsDOMStyleSheetCollection;
@ -186,8 +190,11 @@ public:
/**
* Returns the Selection Object
*/
#if XP_NEW_SELECTION
NS_IMETHOD GetSelection(nsICollection ** aSelection);
#else
NS_IMETHOD GetSelection(nsISelection *& aSelection);
#endif
/**
* Selects all the Content
*/
@ -298,8 +305,11 @@ protected:
virtual ~nsDocument();
nsresult Init();
#if XP_NEW_SELECTION
nsICollection * mSelection;
#else
nsISelection * mSelection;
#endif
nsIArena* mArena;
nsString* mDocumentTitle;
nsIURL* mDocumentURL;

5
layout/base/src/makefile.win
Просмотреть файл

@ -19,6 +19,9 @@ DEPTH=..\..\..
LIBRARY_NAME=raptorlayout_s
DEFINES=-D_IMPL_NS_LAYOUT -DWIN32_LEAN_AND_MEAN
!if defined(XP_NEW_SELECTION)
DEFINES = $(DEFINES) -DXP_NEW_SELECTION
!endif
CPPSRCS = \
nsGenericElement.cpp \
@ -41,6 +44,7 @@ CPPSRCS = \
nsXIFConverter.cpp \
nsRangeList.cpp \
nsLayoutAtoms.cpp \
nsRange.cpp \
$(NULL)
MODULE=raptor
@ -68,6 +72,7 @@ CPP_OBJS= \
.\$(OBJDIR)\nsXIFConverter.obj \
.\$(OBJDIR)\nsRangeList.obj \
.\$(OBJDIR)\nsLayoutAtoms.obj \
.\$(OBJDIR)\nsRange.obj \
$(NULL)
LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor \

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

@ -54,6 +54,13 @@
#include "nsIDOMText.h"
#include "nsDocumentFragment.h"
#if XP_NEW_SELECTION
#include "nsLayoutCID.h"
#include "nsIDOMRange.h"
#include "nsICollection.h"
#include "nsIEnumerator.h"
#endif //XP_NEW_SELECTION
static NS_DEFINE_IID(kIDOMTextIID, NS_IDOMTEXT_IID);
static NS_DEFINE_IID(kIDocumentIID, NS_IDOCUMENT_IID);
@ -71,6 +78,14 @@ static NS_DEFINE_IID(kIDOMStyleSheetIID, NS_IDOMSTYLESHEET_IID);
static NS_DEFINE_IID(kIDocumentObserverIID, NS_IDOCUMENT_OBSERVER_IID);
static NS_DEFINE_IID(kICSSStyleSheetIID, NS_ICSS_STYLE_SHEET_IID);
#if XP_NEW_SELECTION
static NS_DEFINE_IID(kCRangeCID, NS_RANGE_CID);
static NS_DEFINE_IID(kIDOMRange, NS_IDOMRANGE_IID);
static NS_DEFINE_IID(kCRangeListCID, NS_RANGELIST_CID);
static NS_DEFINE_IID(kICollectionIID, NS_ICOLLECTION_IID);
static NS_DEFINE_IID(kIEnumeratorIID, NS_IENUMERATOR_IID);
#endif //XP_NEW_SELECION
class nsDOMStyleSheetCollection : public nsIDOMStyleSheetCollection,
public nsIScriptObjectOwner,
public nsIDocumentObserver
@ -400,7 +415,11 @@ nsDocument::nsDocument()
mListenerManager = nsnull;
mDisplaySelection = PR_FALSE;
mInDestructor = PR_FALSE;
#if XP_NEW_SELECTION
if (!NS_SUCCEEDED(nsRepository::CreateInstance(kCRangeListCID, nsnull, kICollectionIID, (void **)&mSelection))){
#else
if (NS_OK != NS_NewSelection(&mSelection)) {
#endif
printf("*************** Error: nsDocument::nsDocument - Creation of Selection failed!\n");
}
mDOMStyleSheets = nsnull;
@ -1513,6 +1532,20 @@ void nsDocument::Finalize(JSContext *aContext)
/**
* Returns the Selection Object
*/
#if XP_NEW_SELECTION
NS_IMETHODIMP nsDocument::GetSelection(nsICollection ** aSelection) {
if (!aSelection)
return NS_ERROR_NULL_POINTER;
if (mSelection != nsnull) {
NS_ADDREF(mSelection);
*aSelection = mSelection;
return NS_OK;
} else {
*aSelection = nsnull;
}
return NS_ERROR_FAILURE;
}
#else
NS_IMETHODIMP nsDocument::GetSelection(nsISelection *& aSelection) {
if (mSelection != nsnull) {
NS_ADDREF(mSelection);
@ -1523,7 +1556,7 @@ NS_IMETHODIMP nsDocument::GetSelection(nsISelection *& aSelection) {
}
return NS_ERROR_FAILURE;
}
#endif //XP_NEW_SELECTION
/**
* Selects all the Content
@ -1584,12 +1617,38 @@ NS_IMETHODIMP nsDocument::SelectAll() {
//NS_RELEASE(start);
//NS_RELEASE(end);
#if XP_NEW_SELECTION
mSelection->Clear();//clear all old selection
nsIDOMRange *range = nsnull;
if (NS_SUCCEEDED(nsRepository::CreateInstance(kCRangeCID, nsnull, kIDOMRange, (void **)&range))){ //create an irange
nsIDOMDocument *domDoc;
if (NS_SUCCEEDED(QueryInterface(kIDOMDocumentIID, (void **)&domDoc))){//get the dom doc from this
nsIDOMElement *domElement = nsnull;
if (NS_SUCCEEDED(domDoc->GetDocumentElement(&domElement))) {//get the first element from the dom
nsIDOMNode *domNode;
if (NS_SUCCEEDED(domElement->QueryInterface(kIDOMNodeIID,(void **)&domNode))) {//get the node interface for the range object
range->SetStart(domNode,0);
range->SetEnd(domNode,0);
nsISupports *rangeISupports;
if (NS_SUCCEEDED(range->QueryInterface(kISupportsIID,(void **)&rangeISupports))) {
mSelection->AddItem(rangeISupports);
NS_IF_RELEASE(rangeISupports);
}
NS_IF_RELEASE(domNode);
}
NS_IF_RELEASE(domElement);
}
NS_IF_RELEASE(domDoc);
}
NS_IF_RELEASE(range);//allready referenced in the selection now.
}
#else
nsSelectionRange * range = mSelection->GetRange();
nsSelectionPoint * startPnt = range->GetStartPoint();
nsSelectionPoint * endPnt = range->GetEndPoint();
startPnt->SetPoint(start, -1, PR_TRUE);
endPnt->SetPoint(end, -1, PR_FALSE);
#endif
SetDisplaySelection(PR_TRUE);
return NS_OK;
@ -1773,6 +1832,20 @@ PRBool nsDocument::IsInSelection(const nsIContent* aContent) const
{
PRBool result = PR_FALSE;
#if XP_NEW_SELECTION
//travers through an iterator to see if the acontent is in the ranges
if (mSelection != nsnull)
{
nsIEnumerator *enumerator;
if (NS_SUCCEEDED(mSelection->QueryInterface(kIEnumeratorIID, (void **)&enumerator))){
for (enumerator->First();NS_COMFALSE == enumerator->IsDone(); enumerator->Next())
{
}
NS_IF_RELEASE(enumerator);
}
}
#else
if (mSelection != nsnull)
{
nsSelectionRange* range = mSelection->GetRange();
@ -1788,6 +1861,7 @@ PRBool nsDocument::IsInSelection(const nsIContent* aContent) const
NS_IF_RELEASE(endContent);
}
}
#endif
return result;
}

14
layout/base/src/nsDocument.h
Просмотреть файл

@ -29,7 +29,11 @@
#include "nsIJSScriptObject.h"
#include "nsIContent.h"
#if XP_NEW_SELECTION
class nsICollection;
#else
class nsISelection;
#endif
class nsIEventListenerManager;
class nsDOMStyleSheetCollection;
@ -186,8 +190,11 @@ public:
/**
* Returns the Selection Object
*/
#if XP_NEW_SELECTION
NS_IMETHOD GetSelection(nsICollection ** aSelection);
#else
NS_IMETHOD GetSelection(nsISelection *& aSelection);
#endif
/**
* Selects all the Content
*/
@ -298,8 +305,11 @@ protected:
virtual ~nsDocument();
nsresult Init();
#if XP_NEW_SELECTION
nsICollection * mSelection;
#else
nsISelection * mSelection;
#endif
nsIArena* mArena;
nsString* mDocumentTitle;
nsIURL* mDocumentURL;

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

@ -57,7 +57,7 @@ see the nsIEnumerator for more details*/
virtual nsresult CurrentItem(nsISupports **aRange);
virtual nsresult IsDone(PRBool *adone);
virtual nsresult IsDone();
/*END nsIEnumerator interfaces*/
@ -180,14 +180,14 @@ nsRangeListIterator::CurrentItem(nsISupports **aItem)
nsresult
nsRangeListIterator::IsDone(PRBool *aDone)
nsRangeListIterator::IsDone()
{
if (!aDone)
return NS_ERROR_NULL_POINTER;
if ((mIndex == mRangeList->mCount -1) || !mRangeList->mCount) //empty lists are always done
*aDone = PR_TRUE;
else
*aDone = PR_FALSE;
if ((mIndex == mRangeList->mCount -1) || !mRangeList->mCount) { //empty lists are always done
return NS_OK;
}
else{
return NS_COMFALSE;
}
return NS_OK;
}