Changeset 39416 in webkit

Timestamp:

Dec 19, 2008 4:28:32 PM (15 years ago)

Author:

kevino@webkit.org

Message:

Reviewed by Kevin Ollivier.

Add Context Menu support to wx bindings.

​https://bugs.webkit.org/show_bug.cgi?id=22675

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/ContextMenu.h (modified) (1 diff)
• WebCore/platform/ContextMenuItem.h (modified) (1 diff)
• WebCore/platform/wx/ContextMenuItemWx.cpp (added)
• WebCore/platform/wx/ContextMenuWx.cpp (added)
• WebCore/platform/wx/LocalizedStringsWx.cpp (modified) (1 diff)
• WebCore/platform/wx/TemporaryLinkStubs.cpp (modified) (1 diff)
• WebCore/webcore-wx.bkl (modified) (1 diff)
• WebKit/wx/ChangeLog (modified) (1 diff)
• WebKit/wx/WebKitSupport/ContextMenuClientWx.cpp (modified) (2 diffs)
• WebKit/wx/WebView.cpp (modified) (3 diffs)
• WebKit/wx/WebView.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-12-19  miggilin  <mr.diggilin@gmail.com>
+
+        Reviewed by Kevin Ollivier.
+
+        Add Context Menu support to wx bindings.
+        
+        https://bugs.webkit.org/show_bug.cgi?id=22675
+
+        * platform/ContextMenu.h:
+        * platform/ContextMenuItem.h:
+        (WebCore::PlatformMenuItemDescription::PlatformMenuItemDescription):
+        * platform/wx/ContextMenuItemWx.cpp: Added.
+        * platform/wx/ContextMenuWx.cpp: Added.
+        * platform/wx/LocalizedStringsWx.cpp:
+        * platform/wx/TemporaryLinkStubs.cpp:
+        * webcore-wx.bkl:
+
+
 2008-12-19  Beth Dakin  <bdakin@apple.com>
 

trunk/WebCore/platform/ContextMenu.h

@@ -70 +70 @@
 
         PlatformMenuDescription releasePlatformDescription();
-
+#if PLATFORM(WX)
+        static ContextMenuItem* itemWithId(int);
+#endif
     private:
         HitTestResult m_hitTestResult;
-
 #if PLATFORM(MAC)
         // Keep this in sync with the PlatformMenuDescription typedef

trunk/WebCore/platform/ContextMenuItem.h

@@ -173 +173 @@
     };
 #elif PLATFORM(WX)
-    typedef wxMenuItem* PlatformMenuItemDescription;
+    struct PlatformMenuItemDescription {
+        PlatformMenuItemDescription()
+            : type(ActionType),
+              action(ContextMenuItemTagNoAction),
+              checked(false),
+              enabled(true)
+        {}
+
+        ContextMenuItemType type;
+        ContextMenuAction action;
+        String title;
+        wxMenu * subMenu;
+        bool checked;
+        bool enabled;
+    };
 #else
     typedef void* PlatformMenuItemDescription;

trunk/WebCore/platform/wx/LocalizedStringsWx.cpp

