X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0995b9dc18a7ce898c1c1be0e2790b258cab0fee..74a8f67d96591cec101def2a7d47c64072aff7fd:/src/msw/webview_ie.cpp?ds=sidebyside diff --git a/src/msw/webview_ie.cpp b/src/msw/webview_ie.cpp index 4905e5de82..92edb4ecd5 100644 --- a/src/msw/webview_ie.cpp +++ b/src/msw/webview_ie.cpp @@ -3,7 +3,7 @@ // Purpose: wxMSW wxWebViewIE class implementation for web view component // Author: Marianne Gagnon // Id: $Id$ -// Copyright: (c) 2010 Marianne Gagnon, Steven Lamerton +// Copyright: (c) 2010 Marianne Gagnon, 2011 Steven Lamerton // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -27,34 +27,11 @@ #include "wx/msw/missing.h" #include "wx/filesys.h" +wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewIE, wxWebView); + //We link to urlmon as it is required for CoInternetGetSession #pragma comment(lib, "urlmon") -//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; -} - BEGIN_EVENT_TABLE(wxWebViewIE, wxControl) EVT_ACTIVEX(wxID_ANY, wxWebViewIE::onActiveXEvent) EVT_ERASE_BACKGROUND(wxWebViewIE::onEraseBg) @@ -93,28 +70,17 @@ bool wxWebViewIE::Create(wxWindow* parent, m_webBrowser->put_RegisterAsBrowser(VARIANT_TRUE); m_webBrowser->put_RegisterAsDropTarget(VARIANT_TRUE); - //m_webBrowser->put_Silent(VARIANT_FALSE); - - //We register a custom handler for the file protocol so we can handle - //Virtual file systems - ClassFactory* cf = new ClassFactory; - IInternetSession* session; - if(CoInternetGetSession(0, &session, 0) != S_OK) - return false; - HRESULT hr = session->RegisterNameSpace(cf, CLSID_FileProtocol, L"file", 0, NULL, 0); - if(FAILED(hr)) - return false; m_container = new wxActiveXContainer(this, IID_IWebBrowser2, m_webBrowser); SetBackgroundStyle(wxBG_STYLE_PAINT); SetDoubleBuffered(true); - LoadUrl(url); + LoadURL(url); return true; } -void wxWebViewIE::LoadUrl(const wxString& url) +void wxWebViewIE::LoadURL(const wxString& url) { m_ie.CallMethod("Navigate", (BSTR) url.wc_str(), NULL, NULL, NULL, NULL); } @@ -143,8 +109,8 @@ void wxWebViewIE::SetPage(const wxString& html, const wxString& baseUrl) //We send the events when we are done to mimic webkit //Navigated event - wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATED, - GetId(), baseUrl, "", false); + wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATED, + GetId(), baseUrl, ""); event.SetEventObject(this); HandleWindowEvent(event); @@ -160,7 +126,7 @@ void wxWebViewIE::SetPage(const wxString& html, const wxString& baseUrl) } -wxString wxWebViewIE::GetPageSource() +wxString wxWebViewIE::GetPageSource() const { IHTMLDocument2* document = GetDocument(); IHTMLElement *bodyTag = NULL; @@ -184,7 +150,7 @@ wxString wxWebViewIE::GetPageSource() return source; } -wxWebViewZoom wxWebViewIE::GetZoom() +wxWebViewZoom wxWebViewIE::GetZoom() const { if(m_zoomType == wxWEB_VIEW_ZOOM_TYPE_LAYOUT) return GetIEOpticalZoom(); @@ -224,7 +190,7 @@ void wxWebViewIE::SetIETextZoom(wxWebViewZoom level) wxASSERT(result == S_OK); } -wxWebViewZoom wxWebViewIE::GetIETextZoom() +wxWebViewZoom wxWebViewIE::GetIETextZoom() const { VARIANT zoomVariant; VariantInit (&zoomVariant); @@ -276,7 +242,7 @@ void wxWebViewIE::SetIEOpticalZoom(wxWebViewZoom level) wxASSERT(result == S_OK); } -wxWebViewZoom wxWebViewIE::GetIEOpticalZoom() +wxWebViewZoom wxWebViewIE::GetIEOpticalZoom() const { VARIANT zoomVariant; VariantInit (&zoomVariant); @@ -343,7 +309,7 @@ void wxWebViewIE::Print() OLECMDEXECOPT_DODEFAULT, NULL, NULL); } -bool wxWebViewIE::CanGoBack() +bool wxWebViewIE::CanGoBack() const { if(m_historyEnabled) return m_historyPosition > 0; @@ -351,7 +317,7 @@ bool wxWebViewIE::CanGoBack() return false; } -bool wxWebViewIE::CanGoForward() +bool wxWebViewIE::CanGoForward() const { if(m_historyEnabled) return m_historyPosition != static_cast(m_historyList.size()) - 1; @@ -359,7 +325,7 @@ bool wxWebViewIE::CanGoForward() return false; } -void wxWebViewIE::LoadHistoryItem(wxSharedPtr item) +void wxWebViewIE::LoadHistoryItem(wxSharedPtr item) { int pos = -1; for(unsigned int i = 0; i < m_historyList.size(); i++) @@ -371,13 +337,13 @@ void wxWebViewIE::LoadHistoryItem(wxSharedPtr item) wxASSERT_MSG(pos != static_cast(m_historyList.size()), "invalid history item"); m_historyLoadingFromList = true; - LoadUrl(item->GetUrl()); + LoadURL(item->GetUrl()); m_historyPosition = pos; } -wxVector > wxWebViewIE::GetBackwardHistory() +wxVector > wxWebViewIE::GetBackwardHistory() { - wxVector > backhist; + wxVector > backhist; //As we don't have std::copy or an iterator constructor in the wxwidgets //native vector we construct it by hand for(int i = 0; i < m_historyPosition; i++) @@ -387,9 +353,9 @@ wxVector > wxWebViewIE::GetBackwardHistory() return backhist; } -wxVector > wxWebViewIE::GetForwardHistory() +wxVector > wxWebViewIE::GetForwardHistory() { - wxVector > forwardhist; + wxVector > forwardhist; //As we don't have std::copy or an iterator constructor in the wxwidgets //native vector we construct it by hand for(int i = m_historyPosition + 1; i < static_cast(m_historyList.size()); i++) @@ -467,8 +433,8 @@ void wxWebViewIE::SetOfflineMode(bool offline) wxASSERT(success); } -bool wxWebViewIE::IsBusy() -{ +bool wxWebViewIE::IsBusy() const +{ if (m_isBusy) return true; wxVariant out = m_ie.GetProperty("Busy"); @@ -478,7 +444,7 @@ bool wxWebViewIE::IsBusy() return out.GetBool(); } -wxString wxWebViewIE::GetCurrentURL() +wxString wxWebViewIE::GetCurrentURL() const { wxVariant out = m_ie.GetProperty("LocationURL"); @@ -486,7 +452,7 @@ wxString wxWebViewIE::GetCurrentURL() return out.GetString(); } -wxString wxWebViewIE::GetCurrentTitle() +wxString wxWebViewIE::GetCurrentTitle() const { IHTMLDocument2* document = GetDocument(); BSTR title; @@ -496,16 +462,16 @@ wxString wxWebViewIE::GetCurrentTitle() return wxString(title); } -bool wxWebViewIE::CanCut() +bool wxWebViewIE::CanCut() const { return CanExecCommand("Cut"); } -bool wxWebViewIE::CanCopy() +bool wxWebViewIE::CanCopy() const { return CanExecCommand("Copy"); } -bool wxWebViewIE::CanPaste() +bool wxWebViewIE::CanPaste() const { return CanExecCommand("Paste"); } @@ -525,11 +491,11 @@ void wxWebViewIE::Paste() ExecCommand("Paste"); } -bool wxWebViewIE::CanUndo() +bool wxWebViewIE::CanUndo() const { return CanExecCommand("Undo"); } -bool wxWebViewIE::CanRedo() +bool wxWebViewIE::CanRedo() const { return CanExecCommand("Redo"); } @@ -555,7 +521,7 @@ void wxWebViewIE::SetEditable(bool enable) document->Release(); } -bool wxWebViewIE::IsEditable() +bool wxWebViewIE::IsEditable() const { IHTMLDocument2* document = GetDocument(); BSTR mode; @@ -572,7 +538,7 @@ void wxWebViewIE::SelectAll() ExecCommand("SelectAll"); } -bool wxWebViewIE::HasSelection() +bool wxWebViewIE::HasSelection() const { IHTMLDocument2* document = GetDocument(); IHTMLSelectionObject* selection; @@ -594,7 +560,7 @@ void wxWebViewIE::DeleteSelection() ExecCommand("Delete"); } -wxString wxWebViewIE::GetSelectedText() +wxString wxWebViewIE::GetSelectedText() const { IHTMLDocument2* document = GetDocument(); IHTMLSelectionObject* selection; @@ -623,7 +589,7 @@ wxString wxWebViewIE::GetSelectedText() return selected; } -wxString wxWebViewIE::GetSelectedSource() +wxString wxWebViewIE::GetSelectedSource() const { IHTMLDocument2* document = GetDocument(); IHTMLSelectionObject* selection; @@ -666,7 +632,7 @@ void wxWebViewIE::ClearSelection() document->Release(); } -wxString wxWebViewIE::GetPageText() +wxString wxWebViewIE::GetPageText() const { IHTMLDocument2* document = GetDocument(); wxString text; @@ -699,7 +665,23 @@ void wxWebViewIE::RunScript(const wxString& javascript) document->Release(); } -bool wxWebViewIE::CanExecCommand(wxString command) +void wxWebViewIE::RegisterHandler(wxSharedPtr handler) +{ + ClassFactory* cf = new ClassFactory(handler); + IInternetSession* session; + if(FAILED(CoInternetGetSession(0, &session, 0))) + { + wxFAIL_MSG("Could not retrive internet session"); + } + + HRESULT hr = session->RegisterNameSpace(cf, CLSID_FileProtocol, handler->GetName(), 0, NULL, 0); + if(FAILED(hr)) + { + wxFAIL_MSG("Could not register protocol"); + } +} + +bool wxWebViewIE::CanExecCommand(wxString command) const { IHTMLDocument2* document = GetDocument(); VARIANT_BOOL enabled; @@ -717,7 +699,7 @@ void wxWebViewIE::ExecCommand(wxString command) document->Release(); } -IHTMLDocument2* wxWebViewIE::GetDocument() +IHTMLDocument2* wxWebViewIE::GetDocument() const { wxVariant variant = m_ie.GetProperty("Document"); IHTMLDocument2* document = (IHTMLDocument2*)variant.GetVoidPtr(); @@ -740,12 +722,12 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt) wxString url = evt[1].GetString(); wxString target = evt[3].GetString(); - wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATING, - GetId(), url, target, true); + wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATING, + GetId(), url, target); event.SetEventObject(this); HandleWindowEvent(event); - if (event.IsVetoed()) + if (!event.IsAllowed()) { wxActiveXEventNativeMSW* nativeParams = evt.GetNativeParameters(); @@ -766,8 +748,8 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt) wxString url = evt[1].GetString(); // TODO: set target parameter if possible wxString target = wxEmptyString; - wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATED, - GetId(), url, target, false); + wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATED, + GetId(), url, target); event.SetEventObject(this); HandleWindowEvent(event); break; @@ -792,7 +774,13 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt) //As we are complete we also add to the history list, but not if the //page is not the main page, ie it is a subframe - if(m_historyEnabled && !m_historyLoadingFromList && url == GetCurrentURL()) + //We also have to check if we are loading a file:// url, if so we + //need to change the comparison as ie passes back a different style + //of url + if(m_historyEnabled && !m_historyLoadingFromList && + (url == GetCurrentURL() || + (GetCurrentURL().substr(0, 4) == "file" && + wxFileSystem::URLToFileName(GetCurrentURL()).GetFullPath() == url))) { //If we are not at the end of the list, then erase everything //between us and the end before adding the new page @@ -801,7 +789,7 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt) m_historyList.erase(m_historyList.begin() + m_historyPosition + 1, m_historyList.end()); } - wxSharedPtr item(new wxWebHistoryItem(url, GetCurrentTitle())); + wxSharedPtr item(new wxWebViewHistoryItem(url, GetCurrentTitle())); m_historyList.push_back(item); m_historyPosition++; } @@ -809,8 +797,8 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt) m_historyLoadingFromList = false; // TODO: set target parameter if possible wxString target = wxEmptyString; - wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_LOADED, GetId(), - url, target, false); + wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_LOADED, GetId(), + url, target); event.SetEventObject(this); HandleWindowEvent(event); break; @@ -823,12 +811,19 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt) case DISPID_TITLECHANGE: { + wxString title = evt[0].GetString(); + + wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED, + GetId(), GetCurrentURL(), ""); + event.SetString(title); + event.SetEventObject(this); + HandleWindowEvent(event); break; } case DISPID_NAVIGATEERROR: { - wxWebNavigationError errorType = wxWEB_NAV_ERR_OTHER; + wxWebViewNavigationError errorType = wxWEB_NAV_ERR_OTHER; wxString errorCode = "?"; switch (evt[3].GetLong()) { @@ -942,8 +937,8 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt) wxString url = evt[1].GetString(); wxString target = evt[2].GetString(); - wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_ERROR, GetId(), - url, target, false); + wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_ERROR, GetId(), + url, target); event.SetEventObject(this); event.SetInt(errorType); event.SetString(errorCode); @@ -954,8 +949,8 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt) { wxString url = evt[4].GetString(); - wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_NEWWINDOW, - GetId(), url, wxEmptyString, true); + wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NEWWINDOW, + GetId(), url, wxEmptyString); event.SetEventObject(this); HandleWindowEvent(event); @@ -970,16 +965,15 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt) evt.Skip(); } -VirtualProtocol::VirtualProtocol() +VirtualProtocol::VirtualProtocol(wxSharedPtr handler) { m_refCount = 0; m_file = NULL; - m_fileSys = new wxFileSystem; + m_handler = handler; } VirtualProtocol::~VirtualProtocol() { - wxDELETE(m_fileSys); } ULONG VirtualProtocol::AddRef() @@ -990,10 +984,10 @@ ULONG VirtualProtocol::AddRef() HRESULT VirtualProtocol::QueryInterface(REFIID riid, void **ppvObject) { - if ((riid == IID_IUnknown) || (riid == IID_IInternetProtocol) - || (riid == IID_IInternetProtocolRoot)) + if(riid == IID_IUnknown || riid == IID_IInternetProtocolRoot || + riid == IID_IInternetProtocol) { - *ppvObject = this; + *ppvObject = (IInternetProtocol*)this; AddRef(); return S_OK; } @@ -1027,23 +1021,21 @@ HRESULT VirtualProtocol::Start(LPCWSTR szUrl, IInternetProtocolSink *pOIProtSink wxUnusedVar(grfPI); wxUnusedVar(dwReserved); m_protocolSink = pOIProtSink; - //We have to clean up incoming paths from the webview control as they are - //not properly escaped, see also the comment in filesys.cpp line 668 - wxString path = wxString(szUrl).BeforeFirst(':') + ":" + - EscapeFileNameCharsInURL(wxString(szUrl).AfterFirst(':')); - path.Replace("///", "/"); - m_file = m_fileSys->OpenFile(path); + + //We get the file itself from the protocol handler + m_file = m_handler->GetFile(szUrl); + if(!m_file) return INET_E_RESOURCE_NOT_FOUND; //We return the stream length for current and total size as we can always //read the whole file from the stream + wxFileOffset length = m_file->GetStream()->GetLength(); m_protocolSink->ReportData(BSCF_FIRSTDATANOTIFICATION | BSCF_DATAFULLYAVAILABLE | BSCF_LASTDATANOTIFICATION, - m_file->GetStream()->GetLength(), - m_file->GetStream()->GetLength()); + length, length); return S_OK; } @@ -1091,7 +1083,7 @@ HRESULT ClassFactory::CreateInstance(IUnknown* pUnkOuter, REFIID riid, { if (pUnkOuter) return CLASS_E_NOAGGREGATION; - VirtualProtocol* vp = new VirtualProtocol; + VirtualProtocol* vp = new VirtualProtocol(m_handler); vp->AddRef(); HRESULT hr = vp->QueryInterface(riid, ppvObject); vp->Release();