X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/97e49559fb0e1dfc43d66e8784ec47182f5507e9..9e3d4a32106c8c0f85695f68856da137c14d2b5c:/src/gtk/webview_webkit.cpp diff --git a/src/gtk/webview_webkit.cpp b/src/gtk/webview_webkit.cpp index d4f0c20071..c1493d21e6 100644 --- a/src/gtk/webview_webkit.cpp +++ b/src/gtk/webview_webkit.cpp @@ -26,8 +26,9 @@ extern "C" { static void -wxgtk_webkitctrl_load_status_callback(GtkWidget* widget, GParamSpec* arg1, - wxWebViewWebKit *webKitCtrl) +wxgtk_webview_webkit_load_status(GtkWidget* widget, + GParamSpec*, + wxWebViewWebKit *webKitCtrl) { if (!webKitCtrl->m_ready) return; @@ -60,11 +61,13 @@ wxgtk_webkitctrl_load_status_callback(GtkWidget* widget, GParamSpec* arg1, } } -static WebKitNavigationResponse -wxgtk_webkitctrl_navigation_requ_callback(WebKitWebView *web_view, - WebKitWebFrame *frame, - WebKitNetworkRequest *request, - wxWebViewWebKit *webKitCtrl) +static gboolean +wxgtk_webview_webkit_navigation(WebKitWebView*, + WebKitWebFrame *frame, + WebKitNetworkRequest *request, + WebKitWebNavigationAction *, + WebKitWebPolicyDecision *policy_decision, + wxWebViewWebKit *webKitCtrl) { webKitCtrl->m_busy = true; @@ -83,20 +86,21 @@ wxgtk_webkitctrl_navigation_requ_callback(WebKitWebView *web_view, if (thisEvent.IsVetoed()) { webKitCtrl->m_busy = false; - return WEBKIT_NAVIGATION_RESPONSE_IGNORE; + webkit_web_policy_decision_ignore(policy_decision); + return TRUE; } else { - return WEBKIT_NAVIGATION_RESPONSE_ACCEPT; + return FALSE; } } static gboolean -wxgtk_webkitctrl_error (WebKitWebView *web_view, - WebKitWebFrame *web_frame, - gchar *uri, - gpointer web_error, - wxWebViewWebKit* webKitWindow) +wxgtk_webview_webkit_error(WebKitWebView*, + WebKitWebFrame*, + gchar *uri, + gpointer web_error, + wxWebViewWebKit* webKitWindow) { webKitWindow->m_busy = false; wxWebNavigationError type = wxWEB_NAV_ERR_OTHER; @@ -235,12 +239,12 @@ wxgtk_webkitctrl_error (WebKitWebView *web_view, } static gboolean -wxgtk_webkitctrl_new_window(WebKitWebView *webView, - WebKitWebFrame *frame, - WebKitNetworkRequest *request, - WebKitWebNavigationAction *navigation_action, - WebKitWebPolicyDecision *policy_decision, - wxWebViewWebKit *webKitCtrl) +wxgtk_webview_webkit_new_window(WebKitWebView*, + WebKitWebFrame *frame, + WebKitNetworkRequest *request, + WebKitWebNavigationAction*, + WebKitWebPolicyDecision *policy_decision, + wxWebViewWebKit *webKitCtrl) { const gchar* uri = webkit_network_request_get_uri(request); @@ -254,17 +258,29 @@ wxgtk_webkitctrl_new_window(WebKitWebView *webView, if (webKitCtrl && webKitCtrl->GetEventHandler()) webKitCtrl->GetEventHandler()->ProcessEvent(thisEvent); - if (thisEvent.IsVetoed()) - { - webkit_web_policy_decision_ignore(policy_decision); - } - else - { - webkit_web_policy_decision_use(policy_decision); - } + //We always want the user to handle this themselves + webkit_web_policy_decision_ignore(policy_decision); return TRUE; } +static void +wxgtk_webview_webkit_title_changed(WebKitWebView *webView, + WebKitWebFrame *frame, + gchar *title, + wxWebViewWebKit *webKitCtrl) +{ + wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED, + webKitCtrl->GetId(), + webKitCtrl->GetCurrentURL(), + "", + true); + thisEvent.SetString(wxString(title, wxConvUTF8)); + + if (webKitCtrl && webKitCtrl->GetEventHandler()) + webKitCtrl->GetEventHandler()->ProcessEvent(thisEvent); + +} + } // extern "C" //----------------------------------------------------------------------------- @@ -304,17 +320,20 @@ bool wxWebViewWebKit::Create(wxWindow *parent, gtk_widget_show(web_view); g_signal_connect_after(web_view, "notify::load-status", - G_CALLBACK(wxgtk_webkitctrl_load_status_callback), + G_CALLBACK(wxgtk_webview_webkit_load_status), this); - g_signal_connect_after(web_view, "navigation-requested", - G_CALLBACK(wxgtk_webkitctrl_navigation_requ_callback), + g_signal_connect_after(web_view, "navigation-policy-decision-requested", + G_CALLBACK(wxgtk_webview_webkit_navigation), this); g_signal_connect_after(web_view, "load-error", - G_CALLBACK(wxgtk_webkitctrl_error), + G_CALLBACK(wxgtk_webview_webkit_error), this); g_signal_connect_after(web_view, "new-window-policy-decision-requested", - G_CALLBACK(wxgtk_webkitctrl_new_window), this); + G_CALLBACK(wxgtk_webview_webkit_new_window), this); + + g_signal_connect_after(web_view, "title-changed", + G_CALLBACK(wxgtk_webview_webkit_title_changed), this); m_parent->DoAddChild( this ); @@ -702,6 +721,102 @@ bool wxWebViewWebKit::IsBusy() */ } +void wxWebViewWebKit::SetEditable(bool enable) +{ + webkit_web_view_set_editable(WEBKIT_WEB_VIEW(web_view), enable); +} + +bool wxWebViewWebKit::IsEditable() +{ + return webkit_web_view_get_editable(WEBKIT_WEB_VIEW(web_view)); +} + +void wxWebViewWebKit::DeleteSelection() +{ + webkit_web_view_delete_selection(WEBKIT_WEB_VIEW(web_view)); +} + +bool wxWebViewWebKit::HasSelection() +{ + return webkit_web_view_has_selection(WEBKIT_WEB_VIEW(web_view)); +} + +void wxWebViewWebKit::SelectAll() +{ + webkit_web_view_select_all(WEBKIT_WEB_VIEW(web_view)); +} + +wxString wxWebViewWebKit::GetSelectedText() +{ + WebKitDOMDocument* doc; + WebKitDOMDOMWindow* win; + WebKitDOMDOMSelection* sel; + WebKitDOMRange* range; + + doc = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(web_view)); + win = webkit_dom_document_get_default_view(WEBKIT_DOM_DOCUMENT(doc)); + sel = webkit_dom_dom_window_get_selection(WEBKIT_DOM_DOM_WINDOW(win)); + range = webkit_dom_dom_selection_get_range_at(WEBKIT_DOM_DOM_SELECTION(sel), + 0, NULL); + return wxString(webkit_dom_range_get_text(WEBKIT_DOM_RANGE(range)), + wxConvUTF8); +} + +wxString wxWebViewWebKit::GetSelectedSource() +{ + WebKitDOMDocument* doc; + WebKitDOMDOMWindow* win; + WebKitDOMDOMSelection* sel; + WebKitDOMRange* range; + WebKitDOMElement* div; + WebKitDOMDocumentFragment* clone; + WebKitDOMHTMLElement* html; + + doc = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(web_view)); + win = webkit_dom_document_get_default_view(WEBKIT_DOM_DOCUMENT(doc)); + sel = webkit_dom_dom_window_get_selection(WEBKIT_DOM_DOM_WINDOW(win)); + range = webkit_dom_dom_selection_get_range_at(WEBKIT_DOM_DOM_SELECTION(sel), + 0, NULL); + div = webkit_dom_document_create_element(WEBKIT_DOM_DOCUMENT(doc), "div", NULL); + + clone = webkit_dom_range_clone_contents(WEBKIT_DOM_RANGE(range), NULL); + webkit_dom_node_append_child(&div->parent_instance, &clone->parent_instance, NULL); + html = (WebKitDOMHTMLElement*)div; + + return wxString(webkit_dom_html_element_get_inner_html(WEBKIT_DOM_HTML_ELEMENT(html)), + wxConvUTF8); +} + +void wxWebViewWebKit::ClearSelection() +{ + WebKitDOMDocument* doc; + WebKitDOMDOMWindow* win; + WebKitDOMDOMSelection* sel; + + doc = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(web_view)); + win = webkit_dom_document_get_default_view(WEBKIT_DOM_DOCUMENT(doc)); + sel = webkit_dom_dom_window_get_selection(WEBKIT_DOM_DOM_WINDOW(win)); + webkit_dom_dom_selection_remove_all_ranges(WEBKIT_DOM_DOM_SELECTION(sel)); + +} + +wxString wxWebViewWebKit::GetPageText() +{ + WebKitDOMDocument* doc; + WebKitDOMHTMLElement* body; + + doc = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(web_view)); + body = webkit_dom_document_get_body(WEBKIT_DOM_DOCUMENT(doc)); + return wxString(webkit_dom_html_element_get_inner_text(WEBKIT_DOM_HTML_ELEMENT(body)), + wxConvUTF8); +} + +void wxWebViewWebKit::RunScript(const wxString& javascript) +{ + webkit_web_view_execute_script(WEBKIT_WEB_VIEW(web_view), + javascript.mb_str(wxConvUTF8)); +} + // static wxVisualAttributes wxWebViewWebKit::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))