X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3225a4b8b8656f25dac6cb20684a3c2c273cf796..7d6a4d96961eac84d05db8bb24c64d39003f6e54:/src/gtk/webview_webkit.cpp diff --git a/src/gtk/webview_webkit.cpp b/src/gtk/webview_webkit.cpp index 91973b1d5f..b01fc41c22 100644 --- a/src/gtk/webview_webkit.cpp +++ b/src/gtk/webview_webkit.cpp @@ -10,7 +10,7 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#if wxUSE_WEBVIEW_WEBKIT +#if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT #include "wx/stockitem.h" #include "wx/gtk/webview_webkit.h" @@ -18,7 +18,7 @@ #include "wx/gtk/private.h" #include "wx/filesys.h" #include "wx/base64.h" -#include "webkit/webkit.h" +#include // ---------------------------------------------------------------------------- // GTK callbacks @@ -28,12 +28,10 @@ extern "C" { static void -wxgtk_webview_webkit_load_status(GtkWidget* widget, +wxgtk_webview_webkit_load_status(GtkWidget* widget, GParamSpec*, wxWebViewWebKit *webKitCtrl) { - if (!webKitCtrl->m_ready) return; - wxString url = webKitCtrl->GetCurrentURL(); WebKitLoadStatus status; @@ -43,6 +41,22 @@ wxgtk_webview_webkit_load_status(GtkWidget* widget, if (status == WEBKIT_LOAD_FINISHED) { + WebKitWebBackForwardList* hist = webkit_web_view_get_back_forward_list(WEBKIT_WEB_VIEW(widget)); + WebKitWebHistoryItem* item = webkit_web_back_forward_list_get_current_item(hist); + //We have to check if we are actually storing history + //If the item isn't added we add it ourselves, it isn't added otherwise + //with a custom scheme. + if(WEBKIT_IS_WEB_HISTORY_ITEM(item) && webkit_web_history_item_get_uri(item) != url) + { + WebKitWebHistoryItem* + newitem = webkit_web_history_item_new_with_data + ( + url.utf8_str(), + webKitCtrl->GetCurrentTitle().utf8_str() + ); + webkit_web_back_forward_list_add_item(hist, newitem); + } + webKitCtrl->m_busy = false; wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_LOADED, webKitCtrl->GetId(), @@ -74,7 +88,7 @@ wxgtk_webview_webkit_navigation(WebKitWebView *, if(webKitCtrl->m_guard) { webKitCtrl->m_guard = false; - //We set this to make sure that we don't try to load the page again from + //We set this to make sure that we don't try to load the page again from //the resource request callback webKitCtrl->m_vfsurl = webkit_network_request_get_uri(request); webkit_web_policy_decision_use(policy_decision); @@ -114,7 +128,7 @@ wxgtk_webview_webkit_navigation(WebKitWebView *, handler = (*it); } } - //If we found a handler we can then use it to load the file directly + //If we found a handler we can then use it to load the file directly //ourselves if(handler) { @@ -323,10 +337,10 @@ wxgtk_webview_webkit_resource_req(WebKitWebView *, wxWebViewWebKit *webKitCtrl) { wxString uri = webkit_network_request_get_uri(request); - + wxSharedPtr handler; wxVector > hanlders = webKitCtrl->GetHandlers(); - + //We are not vetoed so see if we match one of the additional handlers for(wxVector >::iterator it = hanlders.begin(); it != hanlders.end(); ++it) @@ -336,7 +350,7 @@ wxgtk_webview_webkit_resource_req(WebKitWebView *, handler = (*it); } } - //If we found a handler we can then use it to load the file directly + //If we found a handler we can then use it to load the file directly //ourselves if(handler) { @@ -357,9 +371,9 @@ wxgtk_webview_webkit_resource_req(WebKitWebView *, wxString mime = file->GetMimeType(); wxString path = "data:" + mime + ";base64," + data; //Then we can redirect the call - webkit_network_request_set_uri(request, path); + webkit_network_request_set_uri(request, path.utf8_str()); } - + } } @@ -379,7 +393,6 @@ bool wxWebViewWebKit::Create(wxWindow *parent, long style, const wxString& name) { - m_ready = false; m_busy = false; m_guard = false; @@ -390,35 +403,28 @@ bool wxWebViewWebKit::Create(wxWindow *parent, return false; } - GtkWidget *scrolled_window = gtk_scrolled_window_new (NULL, NULL); - web_view = webkit_web_view_new (); - g_object_ref(web_view); // TODO: check memory management - - m_widget = scrolled_window; - g_object_ref(m_widget); // TODO: check memory management + m_widget = gtk_scrolled_window_new(NULL, NULL); + g_object_ref(m_widget); + m_web_view = WEBKIT_WEB_VIEW(webkit_web_view_new()); /* Place the WebKitWebView in the GtkScrolledWindow */ - gtk_container_add (GTK_CONTAINER (scrolled_window), web_view); - gtk_widget_show(m_widget); - gtk_widget_show(web_view); + gtk_container_add(GTK_CONTAINER(m_widget), GTK_WIDGET(m_web_view)); + gtk_widget_show(GTK_WIDGET(m_web_view)); - g_signal_connect_after(web_view, "notify::load-status", - G_CALLBACK(wxgtk_webview_webkit_load_status), - this); - g_signal_connect_after(web_view, "navigation-policy-decision-requested", + g_signal_connect_after(m_web_view, "navigation-policy-decision-requested", G_CALLBACK(wxgtk_webview_webkit_navigation), this); - g_signal_connect_after(web_view, "load-error", + g_signal_connect_after(m_web_view, "load-error", G_CALLBACK(wxgtk_webview_webkit_error), this); - g_signal_connect_after(web_view, "new-window-policy-decision-requested", + g_signal_connect_after(m_web_view, "new-window-policy-decision-requested", G_CALLBACK(wxgtk_webview_webkit_new_window), this); - g_signal_connect_after(web_view, "title-changed", + g_signal_connect_after(m_web_view, "title-changed", G_CALLBACK(wxgtk_webview_webkit_title_changed), this); - g_signal_connect_after(web_view, "resource-request-starting", + g_signal_connect_after(m_web_view, "resource-request-starting", G_CALLBACK(wxgtk_webview_webkit_resource_req), this); m_parent->DoAddChild( this ); @@ -426,14 +432,17 @@ bool wxWebViewWebKit::Create(wxWindow *parent, PostCreation(size); /* Open a webpage */ - webkit_web_view_load_uri (WEBKIT_WEB_VIEW (web_view), url); + webkit_web_view_load_uri(m_web_view, url.utf8_str()); //Get the initial history limit so we can enable and disable it later WebKitWebBackForwardList* history; - history = webkit_web_view_get_back_forward_list(WEBKIT_WEB_VIEW(web_view)); + history = webkit_web_view_get_back_forward_list(m_web_view); m_historyLimit = webkit_web_back_forward_list_get_limit(history); - m_ready = true; + // last to avoid getting signal too early + g_signal_connect_after(m_web_view, "notify::load-status", + G_CALLBACK(wxgtk_webview_webkit_load_status), + this); return true; } @@ -443,7 +452,7 @@ bool wxWebViewWebKit::Enable( bool enable ) if (!wxControl::Enable(enable)) return false; - gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable); + gtk_widget_set_sensitive(gtk_bin_get_child(GTK_BIN(m_widget)), enable); //if (enable) // GTKFixSensitivity(); @@ -460,80 +469,80 @@ wxWebViewWebKit::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const void wxWebViewWebKit::ZoomIn() { - webkit_web_view_zoom_in (WEBKIT_WEB_VIEW(web_view)); + webkit_web_view_zoom_in(m_web_view); } void wxWebViewWebKit::ZoomOut() { - webkit_web_view_zoom_out (WEBKIT_WEB_VIEW(web_view)); + webkit_web_view_zoom_out(m_web_view); } void wxWebViewWebKit::SetWebkitZoom(float level) { - webkit_web_view_set_zoom_level (WEBKIT_WEB_VIEW(web_view), level); + webkit_web_view_set_zoom_level(m_web_view, level); } float wxWebViewWebKit::GetWebkitZoom() const { - return webkit_web_view_get_zoom_level (WEBKIT_WEB_VIEW(web_view)); + return webkit_web_view_get_zoom_level(m_web_view); } void wxWebViewWebKit::Stop() { - webkit_web_view_stop_loading (WEBKIT_WEB_VIEW(web_view)); + webkit_web_view_stop_loading(m_web_view); } void wxWebViewWebKit::Reload(wxWebViewReloadFlags flags) { if (flags & wxWEB_VIEW_RELOAD_NO_CACHE) { - webkit_web_view_reload_bypass_cache (WEBKIT_WEB_VIEW(web_view)); + webkit_web_view_reload_bypass_cache(m_web_view); } else { - webkit_web_view_reload (WEBKIT_WEB_VIEW(web_view)); + webkit_web_view_reload(m_web_view); } } void wxWebViewWebKit::LoadURL(const wxString& url) { - webkit_web_view_load_uri(WEBKIT_WEB_VIEW(web_view), wxGTK_CONV(url)); + webkit_web_view_load_uri(m_web_view, wxGTK_CONV(url)); } void wxWebViewWebKit::GoBack() { - webkit_web_view_go_back (WEBKIT_WEB_VIEW(web_view)); + webkit_web_view_go_back(m_web_view); } void wxWebViewWebKit::GoForward() { - webkit_web_view_go_forward (WEBKIT_WEB_VIEW(web_view)); + webkit_web_view_go_forward(m_web_view); } bool wxWebViewWebKit::CanGoBack() const { - return webkit_web_view_can_go_back (WEBKIT_WEB_VIEW(web_view)); + return webkit_web_view_can_go_back(m_web_view); } bool wxWebViewWebKit::CanGoForward() const { - return webkit_web_view_can_go_forward (WEBKIT_WEB_VIEW(web_view)); + return webkit_web_view_can_go_forward(m_web_view); } void wxWebViewWebKit::ClearHistory() { WebKitWebBackForwardList* history; - history = webkit_web_view_get_back_forward_list(WEBKIT_WEB_VIEW(web_view)); + history = webkit_web_view_get_back_forward_list(m_web_view); webkit_web_back_forward_list_clear(history); } void wxWebViewWebKit::EnableHistory(bool enable) { WebKitWebBackForwardList* history; - history = webkit_web_view_get_back_forward_list(WEBKIT_WEB_VIEW(web_view)); + history = webkit_web_view_get_back_forward_list(m_web_view); if(enable) { webkit_web_back_forward_list_set_limit(history, m_historyLimit); @@ -546,10 +555,10 @@ void wxWebViewWebKit::EnableHistory(bool enable) wxVector > wxWebViewWebKit::GetBackwardHistory() { - wxVector > backhist; + wxVector > backhist; WebKitWebBackForwardList* history; - history = webkit_web_view_get_back_forward_list(WEBKIT_WEB_VIEW(web_view)); - GList* list = webkit_web_back_forward_list_get_back_list_with_limit(history, + history = webkit_web_view_get_back_forward_list(m_web_view); + GList* list = webkit_web_back_forward_list_get_back_list_with_limit(history, m_historyLimit); //We need to iterate in reverse to get the order we desire for(int i = g_list_length(list) - 1; i >= 0 ; i--) @@ -567,10 +576,10 @@ wxVector > wxWebViewWebKit::GetBackwardHistory wxVector > wxWebViewWebKit::GetForwardHistory() { - wxVector > forwardhist; + wxVector > forwardhist; WebKitWebBackForwardList* history; - history = webkit_web_view_get_back_forward_list(WEBKIT_WEB_VIEW(web_view)); - GList* list = webkit_web_back_forward_list_get_forward_list_with_limit(history, + history = webkit_web_view_get_back_forward_list(m_web_view); + GList* list = webkit_web_back_forward_list_get_forward_list_with_limit(history, m_historyLimit); for(guint i = 0; i < g_list_length(list); i++) { @@ -587,86 +596,81 @@ wxVector > wxWebViewWebKit::GetForwardHistory( void wxWebViewWebKit::LoadHistoryItem(wxSharedPtr item) { - WebKitWebHistoryItem* gtkitem = item->m_histItem; + WebKitWebHistoryItem* gtkitem = (WebKitWebHistoryItem*)item->m_histItem; if(gtkitem) { - WebKitWebBackForwardList* history; - history = webkit_web_view_get_back_forward_list(WEBKIT_WEB_VIEW(web_view)); - webkit_web_view_go_to_back_forward_item(WEBKIT_WEB_VIEW(web_view), + webkit_web_view_go_to_back_forward_item(m_web_view, WEBKIT_WEB_HISTORY_ITEM(gtkitem)); } } bool wxWebViewWebKit::CanCut() const { - return webkit_web_view_can_cut_clipboard(WEBKIT_WEB_VIEW(web_view)); + return webkit_web_view_can_cut_clipboard(m_web_view); } bool wxWebViewWebKit::CanCopy() const { - return webkit_web_view_can_copy_clipboard(WEBKIT_WEB_VIEW(web_view)); + return webkit_web_view_can_copy_clipboard(m_web_view); } bool wxWebViewWebKit::CanPaste() const { - return webkit_web_view_can_paste_clipboard(WEBKIT_WEB_VIEW(web_view)); + return webkit_web_view_can_paste_clipboard(m_web_view); } void wxWebViewWebKit::Cut() { - webkit_web_view_cut_clipboard(WEBKIT_WEB_VIEW(web_view)); + webkit_web_view_cut_clipboard(m_web_view); } void wxWebViewWebKit::Copy() { - webkit_web_view_copy_clipboard(WEBKIT_WEB_VIEW(web_view)); + webkit_web_view_copy_clipboard(m_web_view); } void wxWebViewWebKit::Paste() { - webkit_web_view_paste_clipboard(WEBKIT_WEB_VIEW(web_view)); + webkit_web_view_paste_clipboard(m_web_view); } bool wxWebViewWebKit::CanUndo() const { - return webkit_web_view_can_undo(WEBKIT_WEB_VIEW(web_view)); + return webkit_web_view_can_undo(m_web_view); } bool wxWebViewWebKit::CanRedo() const { - return webkit_web_view_can_redo(WEBKIT_WEB_VIEW(web_view)); + return webkit_web_view_can_redo(m_web_view); } void wxWebViewWebKit::Undo() { - webkit_web_view_undo(WEBKIT_WEB_VIEW(web_view)); + webkit_web_view_undo(m_web_view); } void wxWebViewWebKit::Redo() { - webkit_web_view_redo(WEBKIT_WEB_VIEW(web_view)); + webkit_web_view_redo(m_web_view); } wxString wxWebViewWebKit::GetCurrentURL() const { // FIXME: check which encoding the web kit control uses instead of // assuming UTF8 (here and elsewhere too) - return wxString::FromUTF8(webkit_web_view_get_uri( - WEBKIT_WEB_VIEW(web_view))); + return wxString::FromUTF8(webkit_web_view_get_uri(m_web_view)); } wxString wxWebViewWebKit::GetCurrentTitle() const { - return wxString::FromUTF8(webkit_web_view_get_title( - WEBKIT_WEB_VIEW(web_view))); + return wxString::FromUTF8(webkit_web_view_get_title(m_web_view)); } wxString wxWebViewWebKit::GetPageSource() const { - WebKitWebFrame* frame = webkit_web_view_get_main_frame( - WEBKIT_WEB_VIEW(web_view)); + WebKitWebFrame* frame = webkit_web_view_get_main_frame(m_web_view); WebKitWebDataSource* src = webkit_web_frame_get_data_source (frame); // TODO: check encoding with @@ -740,15 +744,14 @@ void wxWebViewWebKit::SetZoom(wxWebViewZoom zoom) void wxWebViewWebKit::SetZoomType(wxWebViewZoomType type) { - webkit_web_view_set_full_content_zoom(WEBKIT_WEB_VIEW(web_view), + webkit_web_view_set_full_content_zoom(m_web_view, (type == wxWEB_VIEW_ZOOM_TYPE_LAYOUT ? TRUE : FALSE)); } wxWebViewZoomType wxWebViewWebKit::GetZoomType() const { - gboolean fczoom = webkit_web_view_get_full_content_zoom( - WEBKIT_WEB_VIEW(web_view)); + gboolean fczoom = webkit_web_view_get_full_content_zoom(m_web_view); if (fczoom) return wxWEB_VIEW_ZOOM_TYPE_LAYOUT; else return wxWEB_VIEW_ZOOM_TYPE_TEXT; @@ -762,7 +765,7 @@ bool wxWebViewWebKit::CanSetZoomType(wxWebViewZoomType) const void wxWebViewWebKit::SetPage(const wxString& html, const wxString& baseUri) { - webkit_web_view_load_string (WEBKIT_WEB_VIEW(web_view), + webkit_web_view_load_string (m_web_view, html.mb_str(wxConvUTF8), "text/html", "UTF-8", @@ -771,8 +774,7 @@ void wxWebViewWebKit::SetPage(const wxString& html, const wxString& baseUri) void wxWebViewWebKit::Print() { - WebKitWebFrame* frame = webkit_web_view_get_main_frame( - WEBKIT_WEB_VIEW(web_view)); + WebKitWebFrame* frame = webkit_web_view_get_main_frame(m_web_view); webkit_web_frame_print (frame); // GtkPrintOperationResult webkit_web_frame_print_full @@ -812,48 +814,48 @@ bool wxWebViewWebKit::IsBusy() const void wxWebViewWebKit::SetEditable(bool enable) { - webkit_web_view_set_editable(WEBKIT_WEB_VIEW(web_view), enable); + webkit_web_view_set_editable(m_web_view, enable); } bool wxWebViewWebKit::IsEditable() const { - return webkit_web_view_get_editable(WEBKIT_WEB_VIEW(web_view)); + return webkit_web_view_get_editable(m_web_view); } void wxWebViewWebKit::DeleteSelection() { - webkit_web_view_delete_selection(WEBKIT_WEB_VIEW(web_view)); + webkit_web_view_delete_selection(m_web_view); } bool wxWebViewWebKit::HasSelection() const { - return webkit_web_view_has_selection(WEBKIT_WEB_VIEW(web_view)); + return webkit_web_view_has_selection(m_web_view); } void wxWebViewWebKit::SelectAll() { - webkit_web_view_select_all(WEBKIT_WEB_VIEW(web_view)); + webkit_web_view_select_all(m_web_view); } wxString wxWebViewWebKit::GetSelectedText() const { - WebKitDOMDocument* doc; + WebKitDOMDocument* doc; WebKitDOMDOMWindow* win; WebKitDOMDOMSelection* sel; WebKitDOMRange* range; - doc = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(web_view)); + doc = webkit_web_view_get_dom_document(m_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), + 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)), + return wxString(webkit_dom_range_get_text(WEBKIT_DOM_RANGE(range)), wxConvUTF8); } wxString wxWebViewWebKit::GetSelectedSource() const { - WebKitDOMDocument* doc; + WebKitDOMDocument* doc; WebKitDOMDOMWindow* win; WebKitDOMDOMSelection* sel; WebKitDOMRange* range; @@ -861,10 +863,10 @@ wxString wxWebViewWebKit::GetSelectedSource() const WebKitDOMDocumentFragment* clone; WebKitDOMHTMLElement* html; - doc = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(web_view)); + doc = webkit_web_view_get_dom_document(m_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), + 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); @@ -872,17 +874,17 @@ wxString wxWebViewWebKit::GetSelectedSource() const 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)), + return wxString(webkit_dom_html_element_get_inner_html(WEBKIT_DOM_HTML_ELEMENT(html)), wxConvUTF8); } void wxWebViewWebKit::ClearSelection() { - WebKitDOMDocument* doc; + WebKitDOMDocument* doc; WebKitDOMDOMWindow* win; WebKitDOMDOMSelection* sel; - doc = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(web_view)); + doc = webkit_web_view_get_dom_document(m_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)); @@ -891,18 +893,18 @@ void wxWebViewWebKit::ClearSelection() wxString wxWebViewWebKit::GetPageText() const { - WebKitDOMDocument* doc; + WebKitDOMDocument* doc; WebKitDOMHTMLElement* body; - doc = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(web_view)); + doc = webkit_web_view_get_dom_document(m_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)), + 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), + webkit_web_view_execute_script(m_web_view, javascript.mb_str(wxConvUTF8)); } @@ -919,4 +921,4 @@ wxWebViewWebKit::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) } -#endif // wxHAVE_WEB_BACKEND_GTK_WEBKIT +#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT