mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 379579 - implement IAccessibleHypertext, r=aaronlev, sr=neil
This commit is contained in:
surkov.alexander@gmail.com
parent
edb098f03a
commit
7ce921de7d
131
accessible/src/msaa/CAccessibleHypertext.cpp
Executable file
131
accessible/src/msaa/CAccessibleHypertext.cpp
Executable file
@ -0,0 +1,131 @@
|
||||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* vim:expandtab:shiftwidth=2:tabstop=2:
|
||||
*/
|
||||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla 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/MPL/
|
||||
*
|
||||
* 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
|
||||
* Mozilla Foundation.
|
||||
* Portions created by the Initial Developer are Copyright (C) 2007
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Alexander Surkov <surkov.alexander@gmail.com> (original author)
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the MPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#include "CAccessibleHypertext.h"
|
||||
|
||||
#include "AccessibleHypertext_i.c"
|
||||
#include "AccessibleHyperlink_i.c"
|
||||
|
||||
#include "nsIAccessibleHypertext.h"
|
||||
#include "nsIWinAccessNode.h"
|
||||
|
||||
#include "nsCOMPtr.h"
|
||||
|
||||
// IUnknown
|
||||
|
||||
STDMETHODIMP
|
||||
CAccessibleHypertext::QueryInterface(REFIID iid, void** ppv)
|
||||
{
|
||||
*ppv = NULL;
|
||||
|
||||
if (IID_IAccessibleHypertext == iid) {
|
||||
nsCOMPtr<nsIAccessibleHyperText> hyperAcc(do_QueryInterface(this));
|
||||
if (!hyperAcc)
|
||||
return E_FAIL;
|
||||
|
||||
*ppv = NS_STATIC_CAST(IAccessibleHypertext*, this);
|
||||
(NS_REINTERPRET_CAST(IUnknown*, *ppv))->AddRef();
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
return CAccessibleText::QueryInterface(iid, ppv);
|
||||
}
|
||||
|
||||
// IAccessibleHypertext
|
||||
|
||||
STDMETHODIMP
|
||||
CAccessibleHypertext::get_nHyperlinks(long *aHyperlinkCount)
|
||||
{
|
||||
*aHyperlinkCount = 0;
|
||||
|
||||
nsCOMPtr<nsIAccessibleHyperText> hyperAcc(do_QueryInterface(this));
|
||||
if (!hyperAcc)
|
||||
return E_FAIL;
|
||||
|
||||
PRInt32 count = 0;
|
||||
nsresult rv = hyperAcc->GetLinks(&count);
|
||||
*aHyperlinkCount = count;
|
||||
|
||||
return NS_FAILED(rv) ? E_FAIL : S_OK;
|
||||
}
|
||||
|
||||
STDMETHODIMP
|
||||
CAccessibleHypertext::get_hyperlink(long aIndex,
|
||||
IAccessibleHyperlink **aHyperlink)
|
||||
{
|
||||
*aHyperlink = NULL;
|
||||
|
||||
nsCOMPtr<nsIAccessibleHyperText> hyperAcc(do_QueryInterface(this));
|
||||
if (!hyperAcc)
|
||||
return E_FAIL;
|
||||
|
||||
nsCOMPtr<nsIAccessibleHyperLink> hyperLink;
|
||||
hyperAcc->GetLink(aIndex, getter_AddRefs(hyperLink));
|
||||
if (!hyperLink)
|
||||
return E_FAIL;
|
||||
|
||||
nsCOMPtr<nsIWinAccessNode> winAccessNode(do_QueryInterface(hyperLink));
|
||||
if (!winAccessNode)
|
||||
return E_FAIL;
|
||||
|
||||
void *instancePtr = NULL;
|
||||
nsresult rv = winAccessNode->QueryNativeInterface(IID_IAccessibleHyperlink,
|
||||
&instancePtr);
|
||||
*aHyperlink = NS_STATIC_CAST(IAccessibleHyperlink*, instancePtr);
|
||||
|
||||
return NS_FAILED(rv) ? E_FAIL : S_OK;
|
||||
}
|
||||
|
||||
STDMETHODIMP
|
||||
CAccessibleHypertext::get_hyperlinkIndex(long aCharIndex, long *aHyperlinkIndex)
|
||||
{
|
||||
*aHyperlinkIndex = 0;
|
||||
|
||||
nsCOMPtr<nsIAccessibleHyperText> hyperAcc(do_QueryInterface(this));
|
||||
if (!hyperAcc)
|
||||
return E_FAIL;
|
||||
|
||||
PRInt32 index = 0;
|
||||
nsresult rv = hyperAcc->GetLinkIndex(aCharIndex, &index);
|
||||
*aHyperlinkIndex = index;
|
||||
|
||||
return NS_FAILED(rv) ? E_FAIL : S_OK;
|
||||
}
|
||||
|
||||
74
accessible/src/msaa/CAccessibleHypertext.h
Executable file
74
accessible/src/msaa/CAccessibleHypertext.h
Executable file
@ -0,0 +1,74 @@
|
||||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* vim:expandtab:shiftwidth=2:tabstop=2:
|
||||
*/
|
||||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla 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/MPL/
|
||||
*
|
||||
* 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
|
||||
* Mozilla Foundation.
|
||||
* Portions created by the Initial Developer are Copyright (C) 2007
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Alexander Surkov <surkov.alexander@gmail.com> (original author)
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the MPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#ifndef _ACCESSIBLE_HYPERTEXT_H
|
||||
#define _ACCESSIBLE_HYPERTEXT_H
|
||||
|
||||
#include "nsISupports.h"
|
||||
|
||||
#include "CAccessibleText.h"
|
||||
#include "AccessibleHypertext.h"
|
||||
|
||||
class CAccessibleHypertext: public CAccessibleText,
|
||||
public IAccessibleHypertext
|
||||
{
|
||||
public:
|
||||
|
||||
// IUnknown
|
||||
STDMETHODIMP QueryInterface(REFIID, void**);
|
||||
|
||||
// IAccessibleText
|
||||
FORWARD_IACCESSIBLETEXT(CAccessibleText)
|
||||
|
||||
// IAccessibleHypertext
|
||||
virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_nHyperlinks(
|
||||
/* [retval][out] */ long *hyperlinkCount);
|
||||
|
||||
virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_hyperlink(
|
||||
/* [in] */ long index,
|
||||
/* [retval][out] */ IAccessibleHyperlink **hyperlink);
|
||||
|
||||
virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_hyperlinkIndex(
|
||||
/* [in] */ long charIndex,
|
||||
/* [retval][out] */ long *hyperlinkIndex);
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@ -158,5 +158,142 @@ private:
|
||||
nsAccessibleTextBoundary GetGeckoTextBoundary(enum IA2TextBoundaryType coordinateType);
|
||||
};
|
||||
|
||||
|
||||
#define FORWARD_IACCESSIBLETEXT(Class) \
|
||||
virtual HRESULT STDMETHODCALLTYPE addSelection(long startOffset, \
|
||||
long endOffset) \
|
||||
{ \
|
||||
return Class::addSelection(startOffset, endOffset); \
|
||||
} \
|
||||
\
|
||||
virtual HRESULT STDMETHODCALLTYPE get_attributes(long offset, \
|
||||
long *startOffset, \
|
||||
long *endOffset, \
|
||||
BSTR *textAttributes) \
|
||||
{ \
|
||||
return Class::get_attributes(offset, startOffset, endOffset, textAttributes);\
|
||||
} \
|
||||
\
|
||||
virtual HRESULT STDMETHODCALLTYPE get_caretOffset(long *offset) \
|
||||
{ \
|
||||
return Class::get_caretOffset(offset); \
|
||||
} \
|
||||
\
|
||||
virtual HRESULT STDMETHODCALLTYPE get_characterExtents(long offset, \
|
||||
enum IA2CoordinateType coordType,\
|
||||
long *x, \
|
||||
long *y, \
|
||||
long *width, \
|
||||
long *height) \
|
||||
{ \
|
||||
return Class::get_characterExtents(offset, coordType, x, y, width, height); \
|
||||
} \
|
||||
\
|
||||
virtual HRESULT STDMETHODCALLTYPE get_nSelections(long *nSelections) \
|
||||
{ \
|
||||
return Class::get_nSelections(nSelections); \
|
||||
} \
|
||||
\
|
||||
virtual HRESULT STDMETHODCALLTYPE get_offsetAtPoint(long x, \
|
||||
long y, \
|
||||
enum IA2CoordinateType coordType,\
|
||||
long *offset) \
|
||||
{ \
|
||||
return Class::get_offsetAtPoint(x, y, coordType, offset); \
|
||||
} \
|
||||
\
|
||||
virtual HRESULT STDMETHODCALLTYPE get_selection(long selectionIndex, \
|
||||
long *startOffset, \
|
||||
long *endOffset) \
|
||||
{ \
|
||||
return Class::get_selection(selectionIndex, startOffset, endOffset); \
|
||||
} \
|
||||
\
|
||||
virtual HRESULT STDMETHODCALLTYPE get_text(long startOffset, \
|
||||
long endOffset, \
|
||||
BSTR *text) \
|
||||
{ \
|
||||
return Class::get_text(startOffset, endOffset, text); \
|
||||
} \
|
||||
\
|
||||
virtual HRESULT STDMETHODCALLTYPE get_textBeforeOffset(long offset, \
|
||||
enum IA2TextBoundaryType boundaryType,\
|
||||
long *startOffset, \
|
||||
long *endOffset, \
|
||||
BSTR *text) \
|
||||
{ \
|
||||
return Class::get_textBeforeOffset(offset, boundaryType, \
|
||||
startOffset, endOffset, text); \
|
||||
} \
|
||||
\
|
||||
virtual HRESULT STDMETHODCALLTYPE get_textAfterOffset(long offset, \
|
||||
enum IA2TextBoundaryType boundaryType,\
|
||||
long *startOffset, \
|
||||
long *endOffset, \
|
||||
BSTR *text) \
|
||||
{ \
|
||||
return Class::get_textAfterOffset(offset, boundaryType, \
|
||||
startOffset, endOffset, text); \
|
||||
} \
|
||||
\
|
||||
virtual HRESULT STDMETHODCALLTYPE get_textAtOffset(long offset, \
|
||||
enum IA2TextBoundaryType boundaryType,\
|
||||
long *startOffset, \
|
||||
long *endOffset, \
|
||||
BSTR *text) \
|
||||
{ \
|
||||
return Class::get_textAtOffset(offset, boundaryType, \
|
||||
startOffset, endOffset, text); \
|
||||
} \
|
||||
\
|
||||
virtual HRESULT STDMETHODCALLTYPE removeSelection(long selectionIndex) \
|
||||
{ \
|
||||
return Class::removeSelection(selectionIndex); \
|
||||
} \
|
||||
\
|
||||
virtual HRESULT STDMETHODCALLTYPE setCaretOffset(long offset) \
|
||||
{ \
|
||||
return Class::setCaretOffset(offset); \
|
||||
} \
|
||||
\
|
||||
virtual HRESULT STDMETHODCALLTYPE setSelection(long selectionIndex, \
|
||||
long startOffset, \
|
||||
long endOffset) \
|
||||
{ \
|
||||
return Class::setSelection(selectionIndex, startOffset, endOffset); \
|
||||
} \
|
||||
\
|
||||
virtual HRESULT STDMETHODCALLTYPE get_nCharacters(long *nCharacters) \
|
||||
{ \
|
||||
return Class::get_nCharacters(nCharacters); \
|
||||
} \
|
||||
\
|
||||
virtual HRESULT STDMETHODCALLTYPE scrollSubstringTo(long startIndex, \
|
||||
long endIndex, \
|
||||
enum IA2ScrollType scrollType)\
|
||||
{ \
|
||||
return Class::scrollSubstringTo(startIndex, endIndex, scrollType); \
|
||||
} \
|
||||
\
|
||||
virtual HRESULT STDMETHODCALLTYPE scrollSubstringToPoint(long startIndex, \
|
||||
long endIndex, \
|
||||
enum IA2CoordinateType coordinateType,\
|
||||
long x, \
|
||||
long y) \
|
||||
{ \
|
||||
return Class::scrollSubstringToPoint(startIndex, endIndex, \
|
||||
coordinateType, x, y); \
|
||||
} \
|
||||
\
|
||||
virtual HRESULT STDMETHODCALLTYPE get_newText(IA2TextSegment *newText) \
|
||||
{ \
|
||||
return Class::get_newText(newText); \
|
||||
} \
|
||||
\
|
||||
virtual HRESULT STDMETHODCALLTYPE get_oldText(IA2TextSegment *oldText) \
|
||||
{ \
|
||||
return Class::get_oldText(oldText); \
|
||||
} \
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@ -81,6 +81,7 @@ CPPSRCS = \
|
||||
CAccessibleImage.cpp \
|
||||
CAccessibleText.cpp \
|
||||
CAccessibleEditableText.cpp \
|
||||
CAccessibleHypertext.cpp \
|
||||
CAccessibleTable.cpp \
|
||||
CAccessibleValue.cpp \
|
||||
$(NULL)
|
||||
@ -100,6 +101,7 @@ EXPORTS = \
|
||||
CAccessibleImage.h \
|
||||
CAccessibleText.h \
|
||||
CAccessibleEditableText.h \
|
||||
CAccessibleHypertext.h \
|
||||
CAccessibleTable.h \
|
||||
CAccessibleValue.h \
|
||||
$(NULL)
|
||||
|
||||
@ -48,8 +48,10 @@ PRBool nsHyperTextAccessibleWrap::sIsInserted = PR_FALSE;
|
||||
NS_IMPL_ISUPPORTS_INHERITED0(nsHyperTextAccessibleWrap,
|
||||
nsHyperTextAccessible)
|
||||
|
||||
IMPL_IUNKNOWN_INHERITED2(nsHyperTextAccessibleWrap, nsAccessibleWrap,
|
||||
CAccessibleText, CAccessibleEditableText);
|
||||
IMPL_IUNKNOWN_INHERITED2(nsHyperTextAccessibleWrap,
|
||||
nsAccessibleWrap,
|
||||
CAccessibleHypertext,
|
||||
CAccessibleEditableText);
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsHyperTextAccessibleWrap::FireAccessibleEvent(nsIAccessibleEvent *aEvent)
|
||||
|
||||
@ -44,9 +44,10 @@
|
||||
#include "nsHyperTextAccessible.h"
|
||||
#include "CAccessibleText.h"
|
||||
#include "CAccessibleEditableText.h"
|
||||
#include "CAccessibleHyperText.h"
|
||||
|
||||
class nsHyperTextAccessibleWrap : public nsHyperTextAccessible,
|
||||
public CAccessibleText,
|
||||
public CAccessibleHypertext,
|
||||
public CAccessibleEditableText
|
||||
{
|
||||
public:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user