@@ -69 +69 @@
 String contextMenuItemTagOpenLinkInNewWindow() 
 { 
-    return String(); 
+    return String("Open Link in New Window"); 
 }
 
 String contextMenuItemTagDownloadLinkToDisk() 
 { 
-    return String(); 
+    return String("Download Link to Disk"); 
 }
 
 String contextMenuItemTagCopyLinkToClipboard() 
 { 
-    return String(); 
+    return String("Copy Link to Clipboard"); 
 }
 
 String contextMenuItemTagOpenImageInNewWindow() 
 { 
-    return String(); 
+    return String("Open Image in New Window"); 
 }
 
 String contextMenuItemTagDownloadImageToDisk() 
 { 
-    return String(); 
+    return String("Download Image to Disk"); 
 }
 
 String contextMenuItemTagCopyImageToClipboard() 
 { 
-    return String(); 
+    return String("Copy Image to Clipboard"); 
 }
 
 String contextMenuItemTagOpenFrameInNewWindow() 
 { 
-    return String(); 
+    return String("Open Frame in New Window"); 
 }
 
 String contextMenuItemTagCopy() 
 {
-    return String();
+    return String("Copy");
 }
 
 String contextMenuItemTagGoBack() 
 {
-    return String();
+    return String("Go Back");
 }
 
 String contextMenuItemTagGoForward() 
 {
-    return String();
+    return String("Go Forward");
 }
 
 String contextMenuItemTagStop() 
 {
-    return String();
+    return String("Stop");
 }
 
 String contextMenuItemTagReload() 
 {
-    return String();
+    return String("Reload");
 }
 
 String contextMenuItemTagCut() 
 {
-    return String();
+    return String("Cut");
 }
 
 String contextMenuItemTagPaste() 
 {
-    return String();
+    return String("Paste");
 }
 
 String contextMenuItemTagNoGuessesFound() 
 {
-    return String();
+    return String("No Guesses Found");
 }
 
 String contextMenuItemTagIgnoreSpelling() 
 {
-    return String();
+    return String("Ignore Spelling");
 }
 
 String contextMenuItemTagLearnSpelling() 
 {
-    return String();
+    return String("Learn Spelling");
 }
 
 String contextMenuItemTagSearchWeb() 
 {
-    return String();
+    return String("Search Web");
 }
 
 String contextMenuItemTagLookUpInDictionary() 
 {
-    return String();
+    return String("Look Up in Dictionary");
 }
 
 String contextMenuItemTagOpenLink() 
 {
-    return String();
+    return String("Open Link");
 }
 
 String contextMenuItemTagIgnoreGrammar() 
 {
-    return String();
+    return String("Ignore Grammar");
 }
 
 String contextMenuItemTagSpellingMenu() 
 {
-    return String();
+    return String("Spelling");
 }
 
 String contextMenuItemTagShowSpellingPanel(bool show) 
 {
-    return String();
+    return String("Show Spelling Panel");
 }
 
 String contextMenuItemTagCheckSpelling() 
 {
-    return String();
+    return String("Check Spelling");
 }
 
 String contextMenuItemTagCheckSpellingWhileTyping() 
 {
-    return String();
+    return String("Check Spelling While Typing");
 }
 
 String contextMenuItemTagCheckGrammarWithSpelling() 
 {
-    return String();
+    return String("Check Grammar with Spelling");
 }
 
 String contextMenuItemTagFontMenu() 
 {
-    return String();
+    return String("Font");
 }
 
 String contextMenuItemTagBold() 
 {
-    return String();
+    return String("Bold");
 }
 
 String contextMenuItemTagItalic() 
 {
-    return String();
+    return String("Italic");
 }
 
 String contextMenuItemTagUnderline() 
 {
-    return String();
+    return String("Underline");
 }
 
 String contextMenuItemTagOutline() 
 {
-    return String();
+    return String("Outline");
 }
 
 String contextMenuItemTagWritingDirectionMenu() 
 {
-    return String();
+    return String("Writing Direction");
 }
 
 String contextMenuItemTagTextDirectionMenu()
 {
-    return String();
+    return String("Text Direction");
 }
 
 String contextMenuItemTagDefaultDirection() 
 {
-    return String();
+    return String("Default Direction");
 }
 
 String contextMenuItemTagLeftToRight() 
 {
-    return String();
+    return String("Left to Right");
 }
 
 String contextMenuItemTagRightToLeft() 
 {
-    return String();
+    return String("Right to Left");
 }
 

trunk/WebCore/platform/wx/TemporaryLinkStubs.cpp

@@ -137 +137 @@
 void Icon::paint(GraphicsContext*, const IntRect&) { notImplemented(); }
 
-ContextMenu::ContextMenu(const HitTestResult& result) : m_hitTestResult(result) { notImplemented(); }
-ContextMenu::~ContextMenu() { notImplemented(); }
-void ContextMenu::appendItem(ContextMenuItem&) { notImplemented(); }
-void ContextMenu::setPlatformDescription(PlatformMenuDescription) { notImplemented(); }
-
-ContextMenuItem::ContextMenuItem(PlatformMenuItemDescription) { notImplemented(); }
-ContextMenuItem::ContextMenuItem(ContextMenu*) { notImplemented(); }
-ContextMenuItem::ContextMenuItem(ContextMenuItemType type, ContextMenuAction action, const String& title, ContextMenu* subMenu) { notImplemented(); }
-ContextMenuItem::~ContextMenuItem() { notImplemented(); }
-PlatformMenuItemDescription ContextMenuItem::releasePlatformDescription() { notImplemented(); return m_platformDescription; }
-ContextMenuItemType ContextMenuItem::type() const { notImplemented(); return ActionType; }
-void ContextMenuItem::setType(ContextMenuItemType) { notImplemented(); }
-ContextMenuAction ContextMenuItem::action() const { notImplemented(); return ContextMenuItemTagNoAction; }
-void ContextMenuItem::setAction(ContextMenuAction) { notImplemented(); }
-String ContextMenuItem::title() const { notImplemented(); return String(); }
-void ContextMenuItem::setTitle(const String&) { notImplemented(); }
-//PlatformMenuDescription ContextMenuItem::platformSubMenu() const { notImplemented(); return 0; }
-void ContextMenuItem::setSubMenu(ContextMenu*) { notImplemented(); }
-void ContextMenuItem::setChecked(bool) { notImplemented(); }
-void ContextMenuItem::setEnabled(bool) { notImplemented(); }
-
 void Editor::showColorPanel() { notImplemented(); }
 void Editor::showFontPanel() { notImplemented(); }

trunk/WebCore/webcore-wx.bkl

@@ -92 +92 @@
             platform/wx/SystemTimeWx.cpp
             platform/wx/WidgetWx.cpp
