X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/211da8a57d923da0fda6402dc6d5417124497171..fb8d7eb7a880f1f2e32d8830f9c5e12b2536e05f:/src/gtk/webview_webkit.cpp?ds=sidebyside diff --git a/src/gtk/webview_webkit.cpp b/src/gtk/webview_webkit.cpp index ea424c8b16..3331a74026 100644 --- a/src/gtk/webview_webkit.cpp +++ b/src/gtk/webview_webkit.cpp @@ -10,14 +10,16 @@ // 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" #include "wx/gtk/control.h" #include "wx/gtk/private.h" #include "wx/filesys.h" -#include "webkit/webkit.h" +#include "wx/base64.h" +#include "wx/log.h" +#include // ---------------------------------------------------------------------------- // GTK callbacks @@ -27,12 +29,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; @@ -42,23 +42,39 @@ 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; - wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_LOADED, - webKitCtrl->GetId(), - url, target, false); + wxWebViewEvent event(wxEVT_WEBVIEW_LOADED, + webKitCtrl->GetId(), + url, target); if (webKitCtrl && webKitCtrl->GetEventHandler()) - webKitCtrl->GetEventHandler()->ProcessEvent(thisEvent); + webKitCtrl->GetEventHandler()->ProcessEvent(event); } else if (status == WEBKIT_LOAD_COMMITTED) { webKitCtrl->m_busy = true; - wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_NAVIGATED, - webKitCtrl->GetId(), - url, target, false); + wxWebViewEvent event(wxEVT_WEBVIEW_NAVIGATED, + webKitCtrl->GetId(), + url, target); if (webKitCtrl && webKitCtrl->GetEventHandler()) - webKitCtrl->GetEventHandler()->ProcessEvent(thisEvent); + webKitCtrl->GetEventHandler()->ProcessEvent(event); } } @@ -73,7 +89,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); @@ -85,16 +101,15 @@ wxgtk_webview_webkit_navigation(WebKitWebView *, const gchar* uri = webkit_network_request_get_uri(request); wxString target = webkit_web_frame_get_name (frame); - wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_NAVIGATING, - webKitCtrl->GetId(), - wxString( uri, wxConvUTF8 ), - target, - true); + wxWebViewEvent event(wxEVT_WEBVIEW_NAVIGATING, + webKitCtrl->GetId(), + wxString( uri, wxConvUTF8 ), + target); if (webKitCtrl && webKitCtrl->GetEventHandler()) - webKitCtrl->GetEventHandler()->ProcessEvent(thisEvent); + webKitCtrl->GetEventHandler()->ProcessEvent(event); - if (thisEvent.IsVetoed()) + if (!event.IsAllowed()) { webKitCtrl->m_busy = false; webkit_web_policy_decision_ignore(policy_decision); @@ -103,10 +118,10 @@ wxgtk_webview_webkit_navigation(WebKitWebView *, else { wxString wxuri = uri; - wxWebHandler *handler = NULL; - wxVector hanlders = webKitCtrl->GetHandlers(); + 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(); + for(wxVector >::iterator it = hanlders.begin(); it != hanlders.end(); ++it) { if(wxuri.substr(0, (*it)->GetName().length()) == (*it)->GetName()) @@ -114,7 +129,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) { @@ -140,7 +155,7 @@ wxgtk_webview_webkit_error(WebKitWebView*, wxWebViewWebKit* webKitWindow) { webKitWindow->m_busy = false; - wxWebNavigationError type = wxWEB_NAV_ERR_OTHER; + wxWebViewNavigationError type = wxWEBVIEW_NAV_ERR_OTHER; GError* error = (GError*)web_error; wxString description(error->message, wxConvUTF8); @@ -150,12 +165,12 @@ wxgtk_webview_webkit_error(WebKitWebView*, switch (error->code) { case SOUP_STATUS_CANCELLED: - type = wxWEB_NAV_ERR_USER_CANCELLED; + type = wxWEBVIEW_NAV_ERR_USER_CANCELLED; break; case SOUP_STATUS_CANT_RESOLVE: case SOUP_STATUS_NOT_FOUND: - type = wxWEB_NAV_ERR_NOT_FOUND; + type = wxWEBVIEW_NAV_ERR_NOT_FOUND; break; case SOUP_STATUS_CANT_RESOLVE_PROXY: @@ -163,54 +178,54 @@ wxgtk_webview_webkit_error(WebKitWebView*, case SOUP_STATUS_CANT_CONNECT_PROXY: case SOUP_STATUS_SSL_FAILED: case SOUP_STATUS_IO_ERROR: - type = wxWEB_NAV_ERR_CONNECTION; + type = wxWEBVIEW_NAV_ERR_CONNECTION; break; case SOUP_STATUS_MALFORMED: //case SOUP_STATUS_TOO_MANY_REDIRECTS: - type = wxWEB_NAV_ERR_REQUEST; + type = wxWEBVIEW_NAV_ERR_REQUEST; break; //case SOUP_STATUS_NO_CONTENT: //case SOUP_STATUS_RESET_CONTENT: case SOUP_STATUS_BAD_REQUEST: - type = wxWEB_NAV_ERR_REQUEST; + type = wxWEBVIEW_NAV_ERR_REQUEST; break; case SOUP_STATUS_UNAUTHORIZED: case SOUP_STATUS_FORBIDDEN: - type = wxWEB_NAV_ERR_AUTH; + type = wxWEBVIEW_NAV_ERR_AUTH; break; case SOUP_STATUS_METHOD_NOT_ALLOWED: case SOUP_STATUS_NOT_ACCEPTABLE: - type = wxWEB_NAV_ERR_SECURITY; + type = wxWEBVIEW_NAV_ERR_SECURITY; break; case SOUP_STATUS_PROXY_AUTHENTICATION_REQUIRED: - type = wxWEB_NAV_ERR_AUTH; + type = wxWEBVIEW_NAV_ERR_AUTH; break; case SOUP_STATUS_REQUEST_TIMEOUT: - type = wxWEB_NAV_ERR_CONNECTION; + type = wxWEBVIEW_NAV_ERR_CONNECTION; break; //case SOUP_STATUS_PAYMENT_REQUIRED: case SOUP_STATUS_REQUEST_ENTITY_TOO_LARGE: case SOUP_STATUS_REQUEST_URI_TOO_LONG: case SOUP_STATUS_UNSUPPORTED_MEDIA_TYPE: - type = wxWEB_NAV_ERR_REQUEST; + type = wxWEBVIEW_NAV_ERR_REQUEST; break; case SOUP_STATUS_BAD_GATEWAY: case SOUP_STATUS_SERVICE_UNAVAILABLE: case SOUP_STATUS_GATEWAY_TIMEOUT: - type = wxWEB_NAV_ERR_CONNECTION; + type = wxWEBVIEW_NAV_ERR_CONNECTION; break; case SOUP_STATUS_HTTP_VERSION_NOT_SUPPORTED: - type = wxWEB_NAV_ERR_REQUEST; + type = wxWEBVIEW_NAV_ERR_REQUEST; break; //case SOUP_STATUS_INSUFFICIENT_STORAGE: //case SOUP_STATUS_NOT_EXTENDED: @@ -225,15 +240,15 @@ wxgtk_webview_webkit_error(WebKitWebView*, //WEBKIT_NETWORK_ERROR_TRANSPORT: case WEBKIT_NETWORK_ERROR_UNKNOWN_PROTOCOL: - type = wxWEB_NAV_ERR_REQUEST; + type = wxWEBVIEW_NAV_ERR_REQUEST; break; case WEBKIT_NETWORK_ERROR_CANCELLED: - type = wxWEB_NAV_ERR_USER_CANCELLED; + type = wxWEBVIEW_NAV_ERR_USER_CANCELLED; break; case WEBKIT_NETWORK_ERROR_FILE_DOES_NOT_EXIST: - type = wxWEB_NAV_ERR_NOT_FOUND; + type = wxWEBVIEW_NAV_ERR_NOT_FOUND; break; } } @@ -247,7 +262,7 @@ wxgtk_webview_webkit_error(WebKitWebView*, //case WEBKIT_POLICY_ERROR_CANNOT_SHOW_URL: //case WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE: case WEBKIT_POLICY_ERROR_CANNOT_USE_RESTRICTED_PORT: - type = wxWEB_NAV_ERR_SECURITY; + type = wxWEBVIEW_NAV_ERR_SECURITY; break; } } @@ -259,17 +274,15 @@ wxgtk_webview_webkit_error(WebKitWebView*, } */ - wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_ERROR, - webKitWindow->GetId(), - uri, - wxEmptyString, - false); - thisEvent.SetString(description); - thisEvent.SetInt(type); + wxWebViewEvent event(wxEVT_WEBVIEW_ERROR, + webKitWindow->GetId(), + uri, ""); + event.SetString(description); + event.SetInt(type); if (webKitWindow && webKitWindow->GetEventHandler()) { - webKitWindow->GetEventHandler()->ProcessEvent(thisEvent); + webKitWindow->GetEventHandler()->ProcessEvent(event); } return FALSE; @@ -286,14 +299,13 @@ wxgtk_webview_webkit_new_window(WebKitWebView*, const gchar* uri = webkit_network_request_get_uri(request); wxString target = webkit_web_frame_get_name (frame); - wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_NEWWINDOW, - webKitCtrl->GetId(), - wxString( uri, wxConvUTF8 ), - target, - true); + wxWebViewEvent event(wxEVT_WEBVIEW_NEWWINDOW, + webKitCtrl->GetId(), + wxString( uri, wxConvUTF8 ), + target); if (webKitCtrl && webKitCtrl->GetEventHandler()) - webKitCtrl->GetEventHandler()->ProcessEvent(thisEvent); + webKitCtrl->GetEventHandler()->ProcessEvent(event); //We always want the user to handle this themselves webkit_web_policy_decision_ignore(policy_decision); @@ -306,15 +318,14 @@ wxgtk_webview_webkit_title_changed(WebKitWebView*, gchar *title, wxWebViewWebKit *webKitCtrl) { - wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED, - webKitCtrl->GetId(), - webKitCtrl->GetCurrentURL(), - "", - true); - thisEvent.SetString(wxString(title, wxConvUTF8)); + wxWebViewEvent event(wxEVT_WEBVIEW_TITLE_CHANGED, + webKitCtrl->GetId(), + webKitCtrl->GetCurrentURL(), + ""); + event.SetString(wxString(title, wxConvUTF8)); if (webKitCtrl && webKitCtrl->GetEventHandler()) - webKitCtrl->GetEventHandler()->ProcessEvent(thisEvent); + webKitCtrl->GetEventHandler()->ProcessEvent(event); } @@ -327,12 +338,12 @@ wxgtk_webview_webkit_resource_req(WebKitWebView *, wxWebViewWebKit *webKitCtrl) { wxString uri = webkit_network_request_get_uri(request); - - wxWebHandler *handler = NULL; - wxVector hanlders = webKitCtrl->GetHandlers(); - + + 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(); + for(wxVector >::iterator it = hanlders.begin(); it != hanlders.end(); ++it) { if(uri.substr(0, (*it)->GetName().length()) == (*it)->GetName()) @@ -340,7 +351,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) { @@ -352,24 +363,38 @@ wxgtk_webview_webkit_resource_req(WebKitWebView *, wxFSFile* file = handler->GetFile(uri); if(file) { - //We redirect to a temp file for now, small things could be loaded - //using the data scheme + //We load the data into a data url to save it being written out again size_t size = file->GetStream()->GetLength(); char *buffer = new char[size]; - wxFile tempfile; - wxString path = wxFileName::CreateTempFileName("wxwebview_", &tempfile); - //We can then stream from the archive to the temp file file->GetStream()->Read(buffer, size); - tempfile.Write(buffer, size); - tempfile.Close(); + wxString data = wxBase64Encode(buffer, size); delete[] buffer; + wxString mime = file->GetMimeType(); + wxString path = "data:" + mime + ";base64," + data; //Then we can redirect the call - webkit_network_request_set_uri(request, "file://" + path); + webkit_network_request_set_uri(request, path.utf8_str()); } - + } } +#if WEBKIT_CHECK_VERSION(1, 10, 0) + +static gboolean +wxgtk_webview_webkit_context_menu(WebKitWebView *, + GtkWidget *, + WebKitHitTestResult *, + gboolean, + wxWebViewWebKit *webKitCtrl) +{ + if(webKitCtrl->IsContextMenuEnabled()) + return FALSE; + else + return TRUE; +} + +#endif + } // extern "C" //----------------------------------------------------------------------------- @@ -378,6 +403,11 @@ wxgtk_webview_webkit_resource_req(WebKitWebView *, wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewWebKit, wxWebView); +wxWebViewWebKit::wxWebViewWebKit() +{ + m_web_view = NULL; +} + bool wxWebViewWebKit::Create(wxWindow *parent, wxWindowID id, const wxString &url, @@ -386,9 +416,13 @@ bool wxWebViewWebKit::Create(wxWindow *parent, long style, const wxString& name) { - m_ready = false; m_busy = false; m_guard = false; + FindClear(); + + // We currently unconditionally impose scrolling in both directions as it's + // necessary to show arbitrary pages. + style |= wxHSCROLL | wxVSCROLL; if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) @@ -397,60 +431,63 @@ 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_web_view = WEBKIT_WEB_VIEW(webkit_web_view_new()); + GTKCreateScrolledWindowWith(GTK_WIDGET(m_web_view)); + g_object_ref(m_widget); - /* 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); - - 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); + +#if WEBKIT_CHECK_VERSION(1, 10, 0) + g_signal_connect_after(m_web_view, "context-menu", + G_CALLBACK(wxgtk_webview_webkit_context_menu), this); +#endif m_parent->DoAddChild( this ); 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; } +wxWebViewWebKit::~wxWebViewWebKit() +{ + if (m_web_view) + GTKDisconnect(m_web_view); +} + 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(); @@ -467,80 +504,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() +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) + if (flags & wxWEBVIEW_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) +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() +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() +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); @@ -551,129 +588,124 @@ void wxWebViewWebKit::EnableHistory(bool enable) } } -wxVector > wxWebViewWebKit::GetBackwardHistory() +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--) { WebKitWebHistoryItem* gtkitem = (WebKitWebHistoryItem*)g_list_nth_data(list, i); - wxWebHistoryItem* wxitem = new wxWebHistoryItem( + wxWebViewHistoryItem* wxitem = new wxWebViewHistoryItem( webkit_web_history_item_get_uri(gtkitem), webkit_web_history_item_get_title(gtkitem)); wxitem->m_histItem = gtkitem; - wxSharedPtr item(wxitem); + wxSharedPtr item(wxitem); backhist.push_back(item); } return backhist; } -wxVector > wxWebViewWebKit::GetForwardHistory() +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++) { WebKitWebHistoryItem* gtkitem = (WebKitWebHistoryItem*)g_list_nth_data(list, i); - wxWebHistoryItem* wxitem = new wxWebHistoryItem( + wxWebViewHistoryItem* wxitem = new wxWebViewHistoryItem( webkit_web_history_item_get_uri(gtkitem), webkit_web_history_item_get_title(gtkitem)); wxitem->m_histItem = gtkitem; - wxSharedPtr item(wxitem); + wxSharedPtr item(wxitem); forwardhist.push_back(item); } return forwardhist; } -void wxWebViewWebKit::LoadHistoryItem(wxSharedPtr item) +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_back_forward_list_go_to_item(WEBKIT_WEB_BACK_FORWARD_LIST(history), + webkit_web_view_go_to_back_forward_item(m_web_view, WEBKIT_WEB_HISTORY_ITEM(gtkitem)); } } -bool wxWebViewWebKit::CanCut() +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() +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() +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() +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() +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() +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() +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() +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 @@ -683,35 +715,35 @@ wxString wxWebViewWebKit::GetPageSource() } -wxWebViewZoom wxWebViewWebKit::GetZoom() +wxWebViewZoom wxWebViewWebKit::GetZoom() const { float zoom = GetWebkitZoom(); // arbitrary way to map float zoom to our common zoom enum if (zoom <= 0.65) { - return wxWEB_VIEW_ZOOM_TINY; + return wxWEBVIEW_ZOOM_TINY; } else if (zoom > 0.65 && zoom <= 0.90) { - return wxWEB_VIEW_ZOOM_SMALL; + return wxWEBVIEW_ZOOM_SMALL; } else if (zoom > 0.90 && zoom <= 1.15) { - return wxWEB_VIEW_ZOOM_MEDIUM; + return wxWEBVIEW_ZOOM_MEDIUM; } else if (zoom > 1.15 && zoom <= 1.45) { - return wxWEB_VIEW_ZOOM_LARGE; + return wxWEBVIEW_ZOOM_LARGE; } else if (zoom > 1.45) { - return wxWEB_VIEW_ZOOM_LARGEST; + return wxWEBVIEW_ZOOM_LARGEST; } // to shut up compilers, this can never be reached logically wxASSERT(false); - return wxWEB_VIEW_ZOOM_MEDIUM; + return wxWEBVIEW_ZOOM_MEDIUM; } @@ -720,23 +752,23 @@ void wxWebViewWebKit::SetZoom(wxWebViewZoom zoom) // arbitrary way to map our common zoom enum to float zoom switch (zoom) { - case wxWEB_VIEW_ZOOM_TINY: + case wxWEBVIEW_ZOOM_TINY: SetWebkitZoom(0.6f); break; - case wxWEB_VIEW_ZOOM_SMALL: + case wxWEBVIEW_ZOOM_SMALL: SetWebkitZoom(0.8f); break; - case wxWEB_VIEW_ZOOM_MEDIUM: + case wxWEBVIEW_ZOOM_MEDIUM: SetWebkitZoom(1.0f); break; - case wxWEB_VIEW_ZOOM_LARGE: + case wxWEBVIEW_ZOOM_LARGE: SetWebkitZoom(1.3); break; - case wxWEB_VIEW_ZOOM_LARGEST: + case wxWEBVIEW_ZOOM_LARGEST: SetWebkitZoom(1.6); break; @@ -747,18 +779,17 @@ void wxWebViewWebKit::SetZoom(wxWebViewZoom zoom) void wxWebViewWebKit::SetZoomType(wxWebViewZoomType type) { - webkit_web_view_set_full_content_zoom(WEBKIT_WEB_VIEW(web_view), - (type == wxWEB_VIEW_ZOOM_TYPE_LAYOUT ? + webkit_web_view_set_full_content_zoom(m_web_view, + (type == wxWEBVIEW_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; + if (fczoom) return wxWEBVIEW_ZOOM_TYPE_LAYOUT; + else return wxWEBVIEW_ZOOM_TYPE_TEXT; } bool wxWebViewWebKit::CanSetZoomType(wxWebViewZoomType) const @@ -767,9 +798,9 @@ bool wxWebViewWebKit::CanSetZoomType(wxWebViewZoomType) const return true; } -void wxWebViewWebKit::SetPage(const wxString& html, const wxString& baseUri) +void wxWebViewWebKit::DoSetPage(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", @@ -778,8 +809,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 @@ -791,7 +821,7 @@ void wxWebViewWebKit::Print() } -bool wxWebViewWebKit::IsBusy() +bool wxWebViewWebKit::IsBusy() const { return m_busy; @@ -819,48 +849,48 @@ bool wxWebViewWebKit::IsBusy() 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() +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() +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() +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() +wxString wxWebViewWebKit::GetSelectedSource() const { - WebKitDOMDocument* doc; + WebKitDOMDocument* doc; WebKitDOMDOMWindow* win; WebKitDOMDOMSelection* sel; WebKitDOMRange* range; @@ -868,10 +898,10 @@ wxString wxWebViewWebKit::GetSelectedSource() 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); @@ -879,51 +909,134 @@ wxString wxWebViewWebKit::GetSelectedSource() 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)); } -wxString wxWebViewWebKit::GetPageText() +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)); } -void wxWebViewWebKit::RegisterHandler(wxWebHandler* handler) +void wxWebViewWebKit::RegisterHandler(wxSharedPtr handler) { m_handlerList.push_back(handler); } +void wxWebViewWebKit::EnableContextMenu(bool enable) +{ +#if !WEBKIT_CHECK_VERSION(1, 10, 0) //If we are using an older version + g_object_set(webkit_web_view_get_settings(m_web_view), + "enable-default-context-menu", enable, NULL); +#endif + wxWebView::EnableContextMenu(enable); +} + +long wxWebViewWebKit::Find(const wxString& text, int flags) +{ + bool newSearch = false; + if(text != m_findText || + (flags & wxWEBVIEW_FIND_MATCH_CASE) != (m_findFlags & wxWEBVIEW_FIND_MATCH_CASE)) + { + newSearch = true; + //If it is a new search we need to clear existing highlights + webkit_web_view_unmark_text_matches(m_web_view); + webkit_web_view_set_highlight_text_matches(m_web_view, false); + } + + m_findFlags = flags; + m_findText = text; + + //If the search string is empty then we clear any selection and highlight + if(text == "") + { + webkit_web_view_unmark_text_matches(m_web_view); + webkit_web_view_set_highlight_text_matches(m_web_view, false); + ClearSelection(); + return wxNOT_FOUND; + } + + bool wrap = false, matchCase = false, forward = true; + if(flags & wxWEBVIEW_FIND_WRAP) + wrap = true; + if(flags & wxWEBVIEW_FIND_MATCH_CASE) + matchCase = true; + if(flags & wxWEBVIEW_FIND_BACKWARDS) + forward = false; + + if(newSearch) + { + //Initially we mark the matches to know how many we have + m_findCount = webkit_web_view_mark_text_matches(m_web_view, wxGTK_CONV(text), matchCase, 0); + //In this case we return early to match IE behaviour + m_findPosition = -1; + return m_findCount; + } + else + { + if(forward) + m_findPosition++; + else + m_findPosition--; + if(m_findPosition < 0) + m_findPosition += m_findCount; + if(m_findPosition > m_findCount) + m_findPosition -= m_findCount; + } + + //Highlight them if needed + bool highlight = flags & wxWEBVIEW_FIND_HIGHLIGHT_RESULT ? true : false; + webkit_web_view_set_highlight_text_matches(m_web_view, highlight); + + if(!webkit_web_view_search_text(m_web_view, wxGTK_CONV(text), matchCase, forward, wrap)) + { + m_findPosition = -1; + ClearSelection(); + return wxNOT_FOUND; + } + wxLogMessage(wxString::Format("Returning %d", m_findPosition)); + return newSearch ? m_findCount : m_findPosition; +} + +void wxWebViewWebKit::FindClear() +{ + m_findCount = 0; + m_findFlags = 0; + m_findText = ""; + m_findPosition = -1; +} + // static wxVisualAttributes wxWebViewWebKit::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) { - return GetDefaultAttributesFromGTKWidget(webkit_web_view_new); + return GetDefaultAttributesFromGTKWidget(webkit_web_view_new()); } -#endif // wxHAVE_WEB_BACKEND_GTK_WEBKIT +#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT