/////////////////////////////////////////////////////////////////////////////
// Name: src/osx/webview_webkit.mm
-// Purpose: wxOSXWebKitCtrl - embeddable web kit control,
+// Purpose: wxWebViewWebKit - embeddable web kit control,
// OS X implementation of web view component
// Author: Jethro Grassie / Kevin Ollivier / Marianne Gagnon
// Modified by:
#include "wx/osx/webview_webkit.h"
+#if wxUSE_WEBVIEW_WEBKIT && (defined(__WXOSX_COCOA__) \
+ || defined(__WXOSX_CARBON__))
+
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/wx.h"
#endif
-#if wxHAVE_WEB_BACKEND_OSX_WEBKIT
-
-#ifdef __WXCOCOA__
-#include "wx/cocoa/autorelease.h"
-#else
#include "wx/osx/private.h"
+#include "wx/cocoa/string.h"
+#include "wx/hashmap.h"
+#include "wx/filesys.h"
#include <WebKit/WebKit.h>
#include <WebKit/HIWebView.h>
#include <WebKit/CarbonUtils.h>
-#endif
#include <Foundation/NSURLError.h>
-// FIXME: find cleaner way to find the wxWidgets ID of a webview than this hack
-#include <map>
-std::map<WebView*, wxOSXWebKitCtrl*> wx_webviewctrls;
-
#define DEBUG_WEBKIT_SIZING 0
// ----------------------------------------------------------------------------
// macros
// ----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxOSXWebKitCtrl, wxControl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewWebKit, wxWebView);
-BEGIN_EVENT_TABLE(wxOSXWebKitCtrl, wxControl)
+BEGIN_EVENT_TABLE(wxWebViewWebKit, wxControl)
#if defined(__WXMAC__) && wxOSX_USE_CARBON
- EVT_SIZE(wxOSXWebKitCtrl::OnSize)
+ EVT_SIZE(wxWebViewWebKit::OnSize)
#endif
END_EVENT_TABLE()
OSStatus result = eventNotHandledErr ;
wxMacCarbonEvent cEvent( event ) ;
- wxOSXWebKitCtrl* thisWindow = (wxOSXWebKitCtrl*) data ;
+ wxWebViewWebKit* thisWindow = (wxWebViewWebKit*) data ;
wxWindow* focus = thisWindow ;
unsigned char charCode ;
return result ;
}
-static pascal OSStatus wxOSXWebKitCtrlEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+static pascal OSStatus wxWebViewWebKitEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
{
OSStatus result = eventNotHandledErr ;
wxMacCarbonEvent cEvent( event ) ;
ControlRef controlRef ;
- wxOSXWebKitCtrl* thisWindow = (wxOSXWebKitCtrl*) data ;
+ wxWebViewWebKit* thisWindow = (wxWebViewWebKit*) data ;
wxNonOwnedWindow* tlw = NULL;
if (thisWindow)
tlw = thisWindow->MacGetTopLevelWindow();
return result ;
}
-DEFINE_ONE_SHOT_HANDLER_GETTER( wxOSXWebKitCtrlEventHandler )
+DEFINE_ONE_SHOT_HANDLER_GETTER( wxWebViewWebKitEventHandler )
#endif
-//---------------------------------------------------------
-// helper functions for NSString<->wxString conversion
-//---------------------------------------------------------
-
-inline wxString wxStringWithNSString(NSString *nsstring)
+@interface WebViewLoadDelegate : NSObject
{
-#if wxUSE_UNICODE
- return wxString([nsstring UTF8String], wxConvUTF8);
-#else
- return wxString([nsstring lossyCString]);
-#endif // wxUSE_UNICODE
+ wxWebViewWebKit* webKitWindow;
}
-inline NSString* wxNSStringWithWxString(const wxString &wxstring)
-{
-#if wxUSE_UNICODE
- return [NSString stringWithUTF8String: wxstring.mb_str(wxConvUTF8)];
-#else
- return [NSString stringWithCString: wxstring.c_str() length:wxstring.Len()];
-#endif // wxUSE_UNICODE
-}
+- initWithWxWindow: (wxWebViewWebKit*)inWindow;
-inline int wxNavTypeFromWebNavType(int type){
- if (type == WebNavigationTypeLinkClicked)
- return wxWEBKIT_NAV_LINK_CLICKED;
-
- if (type == WebNavigationTypeFormSubmitted)
- return wxWEBKIT_NAV_FORM_SUBMITTED;
-
- if (type == WebNavigationTypeBackForward)
- return wxWEBKIT_NAV_BACK_NEXT;
-
- if (type == WebNavigationTypeReload)
- return wxWEBKIT_NAV_RELOAD;
-
- if (type == WebNavigationTypeFormResubmitted)
- return wxWEBKIT_NAV_FORM_RESUBMITTED;
-
- return wxWEBKIT_NAV_OTHER;
-}
+@end
-@interface MyFrameLoadMonitor : NSObject
+@interface WebViewPolicyDelegate : NSObject
{
- wxOSXWebKitCtrl* webKitWindow;
+ wxWebViewWebKit* webKitWindow;
}
-- initWithWxWindow: (wxOSXWebKitCtrl*)inWindow;
+- initWithWxWindow: (wxWebViewWebKit*)inWindow;
@end
-@interface MyPolicyDelegate : NSObject
-{
- wxOSXWebKitCtrl* webKitWindow;
-}
+//We use a hash to map scheme names to wxWebHandlers
+WX_DECLARE_STRING_HASH_MAP(wxSharedPtr<wxWebHandler>, wxStringToWebHandlerMap);
-- initWithWxWindow: (wxOSXWebKitCtrl*)inWindow;
+static wxStringToWebHandlerMap g_stringHandlerMap;
+@interface WebViewCustomProtocol : NSURLProtocol
+{
+}
@end
// ----------------------------------------------------------------------------
// creation/destruction
// ----------------------------------------------------------------------------
-bool wxOSXWebKitCtrl::Create(wxWindow *parent,
+bool wxWebViewWebKit::Create(wxWindow *parent,
wxWindowID winID,
const wxString& strURL,
const wxPoint& pos,
const wxString& name)
{
m_busy = false;
- //m_pageTitle = _("Untitled Page");
- //still needed for wxCocoa??
-/*
- int width, height;
- wxSize sizeInstance;
- if (size.x == wxDefaultCoord || size.y == wxDefaultCoord)
- {
- m_parent->GetClientSize(&width, &height);
- sizeInstance.x = width;
- sizeInstance.y = height;
- }
- else
- {
- sizeInstance.x = size.x;
- sizeInstance.y = size.y;
- }
-*/
- // now create and attach WebKit view...
-#ifdef __WXCOCOA__
- wxControl::Create(parent, m_windowID, pos, sizeInstance, style, name);
- SetSize(pos.x, pos.y, sizeInstance.x, sizeInstance.y);
-
- wxTopLevelWindowCocoa *topWin = wxDynamicCast(this, wxTopLevelWindowCocoa);
- NSWindow* nsWin = topWin->GetNSWindow();
- NSRect rect;
- rect.origin.x = pos.x;
- rect.origin.y = pos.y;
- rect.size.width = sizeInstance.x;
- rect.size.height = sizeInstance.y;
- m_webView = (WebView*)[[WebView alloc] initWithFrame:rect
- frameName:@"webkitFrame"
- groupName:@"webkitGroup"];
- SetNSView(m_webView);
- [m_cocoaNSView release];
-
- if(m_parent) m_parent->CocoaAddChild(this);
- SetInitialFrameRect(pos,sizeInstance);
-#else
- m_macIsUserPane = false;
+ DontCreatePeer();
wxControl::Create(parent, winID, pos, size, style, wxDefaultValidator, name);
#if wxOSX_USE_CARBON
- m_peer = new wxMacControl(this);
+ wxMacControl* peer = new wxMacControl(this);
WebInitForCarbon();
- HIWebViewCreate( m_peer->GetControlRefAddr() );
+ HIWebViewCreate( peer->GetControlRefAddr() );
- m_webView = (WebView*) HIWebViewGetWebView( m_peer->GetControlRef() );
+ m_webView = (WebView*) HIWebViewGetWebView( peer->GetControlRef() );
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
if ( UMAGetSystemVersion() >= 0x1030 )
- HIViewChangeFeatures( m_peer->GetControlRef() , kHIViewIsOpaque , 0 ) ;
+ HIViewChangeFeatures( peer->GetControlRef() , kHIViewIsOpaque , 0 ) ;
#endif
- InstallControlEventHandler(m_peer->GetControlRef(),
- GetwxOSXWebKitCtrlEventHandlerUPP(),
+ InstallControlEventHandler(peer->GetControlRef(),
+ GetwxWebViewWebKitEventHandlerUPP(),
GetEventTypeCount(eventList), eventList, this,
(EventHandlerRef *)&m_webKitCtrlEventHandler);
+ SetPeer(peer);
#else
NSRect r = wxOSXGetFrameForControl( this, pos , size ) ;
m_webView = [[WebView alloc] initWithFrame:r
frameName:@"webkitFrame"
groupName:@"webkitGroup"];
- m_peer = new wxWidgetCocoaImpl( this, m_webView );
+ SetPeer(new wxWidgetCocoaImpl( this, m_webView ));
#endif
- wx_webviewctrls[m_webView] = this;
-
MacPostControlCreate(pos, size);
#if wxOSX_USE_CARBON
- HIViewSetVisible( m_peer->GetControlRef(), true );
+ HIViewSetVisible( GetPeer()->GetControlRef(), true );
#endif
[m_webView setHidden:false];
-#endif
+
// Register event listener interfaces
- MyFrameLoadMonitor* myFrameLoadMonitor =
- [[MyFrameLoadMonitor alloc] initWithWxWindow: this];
+ WebViewLoadDelegate* loadDelegate =
+ [[WebViewLoadDelegate alloc] initWithWxWindow: this];
- [m_webView setFrameLoadDelegate:myFrameLoadMonitor];
+ [m_webView setFrameLoadDelegate:loadDelegate];
// this is used to veto page loads, etc.
- MyPolicyDelegate* myPolicyDelegate =
- [[MyPolicyDelegate alloc] initWithWxWindow: this];
+ WebViewPolicyDelegate* policyDelegate =
+ [[WebViewPolicyDelegate alloc] initWithWxWindow: this];
- [m_webView setPolicyDelegate:myPolicyDelegate];
+ [m_webView setPolicyDelegate:policyDelegate];
- InternalLoadURL(strURL);
+ //Register our own class for custom scheme handling
+ [NSURLProtocol registerClass:[WebViewCustomProtocol class]];
+
+ LoadUrl(strURL);
return true;
}
-wxOSXWebKitCtrl::~wxOSXWebKitCtrl()
+wxWebViewWebKit::~wxWebViewWebKit()
{
- MyFrameLoadMonitor* myFrameLoadMonitor = [m_webView frameLoadDelegate];
- MyPolicyDelegate* myPolicyDelegate = [m_webView policyDelegate];
+ WebViewLoadDelegate* loadDelegate = [m_webView frameLoadDelegate];
+ WebViewPolicyDelegate* policyDelegate = [m_webView policyDelegate];
[m_webView setFrameLoadDelegate: nil];
[m_webView setPolicyDelegate: nil];
- if (myFrameLoadMonitor)
- [myFrameLoadMonitor release];
+ if (loadDelegate)
+ [loadDelegate release];
- if (myPolicyDelegate)
- [myPolicyDelegate release];
+ if (policyDelegate)
+ [policyDelegate release];
}
// ----------------------------------------------------------------------------
// public methods
// ----------------------------------------------------------------------------
-void wxOSXWebKitCtrl::InternalLoadURL(const wxString &url)
-{
- if( !m_webView )
- return;
-
- [[m_webView mainFrame] loadRequest:[NSURLRequest requestWithURL:
- [NSURL URLWithString:wxNSStringWithWxString(url)]]];
-}
-
-bool wxOSXWebKitCtrl::CanGoBack()
+bool wxWebViewWebKit::CanGoBack()
{
if ( !m_webView )
return false;
return [m_webView canGoBack];
}
-bool wxOSXWebKitCtrl::CanGoForward()
+bool wxWebViewWebKit::CanGoForward()
{
if ( !m_webView )
return false;
return [m_webView canGoForward];
}
-void wxOSXWebKitCtrl::GoBack()
+void wxWebViewWebKit::GoBack()
{
if ( !m_webView )
return;
- bool result = [(WebView*)m_webView goBack];
-
- // TODO: return result (if it also exists in other backends...)
- //return result;
+ [(WebView*)m_webView goBack];
}
-void wxOSXWebKitCtrl::GoForward()
+void wxWebViewWebKit::GoForward()
{
if ( !m_webView )
return;
- bool result = [(WebView*)m_webView goForward];
-
- // TODO: return result (if it also exists in other backends...)
- //return result;
+ [(WebView*)m_webView goForward];
}
-void wxOSXWebKitCtrl::Reload(wxWebViewReloadFlags flags)
+void wxWebViewWebKit::Reload(wxWebViewReloadFlags flags)
{
if ( !m_webView )
return;
}
}
-void wxOSXWebKitCtrl::Stop()
+void wxWebViewWebKit::Stop()
{
if ( !m_webView )
return;
[[m_webView mainFrame] stopLoading];
}
-bool wxOSXWebKitCtrl::CanGetPageSource()
+bool wxWebViewWebKit::CanGetPageSource()
{
if ( !m_webView )
return false;
return ( [[dataSource representation] canProvideDocumentSource] );
}
-wxString wxOSXWebKitCtrl::GetPageSource()
+wxString wxWebViewWebKit::GetPageSource()
{
if (CanGetPageSource())
return wxEmptyString;
}
-wxString wxOSXWebKitCtrl::GetSelection()
-{
- if ( !m_webView )
- return wxEmptyString;
-
- NSString* selectedText = [[m_webView selectedDOMRange] toString];
- return wxStringWithNSString( selectedText );
-}
-
-bool wxOSXWebKitCtrl::CanIncreaseTextSize()
+bool wxWebViewWebKit::CanIncreaseTextSize()
{
if ( !m_webView )
return false;
return false;
}
-void wxOSXWebKitCtrl::IncreaseTextSize()
+void wxWebViewWebKit::IncreaseTextSize()
{
if ( !m_webView )
return;
[m_webView makeTextLarger:(WebView*)m_webView];
}
-bool wxOSXWebKitCtrl::CanDecreaseTextSize()
+bool wxWebViewWebKit::CanDecreaseTextSize()
{
if ( !m_webView )
return false;
return false;
}
-void wxOSXWebKitCtrl::DecreaseTextSize()
+void wxWebViewWebKit::DecreaseTextSize()
{
if ( !m_webView )
return;
[m_webView makeTextSmaller:(WebView*)m_webView];
}
-void wxOSXWebKitCtrl::Print()
+void wxWebViewWebKit::Print()
{
// TODO: allow specifying the "show prompt" parameter in Print() ?
[op runOperation];
}
-void wxOSXWebKitCtrl::MakeEditable(bool enable)
+void wxWebViewWebKit::SetEditable(bool enable)
{
if ( !m_webView )
return;
[m_webView setEditable:enable ];
}
-bool wxOSXWebKitCtrl::IsEditable()
+bool wxWebViewWebKit::IsEditable()
{
if ( !m_webView )
return false;
return [m_webView isEditable];
}
-void wxOSXWebKitCtrl::SetZoomType(wxWebViewZoomType zoomType)
+void wxWebViewWebKit::SetZoomType(wxWebViewZoomType zoomType)
{
// there is only one supported zoom type at the moment so this setter
// does nothing beyond checking sanity
wxASSERT(zoomType == wxWEB_VIEW_ZOOM_TYPE_TEXT);
}
-wxWebViewZoomType wxOSXWebKitCtrl::GetZoomType() const
+wxWebViewZoomType wxWebViewWebKit::GetZoomType() const
{
// for now that's the only one that is supported
// FIXME: does the default zoom type change depending on webkit versions? :S
return wxWEB_VIEW_ZOOM_TYPE_TEXT;
}
-bool wxOSXWebKitCtrl::CanSetZoomType(wxWebViewZoomType type) const
+bool wxWebViewWebKit::CanSetZoomType(wxWebViewZoomType type) const
{
switch (type)
{
}
}
-int wxOSXWebKitCtrl::GetScrollPos()
+int wxWebViewWebKit::GetScrollPos()
{
id result = [[m_webView windowScriptObject]
evaluateWebScript:@"document.body.scrollTop"];
return [result intValue];
}
-void wxOSXWebKitCtrl::SetScrollPos(int pos)
+void wxWebViewWebKit::SetScrollPos(int pos)
{
if ( !m_webView )
return;
(NSString*)wxNSStringWithWxString( javascript )];
}
-wxString wxOSXWebKitCtrl::GetSelectedText()
+wxString wxWebViewWebKit::GetSelectedText()
{
NSString* selection = [[m_webView selectedDOMRange] markupString];
if (!selection) return wxEmptyString;
return wxStringWithNSString(selection);
}
-wxString wxOSXWebKitCtrl::RunScript(const wxString& javascript)
+void wxWebViewWebKit::RunScript(const wxString& javascript)
{
if ( !m_webView )
- return wxEmptyString;
+ return;
- id result = [[m_webView windowScriptObject] evaluateWebScript:
+ [[m_webView windowScriptObject] evaluateWebScript:
(NSString*)wxNSStringWithWxString( javascript )];
-
- NSString* resultAsString;
- NSString* className = NSStringFromClass([result class]);
-
- if ([className isEqualToString:@"NSCFNumber"])
- {
- resultAsString = [NSString stringWithFormat:@"%@", result];
- }
- else if ([className isEqualToString:@"NSCFString"])
- {
- resultAsString = result;
- }
- else if ([className isEqualToString:@"NSCFBoolean"])
- {
- if ([result boolValue])
- resultAsString = @"true";
- else
- resultAsString = @"false";
- }
- else if ([className isEqualToString:@"WebScriptObject"])
- {
- resultAsString = [result stringRepresentation];
- }
- else
- {
- return wxString();
- }
-
- return wxStringWithNSString( resultAsString );
}
-void wxOSXWebKitCtrl::OnSize(wxSizeEvent &event)
+void wxWebViewWebKit::OnSize(wxSizeEvent &event)
{
#if defined(__WXMAC_) && wxOSX_USE_CARBON
// This is a nasty hack because WebKit seems to lose its position when it is
#endif
}
-void wxOSXWebKitCtrl::MacVisibilityChanged(){
+void wxWebViewWebKit::MacVisibilityChanged(){
#if defined(__WXMAC__) && wxOSX_USE_CARBON
- bool isHidden = !IsControlVisible( m_peer->GetControlRef());
+ bool isHidden = !IsControlVisible( GetPeer()->GetControlRef());
if (!isHidden)
[(WebView*)m_webView display];
#endif
}
-void wxOSXWebKitCtrl::LoadUrl(const wxString& url)
+void wxWebViewWebKit::LoadUrl(const wxString& url)
{
- InternalLoadURL(url);
+ [[m_webView mainFrame] loadRequest:[NSURLRequest requestWithURL:
+ [NSURL URLWithString:wxNSStringWithWxString(url)]]];
}
-wxString wxOSXWebKitCtrl::GetCurrentURL()
+wxString wxWebViewWebKit::GetCurrentURL()
{
return wxStringWithNSString([m_webView mainFrameURL]);
}
-wxString wxOSXWebKitCtrl::GetCurrentTitle()
+wxString wxWebViewWebKit::GetCurrentTitle()
{
- return GetPageTitle();
+ return wxStringWithNSString([m_webView mainFrameTitle]);
}
-float wxOSXWebKitCtrl::GetWebkitZoom()
+float wxWebViewWebKit::GetWebkitZoom()
{
return [m_webView textSizeMultiplier];
}
-void wxOSXWebKitCtrl::SetWebkitZoom(float zoom)
+void wxWebViewWebKit::SetWebkitZoom(float zoom)
{
[m_webView setTextSizeMultiplier:zoom];
}
-wxWebViewZoom wxOSXWebKitCtrl::GetZoom()
+wxWebViewZoom wxWebViewWebKit::GetZoom()
{
float zoom = GetWebkitZoom();
return wxWEB_VIEW_ZOOM_MEDIUM;
}
-void wxOSXWebKitCtrl::SetZoom(wxWebViewZoom zoom)
+void wxWebViewWebKit::SetZoom(wxWebViewZoom zoom)
{
// arbitrary way to map our common zoom enum to float zoom
switch (zoom)
}
-void wxOSXWebKitCtrl::SetPage(const wxString& src, const wxString& baseUrl)
+void wxWebViewWebKit::SetPage(const wxString& src, const wxString& baseUrl)
{
if ( !m_webView )
return;
wxNSStringWithWxString( baseUrl )]];
}
+void wxWebViewWebKit::Cut()
+{
+ if ( !m_webView )
+ return;
+
+ [(WebView*)m_webView cut:m_webView];
+}
+
+void wxWebViewWebKit::Copy()
+{
+ if ( !m_webView )
+ return;
+
+ [(WebView*)m_webView copy:m_webView];
+}
+
+void wxWebViewWebKit::Paste()
+{
+ if ( !m_webView )
+ return;
+
+ [(WebView*)m_webView paste:m_webView];
+}
+
+void wxWebViewWebKit::DeleteSelection()
+{
+ if ( !m_webView )
+ return;
+
+ [(WebView*)m_webView deleteSelection];
+}
+
+bool wxWebViewWebKit::HasSelection()
+{
+ DOMRange* range = [m_webView selectedDOMRange];
+ if(!range)
+ {
+ return false;
+ }
+ else
+ {
+ return true;
+ }
+}
+
+void wxWebViewWebKit::ClearSelection()
+{
+ //We use javascript as selection isn't exposed at the moment in webkit
+ RunScript("window.getSelection().removeAllRanges();");
+}
+
+void wxWebViewWebKit::SelectAll()
+{
+ RunScript("window.getSelection().selectAllChildren(document.body);");
+}
+
+wxString wxWebViewWebKit::GetSelectedSource()
+{
+ wxString script = ("var range = window.getSelection().getRangeAt(0);"
+ "var element = document.createElement('div');"
+ "element.appendChild(range.cloneContents());"
+ "return element.innerHTML;");
+ id result = [[m_webView windowScriptObject]
+ evaluateWebScript:wxNSStringWithWxString(script)];
+ return wxStringWithNSString([result stringValue]);
+}
+
+wxString wxWebViewWebKit::GetPageText()
+{
+ id result = [[m_webView windowScriptObject]
+ evaluateWebScript:@"document.body.textContent"];
+ return wxStringWithNSString([result stringValue]);
+}
+
+void wxWebViewWebKit::EnableHistory(bool enable)
+{
+ if ( !m_webView )
+ return;
+
+ [m_webView setMaintainsBackForwardList:enable];
+}
+
+void wxWebViewWebKit::ClearHistory()
+{
+ [m_webView setMaintainsBackForwardList:NO];
+ [m_webView setMaintainsBackForwardList:YES];
+}
+
+wxVector<wxSharedPtr<wxWebHistoryItem> > wxWebViewWebKit::GetBackwardHistory()
+{
+ wxVector<wxSharedPtr<wxWebHistoryItem> > backhist;
+ WebBackForwardList* history = [m_webView backForwardList];
+ int count = [history backListCount];
+ for(int i = -count; i < 0; i++)
+ {
+ WebHistoryItem* item = [history itemAtIndex:i];
+ wxString url = wxStringWithNSString([item URLString]);
+ wxString title = wxStringWithNSString([item title]);
+ wxWebHistoryItem* wxitem = new wxWebHistoryItem(url, title);
+ wxitem->m_histItem = item;
+ wxSharedPtr<wxWebHistoryItem> itemptr(wxitem);
+ backhist.push_back(itemptr);
+ }
+ return backhist;
+}
+
+wxVector<wxSharedPtr<wxWebHistoryItem> > wxWebViewWebKit::GetForwardHistory()
+{
+ wxVector<wxSharedPtr<wxWebHistoryItem> > forwardhist;
+ WebBackForwardList* history = [m_webView backForwardList];
+ int count = [history forwardListCount];
+ for(int i = 1; i <= count; i++)
+ {
+ WebHistoryItem* item = [history itemAtIndex:i];
+ wxString url = wxStringWithNSString([item URLString]);
+ wxString title = wxStringWithNSString([item title]);
+ wxWebHistoryItem* wxitem = new wxWebHistoryItem(url, title);
+ wxitem->m_histItem = item;
+ wxSharedPtr<wxWebHistoryItem> itemptr(wxitem);
+ forwardhist.push_back(itemptr);
+ }
+ return forwardhist;
+}
+
+void wxWebViewWebKit::LoadHistoryItem(wxSharedPtr<wxWebHistoryItem> item)
+{
+ [m_webView goToBackForwardItem:item->m_histItem];
+}
+
+bool wxWebViewWebKit::CanUndo()
+{
+ return [[m_webView undoManager] canUndo];
+}
+
+bool wxWebViewWebKit::CanRedo()
+{
+ return [[m_webView undoManager] canRedo];
+}
+
+void wxWebViewWebKit::Undo()
+{
+ [[m_webView undoManager] undo];
+}
+
+void wxWebViewWebKit::Redo()
+{
+ [[m_webView undoManager] redo];
+}
+
+void wxWebViewWebKit::RegisterHandler(wxSharedPtr<wxWebHandler> handler)
+{
+ g_stringHandlerMap[handler->GetName()] = handler;
+}
+
//------------------------------------------------------------
// Listener interfaces
//------------------------------------------------------------
// destroyed. Therefore, we must be careful to check both the existence
// of the Carbon control and the event handler before firing events.
-@implementation MyFrameLoadMonitor
+@implementation WebViewLoadDelegate
-- initWithWxWindow: (wxOSXWebKitCtrl*)inWindow
+- initWithWxWindow: (wxWebViewWebKit*)inWindow
{
[super init];
webKitWindow = inWindow; // non retained
- (void)webView:(WebView *)sender
didStartProvisionalLoadForFrame:(WebFrame *)frame
{
- wxASSERT(wx_webviewctrls.find(sender) != wx_webviewctrls.end());
- wx_webviewctrls[sender]->m_busy = true;
+ webKitWindow->m_busy = true;
}
- (void)webView:(WebView *)sender didCommitLoadForFrame:(WebFrame *)frame
{
- wxASSERT(wx_webviewctrls.find(sender) != wx_webviewctrls.end());
- wx_webviewctrls[sender]->m_busy = true;
+ webKitWindow->m_busy = true;
if (webKitWindow && frame == [sender mainFrame]){
NSString *url = [[[[frame dataSource] request] URL] absoluteString];
wxString target = wxStringWithNSString([frame name]);
wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_NAVIGATED,
- wx_webviewctrls[sender]->GetId(),
+ webKitWindow->GetId(),
wxStringWithNSString( url ),
target, false);
- (void)webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame
{
- wxASSERT(wx_webviewctrls.find(sender) != wx_webviewctrls.end());
- wx_webviewctrls[sender]->m_busy = false;
+ webKitWindow->m_busy = false;
if (webKitWindow && frame == [sender mainFrame]){
NSString *url = [[[[frame dataSource] request] URL] absoluteString];
wxString target = wxStringWithNSString([frame name]);
wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_LOADED,
- wx_webviewctrls[sender]->GetId(),
+ webKitWindow->GetId(),
wxStringWithNSString( url ),
target, false);
- (void)webView:(WebView *)sender didFailLoadWithError:(NSError*) error
forFrame:(WebFrame *)frame
{
- wxASSERT(wx_webviewctrls.find(sender) != wx_webviewctrls.end());
- wx_webviewctrls[sender]->m_busy = false;
+ webKitWindow->m_busy = false;
if (webKitWindow && frame == [sender mainFrame]){
NSString *url = [[[[frame dataSource] request] URL] absoluteString];
wxWebNavigationError type;
wxString description = nsErrorToWxHtmlError(error, &type);
wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_ERROR,
- wx_webviewctrls[sender]->GetId(),
+ webKitWindow->GetId(),
wxStringWithNSString( url ),
wxEmptyString, false);
thisEvent.SetString(description);
didFailProvisionalLoadWithError:(NSError*)error
forFrame:(WebFrame *)frame
{
- wxASSERT(wx_webviewctrls.find(sender) != wx_webviewctrls.end());
- wx_webviewctrls[sender]->m_busy = false;
+ webKitWindow->m_busy = false;
if (webKitWindow && frame == [sender mainFrame]){
NSString *url = [[[[frame provisionalDataSource] request] URL]
wxWebNavigationError type;
wxString description = nsErrorToWxHtmlError(error, &type);
wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_ERROR,
- wx_webviewctrls[sender]->GetId(),
+ webKitWindow->GetId(),
wxStringWithNSString( url ),
wxEmptyString, false);
thisEvent.SetString(description);
- (void)webView:(WebView *)sender didReceiveTitle:(NSString *)title
forFrame:(WebFrame *)frame
{
- if (webKitWindow && frame == [sender mainFrame])
- {
- webKitWindow->SetPageTitle(wxStringWithNSString( title ));
- }
+ wxString target = wxStringWithNSString([frame name]);
+ wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED,
+ webKitWindow->GetId(),
+ webKitWindow->GetCurrentURL(),
+ target, true);
+
+ thisEvent.SetString(wxStringWithNSString(title));
+
+ if (webKitWindow && webKitWindow->GetEventHandler())
+ webKitWindow->GetEventHandler()->ProcessEvent(thisEvent);
}
@end
-@implementation MyPolicyDelegate
+@implementation WebViewPolicyDelegate
-- initWithWxWindow: (wxOSXWebKitCtrl*)inWindow
+- initWithWxWindow: (wxWebViewWebKit*)inWindow
{
[super init];
webKitWindow = inWindow; // non retained
frame:(WebFrame *)frame
decisionListener:(id<WebPolicyDecisionListener>)listener
{
- //wxUnusedVar(sender);
wxUnusedVar(frame);
- wxASSERT(wx_webviewctrls.find(sender) != wx_webviewctrls.end());
- wx_webviewctrls[sender]->m_busy = true;
+ webKitWindow->m_busy = true;
NSString *url = [[request URL] absoluteString];
wxString target = wxStringWithNSString([frame name]);
wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_NAVIGATING,
- wx_webviewctrls[sender]->GetId(),
+ webKitWindow->GetId(),
wxStringWithNSString( url ), target, true);
if (webKitWindow && webKitWindow->GetEventHandler())
if (thisEvent.IsVetoed())
{
- wx_webviewctrls[sender]->m_busy = false;
+ webKitWindow->m_busy = false;
[listener ignore];
}
else
newFrameName:(NSString *)frameName
decisionListener:(id < WebPolicyDecisionListener >)listener
{
- wxUnusedVar(sender);
wxUnusedVar(actionInformation);
+ NSString *url = [[request URL] absoluteString];
+ wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_NEWWINDOW,
+ webKitWindow->GetId(),
+ wxStringWithNSString( url ), "", true);
+
+ if (webKitWindow && webKitWindow->GetEventHandler())
+ webKitWindow->GetEventHandler()->ProcessEvent(thisEvent);
+
[listener ignore];
}
@end
-#endif //wxHAVE_WEB_BACKEND_OSX_WEBKIT
+@implementation WebViewCustomProtocol
+
++ (BOOL)canInitWithRequest:(NSURLRequest *)request
+{
+ NSString *scheme = [[request URL] scheme];
+
+ wxStringToWebHandlerMap::const_iterator it;
+ for( it = g_stringHandlerMap.begin(); it != g_stringHandlerMap.end(); ++it )
+ {
+ if(it->first.IsSameAs(wxStringWithNSString(scheme)))
+ {
+ return YES;
+ }
+ }
+
+ return NO;
+}
+
++ (NSURLRequest *)canonicalRequestForRequest:(NSURLRequest *)request
+{
+ //We don't do any processing here as the wxWebHandler classes do it
+ return request;
+}
+
+- (void)startLoading
+{
+ NSURLRequest *request = [self request];
+ NSString* path = [[request URL] absoluteString];
+
+ wxString wxpath = wxStringWithNSString(path);
+ wxString scheme = wxStringWithNSString([[request URL] scheme]);
+ wxFSFile* file = g_stringHandlerMap[scheme]->GetFile(wxpath);
+ size_t length = file->GetStream()->GetLength();
+
+
+ NSURLResponse *response = [[NSURLResponse alloc] initWithURL:[request URL]
+ MIMEType:wxNSStringWithWxString(file->GetMimeType())
+ expectedContentLength:length
+ textEncodingName:nil];
+
+ //Load the data, we malloc it so it is tidied up properly
+ void* buffer = malloc(length);
+ file->GetStream()->Read(buffer, length);
+ NSData *data = [[NSData alloc] initWithBytesNoCopy:buffer length:length];
+
+ id<NSURLProtocolClient> client = [self client];
+
+ //We do not support caching anything yet
+ [client URLProtocol:self didReceiveResponse:response
+ cacheStoragePolicy:NSURLCacheStorageNotAllowed];
+
+ //Set the data
+ [client URLProtocol:self didLoadData:data];
+
+ //Notify that we have finished
+ [client URLProtocolDidFinishLoading:self];
+
+ [response release];
+}
+
+- (void)stopLoading
+{
+
+}
+
+@end
+
+#endif //wxUSE_WEBVIEW_WEBKIT
projects / wxWidgets.git / blobdiff