#include "wx/osx/webview_webkit.h"
-#if wxUSE_WEBVIEW_WEBKIT && (defined(__WXOSX_COCOA__) \
- || defined(__WXOSX_CARBON__))
+#if wxUSE_WEBVIEW && 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
-#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*, wxWebViewWebKit*> wx_webviewctrls;
-
#define DEBUG_WEBKIT_SIZING 0
// ----------------------------------------------------------------------------
UInt32 keyCode ;
UInt32 modifiers ;
- Point point ;
UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ;
#if wxUSE_UNICODE
#endif
GetEventParameter(event, kEventParamKeyMacCharCodes, typeChar, NULL,
- sizeof(char), NULL, &charCode );
+ 1, NULL, &charCode );
GetEventParameter(event, kEventParamKeyCode, typeUInt32, NULL,
sizeof(UInt32), NULL, &keyCode );
GetEventParameter(event, kEventParamKeyModifiers, typeUInt32, NULL,
sizeof(UInt32), NULL, &modifiers );
- GetEventParameter(event, kEventParamMouseLocation, typeQDPoint, NULL,
- sizeof(Point), NULL, &point );
UInt32 message = (keyCode << 8) + charCode;
switch ( GetEventKind( event ) )
wxTheApp->MacSetCurrentEvent( event , handler ) ;
if ( /* focus && */ wxTheApp->MacSendKeyDownEvent(
- focus, message, modifiers, when, point.h, point.v, uniChar[0]))
+ focus, message, modifiers, when, uniChar[0]))
{
result = noErr ;
}
case kEventRawKeyUp :
if ( /* focus && */ wxTheApp->MacSendKeyUpEvent(
- focus , message , modifiers , when , point.h , point.v , uniChar[0] ) )
+ focus , message , modifiers , when , uniChar[0] ) )
{
result = noErr ;
}
event.m_controlDown = modifiers & controlKey;
event.m_altDown = modifiers & optionKey;
event.m_metaDown = modifiers & cmdKey;
- event.m_x = point.h;
- event.m_y = point.v;
#if wxUSE_UNICODE
event.m_uniChar = uniChar[0] ;
#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;
+
+@end
-@interface MyFrameLoadMonitor : NSObject
+@interface WebViewPolicyDelegate : NSObject
{
wxWebViewWebKit* webKitWindow;
}
@end
-@interface MyPolicyDelegate : NSObject
+@interface WebViewUIDelegate : NSObject
{
wxWebViewWebKit* webKitWindow;
}
@end
+//We use a hash to map scheme names to wxWebViewHandler
+WX_DECLARE_STRING_HASH_MAP(wxSharedPtr<wxWebViewHandler>, wxStringToWebHandlerMap);
+
+static wxStringToWebHandlerMap g_stringHandlerMap;
+
+@interface WebViewCustomProtocol : NSURLProtocol
+{
+}
+@end
+
// ----------------------------------------------------------------------------
// creation/destruction
// ----------------------------------------------------------------------------
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
+ 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(),
+ 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:policyDelegate];
+
+ WebViewUIDelegate* uiDelegate =
+ [[WebViewUIDelegate alloc] initWithWxWindow: this];
- [m_webView setPolicyDelegate:myPolicyDelegate];
-
- // add history
- WebHistory* history = [[WebHistory alloc] init];
- [WebHistory setOptionalSharedHistory:history];
+ [m_webView setUIDelegate:uiDelegate];
- InternalLoadURL(strURL);
+ //Register our own class for custom scheme handling
+ [NSURLProtocol registerClass:[WebViewCustomProtocol class]];
+
+ LoadURL(strURL);
return true;
}
wxWebViewWebKit::~wxWebViewWebKit()
{
- MyFrameLoadMonitor* myFrameLoadMonitor = [m_webView frameLoadDelegate];
- MyPolicyDelegate* myPolicyDelegate = [m_webView policyDelegate];
+ WebViewLoadDelegate* loadDelegate = [m_webView frameLoadDelegate];
+ WebViewPolicyDelegate* policyDelegate = [m_webView policyDelegate];
+ WebViewUIDelegate* uiDelegate = [m_webView UIDelegate];
[m_webView setFrameLoadDelegate: nil];
[m_webView setPolicyDelegate: nil];
+ [m_webView setUIDelegate: nil];
+
+ if (loadDelegate)
+ [loadDelegate release];
- if (myFrameLoadMonitor)
- [myFrameLoadMonitor release];
+ if (policyDelegate)
+ [policyDelegate release];
- if (myPolicyDelegate)
- [myPolicyDelegate release];
+ if (uiDelegate)
+ [uiDelegate release];
}
// ----------------------------------------------------------------------------
// public methods
// ----------------------------------------------------------------------------
-void wxWebViewWebKit::InternalLoadURL(const wxString &url)
-{
- if( !m_webView )
- return;
-
- [[m_webView mainFrame] loadRequest:[NSURLRequest requestWithURL:
- [NSURL URLWithString:wxNSStringWithWxString(url)]]];
-}
-
-bool wxWebViewWebKit::CanGoBack()
+bool wxWebViewWebKit::CanGoBack() const
{
if ( !m_webView )
return false;
return [m_webView canGoBack];
}
-bool wxWebViewWebKit::CanGoForward()
+bool wxWebViewWebKit::CanGoForward() const
{
if ( !m_webView )
return false;
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 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 wxWebViewWebKit::Reload(wxWebViewReloadFlags flags)
if ( !m_webView )
return;
- if (flags & wxWEB_VIEW_RELOAD_NO_CACHE)
+ if (flags & wxWEBVIEW_RELOAD_NO_CACHE)
{
// TODO: test this indeed bypasses the cache
[[m_webView preferences] setUsesPageCache:NO];
[[m_webView mainFrame] stopLoading];
}
-bool wxWebViewWebKit::CanGetPageSource()
+bool wxWebViewWebKit::CanGetPageSource() const
{
if ( !m_webView )
return false;
return ( [[dataSource representation] canProvideDocumentSource] );
}
-wxString wxWebViewWebKit::GetPageSource()
+wxString wxWebViewWebKit::GetPageSource() const
{
if (CanGetPageSource())
return wxEmptyString;
}
-bool wxWebViewWebKit::CanIncreaseTextSize()
+bool wxWebViewWebKit::CanIncreaseTextSize() const
{
if ( !m_webView )
return false;
[m_webView makeTextLarger:(WebView*)m_webView];
}
-bool wxWebViewWebKit::CanDecreaseTextSize()
+bool wxWebViewWebKit::CanDecreaseTextSize() const
{
if ( !m_webView )
return false;
{
[op setShowsPrintPanel: showPrompt];
// in my tests, the progress bar always freezes and it stops the whole
- // print operation. do not turn this to true unless there is a
+ // print operation. do not turn this to true unless there is a
// workaround for the bug.
[op setShowsProgressPanel: false];
}
[m_webView setEditable:enable ];
}
-bool wxWebViewWebKit::IsEditable()
+bool wxWebViewWebKit::IsEditable() const
{
if ( !m_webView )
return false;
{
// 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);
+ wxASSERT(zoomType == wxWEBVIEW_ZOOM_TYPE_TEXT);
}
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
// Then this will be wrong
- return wxWEB_VIEW_ZOOM_TYPE_TEXT;
+ return wxWEBVIEW_ZOOM_TYPE_TEXT;
}
bool wxWebViewWebKit::CanSetZoomType(wxWebViewZoomType type) const
// for now that's the only one that is supported
// TODO: I know recent versions of webkit support layout zoom too,
// check if we can support it
- case wxWEB_VIEW_ZOOM_TYPE_TEXT:
+ case wxWEBVIEW_ZOOM_TYPE_TEXT:
return true;
default:
(NSString*)wxNSStringWithWxString( javascript )];
}
-wxString wxWebViewWebKit::GetSelectedText()
+wxString wxWebViewWebKit::GetSelectedText() const
{
NSString* selection = [[m_webView selectedDOMRange] markupString];
if (!selection) return wxEmptyString;
void wxWebViewWebKit::OnSize(wxSizeEvent &event)
{
-#if defined(__WXMAC_) && wxOSX_USE_CARBON
+#if defined(__WXMAC__) && wxOSX_USE_CARBON
// This is a nasty hack because WebKit seems to lose its position when it is
// embedded in a control that is not itself the content view for a TLW.
// I put it in OnSize because these calcs are not perfect, and in fact are
// we want is the root view, because we need to make the y origin relative
// to the very top of the window, not its contents, since we later flip
// the y coordinate for Cocoa.
- HIViewConvertRect (&rect, m_peer->GetControlRef(),
+ HIViewConvertRect (&rect, GetPeer()->GetControlRef(),
HIViewGetRoot(
(WindowRef) MacGetTopLevelWindowRef()
));
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 wxWebViewWebKit::LoadUrl(const wxString& url)
+void wxWebViewWebKit::LoadURL(const wxString& url)
{
- InternalLoadURL(url);
+ [[m_webView mainFrame] loadRequest:[NSURLRequest requestWithURL:
+ [NSURL URLWithString:wxNSStringWithWxString(url)]]];
}
-wxString wxWebViewWebKit::GetCurrentURL()
+wxString wxWebViewWebKit::GetCurrentURL() const
{
return wxStringWithNSString([m_webView mainFrameURL]);
}
-wxString wxWebViewWebKit::GetCurrentTitle()
+wxString wxWebViewWebKit::GetCurrentTitle() const
{
- return GetPageTitle();
+ return wxStringWithNSString([m_webView mainFrameTitle]);
}
-float wxWebViewWebKit::GetWebkitZoom()
+float wxWebViewWebKit::GetWebkitZoom() const
{
return [m_webView textSizeMultiplier];
}
[m_webView setTextSizeMultiplier:zoom];
}
-wxWebViewZoom wxWebViewWebKit::GetZoom()
+wxWebViewZoom wxWebViewWebKit::GetZoom() const
{
float zoom = GetWebkitZoom();
// arbitrary way to map float zoom to our common zoom enum
if (zoom <= 0.55)
{
- return wxWEB_VIEW_ZOOM_TINY;
+ return wxWEBVIEW_ZOOM_TINY;
}
else if (zoom > 0.55 && zoom <= 0.85)
{
- return wxWEB_VIEW_ZOOM_SMALL;
+ return wxWEBVIEW_ZOOM_SMALL;
}
else if (zoom > 0.85 && 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;
}
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.4f);
break;
- case wxWEB_VIEW_ZOOM_SMALL:
+ case wxWEBVIEW_ZOOM_SMALL:
SetWebkitZoom(0.7f);
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;
}
-void wxWebViewWebKit::SetPage(const wxString& src, const wxString& baseUrl)
+void wxWebViewWebKit::DoSetPage(const wxString& src, const wxString& baseUrl)
{
if ( !m_webView )
return;
[(WebView*)m_webView deleteSelection];
}
-bool wxWebViewWebKit::HasSelection()
+bool wxWebViewWebKit::HasSelection() const
{
DOMRange* range = [m_webView selectedDOMRange];
if(!range)
}
}
+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() const
+{
+ wxString script = ("var range = window.getSelection().getRangeAt(0);"
+ "var element = document.createElement('div');"
+ "element.appendChild(range.cloneContents());"
+ "return element.innerHTML;");
+ NSString *result = [m_webView stringByEvaluatingJavaScriptFromString:
+ wxNSStringWithWxString(script)];
+ return wxStringWithNSString(result);
+}
+
+wxString wxWebViewWebKit::GetPageText() const
+{
+ NSString *result = [m_webView stringByEvaluatingJavaScriptFromString:
+ @"document.body.textContent"];
+ return wxStringWithNSString(result);
+}
+
void wxWebViewWebKit::EnableHistory(bool enable)
{
if ( !m_webView )
void wxWebViewWebKit::ClearHistory()
{
- [[WebHistory optionalSharedHistory] removeAllItems];
+ [m_webView setMaintainsBackForwardList:NO];
+ [m_webView setMaintainsBackForwardList:YES];
+}
+
+wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewWebKit::GetBackwardHistory()
+{
+ wxVector<wxSharedPtr<wxWebViewHistoryItem> > 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]);
+ wxWebViewHistoryItem* wxitem = new wxWebViewHistoryItem(url, title);
+ wxitem->m_histItem = item;
+ wxSharedPtr<wxWebViewHistoryItem> itemptr(wxitem);
+ backhist.push_back(itemptr);
+ }
+ return backhist;
+}
+
+wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewWebKit::GetForwardHistory()
+{
+ wxVector<wxSharedPtr<wxWebViewHistoryItem> > 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]);
+ wxWebViewHistoryItem* wxitem = new wxWebViewHistoryItem(url, title);
+ wxitem->m_histItem = item;
+ wxSharedPtr<wxWebViewHistoryItem> itemptr(wxitem);
+ forwardhist.push_back(itemptr);
+ }
+ return forwardhist;
+}
+
+void wxWebViewWebKit::LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item)
+{
+ [m_webView goToBackForwardItem:item->m_histItem];
}
-bool wxWebViewWebKit::CanUndo()
+bool wxWebViewWebKit::CanUndo() const
{
return [[m_webView undoManager] canUndo];
}
-bool wxWebViewWebKit::CanRedo()
+bool wxWebViewWebKit::CanRedo() const
{
return [[m_webView undoManager] canRedo];
}
[[m_webView undoManager] redo];
}
+void wxWebViewWebKit::RegisterHandler(wxSharedPtr<wxWebViewHandler> 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: (wxWebViewWebKit*)inWindow
{
- (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(),
- wxStringWithNSString( url ),
- target, false);
+ wxWebViewEvent event(wxEVT_WEBVIEW_NAVIGATED,
+ webKitWindow->GetId(),
+ wxStringWithNSString( url ),
+ target);
if (webKitWindow && webKitWindow->GetEventHandler())
- webKitWindow->GetEventHandler()->ProcessEvent(thisEvent);
+ webKitWindow->GetEventHandler()->ProcessEvent(event);
}
}
- (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(),
- wxStringWithNSString( url ),
- target, false);
+ wxWebViewEvent event(wxEVT_WEBVIEW_LOADED,
+ webKitWindow->GetId(),
+ wxStringWithNSString( url ),
+ target);
if (webKitWindow && webKitWindow->GetEventHandler())
- webKitWindow->GetEventHandler()->ProcessEvent(thisEvent);
+ webKitWindow->GetEventHandler()->ProcessEvent(event);
}
}
-wxString nsErrorToWxHtmlError(NSError* error, wxWebNavigationError* out)
+wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
{
- *out = wxWEB_NAV_ERR_OTHER;
+ *out = wxWEBVIEW_NAV_ERR_OTHER;
if ([[error domain] isEqualToString:NSURLErrorDomain])
{
case NSURLErrorCannotFindHost:
case NSURLErrorFileDoesNotExist:
case NSURLErrorRedirectToNonExistentLocation:
- *out = wxWEB_NAV_ERR_NOT_FOUND;
+ *out = wxWEBVIEW_NAV_ERR_NOT_FOUND;
break;
case NSURLErrorResourceUnavailable:
case NSURLErrorHTTPTooManyRedirects:
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
case NSURLErrorDataLengthExceedsMaximum:
+#endif
case NSURLErrorBadURL:
case NSURLErrorFileIsDirectory:
- *out = wxWEB_NAV_ERR_REQUEST;
+ *out = wxWEBVIEW_NAV_ERR_REQUEST;
break;
case NSURLErrorTimedOut:
//case NSURLErrorInternationalRoamingOff:
//case NSURLErrorCallIsActive:
//case NSURLErrorDataNotAllowed:
- *out = wxWEB_NAV_ERR_CONNECTION;
+ *out = wxWEBVIEW_NAV_ERR_CONNECTION;
break;
case NSURLErrorCancelled:
case NSURLErrorUserCancelledAuthentication:
- *out = wxWEB_NAV_ERR_USER_CANCELLED;
+ *out = wxWEBVIEW_NAV_ERR_USER_CANCELLED;
break;
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
case NSURLErrorCannotDecodeRawData:
case NSURLErrorCannotDecodeContentData:
- case NSURLErrorBadServerResponse:
case NSURLErrorCannotParseResponse:
- *out = wxWEB_NAV_ERR_REQUEST;
+#endif
+ case NSURLErrorBadServerResponse:
+ *out = wxWEBVIEW_NAV_ERR_REQUEST;
break;
case NSURLErrorUserAuthenticationRequired:
case NSURLErrorSecureConnectionFailed:
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
case NSURLErrorClientCertificateRequired:
- *out = wxWEB_NAV_ERR_AUTH;
+#endif
+ *out = wxWEBVIEW_NAV_ERR_AUTH;
break;
case NSURLErrorNoPermissionsToReadFile:
- *out = wxWEB_NAV_ERR_SECURITY;
+ *out = wxWEBVIEW_NAV_ERR_SECURITY;
break;
case NSURLErrorServerCertificateHasBadDate:
case NSURLErrorServerCertificateHasUnknownRoot:
case NSURLErrorServerCertificateNotYetValid:
case NSURLErrorClientCertificateRejected:
- *out = wxWEB_NAV_ERR_CERTIFICATE;
+ *out = wxWEBVIEW_NAV_ERR_CERTIFICATE;
break;
}
}
- (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;
+ wxWebViewNavigationError type;
wxString description = nsErrorToWxHtmlError(error, &type);
- wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_ERROR,
- wx_webviewctrls[sender]->GetId(),
- wxStringWithNSString( url ),
- wxEmptyString, false);
- thisEvent.SetString(description);
- thisEvent.SetInt(type);
+ wxWebViewEvent event(wxEVT_WEBVIEW_ERROR,
+ webKitWindow->GetId(),
+ wxStringWithNSString( url ),
+ wxEmptyString);
+ event.SetString(description);
+ event.SetInt(type);
if (webKitWindow && webKitWindow->GetEventHandler())
{
- webKitWindow->GetEventHandler()->ProcessEvent(thisEvent);
+ webKitWindow->GetEventHandler()->ProcessEvent(event);
}
}
}
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]
absoluteString];
- wxWebNavigationError type;
+ wxWebViewNavigationError type;
wxString description = nsErrorToWxHtmlError(error, &type);
- wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_ERROR,
- wx_webviewctrls[sender]->GetId(),
- wxStringWithNSString( url ),
- wxEmptyString, false);
- thisEvent.SetString(description);
- thisEvent.SetInt(type);
+ wxWebViewEvent event(wxEVT_WEBVIEW_ERROR,
+ webKitWindow->GetId(),
+ wxStringWithNSString( url ),
+ wxEmptyString);
+ event.SetString(description);
+ event.SetInt(type);
if (webKitWindow && webKitWindow->GetEventHandler())
- webKitWindow->GetEventHandler()->ProcessEvent(thisEvent);
+ webKitWindow->GetEventHandler()->ProcessEvent(event);
}
}
- (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,
- wx_webviewctrls[sender]->GetId(),
- wx_webviewctrls[sender]->GetCurrentURL(),
- target, true);
-
- thisEvent.SetString(wxStringWithNSString(title));
+ wxWebViewEvent event(wxEVT_WEBVIEW_TITLE_CHANGED,
+ webKitWindow->GetId(),
+ webKitWindow->GetCurrentURL(),
+ target);
+
+ event.SetString(wxStringWithNSString(title));
if (webKitWindow && webKitWindow->GetEventHandler())
- webKitWindow->GetEventHandler()->ProcessEvent(thisEvent);
+ webKitWindow->GetEventHandler()->ProcessEvent(event);
}
@end
-@implementation MyPolicyDelegate
+@implementation WebViewPolicyDelegate
- initWithWxWindow: (wxWebViewWebKit*)inWindow
{
{
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(),
- wxStringWithNSString( url ), target, true);
+ wxWebViewEvent event(wxEVT_WEBVIEW_NAVIGATING,
+ webKitWindow->GetId(),
+ wxStringWithNSString( url ), target);
if (webKitWindow && webKitWindow->GetEventHandler())
- webKitWindow->GetEventHandler()->ProcessEvent(thisEvent);
+ webKitWindow->GetEventHandler()->ProcessEvent(event);
- if (thisEvent.IsVetoed())
+ if (!event.IsAllowed())
{
- wx_webviewctrls[sender]->m_busy = false;
+ webKitWindow->m_busy = false;
[listener ignore];
}
else
}
}
-- (void)webView:(WebView *)sender
+- (void)webView:(WebView *)sender
decidePolicyForNewWindowAction:(NSDictionary *)actionInformation
request:(NSURLRequest *)request
newFrameName:(NSString *)frameName
decisionListener:(id < WebPolicyDecisionListener >)listener
{
wxUnusedVar(actionInformation);
-
- wxASSERT(wx_webviewctrls.find(sender) != wx_webviewctrls.end());
+
NSString *url = [[request URL] absoluteString];
- wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_NEWWINDOW,
- wx_webviewctrls[sender]->GetId(),
- wxStringWithNSString( url ), "", true);
+ wxWebViewEvent event(wxEVT_WEBVIEW_NEWWINDOW,
+ webKitWindow->GetId(),
+ wxStringWithNSString( url ), "");
if (webKitWindow && webKitWindow->GetEventHandler())
- webKitWindow->GetEventHandler()->ProcessEvent(thisEvent);
+ webKitWindow->GetEventHandler()->ProcessEvent(event);
[listener ignore];
}
@end
-#endif //wxUSE_WEBVIEW_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 wxWebViewHandler classes do it
+ return request;
+}
+
+- (void)startLoading
+{
+ NSURLRequest *request = [self request];
+ NSString* path = [[request URL] absoluteString];
+
+ id<NSURLProtocolClient> client = [self client];
+
+ wxString wxpath = wxStringWithNSString(path);
+ wxString scheme = wxStringWithNSString([[request URL] scheme]);
+ wxFSFile* file = g_stringHandlerMap[scheme]->GetFile(wxpath);
+
+ if (!file)
+ {
+ NSError *error = [[NSError alloc] initWithDomain:NSURLErrorDomain
+ code:NSURLErrorFileDoesNotExist
+ userInfo:nil];
+
+ [client URLProtocol:self didFailWithError:error];
+
+ return;
+ }
+
+ 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];
+
+ //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
+
+
+@implementation WebViewUIDelegate
+
+- initWithWxWindow: (wxWebViewWebKit*)inWindow
+{
+ [super init];
+ webKitWindow = inWindow; // non retained
+ return self;
+}
+
+- (void)webView:(WebView *)sender printFrameView:(WebFrameView *)frameView
+{
+ wxUnusedVar(sender);
+ wxUnusedVar(frameView);
+
+ webKitWindow->Print();
+}
+
+- (NSArray *)webView:(WebView *)sender contextMenuItemsForElement:(NSDictionary *)element
+ defaultMenuItems:(NSArray *) defaultMenuItems
+{
+ if(webKitWindow->IsContextMenuEnabled())
+ return defaultMenuItems;
+ else
+ return nil;
+}
+@end
+
+#endif //wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT
projects / wxWidgets.git / blobdiff