X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eff8f7952ed2ecc85b48dd01a047658d7f4eafcb..e56fee472c0a59f9b1d45c84a8439e37a1f9925d:/src/common/webview.cpp?ds=sidebyside diff --git a/src/common/webview.cpp b/src/common/webview.cpp index 6fa131c2f2..e664d60192 100644 --- a/src/common/webview.cpp +++ b/src/common/webview.cpp @@ -3,14 +3,14 @@ // Purpose: Common interface and events for web view component // Author: Marianne Gagnon // Id: $Id$ -// Copyright: (c) 2010 Marianne Gagnon +// Copyright: (c) 2010 Marianne Gagnon, 2011 Steven Lamerton // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#if wxUSE_WEB +#if wxUSE_WEBVIEW #if defined(__BORLANDC__) #pragma hdrstop @@ -18,188 +18,94 @@ #include "wx/webview.h" +#if defined(__WXOSX_COCOA__) || defined(__WXOSX_CARBON__) #include "wx/osx/webview_webkit.h" +#elif defined(__WXGTK__) #include "wx/gtk/webview_webkit.h" +#elif defined(__WXMSW__) #include "wx/msw/webview_ie.h" -#include "wx/filesys.h" -#include "wx/tokenzr.h" +#endif // DLL options compatibility check: #include "wx/app.h" -WX_CHECK_BUILD_OPTIONS("wxWEB") +WX_CHECK_BUILD_OPTIONS("wxWEBVIEW") -extern WXDLLIMPEXP_DATA_WEB(const char) wxWebViewNameStr[] = "wxWebView"; -extern WXDLLIMPEXP_DATA_WEB(const char) wxWebViewDefaultURLStr[] = "about:blank"; +extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewNameStr[] = "wxWebView"; +extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewDefaultURLStr[] = "about:blank"; +extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewBackendIE[] = "wxWebViewIE"; +extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewBackendWebKit[] = "wxWebViewWebKit"; -IMPLEMENT_DYNAMIC_CLASS(wxWebNavigationEvent, wxCommandEvent) +#ifdef __WXMSW__ +extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewBackendDefault[] = "wxWebViewIE"; +#else +extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewBackendDefault[] = "wxWebViewWebKit"; +#endif -wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_NAVIGATING, wxWebNavigationEvent ); -wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_NAVIGATED, wxWebNavigationEvent ); -wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_LOADED, wxWebNavigationEvent ); -wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_ERROR, wxWebNavigationEvent ); -wxDEFINE_EVENT( wxEVT_COMMAND_WEB_VIEW_NEWWINDOW, wxWebNavigationEvent ); +wxIMPLEMENT_ABSTRACT_CLASS(wxWebView, wxControl); +wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewEvent, wxCommandEvent); -//Taken from wx/filesys.cpp -static wxString EscapeFileNameCharsInURL(const char *in) -{ - wxString s; - - for ( const unsigned char *p = (const unsigned char*)in; *p; ++p ) - { - const unsigned char c = *p; - - if ( c == '/' || c == '-' || c == '.' || c == '_' || c == '~' || - (c >= '0' && c <= '9') || - (c >= 'a' && c <= 'z') || - (c >= 'A' && c <= 'Z') ) - { - s << c; - } - else - { - s << wxString::Format("%%%02x", c); - } - } - - return s; -} +wxDEFINE_EVENT( wxEVT_COMMAND_WEBVIEW_NAVIGATING, wxWebViewEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_WEBVIEW_NAVIGATED, wxWebViewEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_WEBVIEW_LOADED, wxWebViewEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_WEBVIEW_ERROR, wxWebViewEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_WEBVIEW_NEWWINDOW, wxWebViewEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_WEBVIEW_TITLE_CHANGED, wxWebViewEvent ); -wxWebFileProtocolHandler::wxWebFileProtocolHandler() -{ - m_protocol = "test"; - m_fileSystem = new wxFileSystem(); -} +wxStringWebViewFactoryMap wxWebView::m_factoryMap; -wxFSFile* wxWebFileProtocolHandler::GetFile(const wxString &uri) +// static +wxWebView* wxWebView::New(const wxString& backend) { - size_t pos = uri.find('?'); - //There is no query string so we can load the file directly - if(pos == wxString::npos) - { - size_t doubleslash = uri.find("//"); - //The path is incorrectly formed without // after the first protocol - if(doubleslash == wxString::npos) - return NULL; - - wxString fspath = "file:" + - EscapeFileNameCharsInURL(uri.substr(doubleslash + 2)); - return m_fileSystem->OpenFile(fspath); - } - //Otherwise we have a query string of some kind that we need to extract - else{ - //First we extract the query string, this should have two parameters, - //protocol=type and path=path - wxString query = uri.substr(pos + 1), protocol, path; - //We also trim the query off the end as we handle it alone - wxString lefturi = uri.substr(0, pos); - wxStringTokenizer tokenizer(query, ";"); - while(tokenizer.HasMoreTokens() && (protocol == "" || path == "")) - { - wxString token = tokenizer.GetNextToken(); - if(token.substr(0, 9) == "protocol=") - { - protocol = token.substr(9); - } - else if(token.substr(0, 5) == "path=") - { - path = token.substr(5); - } - } - if(protocol == "" || path == "") - return NULL; - - //We now have the path and the protocol and so can format a correct uri - //to pass to wxFileSystem to get a wxFSFile - size_t doubleslash = uri.find("//"); - //The path is incorrectly formed without // after the first protocol - if(doubleslash == wxString::npos) - return NULL; - - wxString fspath = "file:" + - EscapeFileNameCharsInURL(lefturi.substr(doubleslash + 2)) - + "#" + protocol +":" + path; - return m_fileSystem->OpenFile(fspath); - } + wxStringWebViewFactoryMap::iterator iter = FindFactory(backend); + + if(iter == m_factoryMap.end()) + return NULL; + else + return (*iter).second->Create(); } -wxString wxWebFileProtocolHandler::CombineURIs(const wxString &baseuri, - const wxString &newuri) +// static +wxWebView* wxWebView::New(wxWindow* parent, wxWindowID id, const wxString& url, + const wxPoint& pos, const wxSize& size, + const wxString& backend, long style, + const wxString& name) { - //Still need to be implemented correctly - return newuri; + wxStringWebViewFactoryMap::iterator iter = FindFactory(backend); + + if(iter == m_factoryMap.end()) + return NULL; + else + return (*iter).second->Create(parent, id, url, pos, size, style, name); + } // static -wxWebView* wxWebView::New(wxWebViewBackend backend) +void wxWebView::RegisterFactory(const wxString& backend, + wxSharedPtr factory) { - switch (backend) - { - #if defined(wxUSE_WEBVIEW_WEBKIT) && \ - (defined(__WXGTK__) || defined(__WXOSX__)) - case wxWEB_VIEW_BACKEND_WEBKIT: - return new wxWebViewWebKit(); - #endif - - #if wxUSE_WEBVIEW_IE - case wxWEB_VIEW_BACKEND_IE: - return new wxWebViewIE(); - #endif - - case wxWEB_VIEW_BACKEND_DEFAULT: - - #if defined(wxUSE_WEBVIEW_WEBKIT) && \ - (defined(__WXGTK__) || defined(__WXOSX__)) - return new wxWebViewWebKit(); - #endif - - #if wxUSE_WEBVIEW_IE - return new wxWebViewIE(); - #endif - - // fall-through intended - default: - return NULL; - } + m_factoryMap[backend] = factory; } +// static +wxStringWebViewFactoryMap::iterator wxWebView::FindFactory(const wxString &backend) +{ + // Initialise the map if needed + if(m_factoryMap.empty()) + InitFactoryMap(); + + return m_factoryMap.find(backend); +} + // static -wxWebView* wxWebView::New(wxWindow* parent, - wxWindowID id, - const wxString& url, - const wxPoint& pos, - const wxSize& size, - wxWebViewBackend backend, - long style, - const wxString& name) +void wxWebView::InitFactoryMap() { - switch (backend) - { - #if defined(wxUSE_WEBVIEW_WEBKIT) && \ - (defined(__WXGTK__) || defined(__WXOSX__)) - case wxWEB_VIEW_BACKEND_WEBKIT: - return new wxWebViewWebKit(parent, id, url, pos, size, style, name); - #endif - - #if wxUSE_WEBVIEW_IE - case wxWEB_VIEW_BACKEND_IE: - return new wxWebViewIE(parent, id, url, pos, size, style, name); - #endif - - case wxWEB_VIEW_BACKEND_DEFAULT: - - #if defined(wxUSE_WEBVIEW_WEBKIT) && \ - (defined(__WXGTK__) || defined(__WXOSX__)) - return new wxWebViewWebKit(parent, id, url, pos, size, style, name); - #endif - - #if wxUSE_WEBVIEW_IE - return new wxWebViewIE(parent, id, url, pos, size, style, name); - #endif - - // fall-through intended - default: - return NULL; - } +#ifdef __WXMSW__ + RegisterFactory(wxWebViewBackendIE, wxSharedPtr + (new wxWebViewFactoryIE)); +#else + RegisterFactory(wxWebViewBackendWebKit, wxSharedPtr + (new wxWebViewFactoryWebKit)); +#endif } -#endif // wxUSE_WEB +#endif // wxUSE_WEBVIEW