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

added KeyPress event propogation. This makes the editor image dialog work much better.

Browse Source 
as part of this, I moved when I install event propogation listeners in the gfx text control frame.  nobody will notice
the difference, except keyPress notifications will work correctly.
This commit is contained in:
buster%netscape.com 1999-08-10 02:58:07 +00:00
parent 88da3e4b36
commit e98b412b9a
2 changed files with 90 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
layout/html/forms/src/nsGfxTextControlFrame.cpp
View File

@ -1065,58 +1065,6 @@ nsGfxTextControlFrame::InstallEditor()
doc->AddObserver(mDocObserver);
}
// get the DOM event receiver
nsCOMPtr<nsIDOMEventReceiver> er;
result = mDoc->QueryInterface(kIDOMEventReceiverIID, getter_AddRefs(er));
if (!er) { result = NS_ERROR_NULL_POINTER; }
nsCOMPtr<nsIEnderEventListener> eL;
// we need to hook up our listeners before the editor is initialized
result = NS_NewEnderKeyListener(getter_AddRefs(mKeyListener));
if (NS_SUCCEEDED(result) && mKeyListener)
{
eL = do_QueryInterface(mKeyListener);
if (eL)
{
eL->SetFrame(this);
eL->SetPresContext(mFramePresContext);
}
result = er->AddEventListenerByIID(mKeyListener, kIDOMKeyListenerIID);
if (NS_FAILED(result)) { //we couldn't add the listener
mKeyListener = do_QueryInterface(nsnull); // null out the listener, it's useless
}
}
/*
result = NS_NewEnderMouseListener(getter_AddRefs(mMouseListener));
if (NS_SUCCEEDED(result) && mMouseListener)
{
eL = do_QueryInterface(mMouseListener);
if (eL)
{
eL->SetFrame(this);
eL->SetPresContext(mFramePresContext);
result = er->AddEventListenerByIID(mMouseListener, kIDOMMouseListenerIID);
if (NS_FAILED(result)) { //we couldn't add the listener
mMouseListener = do_QueryInterface(nsnull); // null out the listener, it's useless
}
}
}
*/
result = NS_NewEnderFocusListener(getter_AddRefs(mFocusListener));
if (NS_SUCCEEDED(result) && mFocusListener)
{
eL = do_QueryInterface(mFocusListener);
if (eL)
{
eL->SetFrame(this);
eL->SetPresContext(mFramePresContext);
result = er->AddEventListenerByIID(mFocusListener, kIDOMFocusListenerIID);
if (NS_FAILED(result)) { //we couldn't add the listener
mFocusListener = do_QueryInterface(nsnull); // null out the listener, it's useless
}
}
}
PRUint32 editorFlags = 0;
if (IsPlainTextControl())
editorFlags |= nsIHTMLEditor::eEditorPlaintextMask;
@ -1129,6 +1077,68 @@ nsGfxTextControlFrame::InstallEditor()
if (NS_SUCCEEDED(result)) {
result = InitializeTextControl(presShell, mDoc);
}
if (NS_SUCCEEDED(result)) {
result = InstallEventListeners();
}
}
return result;
}
NS_IMETHODIMP
nsGfxTextControlFrame::InstallEventListeners()
{
nsresult result;
// get the DOM event receiver
nsCOMPtr<nsIDOMEventReceiver> er;
result = mDoc->QueryInterface(kIDOMEventReceiverIID, getter_AddRefs(er));
if (!er) { result = NS_ERROR_NULL_POINTER; }
nsCOMPtr<nsIEnderEventListener> eL;
// we need to hook up our listeners before the editor is initialized
result = NS_NewEnderKeyListener(getter_AddRefs(mKeyListener));
if (NS_SUCCEEDED(result) && mKeyListener)
{
eL = do_QueryInterface(mKeyListener);
if (eL)
{
eL->SetFrame(this);
eL->SetPresContext(mFramePresContext);
}
result = er->AddEventListenerByIID(mKeyListener, kIDOMKeyListenerIID);
if (NS_FAILED(result)) { //we couldn't add the listener
mKeyListener = do_QueryInterface(nsnull); // null out the listener, it's useless
}
}
/*
result = NS_NewEnderMouseListener(getter_AddRefs(mMouseListener));
if (NS_SUCCEEDED(result) && mMouseListener)
{
eL = do_QueryInterface(mMouseListener);
if (eL)
{
eL->SetFrame(this);
eL->SetPresContext(mFramePresContext);
result = er->AddEventListenerByIID(mMouseListener, kIDOMMouseListenerIID);
if (NS_FAILED(result)) { //we couldn't add the listener
mMouseListener = do_QueryInterface(nsnull); // null out the listener, it's useless
}
}
}
*/
result = NS_NewEnderFocusListener(getter_AddRefs(mFocusListener));
if (NS_SUCCEEDED(result) && mFocusListener)
{
eL = do_QueryInterface(mFocusListener);
if (eL)
{
eL->SetFrame(this);
eL->SetPresContext(mFramePresContext);
result = er->AddEventListenerByIID(mFocusListener, kIDOMFocusListenerIID);
if (NS_FAILED(result)) { //we couldn't add the listener
mFocusListener = do_QueryInterface(nsnull); // null out the listener, it's useless
}
}
}
return result;
}
@ -1684,6 +1694,32 @@ nsEnderKeyListener::KeyUp(nsIDOMEvent* aKeyEvent)
nsresult
nsEnderKeyListener::KeyPress(nsIDOMEvent* aKeyEvent)
{
nsCOMPtr<nsIDOMUIEvent>uiEvent;
uiEvent = do_QueryInterface(aKeyEvent);
if (!uiEvent) { //non-key event passed to keydown. bad things.
return NS_OK;
}
if (mFrame && mContent)
{
nsEventStatus status = nsEventStatus_eIgnore;
nsKeyEvent event;
event.eventStructType = NS_KEY_EVENT;
event.widget = nsnull;
event.message = NS_KEY_PRESS;
event.flags = NS_EVENT_FLAG_INIT;
uiEvent->GetKeyCode(&(event.keyCode));
uiEvent->GetCharCode(&(event.charCode));
uiEvent->GetShiftKey(&(event.isShift));
uiEvent->GetCtrlKey(&(event.isControl));
uiEvent->GetAltKey(&(event.isAlt));
// Have the content handle the event.
mContent->HandleDOMEvent(*mContext, &event, nsnull, NS_EVENT_FLAG_INIT, status);
// Now have the frame handle the event
mFrame->HandleEvent(*mContext, &event, status);
}
return NS_OK;
}

2
layout/html/forms/src/nsGfxTextControlFrame.h
View File

@ -460,6 +460,8 @@ protected:
NS_IMETHOD InitializeTextControl(nsIPresShell *aPresShell, nsIDOMDocument *aDoc);
NS_IMETHOD InstallEventListeners();
NS_IMETHOD GetPresShellFor(nsIWebShell* aWebShell, nsIPresShell** aPresShell);
NS_IMETHOD GetFirstNodeOfType(const nsString& aTag, nsIDOMDocument *aDOMDoc, nsIDOMNode **aBodyNode);