Changeset 38211 in webkit


Ignore:
Timestamp:
Nov 6, 2008, 9:52:46 PM (16 years ago)
Author:
[email protected]
Message:

Reviewed by Darin Adler.

​https://bugs.webkit.org/show_bug.cgi?id=21107
<rdar://problem/6264219> New access key combination conflicts with VoiceOver

  • page/EventHandler.h:
  • page/gtk/EventHandlerGtk.cpp: (WebCore::EventHandler::accessKeyModifiers):
  • page/qt/EventHandlerQt.cpp: (WebCore::EventHandler::accessKeyModifiers):
  • page/win/EventHandlerWin.cpp: (WebCore::EventHandler::accessKeyModifiers):
  • page/wx/EventHandlerWx.cpp: (WebCore::EventHandler::accessKeyModifiers): Access access key modifiers via a function, not a static variable.
  • page/mac/EventHandlerMac.mm: (WebCore::EventHandler::accessKeyModifiers): Use Ctrl when VoiceOver is enabled, because a conflict with Emacs-style key bindings is less troublesome than one with VO keys.
  • page/EventHandler.cpp: (WebCore::EventHandler::handleAccessKey): Also fix an access key matching bug introduced in r32424 - Any superset of specified modifier set invoked access keys. We can use simple equality comparison instead because CapsLock is not part of modifiers(), so it doesn't need to be ignored explicitly.