+            platform/wx/ContextMenuWx.cpp
+            platform/wx/ContextMenuItemWx.cpp
            
             <!-- files from other ports we currently rely on -->

trunk/WebKit/wx/ChangeLog

@@ +1 @@
+2008-12-19  miggilin  <mr.diggilin@gmail.com>
+
+        Reviewed by Kevin Ollivier.
+
+        Add Context Menu support to wx bindings.
+        
+        https://bugs.webkit.org/show_bug.cgi?id=22675
+
+        * WebKitSupport/ContextMenuClientWx.cpp:
+        (WebCore::ContextMenuClientWx::contextMenuDestroyed):
+        (WebCore::ContextMenuClientWx::getCustomMenuFromDefaultItems):
+        * WebView.cpp:
+        (wxWebView::OnMouseEvents):
+        (wxWebView::OnContextMenuEvents):
+        (wxWebView::OnMenuSelectEvents):
+        * WebView.h:
+
+
 2008-12-19  Kevin Ollivier  <kevino@theolliviers.com>
 

trunk/WebKit/wx/WebKitSupport/ContextMenuClientWx.cpp

@@ -29 +29 @@
 #include "ContextMenuClientWx.h"
 #include "NotImplemented.h"
+#include "ContextMenu.h"
 #include <stdio.h>
 
@@ -39 +40 @@
 void ContextMenuClientWx::contextMenuDestroyed()
 {
-    notImplemented();
+    delete this;
 }
 
-PlatformMenuDescription ContextMenuClientWx::getCustomMenuFromDefaultItems(ContextMenu*)
+PlatformMenuDescription ContextMenuClientWx::getCustomMenuFromDefaultItems(ContextMenu* menu)
 {
-    notImplemented();
-    return 0;
+    return menu->releasePlatformDescription();
 }
 

trunk/WebKit/wx/WebView.cpp

@@ -38 +38 @@
 #include "markup.h"
 #include "Page.h"
+#include "ContextMenu.h"
+#include "ContextMenuItem.h"
+#include "ContextMenuController.h"
 #include "PlatformKeyboardEvent.h"
 #include "PlatformMouseEvent.h"
@@ -173 +176 @@
     EVT_SIZE(wxWebView::OnSize)
     EVT_MOUSE_EVENTS(wxWebView::OnMouseEvents)
+    EVT_CONTEXT_MENU(wxWebView::OnContextMenuEvents)
+    EVT_MENU(wxID_ANY, wxWebView::OnMenuSelectEvents)
     EVT_KEY_DOWN(wxWebView::OnKeyEvents)
     EVT_KEY_UP(wxWebView::OnKeyEvents)
@@ -516 +521 @@
     else if (type == wxEVT_MOTION)
         frame->eventHandler()->mouseMoved(wkEvent);
+}
+
+void wxWebView::OnContextMenuEvents(wxContextMenuEvent& event)
+{
+    m_impl->page->contextMenuController()->clearContextMenu();
+    wxPoint localEventPoint = ScreenToClient(event.GetPosition());
+
+    if (!m_mainFrame)
+        return;
+        
+    WebCore::Frame* focusedFrame = m_mainFrame->GetFrame();
+    if (!focusedFrame->view())
+        return;
+
+    //Create WebCore mouse event from the wxContextMenuEvent
+    wxMouseEvent mouseEvent(wxEVT_RIGHT_DOWN);
+    mouseEvent.m_x = localEventPoint.x;
+    mouseEvent.m_y = localEventPoint.y;
+    WebCore::PlatformMouseEvent wkEvent(mouseEvent, event.GetPosition());
+
+    bool handledEvent = focusedFrame->eventHandler()->sendContextMenuEvent(wkEvent);
+    if (!handledEvent)
+        return;
+
+    WebCore::ContextMenu* coreMenu = m_impl->page->contextMenuController()->contextMenu();
+    if (!coreMenu)
+        return;
+
+    WebCore::PlatformMenuDescription menuWx = coreMenu->platformDescription();
+    if (!menuWx)
+        return;
+
+    PopupMenu(menuWx, localEventPoint);
+}
+
+void wxWebView::OnMenuSelectEvents(wxCommandEvent& event)
+{
+    WebCore::ContextMenuItem* item = WebCore::ContextMenu::itemWithId (event.GetId());
+    if (!item)
+        return;
+
+    m_impl->page->contextMenuController()->contextMenuItemSelected(item);
+    delete item;
 }
 

trunk/WebKit/wx/WebView.h

@@ -150 +150 @@
     void OnSize(wxSizeEvent& event);
     void OnMouseEvents(wxMouseEvent& event);
+    void OnContextMenuEvents(wxContextMenuEvent& event);
+    void OnMenuSelectEvents(wxCommandEvent& event);
     void OnKeyEvents(wxKeyEvent& event);
     void OnSetFocus(wxFocusEvent& event);