sr=sfraser@netscape.com,mscott@netscape.com r=jfrancis@netscape.com * nsITransaction, nsITransactionListenter, nsITransactionManager have been XPIDL'ized and moved into mozilla/editor/txmgr/idl. The versions of these interfaces in mozilla/editor/txmgr/public are being CVS removed. * Renamed Do(), Undo(), and Redo() to DoTransaction(), UndoTransaction(), and RedoTransaction() to avoid reserved word problems in languages like JS. I did a sweep through editor and mailnews to remove these methods. * PeekUndoStack() and PeekRedoStack() now return an AddRef'd pointer. * Removed GetUndoString(), GetRedoString() and Write() from the nsITransaction interface. Neither editor or mailnews really made use of these methods. * Removed Write() from the nsITransactionManager.cpp interface. * The Transaction Manager now supports weak references. * Added support for nsITransactionList to the TransactionManager to allow access to all transactions on the Undo and Redo stacks, as well as auto-aggregated transactions. * Removed all references to nsITransactionDescription from txmgr and editor. * Added nsPIEditorTransaction and made all Editor internal transactions inherit from it so we can distinguish between our transactions and ones from 3rd parties. New files checked in: editor/txmgr/idl/nsITransaction.idl editor/txmgr/idl/nsITransactionList.idl editor/txmgr/idl/nsITransactionListener.idl editor/txmgr/idl/nsITransactionManager.idl editor/txmgr/src/nsITransactionList.cpp editor/txmgr/src/nsITransactionList.h editor/idl/nsPIEditorTransaction.idl Files that were CVS removed: editor/txmgr/public/nsITransaction.h editor/txmgr/public/nsITransactionListener.h editor/txmgr/public/nsITransactionManager.h editor/txmgr/idl/nsITransactionDescription.h editor/base/IMECommitTxn.cpp editor/base/IMECommitTxn.h Files modified: editor/Makefile.in editor/makefile.win editor/base/ChangeAttributeTxn.cpp editor/base/ChangeAttributeTxn.h editor/base/CreateElementTxn.cpp editor/base/CreateElementTxn.h editor/base/DeleteElementTxn.cpp editor/base/DeleteElementTxn.h editor/base/DeleteRangeTxn.cpp editor/base/DeleteRangeTxn.h editor/base/DeleteTextTxn.cpp editor/base/DeleteTextTxn.h editor/base/EditAggregateTxn.cpp editor/base/EditAggregateTxn.h editor/base/EditTxn.cpp editor/base/EditTxn.h editor/base/IMECommitTxn.cpp editor/base/IMECommitTxn.h editor/base/IMETextTxn.cpp editor/base/IMETextTxn.h editor/base/InsertElementTxn.cpp editor/base/InsertElementTxn.h editor/base/InsertTextTxn.cpp editor/base/InsertTextTxn.h editor/base/JoinElementTxn.cpp editor/base/JoinElementTxn.h editor/base/nsEditor.cpp editor/base/nsEditorShell.cpp editor/base/nsEditorShell.h editor/base/nsEditorTxnLog.cpp editor/base/nsStyleSheetTxns.cpp editor/base/nsStyleSheetTxns.h editor/base/PlaceholderTxn.cpp editor/base/PlaceholderTxn.h editor/base/SetDocTitleTxn.cpp editor/base/SetDocTitleTxn.h editor/base/SplitElementTxn.cpp editor/base/SplitElementTxn.h editor/idl/Makefile.in editor/idl/makefile.win editor/idl/MANIFEST editor/idl/nsIEditorShell.idl editor/macbuild/editor.mcp editor/macbuild/EditorIDL.mcp editor/txmgr/idl/Makefile.in editor/txmgr/idl/makefile.win editor/txmgr/idl/MANIFEST editor/txmgr/idl/nsITransactionManager.idl editor/txmgr/macbuild/txmgr.mcp editor/txmgr/macbuild/txmgrIDL.mcp editor/txmgr/public/Makefile.in editor/txmgr/public/makefile.win editor/txmgr/public/MANIFEST editor/txmgr/src/Makefile.in editor/txmgr/src/makefile.win editor/txmgr/src/nsTransactionItem.cpp editor/txmgr/src/nsTransactionItem.h editor/txmgr/src/nsTransactionList.cpp editor/txmgr/src/nsTransactionList.h editor/txmgr/src/nsTransactionManager.cpp editor/txmgr/src/nsTransactionManager.h editor/txmgr/src/nsTransactionManagerFactory.cpp editor/txmgr/src/nsTransactionStack.cpp editor/txmgr/src/nsTransactionStack.h editor/txmgr/tests/TestTXMgr.cpp editor/ui/composer/content/EditorCommandsDebug.js editor/ui/composer/content/editorOverlay.xul editor/ui/composer/locale/en-US/editorOverlay.dtd mailnews/base/src/nsMessenger.cpp mailnews/base/util/nsMsgTxn.cpp mailnews/base/util/nsMsgTxn.h mailnews/imap/src/nsImapMailFolder.cpp mailnews/imap/src/nsImapUndoTxn.cpp mailnews/imap/src/nsImapUndoTxn.h mailnews/local/src/nsLocalMailFolder.cpp mailnews/local/src/nsLocalUndoTxn.cpp mailnews/local/src/nsLocalUndoTxn.h git-svn-id: svn://10.0.0.236/trunk@89126 18797224-902f-48f8-a5cc-f745e15eee43
290 lines
8.4 KiB
C++
290 lines
8.4 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
|
*
|
|
* The contents of this file are subject to the Netscape Public
|
|
* License Version 1.1 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.mozilla.org/NPL/
|
|
*
|
|
* Software distributed under the License is distributed on an "AS
|
|
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
|
* implied. See the License for the specific language governing
|
|
* rights and limitations under the License.
|
|
*
|
|
* The Original Code is mozilla.org code.
|
|
*
|
|
* The Initial Developer of the Original Code is Netscape
|
|
* Communications Corporation. Portions created by Netscape are
|
|
* Copyright (C) 1998-1999 Netscape Communications Corporation. All
|
|
* Rights Reserved.
|
|
*
|
|
* Contributor(s):
|
|
* Pierre Phaneuf <pp@ludusdesign.com>
|
|
*/
|
|
|
|
#include "PlaceholderTxn.h"
|
|
#include "nsVoidArray.h"
|
|
#include "nsHTMLEditor.h"
|
|
#include "nsIPresShell.h"
|
|
#include "IMETextTxn.h"
|
|
|
|
#if defined(NS_DEBUG) && defined(DEBUG_buster)
|
|
static PRBool gNoisy = PR_TRUE;
|
|
#else
|
|
static const PRBool gNoisy = PR_FALSE;
|
|
#endif
|
|
|
|
|
|
PlaceholderTxn::PlaceholderTxn() : EditAggregateTxn(),
|
|
mAbsorb(PR_TRUE),
|
|
mForwarding(nsnull),
|
|
mIMETextTxn(nsnull),
|
|
mCommitted(PR_FALSE),
|
|
mStartSel(nsnull),
|
|
mEndSel(),
|
|
mEditor(nsnull)
|
|
{
|
|
}
|
|
|
|
|
|
PlaceholderTxn::~PlaceholderTxn()
|
|
{
|
|
delete mStartSel;
|
|
}
|
|
|
|
NS_IMPL_ADDREF_INHERITED(PlaceholderTxn, EditAggregateTxn)
|
|
NS_IMPL_RELEASE_INHERITED(PlaceholderTxn, EditAggregateTxn)
|
|
|
|
//NS_IMPL_QUERY_INTERFACE_INHERITED(Class, Super, AdditionalInterface)
|
|
NS_IMETHODIMP PlaceholderTxn::QueryInterface(REFNSIID aIID, void** aInstancePtr)
|
|
{
|
|
if (!aInstancePtr) return NS_ERROR_NULL_POINTER;
|
|
|
|
if (aIID.Equals(NS_GET_IID(nsIAbsorbingTransaction))) {
|
|
*aInstancePtr = (nsISupports*)(nsIAbsorbingTransaction*)(this);
|
|
NS_ADDREF_THIS();
|
|
return NS_OK;
|
|
}
|
|
if (aIID.Equals(NS_GET_IID(nsISupportsWeakReference))) {
|
|
*aInstancePtr = (nsISupports*)(nsISupportsWeakReference*) this;
|
|
NS_ADDREF_THIS();
|
|
return NS_OK;
|
|
}
|
|
return EditAggregateTxn::QueryInterface(aIID, aInstancePtr);
|
|
}
|
|
|
|
NS_IMETHODIMP PlaceholderTxn::Init(nsIAtom *aName, nsSelectionState *aSelState, nsIEditor *aEditor)
|
|
{
|
|
if (!aEditor || !aSelState) return NS_ERROR_NULL_POINTER;
|
|
|
|
mName = aName;
|
|
mStartSel = aSelState;
|
|
mEditor = aEditor;
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP PlaceholderTxn::DoTransaction(void)
|
|
{
|
|
if (gNoisy) { printf("PlaceholderTxn Do\n"); }
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP PlaceholderTxn::UndoTransaction(void)
|
|
{
|
|
// undo txns
|
|
nsresult res = EditAggregateTxn::UndoTransaction();
|
|
if (NS_FAILED(res)) return res;
|
|
|
|
// now restore selection
|
|
nsCOMPtr<nsISelection> selection;
|
|
res = mEditor->GetSelection(getter_AddRefs(selection));
|
|
if (NS_FAILED(res)) return res;
|
|
if (!selection) return NS_ERROR_NULL_POINTER;
|
|
if (!mStartSel) return NS_ERROR_NULL_POINTER;
|
|
res = mStartSel->RestoreSelection(selection);
|
|
return res;
|
|
}
|
|
|
|
|
|
NS_IMETHODIMP PlaceholderTxn::RedoTransaction(void)
|
|
{
|
|
// redo txns
|
|
nsresult res = EditAggregateTxn::RedoTransaction();
|
|
if (NS_FAILED(res)) return res;
|
|
|
|
// now restore selection
|
|
nsCOMPtr<nsISelection> selection;
|
|
res = mEditor->GetSelection(getter_AddRefs(selection));
|
|
if (NS_FAILED(res)) return res;
|
|
if (!selection) return NS_ERROR_NULL_POINTER;
|
|
res = mEndSel.RestoreSelection(selection);
|
|
return res;
|
|
}
|
|
|
|
|
|
NS_IMETHODIMP PlaceholderTxn::Merge(nsITransaction *aTransaction, PRBool *aDidMerge)
|
|
{
|
|
if (!aDidMerge || !aTransaction) return NS_ERROR_NULL_POINTER;
|
|
|
|
// set out param default value
|
|
*aDidMerge=PR_FALSE;
|
|
|
|
nsresult res = NS_OK;
|
|
|
|
if (mForwarding)
|
|
{
|
|
NS_NOTREACHED("tried to merge into a placeholder that was in forwarding mode!");
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
EditTxn *editTxn = (EditTxn*)aTransaction; //XXX: hack, not safe! need nsIEditTransaction!
|
|
if (PR_TRUE==mAbsorb)
|
|
{ // yep, it's one of ours. Assimilate it.
|
|
IMETextTxn* otherTxn = nsnull;
|
|
if (NS_SUCCEEDED(aTransaction->QueryInterface(IMETextTxn::GetCID(),(void**)&otherTxn)) && otherTxn)
|
|
{
|
|
// special handling for IMETextTxn's: they need to merge with any previous
|
|
// IMETextTxn in this placeholder, if possible.
|
|
if (!mIMETextTxn)
|
|
{
|
|
// this is the first IME txn in the placeholder
|
|
mIMETextTxn =otherTxn;
|
|
AppendChild(editTxn);
|
|
}
|
|
else
|
|
{
|
|
PRBool didMerge;
|
|
mIMETextTxn->Merge(otherTxn, &didMerge);
|
|
if (!didMerge)
|
|
{
|
|
// it wouldn't merge. Earlier IME txn is already commited and will
|
|
// not absorb frther IME txns. So just stack this one after it
|
|
// and remember it as a candidate for furthre merges.
|
|
mIMETextTxn =otherTxn;
|
|
AppendChild(editTxn);
|
|
}
|
|
}
|
|
NS_IF_RELEASE(otherTxn);
|
|
}
|
|
else
|
|
{
|
|
AppendChild(editTxn);
|
|
}
|
|
*aDidMerge = PR_TRUE;
|
|
// RememberEndingSelection();
|
|
// efficiency hack: no need to remember selection here, as we haven't yet
|
|
// finished the inital batch and we know we will be told when the batch ends.
|
|
// we can remeber the selection then.
|
|
if (gNoisy) { printf("Placeholder txn assimilated %p\n", (void*)aTransaction); }
|
|
}
|
|
else
|
|
{ // merge typing or IME or deletion transactions if the selection matches
|
|
if (((mName.get() == nsHTMLEditor::gTypingTxnName) ||
|
|
(mName.get() == nsHTMLEditor::gIMETxnName) ||
|
|
(mName.get() == nsHTMLEditor::gDeleteTxnName))
|
|
&& !mCommitted )
|
|
{
|
|
// but only if this placeholder started with a collapsed selection
|
|
if (mStartSel->IsCollapsed())
|
|
{
|
|
nsCOMPtr<nsIAbsorbingTransaction> plcTxn;// = do_QueryInterface(editTxn);
|
|
// cant do_QueryInterface() above due to our broken transaction interfaces.
|
|
// instead have to brute it below. ugh.
|
|
editTxn->QueryInterface(NS_GET_IID(nsIAbsorbingTransaction), getter_AddRefs(plcTxn));
|
|
if (plcTxn)
|
|
{
|
|
nsCOMPtr<nsIAtom> atom;
|
|
plcTxn->GetTxnName(getter_AddRefs(atom));
|
|
if (atom && (atom == mName))
|
|
{
|
|
// check if start selection of next placeholder matches
|
|
// end selection of this placeholder
|
|
PRBool isSame;
|
|
plcTxn->StartSelectionEquals(&mEndSel, &isSame);
|
|
if (isSame)
|
|
{
|
|
mAbsorb = PR_TRUE; // we need to start absorbing again
|
|
plcTxn->ForwardEndBatchTo(this);
|
|
AppendChild(editTxn);
|
|
RememberEndingSelection();
|
|
*aDidMerge = PR_TRUE;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return res;
|
|
}
|
|
|
|
NS_IMETHODIMP PlaceholderTxn::GetTxnDescription(nsAWritableString& aString)
|
|
{
|
|
aString.Assign(NS_LITERAL_STRING("PlaceholderTxn: "));
|
|
|
|
if (mName)
|
|
{
|
|
nsAutoString name;
|
|
mName->ToString(name);
|
|
aString += name;
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP PlaceholderTxn::GetTxnName(nsIAtom **aName)
|
|
{
|
|
return GetName(aName);
|
|
}
|
|
|
|
NS_IMETHODIMP PlaceholderTxn::StartSelectionEquals(nsSelectionState *aSelState, PRBool *aResult)
|
|
{
|
|
// determine if starting selection matches the given selection state.
|
|
// note that we only care about collapsed selections.
|
|
if (!aResult || !aSelState) return NS_ERROR_NULL_POINTER;
|
|
if (!mStartSel->IsCollapsed() || !aSelState->IsCollapsed())
|
|
{
|
|
*aResult = PR_FALSE;
|
|
return NS_OK;
|
|
}
|
|
*aResult = mStartSel->IsEqual(aSelState);
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP PlaceholderTxn::EndPlaceHolderBatch()
|
|
{
|
|
mAbsorb = PR_FALSE;
|
|
|
|
if (mForwarding)
|
|
{
|
|
nsCOMPtr<nsIAbsorbingTransaction> plcTxn = do_QueryReferent(mForwarding);
|
|
if (plcTxn) plcTxn->EndPlaceHolderBatch();
|
|
}
|
|
|
|
// remember our selection state.
|
|
return RememberEndingSelection();
|
|
};
|
|
|
|
NS_IMETHODIMP PlaceholderTxn::ForwardEndBatchTo(nsIAbsorbingTransaction *aForwardingAddress)
|
|
{
|
|
mForwarding = getter_AddRefs( NS_GetWeakReference(aForwardingAddress) );
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP PlaceholderTxn::Commit()
|
|
{
|
|
mCommitted = PR_TRUE;
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP PlaceholderTxn::RememberEndingSelection()
|
|
{
|
|
nsCOMPtr<nsISelection> selection;
|
|
nsresult res = mEditor->GetSelection(getter_AddRefs(selection));
|
|
if (NS_FAILED(res)) return res;
|
|
if (!selection) return NS_ERROR_NULL_POINTER;
|
|
res = mEndSel.SaveSelection(selection);
|
|
|
|
return res;
|
|
}
|
|
|
|
|