// 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
/////////////////////////////////////////////////////////////////////////////
#include "wx/msw/registry.h"
#include "wx/msw/missing.h"
#include "wx/filesys.h"
-#include "wx/tokenzr.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;
-}
-
-wxWebFileProtocolHandler::wxWebFileProtocolHandler()
-{
- m_protocol = "test";
- m_fileSystem = new wxFileSystem();
-}
-
-wxFSFile* wxWebFileProtocolHandler::GetFile(const wxString &uri)
-{
- 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);
- }
-}
-
-wxString wxWebFileProtocolHandler::CombineURIs(const wxString &baseuri,
- const wxString &newuri)
-{
- //Still need to be implemented correctly
- return newuri;
-}
-
BEGIN_EVENT_TABLE(wxWebViewIE, wxControl)
EVT_ACTIVEX(wxID_ANY, wxWebViewIE::onActiveXEvent)
EVT_ERASE_BACKGROUND(wxWebViewIE::onEraseBg)
m_webBrowser->put_RegisterAsBrowser(VARIANT_TRUE);
m_webBrowser->put_RegisterAsDropTarget(VARIANT_TRUE);
- //For testing purposes
- RegisterProtocol(new wxWebFileProtocolHandler());
-
m_container = new wxActiveXContainer(this, IID_IWebBrowser2, m_webBrowser);
SetBackgroundStyle(wxBG_STYLE_PAINT);
document->Release();
}
-void wxWebViewIE::RegisterProtocol(wxWebProtocolHandler* handler)
+void wxWebViewIE::RegisterHandler(wxWebHandler* handler)
{
ClassFactory* cf = new ClassFactory(handler);
IInternetSession* session;
wxFAIL_MSG("Could not retrive internet session");
}
- HRESULT hr = session->RegisterNameSpace(cf, CLSID_FileProtocol, handler->GetProtocol(), 0, NULL, 0);
+ HRESULT hr = session->RegisterNameSpace(cf, CLSID_FileProtocol, handler->GetName(), 0, NULL, 0);
if(FAILED(hr))
{
wxFAIL_MSG("Could not register protocol");
case DISPID_TITLECHANGE:
{
+ wxString title = evt[0].GetString();
+
+ wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED,
+ GetId(), GetCurrentURL(), wxEmptyString, true);
+ event.SetString(title);
+ event.SetEventObject(this);
+ HandleWindowEvent(event);
break;
}
evt.Skip();
}
-VirtualProtocol::VirtualProtocol(wxWebProtocolHandler *handler)
+VirtualProtocol::VirtualProtocol(wxWebHandler *handler)
{
m_refCount = 0;
m_file = NULL;
}
HRESULT VirtualProtocol::CombineUrl(LPCWSTR pwzBaseUrl, LPCWSTR pwzRelativeUrl,
- DWORD dwCombineFlags, LPWSTR pwzResult,
+ DWORD WXUNUSED(dwCombineFlags),
+ LPWSTR pwzResult,
DWORD cchResult, DWORD *pcchResult,
- DWORD dwReserved)
+ DWORD WXUNUSED(dwReserved))
{
- return INET_E_DEFAULT_ACTION;
+
+ wxString newuri = m_handler->CombineURIs(pwzBaseUrl, pwzRelativeUrl);
+ //Check the buffer we are given can hold the new url
+ if(wxStrlen(newuri) > cchResult)
+ return S_FALSE;
+
+ wxStrcpy(pwzResult, newuri.c_str());
+ *pcchResult = wxStrlen(newuri);
+ return S_OK;
}
-HRESULT VirtualProtocol::ParseUrl(LPCWSTR pwzUrl, PARSEACTION ParseAction,
- DWORD dwParseFlags, LPWSTR pwzResult,
+HRESULT VirtualProtocol::ParseUrl(LPCWSTR pwzUrl,
+ PARSEACTION WXUNUSED(ParseAction),
+ DWORD WXUNUSED(dwParseFlags),
+ LPWSTR pwzResult,
DWORD cchResult, DWORD *pcchResult,
- DWORD dwReserved)
+ DWORD WXUNUSED(dwReserved))
{
- //return INET_E_DEFAULT_ACTION;
- wcscpy(pwzResult, pwzUrl);
- *pcchResult = wcslen(pwzResult);
+ //Check the buffer we are given can hold the new url
+ if(wxStrlen(pwzUrl) > cchResult)
+ return S_FALSE;
+
+ wxStrcpy(pwzResult, pwzUrl);
+ *pcchResult = wxStrlen(pwzResult);
return S_OK;
}
-HRESULT VirtualProtocol::QueryInfo(LPCWSTR pwzUrl, QUERYOPTION OueryOption,
- DWORD dwQueryFlags, LPVOID pBuffer,
- DWORD cbBuffer, DWORD *pcbBuf,
- DWORD dwReserved)
+HRESULT VirtualProtocol::QueryInfo(LPCWSTR WXUNUSED(pwzUrl),
+ QUERYOPTION WXUNUSED(OueryOption),
+ DWORD WXUNUSED(dwQueryFlags),
+ LPVOID WXUNUSED(pBuffer),
+ DWORD WXUNUSED(cbBuffer),
+ DWORD* WXUNUSED(pcbBuf),
+ DWORD WXUNUSED(dwReserved))
{
return INET_E_DEFAULT_ACTION;
}
projects / wxWidgets.git / blobdiff