Location:
trunk/WebCore
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r38210 r38211  
     12008-11-06  Alexey Proskuryakov  <[email protected]>
     2
     3        Reviewed by Darin Adler.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=21107
     6        <rdar://problem/6264219> New access key combination conflicts with VoiceOver
     7
     8        * page/EventHandler.h:
     9        * page/gtk/EventHandlerGtk.cpp:
     10        (WebCore::EventHandler::accessKeyModifiers):
     11        * page/qt/EventHandlerQt.cpp:
     12        (WebCore::EventHandler::accessKeyModifiers):
     13        * page/win/EventHandlerWin.cpp:
     14        (WebCore::EventHandler::accessKeyModifiers):
     15        * page/wx/EventHandlerWx.cpp:
     16        (WebCore::EventHandler::accessKeyModifiers):
     17        Access access key modifiers via a function, not a static variable.
     18
     19        * page/mac/EventHandlerMac.mm: (WebCore::EventHandler::accessKeyModifiers):
     20        Use Ctrl when VoiceOver is enabled, because a conflict with Emacs-style key bindings is
     21        less troublesome than one with VO keys.
     22
     23        * page/EventHandler.cpp: (WebCore::EventHandler::handleAccessKey):
     24        Also fix an access key matching bug introduced in r32424 - Any superset of specified
     25        modifier set invoked access keys. We can use simple equality comparison instead because
     26        CapsLock is not part of modifiers(), so it doesn't need to be ignored explicitly.
     27
    1282008-11-06  Anders Carlsson  <[email protected]>
    229

  • trunk/WebCore/page/EventHandler.cpp

    r38207 r38211  
    17231723bool EventHandler::handleAccessKey(const PlatformKeyboardEvent& evt)
    17241724{
    1725     if ((evt.modifiers() & s_accessKeyModifiers) != s_accessKeyModifiers)
     1725    if (evt.modifiers() != accessKeyModifiers())
    17261726        return false;
    17271727    String key = evt.unmodifiedText();

  • trunk/WebCore/page/EventHandler.h

    r37435 r38211  
    141141    bool needsKeyboardEventDisambiguationQuirks() const;
    142142
    143     static unsigned accessKeyModifiers() { return s_accessKeyModifiers; }
     143    static unsigned accessKeyModifiers();
    144144    bool handleAccessKey(const PlatformKeyboardEvent&);
    145145    bool keyEvent(const PlatformKeyboardEvent&);
    … …  
    335335    double m_mouseDownTimestamp;
    336336    PlatformMouseEvent m_mouseDown;
    337 
    338     static unsigned s_accessKeyModifiers;
    339337   
    340338    unsigned m_pendingFrameUnloadEventCount;

  • trunk/WebCore/page/gtk/EventHandlerGtk.cpp

    r38094 r38211  
    4242
    4343namespace WebCore {
    44 
    45 unsigned EventHandler::s_accessKeyModifiers = PlatformKeyboardEvent::AltKey;
    4644
    4745const double EventHandler::TextDragDelay = 0.0;
    … …  
    121119}
    122120
     121unsigned EventHandler::accessKeyModifiers()
     122{
     123    return PlatformKeyboardEvent::AltKey;
    123124}
     125
     126}

  • trunk/WebCore/page/mac/EventHandlerMac.mm

    r38094 r38211  
    2727#include "EventHandler.h"
    2828
     29#include "AXObjectCache.h"
    2930#include "BlockExceptions.h"
    3031#include "ChromeClient.h"
    … …  
    4546
    4647namespace WebCore {
    47 
    48 unsigned EventHandler::s_accessKeyModifiers = PlatformKeyboardEvent::CtrlKey | PlatformKeyboardEvent::AltKey;
    4948
    5049const double EventHandler::TextDragDelay = 0.15;
    … …  
    644643}
    645644
    646 }
     645unsigned EventHandler::accessKeyModifiers()
     646{
     647    / Control+Option key combinations are usually unused on Mac OS X, but not when VoiceOver is enabled.
     648    / So, we use Control in this case, even though it conflicts with Emacs-style key bindings.
     649    / See <https://bugs.webkit.org/show_bug.cgi?id=21107> for more detail.
     650    if (AXObjectCache::accessibilityEnhancedUserInterfaceEnabled())
     651        return PlatformKeyboardEvent::CtrlKey;
     652
     653    return PlatformKeyboardEvent::CtrlKey | PlatformKeyboardEvent::AltKey;
     654}
     655
     656}

  • trunk/WebCore/page/qt/EventHandlerQt.cpp

    r38094 r38211  
    5656
    5757namespace WebCore {
    58 
    59 unsigned EventHandler::s_accessKeyModifiers = PlatformKeyboardEvent::CtrlKey;
    6058
    6159const double EventHandler::TextDragDelay = 0.0;
    … …  
    133131}
    134132
     133unsigned EventHandler::accessKeyModifiers()
     134{
     135    return PlatformKeyboardEvent::CtrlKey;
    135136}
     137
     138}

  • trunk/WebCore/page/win/EventHandlerWin.cpp

    r37251 r38211  
    4545
    4646namespace WebCore {
    47 
    48 unsigned EventHandler::s_accessKeyModifiers = PlatformKeyboardEvent::AltKey;
    4947
    5048const double EventHandler::TextDragDelay = 0.0;
    … …  
    109107}
    110108
     109unsigned EventHandler::accessKeyModifiers()
     110{
     111    return PlatformKeyboardEvent::AltKey;
    111112}
     113
     114}

  • trunk/WebCore/page/wx/EventHandlerWx.cpp

    r37251 r38211  
    3939
    4040namespace WebCore {
    41 
    42 unsigned EventHandler::s_accessKeyModifiers = PlatformKeyboardEvent::AltKey;
    4341
    4442const double EventHandler::TextDragDelay = 0.0;
    … …  
    9290}
    9391
     92unsigned EventHandler::accessKeyModifiers()
     93{
     94    return PlatformKeyboardEvent::AltKey;
    9495}
     96
     97}
Note: See TracChangeset for help on using the changeset viewer.

Follow Lee on X/Twitter - Father, Husband, Serial builder creating AI, crypto, games & web tools. We are friends :) AI Will Come To Life!

Check out: eBank.nz (Art Generator) | Netwrck.com (AI Tools) | Text-Generator.io (AI API) | BitBank.nz (Crypto AI) | ReadingTime (Kids Reading) | RewordGame | BigMultiplayerChess | WebFiddle | How.nz | Helix AI Assistant