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

Middle-mouse paste; also, fix a bunch of warnings

This commit is contained in:
akkana%netscape.com 1999-05-07 19:22:38 +00:00
Родитель 50f967f883
Коммит dea0153e34
3 изменённых файлов: 107 добавлений и 38 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -22,6 +22,7 @@
#include "nsIDOMDocument.h"
#include "nsIDOMElement.h"
#include "nsIDOMSelection.h"
#include "nsIDOMCharacterData.h"
#include "nsIEditProperty.h"
#include "nsISupportsArray.h"
@ -370,10 +371,11 @@ nsTextEditorKeyListener::ProcessShortCutKeys(nsIDOMEvent* aKeyEvent, PRBool& aPr
{
printf("Trying to insert HTML\n");
aProcessed=PR_TRUE;
if (mEditor)
nsCOMPtr<nsIHTMLEditor> htmlEditor (do_QueryInterface(mEditor));
if (htmlEditor)
{
nsString nsstr ("<b>This is bold <em>and emphasized</em></b>");
nsresult res = mEditor->Insert(nsstr);
nsresult res = htmlEditor->Insert(nsstr);
if (!NS_SUCCEEDED(res))
printf("nsTextEditor::Insert(string) failed\n");
}
@ -485,9 +487,9 @@ nsTextEditorKeyListener::ProcessShortCutKeys(nsIDOMEvent* aKeyEvent, PRBool& aPr
{
// XXX: move this logic down into texteditor rules delegate
// should just call mEditor->ChangeTextProperty(prop)
PRBool any = PR_FALSE;
PRBool all = PR_FALSE;
PRBool first = PR_FALSE;
//PRBool any = PR_FALSE;
//PRBool all = PR_FALSE;
//PRBool first = PR_FALSE;
nsAutoString prop = "SIZE";
nsAutoString value = "+2";
mEditor->SetTextProperty(nsIEditProperty::font, &prop, &value);
@ -504,9 +506,9 @@ nsTextEditorKeyListener::ProcessShortCutKeys(nsIDOMEvent* aKeyEvent, PRBool& aPr
{
// XXX: move this logic down into texteditor rules delegate
// should just call mEditor->ChangeTextProperty(prop)
PRBool any = PR_FALSE;
PRBool all = PR_FALSE;
PRBool first = PR_FALSE;
//PRBool any = PR_FALSE;
//PRBool all = PR_FALSE;
//PRBool first = PR_FALSE;
nsAutoString prop = "SIZE";
nsAutoString value = "-2";
mEditor->SetTextProperty(nsIEditProperty::font, &prop, &value);
@ -523,9 +525,9 @@ nsTextEditorKeyListener::ProcessShortCutKeys(nsIDOMEvent* aKeyEvent, PRBool& aPr
{
// XXX: move this logic down into texteditor rules delegate
// should just call mEditor->ChangeTextProperty(prop)
PRBool any = PR_FALSE;
PRBool all = PR_FALSE;
PRBool first = PR_FALSE;
//PRBool any = PR_FALSE;
//PRBool all = PR_FALSE;
//PRBool first = PR_FALSE;
nsAutoString prop = "FACE";
nsAutoString value = "helvetica";
mEditor->SetTextProperty(nsIEditProperty::font, &prop, &value);
@ -542,9 +544,9 @@ nsTextEditorKeyListener::ProcessShortCutKeys(nsIDOMEvent* aKeyEvent, PRBool& aPr
{
// XXX: move this logic down into texteditor rules delegate
// should just call mEditor->ChangeTextProperty(prop)
PRBool any = PR_FALSE;
PRBool all = PR_FALSE;
PRBool first = PR_FALSE;
//PRBool any = PR_FALSE;
//PRBool all = PR_FALSE;
//PRBool first = PR_FALSE;
nsAutoString prop = "FACE";
nsAutoString value = "times";
mEditor->SetTextProperty(nsIEditProperty::font, &prop, &value);
@ -766,12 +768,43 @@ nsTextEditorMouseListener::HandleEvent(nsIDOMEvent* aEvent)
nsresult
nsTextEditorMouseListener::MouseDown(nsIDOMEvent* aMouseEvent)
{
if (!aMouseEvent)
return NS_OK; // NS_OK means "we didn't process the event". Go figure.
// We only do anything special for middle-mouse click (paste);
// ignore all other events.
PRUint32 button = 0;
aMouseEvent->GetButton(&button);
if (button != 2)
return NS_OK;
nsCOMPtr<nsIEditor> editor (do_QueryInterface(mEditor));
if (!editor)
return NS_ERROR_FAILURE;
// There's currently no way to set the selection to the mouse position
// outside of liblayout -- nsIDOMEvent has an API to get the node under
// the mouse, but not to get the offset within the node.
#ifdef PASTE_TO_MOUSE_POSITION
nsCOMPtr<nsIDOMNode> target;
if (NS_OK == aMouseEvent->GetTarget(getter_AddRefs(target))) {
// nsSetCurrentNode(aTarget);
if (NS_SUCCEEDED(aMouseEvent->GetTarget(getter_AddRefs(target))))
{
nsCOMPtr<nsIDOMSelection> selection;
if (NS_SUCCEEDED(editor->GetSelection(getter_AddRefs(selection))))
{
if (NS_SUCCEEDED(selection->Collapse(target, 0)))
{
editor->Paste();
}
}
}
//Should not be error. Need a new way to do return values
return NS_ERROR_BASE;
#else /* PASTE_TO_MOUSE_POSITION */
// Until we can get node AND offset,
// it's better to paste to the current selection position:
editor->Paste();
#endif /* PASTE_TO_MOUSE_POSITION */
return NS_ERROR_BASE; // NS_ERROR_BASE means "We did process the event".
}

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

@ -258,6 +258,9 @@ NS_IMETHODIMP nsTextEditor::Init(nsIDOMDocument *aDoc, nsIPresShell *aPresShell)
}
result = NS_NewEditorMouseListener(getter_AddRefs(mMouseListenerP), this);
if (NS_OK != result) {
#ifdef DEBUG_akkana
printf("Couldn't get mouse listener\n");
#endif
// drop the key listener if we couldn't get a mouse listener.
mKeyListenerP = do_QueryInterface(0);
return result;
@ -308,8 +311,8 @@ NS_IMETHODIMP nsTextEditor::Init(nsIDOMDocument *aDoc, nsIPresShell *aPresShell)
}
//cmanske: Shouldn't we check result from this?
erP->AddEventListenerByIID(mKeyListenerP, kIDOMKeyListenerIID);
//erP->AddEventListener(mDragListenerP, kIDOMDragListenerIID);
//erP->AddEventListener(mMouseListenerP, kIDOMMouseListenerIID);
//erP->AddEventListenerByIID(mDragListenerP, kIDOMDragListenerIID);
erP->AddEventListenerByIID(mMouseListenerP, kIDOMMouseListenerIID);
erP->AddEventListenerByIID(mTextListenerP,kIDOMTextListenerIID);
erP->AddEventListenerByIID(mCompositionListenerP,kIDOMCompositionListenerIID);

69
editor/libeditor/text/nsEditorEventListeners.cpp
Просмотреть файл

@ -22,6 +22,7 @@
#include "nsIDOMDocument.h"
#include "nsIDOMElement.h"
#include "nsIDOMSelection.h"
#include "nsIDOMCharacterData.h"
#include "nsIEditProperty.h"
#include "nsISupportsArray.h"
@ -370,10 +371,11 @@ nsTextEditorKeyListener::ProcessShortCutKeys(nsIDOMEvent* aKeyEvent, PRBool& aPr
{
printf("Trying to insert HTML\n");
aProcessed=PR_TRUE;
if (mEditor)
nsCOMPtr<nsIHTMLEditor> htmlEditor (do_QueryInterface(mEditor));
if (htmlEditor)
{
nsString nsstr ("<b>This is bold <em>and emphasized</em></b>");
nsresult res = mEditor->Insert(nsstr);
nsresult res = htmlEditor->Insert(nsstr);
if (!NS_SUCCEEDED(res))
printf("nsTextEditor::Insert(string) failed\n");
}
@ -485,9 +487,9 @@ nsTextEditorKeyListener::ProcessShortCutKeys(nsIDOMEvent* aKeyEvent, PRBool& aPr
{
// XXX: move this logic down into texteditor rules delegate
// should just call mEditor->ChangeTextProperty(prop)
PRBool any = PR_FALSE;
PRBool all = PR_FALSE;
PRBool first = PR_FALSE;
//PRBool any = PR_FALSE;
//PRBool all = PR_FALSE;
//PRBool first = PR_FALSE;
nsAutoString prop = "SIZE";
nsAutoString value = "+2";
mEditor->SetTextProperty(nsIEditProperty::font, &prop, &value);
@ -504,9 +506,9 @@ nsTextEditorKeyListener::ProcessShortCutKeys(nsIDOMEvent* aKeyEvent, PRBool& aPr
{
// XXX: move this logic down into texteditor rules delegate
// should just call mEditor->ChangeTextProperty(prop)
PRBool any = PR_FALSE;
PRBool all = PR_FALSE;
PRBool first = PR_FALSE;
//PRBool any = PR_FALSE;
//PRBool all = PR_FALSE;
//PRBool first = PR_FALSE;
nsAutoString prop = "SIZE";
nsAutoString value = "-2";
mEditor->SetTextProperty(nsIEditProperty::font, &prop, &value);
@ -523,9 +525,9 @@ nsTextEditorKeyListener::ProcessShortCutKeys(nsIDOMEvent* aKeyEvent, PRBool& aPr
{
// XXX: move this logic down into texteditor rules delegate
// should just call mEditor->ChangeTextProperty(prop)
PRBool any = PR_FALSE;
PRBool all = PR_FALSE;
PRBool first = PR_FALSE;
//PRBool any = PR_FALSE;
//PRBool all = PR_FALSE;
//PRBool first = PR_FALSE;
nsAutoString prop = "FACE";
nsAutoString value = "helvetica";
mEditor->SetTextProperty(nsIEditProperty::font, &prop, &value);
@ -542,9 +544,9 @@ nsTextEditorKeyListener::ProcessShortCutKeys(nsIDOMEvent* aKeyEvent, PRBool& aPr
{
// XXX: move this logic down into texteditor rules delegate
// should just call mEditor->ChangeTextProperty(prop)
PRBool any = PR_FALSE;
PRBool all = PR_FALSE;
PRBool first = PR_FALSE;
//PRBool any = PR_FALSE;
//PRBool all = PR_FALSE;
//PRBool first = PR_FALSE;
nsAutoString prop = "FACE";
nsAutoString value = "times";
mEditor->SetTextProperty(nsIEditProperty::font, &prop, &value);
@ -766,12 +768,43 @@ nsTextEditorMouseListener::HandleEvent(nsIDOMEvent* aEvent)
nsresult
nsTextEditorMouseListener::MouseDown(nsIDOMEvent* aMouseEvent)
{
if (!aMouseEvent)
return NS_OK; // NS_OK means "we didn't process the event". Go figure.
// We only do anything special for middle-mouse click (paste);
// ignore all other events.
PRUint32 button = 0;
aMouseEvent->GetButton(&button);
if (button != 2)
return NS_OK;
nsCOMPtr<nsIEditor> editor (do_QueryInterface(mEditor));
if (!editor)
return NS_ERROR_FAILURE;
// There's currently no way to set the selection to the mouse position
// outside of liblayout -- nsIDOMEvent has an API to get the node under
// the mouse, but not to get the offset within the node.
#ifdef PASTE_TO_MOUSE_POSITION
nsCOMPtr<nsIDOMNode> target;
if (NS_OK == aMouseEvent->GetTarget(getter_AddRefs(target))) {
// nsSetCurrentNode(aTarget);
if (NS_SUCCEEDED(aMouseEvent->GetTarget(getter_AddRefs(target))))
{
nsCOMPtr<nsIDOMSelection> selection;
if (NS_SUCCEEDED(editor->GetSelection(getter_AddRefs(selection))))
{
if (NS_SUCCEEDED(selection->Collapse(target, 0)))
{
editor->Paste();
}
}
}
//Should not be error. Need a new way to do return values
return NS_ERROR_BASE;
#else /* PASTE_TO_MOUSE_POSITION */
// Until we can get node AND offset,
// it's better to paste to the current selection position:
editor->Paste();
#endif /* PASTE_TO_MOUSE_POSITION */
return NS_ERROR_BASE; // NS_ERROR_BASE means "We did process the event".
}