+#include <UIKit/UIKit.h>
+#include "iPhonePrivate.h"
+
+#include "UCPlatform.h"
+
#include <UICaboodle/BrowserView.h>
#include <UICaboodle/UCLocalize.h>
-#import <QuartzCore/CALayer.h>
+//#include <QuartzCore/CALayer.h>
// XXX: fix the minimum requirement
extern NSString * const kCAFilterNearest;
#include <WebCore/WebCoreThread.h>
-#include <WebKit/WebPreferences-WebPrivate.h>
+
+#include <WebKit/WebPolicyDelegate.h>
+#include <WebKit/WebPreferences.h>
+
+#include <WebKit/DOMCSSPrimitiveValue.h>
+#include <WebKit/DOMCSSStyleDeclaration.h>
+#include <WebKit/DOMDocument.h>
+#include <WebKit/DOMHTMLBodyElement.h>
+#include <WebKit/DOMRGBColor.h>
+
+//#include <WebCore/Page.h>
+//#include <WebCore/Settings.h>
#include "substrate.h"
-#define ForSaurik 1
+#define ForSaurik 0
+
+template <typename Type_>
+static inline void CYRelease(Type_ &value) {
+ if (value != nil) {
+ [value release];
+ value = nil;
+ }
+}
+
+float CYScrollViewDecelerationRateNormal;
-static CFArrayRef (*$GSSystemCopyCapability)(CFStringRef);
-static CFArrayRef (*$GSSystemGetCapability)(CFStringRef);
+@interface WebView (Apple)
+- (void) _setLayoutInterval:(float)interval;
+@end
-@interface NSString (UIKit)
-- (NSString *) stringByAddingPercentEscapes;
+@interface WebPreferences (Apple)
++ (void) _setInitialDefaultTextEncodingToSystemEncoding;
+- (void) _setLayoutInterval:(NSInteger)interval;
+- (void) setOfflineWebApplicationCacheEnabled:(BOOL)enabled;
@end
/* Indirect Delegate {{{ */
-@interface IndirectDelegate : NSObject {
+@interface IndirectDelegate : NSObject <
+ HookProtocol
+> {
_transient volatile id delegate_;
}
return self;
}
-- (void) webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {
- if (delegate_ != nil)
- return [delegate_ webView:sender didClearWindowObject:window forFrame:frame];
-}
-
-- (void) webView:(WebView *)sender didCommitLoadForFrame:(WebFrame *)frame {
- if (delegate_ != nil)
- return [delegate_ webView:sender didCommitLoadForFrame:frame];
-}
-
-- (void) webView:(WebView *)sender didFailLoadWithError:(NSError *)error forFrame:(WebFrame *)frame {
- if (delegate_ != nil)
- return [delegate_ webView:sender didFailLoadWithError:error forFrame:frame];
-}
-
-- (void) webView:(WebView *)sender didFailProvisionalLoadWithError:(NSError *)error forFrame:(WebFrame *)frame {
- if (delegate_ != nil)
- return [delegate_ webView:sender didFailProvisionalLoadWithError:error forFrame:frame];
-}
-
-- (void) webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame {
- if (delegate_ != nil)
- return [delegate_ webView:sender didFinishLoadForFrame:frame];
-}
-
-- (void) webView:(WebView *)sender didReceiveTitle:(NSString *)title forFrame:(WebFrame *)frame {
- if (delegate_ != nil)
- return [delegate_ webView:sender didReceiveTitle:title forFrame:frame];
-}
-
-- (void) webView:(WebView *)sender didStartProvisionalLoadForFrame:(WebFrame *)frame {
- if (delegate_ != nil)
- return [delegate_ webView:sender didStartProvisionalLoadForFrame:frame];
-}
-
-- (void) webView:(WebView *)sender resource:(id)identifier didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge fromDataSource:(WebDataSource *)source {
+- (void) didDismissModalViewController {
if (delegate_ != nil)
- return [delegate_ webView:sender resource:identifier didReceiveAuthenticationChallenge:challenge fromDataSource:source];
-}
-
-- (NSURLRequest *) webView:(WebView *)sender resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse fromDataSource:(WebDataSource *)source {
- if (delegate_ != nil)
- return [delegate_ webView:sender resource:identifier willSendRequest:request redirectResponse:redirectResponse fromDataSource:source];
- return nil;
+ return [delegate_ didDismissModalViewController];
}
- (IMP) methodForSelector:(SEL)sel {
@end
/* }}} */
-@interface WebView (UICaboodle)
-- (void) setScriptDebugDelegate:(id)delegate;
-- (void) _setFormDelegate:(id)delegate;
-- (void) _setUIKitDelegate:(id)delegate;
-- (void) setWebMailDelegate:(id)delegate;
-- (void) _setLayoutInterval:(float)interval;
-@end
-
@implementation WebScriptObject (UICaboodle)
-- (unsigned) count {
+- (NSUInteger) count {
id length([self valueForKey:@"length"]);
if ([length respondsToSelector:@selector(intValue)])
return [length intValue];
@end
-#define ShowInternals 0
-#define LogBrowser 1
+// CYWebPolicyDecision* {{{
+enum CYWebPolicyDecision {
+ CYWebPolicyDecisionUnknown,
+ CYWebPolicyDecisionDownload,
+ CYWebPolicyDecisionIgnore,
+ CYWebPolicyDecisionUse,
+};
-#define lprintf(args...) fprintf(stderr, args)
+@interface CYWebPolicyDecisionMediator : NSObject <
+ WebPolicyDecisionListener
+> {
+ id<WebPolicyDecisionListener> listener_;
+ CYWebPolicyDecision decision_;
+}
-@implementation BrowserView
+- (id) initWithListener:(id<WebPolicyDecisionListener>)listener;
-#if ShowInternals
-#include "UICaboodle/UCInternal.h"
-#endif
+- (CYWebPolicyDecision) decision;
+- (bool) decided;
+- (bool) decide;
-+ (void) _initialize {
- [WebView enableWebThread];
+@end
- WebPreferences *preferences([WebPreferences standardPreferences]);
- [preferences setCacheModel:WebCacheModelDocumentBrowser];
- [preferences setOfflineWebApplicationCacheEnabled:YES];
+@implementation CYWebPolicyDecisionMediator
- [WebPreferences _setInitialDefaultTextEncodingToSystemEncoding];
+- (id) initWithListener:(id<WebPolicyDecisionListener>)listener {
+ if ((self = [super init]) != nil) {
+ listener_ = listener;
+ } return self;
+}
+
+- (CYWebPolicyDecision) decision {
+ return decision_;
+}
+
+- (bool) decided {
+ return decision_ != CYWebPolicyDecisionUnknown;
+}
+
+- (bool) decide {
+ switch (decision_) {
+ case CYWebPolicyDecisionUnknown:
+ default:
+ NSLog(@"CYWebPolicyDecisionUnknown");
+ return false;
+
+ case CYWebPolicyDecisionDownload: [listener_ download]; break;
+ case CYWebPolicyDecisionIgnore: [listener_ ignore]; break;
+ case CYWebPolicyDecisionUse: [listener_ use]; break;
+ }
+
+ return true;
+}
+
+- (void) download {
+ decision_ = CYWebPolicyDecisionDownload;
+}
+
+- (void) ignore {
+ decision_ = CYWebPolicyDecisionIgnore;
+}
+
+- (void) use {
+ decision_ = CYWebPolicyDecisionUse;
+}
+
+@end
+// }}}
+
+@implementation CYWebView : UIWebView
- $GSSystemCopyCapability = reinterpret_cast<CFArrayRef (*)(CFStringRef)>(dlsym(RTLD_DEFAULT, "GSSystemCopyCapability"));
- $GSSystemGetCapability = reinterpret_cast<CFArrayRef (*)(CFStringRef)>(dlsym(RTLD_DEFAULT, "GSSystemGetCapability"));
+- (id) initWithFrame:(CGRect)frame {
+ if ((self = [super initWithFrame:frame]) != nil) {
+ } return self;
}
- (void) dealloc {
-#if LogBrowser
- NSLog(@"[BrowserView dealloc]");
-#endif
+ [super dealloc];
+}
- if (challenge_ != nil)
- [challenge_ release];
+- (id<CYWebViewDelegate>) delegate {
+ return (id<CYWebViewDelegate>) [super delegate];
+}
- WebThreadLock();
+/*- (WebView *) webView:(WebView *)view createWebViewWithRequest:(NSURLRequest *)request {
+ id<CYWebViewDelegate> delegate([self delegate]);
+ WebView *created(nil);
+ if (created == nil && [delegate respondsToSelector:@selector(webView:createWebViewWithRequest:)])
+ created = [delegate webView:view createWebViewWithRequest:request];
+ if (created == nil && [UIWebView instancesRespondToSelector:@selector(webView:createWebViewWithRequest:)])
+ created = [super webView:view createWebViewWithRequest:request];
+ return created;
+}*/
- WebView *webview = [webview_ webView];
- [webview setFrameLoadDelegate:nil];
- [webview setResourceLoadDelegate:nil];
- [webview setUIDelegate:nil];
- [webview setScriptDebugDelegate:nil];
- [webview setPolicyDelegate:nil];
+// webView:decidePolicyForNavigationAction:request:frame:decisionListener: (2.0+) {{{
+- (void) webView:(WebView *)view decidePolicyForNavigationAction:(NSDictionary *)action request:(NSURLRequest *)request frame:(WebFrame *)frame decisionListener:(id<WebPolicyDecisionListener>)listener {
+ id<CYWebViewDelegate> delegate([self delegate]);
+ CYWebPolicyDecisionMediator *mediator([[[CYWebPolicyDecisionMediator alloc] initWithListener:listener] autorelease]);
+ if (![mediator decided] && [delegate respondsToSelector:@selector(webView:decidePolicyForNavigationAction:request:frame:decisionListener:)])
+ [delegate webView:view decidePolicyForNavigationAction:action request:request frame:frame decisionListener:mediator];
+ if (![mediator decided] && [UIWebView instancesRespondToSelector:@selector(webView:decidePolicyForNavigationAction:request:frame:decisionListener:)])
+ [super webView:view decidePolicyForNavigationAction:action request:request frame:frame decisionListener:mediator];
+ [mediator decide];
+}
+// }}}
+// webView:decidePolicyForNewWindowAction:request:newFrameName:decisionListener: (3.0+) {{{
+static void $UIWebViewWebViewDelegate$webView$decidePolicyForNewWindowAction$request$newFrameName$decisionListener$(UIWebViewWebViewDelegate *self, SEL sel, WebView *view, NSDictionary *action, NSURLRequest *request, NSString *frame, id<WebPolicyDecisionListener> listener) {
+ UIWebView *uiWebView(MSHookIvar<UIWebView *>(self, "uiWebView"));
+ if ([uiWebView respondsToSelector:@selector(webView:decidePolicyForNewWindowAction:request:newFrameName:decisionListener:)])
+ [uiWebView webView:view decidePolicyForNewWindowAction:action request:request newFrameName:frame decisionListener:listener];
+}
+
+- (void) webView:(WebView *)view decidePolicyForNewWindowAction:(NSDictionary *)action request:(NSURLRequest *)request newFrameName:(NSString *)frame decisionListener:(id<WebPolicyDecisionListener>)listener {
+ id<CYWebViewDelegate> delegate([self delegate]);
+ CYWebPolicyDecisionMediator *mediator([[[CYWebPolicyDecisionMediator alloc] initWithListener:listener] autorelease]);
+ if (![mediator decided] && [delegate respondsToSelector:@selector(webView:decidePolicyForNewWindowAction:request:newFrameName:decisionListener:)])
+ [delegate webView:view decidePolicyForNewWindowAction:action request:request newFrameName:frame decisionListener:mediator];
+ if (![mediator decided] && [UIWebView instancesRespondToSelector:@selector(webView:decidePolicyForNewWindowAction:request:newFrameName:decisionListener:)])
+ [super webView:view decidePolicyForNewWindowAction:action request:request newFrameName:frame decisionListener:mediator];
+ [mediator decide];
+}
+// }}}
+// webView:didClearWindowObject:forFrame: (3.2+) {{{
+static void $UIWebViewWebViewDelegate$webView$didClearWindowObject$forFrame$(UIWebViewWebViewDelegate *self, SEL sel, WebView *view, WebScriptObject *window, WebFrame *frame) {
+ UIWebView *uiWebView(MSHookIvar<UIWebView *>(self, "uiWebView"));
+ if ([uiWebView respondsToSelector:@selector(webView:didClearWindowObject:forFrame:)])
+ [uiWebView webView:view didClearWindowObject:window forFrame:frame];
+}
+
+- (void) webView:(WebView *)view didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {
+ id<CYWebViewDelegate> delegate([self delegate]);
+ if ([delegate respondsToSelector:@selector(webView:didClearWindowObject:forFrame:)])
+ [delegate webView:view didClearWindowObject:window forFrame:frame];
+ if ([UIWebView instancesRespondToSelector:@selector(webView:didClearWindowObject:forFrame:)])
+ [super webView:view didClearWindowObject:window forFrame:frame];
+}
+// }}}
+// webView:didFailLoadWithError:forFrame: (2.0+) {{{
+- (void) webView:(WebView *)view didFailLoadWithError:(NSError *)error forFrame:(WebFrame *)frame {
+ id<CYWebViewDelegate> delegate([self delegate]);
+ if ([delegate respondsToSelector:@selector(webView:didFailLoadWithError:forFrame:)])
+ [delegate webView:view didFailLoadWithError:error forFrame:frame];
+ if ([UIWebView instancesRespondToSelector:@selector(webView:didFailLoadWithError:forFrame:)])
+ [super webView:view didFailLoadWithError:error forFrame:frame];
+}
+// }}}
+// webView:didFailProvisionalLoadWithError:forFrame: (2.0+) {{{
+- (void) webView:(WebView *)view didFailProvisionalLoadWithError:(NSError *)error forFrame:(WebFrame *)frame {
+ id<CYWebViewDelegate> delegate([self delegate]);
+ if ([delegate respondsToSelector:@selector(webView:didFailProvisionalLoadWithError:forFrame:)])
+ [delegate webView:view didFailProvisionalLoadWithError:error forFrame:frame];
+ if ([UIWebView instancesRespondToSelector:@selector(webView:didFailProvisionalLoadWithError:forFrame:)])
+ [super webView:view didFailProvisionalLoadWithError:error forFrame:frame];
+}
+// }}}
+// webView:didFinishLoadForFrame: (2.0+) {{{
+- (void) webView:(WebView *)view didFinishLoadForFrame:(WebFrame *)frame {
+ id<CYWebViewDelegate> delegate([self delegate]);
+ if ([delegate respondsToSelector:@selector(webView:didFinishLoadForFrame:)])
+ [delegate webView:view didFinishLoadForFrame:frame];
+ if ([UIWebView instancesRespondToSelector:@selector(webView:didFinishLoadForFrame:)])
+ [super webView:view didFinishLoadForFrame:frame];
+}
+// }}}
+// webView:didReceiveTitle:forFrame: (3.2+) {{{
+static void $UIWebViewWebViewDelegate$webView$didReceiveTitle$forFrame$(UIWebViewWebViewDelegate *self, SEL sel, WebView *view, NSString *title, WebFrame *frame) {
+ UIWebView *uiWebView(MSHookIvar<UIWebView *>(self, "uiWebView"));
+ if ([uiWebView respondsToSelector:@selector(webView:didReceiveTitle:forFrame:)])
+ [uiWebView webView:view didReceiveTitle:title forFrame:frame];
+}
+
+- (void) webView:(WebView *)view didReceiveTitle:(NSString *)title forFrame:(WebFrame *)frame {
+ id<CYWebViewDelegate> delegate([self delegate]);
+ if ([delegate respondsToSelector:@selector(webView:didReceiveTitle:forFrame:)])
+ [delegate webView:view didReceiveTitle:title forFrame:frame];
+ if ([UIWebView instancesRespondToSelector:@selector(webView:didReceiveTitle:forFrame:)])
+ [super webView:view didReceiveTitle:title forFrame:frame];
+}
+// }}}
+// webView:didStartProvisionalLoadForFrame: (2.0+) {{{
+- (void) webView:(WebView *)view didStartProvisionalLoadForFrame:(WebFrame *)frame {
+ id<CYWebViewDelegate> delegate([self delegate]);
+ if ([delegate respondsToSelector:@selector(webView:didStartProvisionalLoadForFrame:)])
+ [delegate webView:view didStartProvisionalLoadForFrame:frame];
+ if ([UIWebView instancesRespondToSelector:@selector(webView:didStartProvisionalLoadForFrame:)])
+ [super webView:view didStartProvisionalLoadForFrame:frame];
+}
+// }}}
+// webView:resource:willSendRequest:redirectResponse:fromDataSource: (3.2+) {{{
+static NSURLRequest *$UIWebViewWebViewDelegate$webView$resource$willSendRequest$redirectResponse$fromDataSource$(UIWebViewWebViewDelegate *self, SEL sel, WebView *view, id identifier, NSURLRequest *request, NSURLResponse *response, WebDataSource *source) {
+ UIWebView *uiWebView(MSHookIvar<UIWebView *>(self, "uiWebView"));
+ if ([uiWebView respondsToSelector:@selector(webView:resource:willSendRequest:redirectResponse:fromDataSource:)])
+ return [uiWebView webView:view resource:identifier willSendRequest:request redirectResponse:response fromDataSource:source];
+ else
+ return request;
+}
+
+- (NSURLRequest *) webView:(WebView *)view resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)response fromDataSource:(WebDataSource *)source {
+ id<CYWebViewDelegate> delegate([self delegate]);
+ if ([UIWebView instancesRespondToSelector:@selector(webView:resource:willSendRequest:redirectResponse:fromDataSource:)])
+ request = [super webView:view resource:identifier willSendRequest:request redirectResponse:response fromDataSource:source];
+ if ([delegate respondsToSelector:@selector(webView:resource:willSendRequest:redirectResponse:fromDataSource:)])
+ request = [delegate webView:view resource:identifier willSendRequest:request redirectResponse:response fromDataSource:source];
+ return request;
+}
+// }}}
+// webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame: (2.1+) {{{
+- (void) webView:(WebView *)view runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WebFrame *)frame {
+ id<CYWebViewDelegate> delegate([self delegate]);
+ if ([UIWebView instancesRespondToSelector:@selector(webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame:)])
+ // XXX: check delegate
+ if ([delegate webView:view shouldRunJavaScriptAlertPanelWithMessage:message initiatedByFrame:frame])
+ [super webView:view runJavaScriptAlertPanelWithMessage:message initiatedByFrame:frame];
+}
+// }}}
+// webView:runJavaScriptConfirmPanelWithMessage:initiatedByFrame: (2.1+) {{{
+- (BOOL) webView:(WebView *)view runJavaScriptConfirmPanelWithMessage:(NSString *)message initiatedByFrame:(WebFrame *)frame {
+ id<CYWebViewDelegate> delegate([self delegate]);
+ if ([UIWebView instancesRespondToSelector:@selector(webView:runJavaScriptConfirmPanelWithMessage:initiatedByFrame:)])
+ // XXX: check delegate
+ if ([delegate webView:view shouldRunJavaScriptConfirmPanelWithMessage:message initiatedByFrame:frame])
+ return [super webView:view runJavaScriptConfirmPanelWithMessage:message initiatedByFrame:frame];
+ return NO;
+}
+// }}}
+// webView:runJavaScriptTextInputPanelWithPrompt:defaultText:initiatedByFrame: (2.1+) {{{
+- (NSString *) webView:(WebView *)view runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(NSString *)text initiatedByFrame:(WebFrame *)frame {
+ id<CYWebViewDelegate> delegate([self delegate]);
+ if ([UIWebView instancesRespondToSelector:@selector(webView:runJavaScriptTextInputPanelWithPrompt:defaultText:initiatedByFrame:)])
+ // XXX: check delegate
+ if ([delegate webView:view shouldRunJavaScriptTextInputPanelWithPrompt:prompt defaultText:text initiatedByFrame:frame])
+ return [super webView:view runJavaScriptTextInputPanelWithPrompt:prompt defaultText:text initiatedByFrame:frame];
+ return nil;
+}
+// }}}
+// webViewClose: (3.2+) {{{
+static void $UIWebViewWebViewDelegate$webViewClose$(UIWebViewWebViewDelegate *self, SEL sel, WebView *view) {
+ UIWebView *uiWebView(MSHookIvar<UIWebView *>(self, "uiWebView"));
+ if ([uiWebView respondsToSelector:@selector(webViewClose:)])
+ [uiWebView webViewClose:view];
+}
+
+- (void) webViewClose:(WebView *)view {
+ id<CYWebViewDelegate> delegate([self delegate]);
+ if ([delegate respondsToSelector:@selector(webViewClose:)])
+ [delegate webViewClose:view];
+ if ([UIWebView instancesRespondToSelector:@selector(webViewClose:)])
+ [super webViewClose:view];
+}
+// }}}
+
++ (void) initialize {
+ if (Class $UIWebViewWebViewDelegate = objc_getClass("UIWebViewWebViewDelegate")) {
+ class_addMethod($UIWebViewWebViewDelegate, @selector(webView:decidePolicyForNewWindowAction:request:newFrameName:decisionListener:), (IMP) &$UIWebViewWebViewDelegate$webView$decidePolicyForNewWindowAction$request$newFrameName$decisionListener$, "v28@0:4@8@12@16@20@24");
+ class_addMethod($UIWebViewWebViewDelegate, @selector(webView:didClearWindowObject:forFrame:), (IMP) &$UIWebViewWebViewDelegate$webView$didClearWindowObject$forFrame$, "v20@0:4@8@12@16");
+ class_addMethod($UIWebViewWebViewDelegate, @selector(webView:didReceiveTitle:forFrame:), (IMP) &$UIWebViewWebViewDelegate$webView$didReceiveTitle$forFrame$, "v20@0:4@8@12@16");
+ class_addMethod($UIWebViewWebViewDelegate, @selector(webView:resource:willSendRequest:redirectResponse:fromDataSource:), (IMP) &$UIWebViewWebViewDelegate$webView$resource$willSendRequest$redirectResponse$fromDataSource$, "@28@0:4@8@12@16@20@24");
+ class_addMethod($UIWebViewWebViewDelegate, @selector(webViewClose:), (IMP) &$UIWebViewWebViewDelegate$webViewClose$, "v12@0:4@8");
+ }
+}
- /* XXX: these are set by UIWebDocumentView
- [webview setDownloadDelegate:nil];
- [webview _setFormDelegate:nil];
- [webview _setUIKitDelegate:nil];
- [webview setEditingDelegate:nil];*/
+@end
- /* XXX: no one sets this, ever
- [webview setWebMailDelegate:nil];*/
+#define ShowInternals 0
+#define LogBrowser 1
- [webview_ setDelegate:nil];
- [webview_ setGestureDelegate:nil];
- [webview_ setFormEditingDelegate:nil];
- [webview_ setInteractionDelegate:nil];
+#define lprintf(args...) fprintf(stderr, args)
- [indirect_ setDelegate:nil];
+@implementation BrowserController
- //NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
+#if ShowInternals
+#include "UICaboodle/UCInternal.h"
+#endif
+
++ (void) _initialize {
+ [WebPreferences _setInitialDefaultTextEncodingToSystemEncoding];
- [webview close];
+ if (float *_UIScrollViewDecelerationRateNormal = reinterpret_cast<float *>(dlsym(RTLD_DEFAULT, "UIScrollViewDecelerationRateNormal")))
+ CYScrollViewDecelerationRateNormal = *_UIScrollViewDecelerationRateNormal;
+ else // XXX: this actually might be fast on some older systems: we should look into this
+ CYScrollViewDecelerationRateNormal = 0.998;
+}
-#if RecycleWebViews
- [webview_ removeFromSuperview];
- [Documents_ addObject:[webview_ autorelease]];
-#else
- [webview_ release];
+- (void) dealloc {
+#if LogBrowser
+ NSLog(@"[BrowserController dealloc]");
#endif
+ [webview_ setDelegate:nil];
+
+ [indirect_ setDelegate:nil];
[indirect_ release];
- WebThreadUnlock();
+ if (challenge_ != nil)
+ [challenge_ release];
- [scroller_ setDelegate:nil];
+ //NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
- if (button_ != nil)
- [button_ release];
+ if (custom_ != nil)
+ [custom_ release];
if (style_ != nil)
[style_ release];
+
if (function_ != nil)
[function_ release];
- if (finish_ != nil)
- [finish_ release];
if (closer_ != nil)
[closer_ release];
- if (special_ != nil)
- [special_ release];
- [scroller_ release];
- [indicator_ release];
- if (confirm_ != nil)
- [confirm_ release];
if (sensitive_ != nil)
[sensitive_ release];
if (title_ != nil)
[title_ release];
+
+ [reloaditem_ release];
+ [loadingitem_ release];
+
+ [indicator_ release];
+
[super dealloc];
}
[self loadRequest:[NSURLRequest
requestWithURL:url
cachePolicy:policy
- timeoutInterval:30.0
+ timeoutInterval:120.0
]];
}
}
- (void) loadRequest:(NSURLRequest *)request {
- pushed_ = true;
+#if LogBrowser
+ NSLog(@"loadRequest:%@", request);
+#endif
+
error_ = false;
WebThreadLock();
if ([request_ HTTPBody] == nil && [request_ HTTPBodyStream] == nil)
[self loadRequest:request_];
else {
- UIActionSheet *sheet = [[[UIActionSheet alloc]
+ UIAlertView *alert = [[[UIAlertView alloc]
initWithTitle:UCLocalize("RESUBMIT_FORM")
- buttons:[NSArray arrayWithObjects:UCLocalize("CANCEL"), UCLocalize("SUBMIT"), nil]
- defaultButtonIndex:0
+ message:nil
delegate:self
- context:@"submit"
+ cancelButtonTitle:UCLocalize("CANCEL")
+ otherButtonTitles:UCLocalize("SUBMIT"), nil
] autorelease];
- [sheet setNumberOfRows:1];
- [sheet popupAlertAnimated:YES];
+ [alert setContext:@"submit"];
+ [alert show];
}
}
-- (WebView *) webView {
- return [webview_ webView];
-}
+- (void) setButtonImage:(NSString *)button withStyle:(NSString *)style toFunction:(id)function {
+ if (custom_ != nil)
+ [custom_ autorelease];
+ custom_ = button == nil ? nil : [[UIImage imageWithData:[NSData dataWithContentsOfURL:[NSURL URLWithString:button]]] retain];
-- (UIWebDocumentView *) documentView {
- return webview_;
-}
+ if (style_ != nil)
+ [style_ autorelease];
+ style_ = style == nil ? nil : [style retain];
-/* XXX: WebThreadLock? */
-- (void) _fixScroller:(CGRect)bounds {
- float extra;
- if (!editing_)
- extra = 0;
- else {
- UIFormAssistant *assistant([UIFormAssistant sharedFormAssistant]);
- CGRect peripheral([assistant peripheralFrame]);
-#if LogBrowser
- NSLog(@"per:%f", peripheral.size.height);
-#endif
- extra = peripheral.size.height;
- }
+ if (function_ != nil)
+ [function_ autorelease];
+ function_ = function == nil ? nil : [function retain];
+
+ [self applyRightButton];
+}
- CGRect subrect([scroller_ frame]);
- subrect.size.height -= extra;
- [scroller_ setScrollerIndicatorSubrect:subrect];
+- (void) setButtonTitle:(NSString *)button withStyle:(NSString *)style toFunction:(id)function {
+ if (custom_ != nil)
+ [custom_ autorelease];
+ custom_ = button == nil ? nil : [button retain];
- NSSize visible(NSMakeSize(subrect.size.width, subrect.size.height));
- [webview_ setValue:[NSValue valueWithSize:visible] forGestureAttribute:UIGestureAttributeVisibleSize];
+ if (style_ != nil)
+ [style_ autorelease];
+ style_ = style == nil ? nil : [style retain];
- CGSize size(size_);
- size.height += extra;
- [scroller_ setContentSize:size];
+ if (function_ != nil)
+ [function_ autorelease];
+ function_ = function == nil ? nil : [function retain];
- [scroller_ releaseRubberBandIfNecessary];
+ [self applyRightButton];
}
-- (void) fixScroller {
- CGRect bounds([webview_ documentBounds]);
-#if TrackResize
- NSLog(@"_fs:(%f,%f+%f,%f)", bounds.origin.x, bounds.origin.y, bounds.size.width, bounds.size.height);
-#endif
- [self _fixScroller:bounds];
+- (void) setPopupHook:(id)function {
+ if (closer_ != nil)
+ [closer_ autorelease];
+ closer_ = function == nil ? nil : [function retain];
}
-- (void) view:(UIView *)sender didSetFrame:(CGRect)frame {
- size_ = frame.size;
-#if TrackResize
- NSLog(@"dsf:(%f,%f+%f,%f)", frame.origin.x, frame.origin.y, frame.size.width, frame.size.height);
-#endif
- [self _fixScroller:frame];
+- (void) setViewportWidth:(float)width {
+ width_ = width != 0 ? width : [[self class] defaultWidth];
+ [[webview_ _documentView] setViewportSize:CGSizeMake(width_, UIWebViewGrowsAndShrinksToFitHeight) forDocumentTypes:0x10];
}
-- (void) view:(UIView *)sender didSetFrame:(CGRect)frame oldFrame:(CGRect)old {
- [self view:sender didSetFrame:frame];
+- (void) _openMailToURL:(NSURL *)url {
+ [[UIApplication sharedApplication] openURL:url];// asPanel:YES];
}
-- (void) pushPage:(RVPage *)page {
- [page setDelegate:delegate_];
- [self setBackButtonTitle:title_];
- [book_ pushPage:page];
+- (bool) _allowJavaScriptPanel {
+ return true;
}
-- (void) _pushPage {
- if (pushed_)
+- (void) _didFailWithError:(NSError *)error forFrame:(WebFrame *)frame {
+ [loading_ removeObject:[NSValue valueWithNonretainedObject:frame]];
+ [self _didFinishLoading];
+
+ if ([error code] == NSURLErrorCancelled)
return;
- // WTR: [self autorelease];
- pushed_ = true;
- [book_ pushPage:self];
-}
-- (void) swapPage:(RVPage *)page {
- [page setDelegate:delegate_];
- if (pushed_)
- [book_ swapPage:page];
- else
- [book_ pushPage:page];
+ if ([frame parentFrame] == nil) {
+ [self loadURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@?%@",
+ [[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"error" ofType:@"html"]] absoluteString],
+ [[error localizedDescription] stringByAddingPercentEscapes]
+ ]]];
+
+ error_ = true;
+ }
}
-- (BOOL) getSpecial:(NSURL *)url swap:(BOOL)swap {
+// CYWebViewDelegate {{{
+- (void) webView:(WebView *)view decidePolicyForNavigationAction:(NSDictionary *)action request:(NSURLRequest *)request frame:(WebFrame *)frame decisionListener:(id<WebPolicyDecisionListener>)listener {
#if LogBrowser
- NSLog(@"getSpecial:%@", url);
+ NSLog(@"decidePolicyForNavigationAction:%@ request:%@ frame:%@", action, request, frame);
#endif
- if (RVPage *page = [delegate_ pageForURL:url hasTag:NULL]) {
- if (swap)
- [self swapPage:page];
+ if (!error_ && [frame parentFrame] == nil) {
+ if (request_ != nil)
+ [request_ autorelease];
+ if (request == nil)
+ request_ = nil;
else
- [self pushPage:page];
-
- return true;
- } else
- return false;
+ request_ = [request retain];
+ }
}
-- (void) formAssistant:(id)sender didBeginEditingFormNode:(id)node {
-}
+- (void) webView:(WebView *)view decidePolicyForNewWindowAction:(NSDictionary *)action request:(NSURLRequest *)request newFrameName:(NSString *)frame decisionListener:(id<WebPolicyDecisionListener>)listener {
+#if LogBrowser
+ NSLog(@"decidePolicyForNewWindowAction:%@ request:%@ newFrameName:%@", action, request, frame);
+#endif
-- (void) formAssistant:(id)sender didEndEditingFormNode:(id)node {
- [self fixScroller];
-}
+ NSURL *url([request URL]);
+ if (url == nil)
+ return;
-- (void) webViewShow:(WebView *)sender {
- /* XXX: this is where I cry myself to sleep */
-}
+ if ([frame isEqualToString:@"_open"])
+ [delegate_ openURL:url];
-- (bool) _allowJavaScriptPanel {
- return true;
-}
+ NSString *scheme([[url scheme] lowercaseString]);
+ if ([scheme isEqualToString:@"mailto"])
+ [self _openMailToURL:url];
-- (bool) allowSensitiveRequests {
- return [self _allowJavaScriptPanel];
-}
+ CYViewController *page([delegate_ pageForURL:url hasTag:NULL]);
+
+ if (page == nil) {
+ BrowserController *browser([[[class_ alloc] init] autorelease]);
+ [browser loadRequest:request];
+ page = browser;
+ }
-- (void) _promptForSensitive:(NSMutableArray *)array {
- NSString *name([array objectAtIndex:0]);
+ [page setDelegate:delegate_];
- UIActionSheet *sheet = [[[UIActionSheet alloc]
- initWithTitle:nil
- buttons:[NSArray arrayWithObjects:UCLocalize("YES"), UCLocalize("NO"), nil]
- defaultButtonIndex:0
- delegate:indirect_
- context:@"sensitive"
- ] autorelease];
+ if (![frame isEqualToString:@"_popup"]) {
+ [[self navigationItem] setTitle:title_];
- NSString *host(@"XXX");
+ [[self navigationController] pushViewController:page animated:YES];
+ } else {
+ UCNavigationController *navigation([[[UCNavigationController alloc] init] autorelease]);
- [sheet setNumberOfRows:1];
- [sheet setBodyText:[NSString stringWithFormat:@"The website at %@ is requesting your phone's %@. This is almost certainly for product licensing purposes. Will you allow this?", host, name]];
- [sheet popupAlertAnimated:YES];
+ [navigation setHook:indirect_];
+ [navigation setDelegate:delegate_];
- NSRunLoop *loop([NSRunLoop currentRunLoop]);
- NSDate *future([NSDate distantFuture]);
+ [navigation setViewControllers:[NSArray arrayWithObject:page]];
- while (sensitive_ == nil && [loop runMode:NSDefaultRunLoopMode beforeDate:future]);
+ [[page navigationItem] setLeftBarButtonItem:[[[UIBarButtonItem alloc]
+ initWithTitle:UCLocalize("CLOSE")
+ style:UIBarButtonItemStylePlain
+ target:page
+ action:@selector(close)
+ ] autorelease]];
- NSNumber *sensitive([sensitive_ autorelease]);
- sensitive_ = nil;
+ [[self navigationController] presentModalViewController:navigation animated:YES];
+ }
- [self autorelease];
- [array replaceObjectAtIndex:0 withObject:sensitive];
+ [listener ignore];
}
-- (bool) promptForSensitive:(NSString *)name {
- if (![self allowSensitiveRequests])
- return false;
+- (void) webView:(WebView *)view didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {
+}
- NSMutableArray *array([NSMutableArray arrayWithCapacity:1]);
- [array addObject:name];
+- (void) webView:(WebView *)view didFailLoadWithError:(NSError *)error forFrame:(WebFrame *)frame {
+#if LogBrowser
+ NSLog(@"didFailLoadWithError:%@ forFrame:%@", error, frame);
+#endif
- [self performSelectorOnMainThread:@selector(_promptForSensitive:) withObject:array waitUntilDone:YES];
- return [[array lastObject] boolValue];
+ [self _didFailWithError:error forFrame:frame];
}
-- (void) webView:(WebView *)sender runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WebFrame *)frame {
- if (![self _allowJavaScriptPanel])
- return;
- [self retain];
-
- UIActionSheet *sheet = [[[UIActionSheet alloc]
- initWithTitle:nil
- buttons:[NSArray arrayWithObjects:UCLocalize("OK"), nil]
- defaultButtonIndex:0
- delegate:self
- context:@"alert"
- ] autorelease];
+- (void) webView:(WebView *)view didFailProvisionalLoadWithError:(NSError *)error forFrame:(WebFrame *)frame {
+#if LogBrowser
+ NSLog(@"didFailProvisionalLoadWithError:%@ forFrame:%@", error, frame);
+#endif
- [sheet setBodyText:message];
- [sheet popupAlertAnimated:YES];
+ [self _didFailWithError:error forFrame:frame];
}
-- (BOOL) webView:(WebView *)sender runJavaScriptConfirmPanelWithMessage:(NSString *)message initiatedByFrame:(WebFrame *)frame {
- if (![self _allowJavaScriptPanel])
- return NO;
- [self retain];
+- (void) webView:(WebView *)view didFinishLoadForFrame:(WebFrame *)frame {
+ [loading_ removeObject:[NSValue valueWithNonretainedObject:frame]];
- UIActionSheet *sheet = [[[UIActionSheet alloc]
- initWithTitle:nil
- buttons:[NSArray arrayWithObjects:UCLocalize("OK"), UCLocalize("CANCEL"), nil]
- defaultButtonIndex:0
- delegate:indirect_
- context:@"confirm"
- ] autorelease];
+ if ([frame parentFrame] == nil) {
+ if (DOMDocument *document = [frame DOMDocument])
+ if (DOMNodeList<NSFastEnumeration> *bodies = [document getElementsByTagName:@"body"])
+ for (DOMHTMLBodyElement *body in (id) bodies) {
+ DOMCSSStyleDeclaration *style([document getComputedStyle:body pseudoElement:nil]);
- [sheet setNumberOfRows:1];
- [sheet setBodyText:message];
- [sheet popupAlertAnimated:YES];
+ bool colored(false);
- NSRunLoop *loop([NSRunLoop currentRunLoop]);
- NSDate *future([NSDate distantFuture]);
+ if (DOMCSSPrimitiveValue *color = static_cast<DOMCSSPrimitiveValue *>([style getPropertyCSSValue:@"background-color"])) {
+ if ([color primitiveType] == DOM_CSS_RGBCOLOR) {
+ DOMRGBColor *rgb([color getRGBColorValue]);
- while (confirm_ == nil && [loop runMode:NSDefaultRunLoopMode beforeDate:future]);
+ float red([[rgb red] getFloatValue:DOM_CSS_NUMBER]);
+ float green([[rgb green] getFloatValue:DOM_CSS_NUMBER]);
+ float blue([[rgb blue] getFloatValue:DOM_CSS_NUMBER]);
+ float alpha([[rgb alpha] getFloatValue:DOM_CSS_NUMBER]);
- NSNumber *confirm([confirm_ autorelease]);
- confirm_ = nil;
+ UIColor *uic(nil);
- [self autorelease];
- return [confirm boolValue];
-}
+ if (red == 0xc7 && green == 0xce && blue == 0xd5)
+ uic = [UIColor groupTableViewBackgroundColor];
+ else if (alpha != 0)
+ uic = [UIColor
+ colorWithRed:(red / 255)
+ green:(green / 255)
+ blue:(blue / 255)
+ alpha:alpha
+ ];
-- (void) setAutoPopup:(BOOL)popup {
- popup_ = popup;
-}
+ if (uic != nil) {
+ colored = true;
+ [scroller_ setBackgroundColor:uic];
+ }
+ }
+ }
+
+ if (!colored)
+ [scroller_ setBackgroundColor:[UIColor groupTableViewBackgroundColor]];
+ break;
+ }
+ }
-- (void) setSpecial:(id)function {
- if (special_ != nil)
- [special_ autorelease];
- special_ = function == nil ? nil : [function retain];
+ [self _didFinishLoading];
}
-- (void) setButtonImage:(NSString *)button withStyle:(NSString *)style toFunction:(id)function {
- if (button_ != nil)
- [button_ autorelease];
- button_ = button == nil ? nil : [[UIImage imageWithData:[NSData dataWithContentsOfURL:[NSURL URLWithString:button]]] retain];
+- (void) webView:(WebView *)view didReceiveTitle:(NSString *)title forFrame:(WebFrame *)frame {
+ if ([frame parentFrame] != nil)
+ return;
- if (style_ != nil)
- [style_ autorelease];
- style_ = style == nil ? nil : [style retain];
+ title_ = [title retain];
+ [[self navigationItem] setTitle:title_];
+}
- if (function_ != nil)
- [function_ autorelease];
- function_ = function == nil ? nil : [function retain];
+- (void) webView:(WebView *)view didStartProvisionalLoadForFrame:(WebFrame *)frame {
+ [loading_ addObject:[NSValue valueWithNonretainedObject:frame]];
+
+ if ([frame parentFrame] == nil) {
+ CYRelease(title_);
+ CYRelease(custom_);
+ CYRelease(style_);
+ CYRelease(function_);
+ CYRelease(closer_);
+
+ // XXX: do we still need to do this?
+ [[self navigationItem] setTitle:nil];
+ }
- [self reloadButtons];
+ [self _didStartLoading];
}
-- (void) setButtonTitle:(NSString *)button withStyle:(NSString *)style toFunction:(id)function {
- if (button_ != nil)
- [button_ autorelease];
- button_ = button == nil ? nil : [button retain];
+- (NSURLRequest *) webView:(WebView *)view resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)response fromDataSource:(WebDataSource *)source {
+#if LogBrowser
+ NSLog(@"resource:%@ willSendRequest:%@ redirectResponse:%@ fromDataSource:%@", identifier, request, response, source);
+#endif
- if (style_ != nil)
- [style_ autorelease];
- style_ = style == nil ? nil : [style retain];
-
- if (function_ != nil)
- [function_ autorelease];
- function_ = function == nil ? nil : [function retain];
-
- [self reloadButtons];
-}
-
-- (void) setFinishHook:(id)function {
- if (finish_ != nil)
- [finish_ autorelease];
- finish_ = function == nil ? nil : [function retain];
-}
-
-- (void) setPopupHook:(id)function {
- if (closer_ != nil)
- [closer_ autorelease];
- closer_ = function == nil ? nil : [function retain];
-}
-
-- (void) _openMailToURL:(NSURL *)url {
- [UIApp openURL:url];// asPanel:YES];
+ return request;
}
-- (void) webView:(WebView *)sender willBeginEditingFormElement:(id)element {
- editing_ = true;
+- (bool) webView:(WebView *)view shouldRunJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WebFrame *)frame {
+ return [self _allowJavaScriptPanel];
}
-- (void) webView:(WebView *)sender didBeginEditingFormElement:(id)element {
- [self fixScroller];
+- (bool) webView:(WebView *)view shouldRunJavaScriptConfirmPanelWithMessage:(NSString *)message initiatedByFrame:(WebFrame *)frame {
+ return [self _allowJavaScriptPanel];
}
-- (void) webViewDidEndEditingFormElements:(WebView *)sender {
- editing_ = false;
- [self fixScroller];
+- (bool) webView:(WebView *)view shouldRunJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(NSString *)text initiatedByFrame:(WebFrame *)frame {
+ return [self _allowJavaScriptPanel];
}
-- (void) webViewClose:(WebView *)sender {
- [book_ close];
+- (void) webViewClose:(WebView *)view {
+ [self close];
}
+// }}}
- (void) close {
- [book_ close];
-}
-
-- (void) webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {
-}
-
-- (void) webView:(WebView *)sender unableToImplementPolicyWithError:(NSError *)error frame:(WebFrame *)frame {
- NSLog(@"err:%@", error);
-}
-
-- (void) webView:(WebView *)sender decidePolicyForNewWindowAction:(NSDictionary *)action request:(NSURLRequest *)request newFrameName:(NSString *)name decisionListener:(id<WebPolicyDecisionListener>)listener {
-#if LogBrowser
- NSLog(@"nwa:%@", name);
-#endif
-
- if (NSURL *url = [request URL]) {
- if (name == nil) unknown: {
- if (![self getSpecial:url swap:NO]) {
- NSString *scheme([[url scheme] lowercaseString]);
- if ([scheme isEqualToString:@"mailto"])
- [self _openMailToURL:url];
- else goto use;
- }
- } else if ([name isEqualToString:@"_open"])
- [delegate_ openURL:url];
- else if ([name isEqualToString:@"_popup"]) {
- NSString *scheme([[url scheme] lowercaseString]);
- if ([scheme isEqualToString:@"mailto"])
- [self _openMailToURL:url];
- else {
- RVBook *book([[[RVPopUpBook alloc] initWithFrame:[delegate_ popUpBounds]] autorelease]);
- [book setHook:indirect_];
-
- RVPage *page([delegate_ pageForURL:url hasTag:NULL]);
- if (page == nil) {
- /* XXX: call createWebViewWithRequest instead? */
-
- [self setBackButtonTitle:title_];
-
- BrowserView *browser([[[class_ alloc] initWithBook:book] autorelease]);
- [browser loadURL:url];
- page = browser;
- }
-
- [book setDelegate:delegate_];
- [page setDelegate:delegate_];
-
- [book setPage:page];
- [book_ pushBook:book];
- }
- } else goto unknown;
-
- [listener ignore];
- } else use:
- [listener use];
-}
-
-- (void) webView:(WebView *)sender decidePolicyForMIMEType:(NSString *)type request:(NSURLRequest *)request frame:(WebFrame *)frame decisionListener:(id<WebPolicyDecisionListener>)listener {
- if ([WebView canShowMIMEType:type])
- [listener use];
- else {
- // XXX: handle more mime types!
- [listener ignore];
-
- WebView *webview([webview_ webView]);
- if (frame == [webview mainFrame])
- [UIApp openURL:[request URL]];
- }
+ [[self navigationController] dismissModalViewControllerAnimated:YES];
}
-- (void) webView:(WebView *)sender decidePolicyForNavigationAction:(NSDictionary *)action request:(NSURLRequest *)request frame:(WebFrame *)frame decisionListener:(id<WebPolicyDecisionListener>)listener {
- if (request == nil) ignore: {
- [listener ignore];
- return;
- }
-
- NSURL *url([request URL]);
- NSString *host([url host]);
-
- if (url == nil) use: {
- if (!error_ && [frame parentFrame] == nil) {
- if (request_ != nil)
- [request_ autorelease];
- request_ = [request retain];
-#if LogBrowser
- NSLog(@"dpn:%@", request_);
-#endif
- }
-
- [listener use];
-
- WebView *webview([webview_ webView]);
- if (frame == [webview mainFrame])
- [self _pushPage];
- return;
- }
-#if LogBrowser
- else NSLog(@"nav:%@:%@", url, [action description]);
-#endif
-
- const NSArray *capability;
-
- if ($GSSystemCopyCapability != NULL) {
- capability = reinterpret_cast<const NSArray *>((*$GSSystemCopyCapability)(kGSDisplayIdentifiersCapability));
- capability = [capability autorelease];
- } else if ($GSSystemGetCapability != NULL) {
- capability = reinterpret_cast<const NSArray *>((*$GSSystemGetCapability)(kGSDisplayIdentifiersCapability));
- } else
- capability = nil;
-
- NSURL *open(nil);
-
- if (capability != nil && (
- [url isGoogleMapsURL] && [capability containsObject:@"com.apple.Maps"] && (open = [url mapsURL]) != nil||
- [host hasSuffix:@"youtube.com"] && [capability containsObject:@"com.apple.youtube"] && (open = [url youTubeURL]) != nil ||
- [url respondsToSelector:@selector(phobosURL)] && (open = [url phobosURL]) != nil
- )) {
- url = open;
- open:
- [UIApp openURL:url];
- goto ignore;
- }
-
- int store(_not(int));
- if (NSURL *itms = [url itmsURL:&store]) {
-#if LogBrowser
- NSLog(@"itms#%@#%u#%@", url, store, itms);
-#endif
-
- if (capability != nil && (
- store == 1 && [capability containsObject:@"com.apple.MobileStore"] ||
- store == 2 && [capability containsObject:@"com.apple.AppStore"]
- )) {
- url = itms;
- goto open;
- }
- }
-
- NSString *scheme([[url scheme] lowercaseString]);
-
- if ([scheme isEqualToString:@"tel"]) {
- // XXX: intelligence
- goto open;
- }
-
- if ([scheme isEqualToString:@"mailto"]) {
- [self _openMailToURL:url];
- goto ignore;
- }
-
- if ([self getSpecial:url swap:YES])
- goto ignore;
- else if ([WebView _canHandleRequest:request])
- goto use;
- else if ([url isSpringboardHandledURL])
- goto open;
- else
- goto use;
-}
+- (void) alertView:(UIAlertView *)alert clickedButtonAtIndex:(NSInteger)button {
+ NSString *context([alert context]);
-- (void) webView:(WebView *)sender setStatusText:(NSString *)text {
- //lprintf("Status:%s\n", [text UTF8String]);
-}
-
-- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
- NSString *context([sheet context]);
-
- if ([context isEqualToString:@"alert"]) {
- [self autorelease];
- [sheet dismiss];
- } else if ([context isEqualToString:@"confirm"]) {
- switch (button) {
- case 1:
- confirm_ = [NSNumber numberWithBool:YES];
- break;
-
- case 2:
- confirm_ = [NSNumber numberWithBool:NO];
- break;
- }
-
- [sheet dismiss];
- } else if ([context isEqualToString:@"sensitive"]) {
+ if ([context isEqualToString:@"sensitive"]) {
switch (button) {
case 1:
sensitive_ = [NSNumber numberWithBool:YES];
break;
}
- [sheet dismiss];
+ [alert dismissWithClickedButtonIndex:-1 animated:YES];
} else if ([context isEqualToString:@"challenge"]) {
id<NSURLAuthenticationChallengeSender> sender([challenge_ sender]);
switch (button) {
case 1: {
- NSString *username([[sheet textFieldAtIndex:0] text]);
- NSString *password([[sheet textFieldAtIndex:1] text]);
+ NSString *username([[alert textFieldAtIndex:0] text]);
+ NSString *password([[alert textFieldAtIndex:1] text]);
NSURLCredential *credential([NSURLCredential credentialWithUser:username password:password persistence:NSURLCredentialPersistenceForSession]);
[sender cancelAuthenticationChallenge:challenge_];
break;
- default:
- _assert(false);
+ _nodefault
}
[challenge_ release];
challenge_ = nil;
- [sheet dismiss];
+ [alert dismissWithClickedButtonIndex:-1 animated:YES];
} else if ([context isEqualToString:@"submit"]) {
switch (button) {
case 1:
}
break;
- default:
- _assert(false);
+ _nodefault
}
- [sheet dismiss];
+ [alert dismissWithClickedButtonIndex:-1 animated:YES];
}
}
-- (void) webView:(WebView *)sender resource:(id)identifier didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge fromDataSource:(WebDataSource *)source {
- challenge_ = [challenge retain];
-
- NSURLProtectionSpace *space([challenge protectionSpace]);
- NSString *realm([space realm]);
- if (realm == nil)
- realm = @"";
+- (UIBarButtonItemStyle) rightButtonStyle {
+ if (style_ == nil) normal:
+ return UIBarButtonItemStylePlain;
+ else if ([style_ isEqualToString:@"Normal"])
+ return UIBarButtonItemStylePlain;
+ else if ([style_ isEqualToString:@"Highlighted"])
+ return UIBarButtonItemStyleDone;
+ else goto normal;
+}
- UIActionSheet *sheet = [[[UIActionSheet alloc]
- initWithTitle:realm
- buttons:[NSArray arrayWithObjects:UCLocalize("LOGIN"), UCLocalize("CANCEL"), nil]
- defaultButtonIndex:0
- delegate:self
- context:@"challenge"
+- (UIBarButtonItem *) customButton {
+ return [[[UIBarButtonItem alloc]
+ initWithTitle:custom_
+ style:[self rightButtonStyle]
+ target:self
+ action:@selector(customButtonClicked)
] autorelease];
-
- [sheet setNumberOfRows:1];
-
- [sheet addTextFieldWithValue:@"" label:UCLocalize("USERNAME")];
- [sheet addTextFieldWithValue:@"" label:UCLocalize("PASSWORD")];
-
- UITextField *username([sheet textFieldAtIndex:0]); {
- UITextInputTraits *traits([username textInputTraits]);
- [traits setAutocapitalizationType:UITextAutocapitalizationTypeNone];
- [traits setAutocorrectionType:UITextAutocorrectionTypeNo];
- [traits setKeyboardType:UIKeyboardTypeASCIICapable];
- [traits setReturnKeyType:UIReturnKeyNext];
- }
-
- UITextField *password([sheet textFieldAtIndex:1]); {
- UITextInputTraits *traits([password textInputTraits]);
- [traits setAutocapitalizationType:UITextAutocapitalizationTypeNone];
- [traits setAutocorrectionType:UITextAutocorrectionTypeNo];
- [traits setKeyboardType:UIKeyboardTypeASCIICapable];
- // XXX: UIReturnKeyDone
- [traits setReturnKeyType:UIReturnKeyNext];
- [traits setSecureTextEntry:YES];
- }
-
- [sheet popupAlertAnimated:YES];
}
-- (NSURLRequest *) webView:(WebView *)sender resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse fromDataSource:(WebDataSource *)source {
- return request;
+- (UIBarButtonItem *) rightButton {
+ return reloaditem_;
}
-- (WebView *) webView:(WebView *)sender createWebViewWithRequest:(NSURLRequest *)request windowFeatures:(NSDictionary *)features {
-//- (WebView *) webView:(WebView *)sender createWebViewWithRequest:(NSURLRequest *)request userGesture:(BOOL)gesture {
-#if LogBrowser
- NSLog(@"cwv:%@ (%@): %@", request, title_, features == nil ? @"{}" : [features description]);
- //NSLog(@"cwv:%@ (%@): %@", request, title_, gesture ? @"Yes" : @"No");
-#endif
-
- NSNumber *value([features objectForKey:@"width"]);
- float width(value == nil ? 0 : [value floatValue]);
-
- RVBook *book(!popup_ ? book_ : [[[RVPopUpBook alloc] initWithFrame:[delegate_ popUpBounds]] autorelease]);
-
- /* XXX: deal with cydia:// pages */
- BrowserView *browser([[[class_ alloc] initWithBook:book forWidth:width] autorelease]);
-
- if (features != nil && popup_) {
- [book setDelegate:delegate_];
- [book setHook:indirect_];
- [browser setDelegate:delegate_];
-
- [browser loadRequest:request];
+- (void) applyLoadingTitle {
+ [[self navigationItem] setTitle:UCLocalize("LOADING")];
+}
- [book setPage:browser];
- [book_ pushBook:book];
- } else if (request == nil) {
- [self setBackButtonTitle:title_];
- [browser setDelegate:delegate_];
- [browser retain];
+- (void) applyRightButton {
+ if ([self isLoading]) {
+ [[self navigationItem] setRightBarButtonItem:loadingitem_ animated:YES];
+ // XXX: why do we do this again here?
+ [[loadingitem_ view] addSubview:indicator_];
+ [self applyLoadingTitle];
+ } else if (custom_ != nil) {
+ [[self navigationItem] setRightBarButtonItem:[self customButton] animated:YES];
} else {
- [self pushPage:browser];
- [browser loadRequest:request];
+ [[self navigationItem] setRightBarButtonItem:[self rightButton] animated:YES];
}
-
- return [browser webView];
}
-- (WebView *) webView:(WebView *)sender createWebViewWithRequest:(NSURLRequest *)request {
- return [self webView:sender createWebViewWithRequest:request windowFeatures:nil];
- //return [self webView:sender createWebViewWithRequest:request userGesture:YES];
+- (void) _didStartLoading {
+ [self applyRightButton];
}
-- (void) webView:(WebView *)sender didReceiveTitle:(NSString *)title forFrame:(WebFrame *)frame {
- if ([frame parentFrame] != nil)
+- (void) _didFinishLoading {
+ if ([loading_ count] != 0)
return;
- title_ = [title retain];
- [book_ reloadTitleForPage:self];
-}
-
-- (void) webView:(WebView *)sender didStartProvisionalLoadForFrame:(WebFrame *)frame {
- /*if ([loading_ count] == 0)
- [self retain];*/
- [loading_ addObject:[NSValue valueWithNonretainedObject:frame]];
-
- if ([frame parentFrame] == nil) {
- [webview_ resignFirstResponder];
-
- reloading_ = false;
-
- if (title_ != nil) {
- [title_ release];
- title_ = nil;
- }
-
- if (button_ != nil) {
- [button_ release];
- button_ = nil;
- }
-
- if (style_ != nil) {
- [style_ release];
- style_ = nil;
- }
-
- if (function_ != nil) {
- [function_ release];
- function_ = nil;
- }
-
- if (finish_ != nil) {
- [finish_ release];
- finish_ = nil;
- }
-
- if (closer_ != nil) {
- [closer_ release];
- closer_ = nil;
- }
-
- if (special_ != nil) {
- [special_ release];
- special_ = nil;
- }
-
- [book_ reloadTitleForPage:self];
-
- [scroller_ scrollPointVisibleAtTopLeft:CGPointZero];
-
- if ([scroller_ respondsToSelector:@selector(setZoomScale:duration:)])
- [scroller_ setZoomScale:1 duration:0];
- else if ([scroller_ respondsToSelector:@selector(_setZoomScale:duration:)])
- [scroller_ _setZoomScale:1 duration:0];
- /*else if ([scroller_ respondsToSelector:@selector(setZoomScale:animated:)])
- [scroller_ setZoomScale:1 animated:NO];*/
-
- CGRect webrect = [scroller_ bounds];
- webrect.size.height = 0;
- [webview_ setFrame:webrect];
- }
-
- [self reloadButtons];
-}
+ [self applyRightButton];
-- (void) _finishLoading {
- size_t count([loading_ count]);
- /*if (count == 0)
- [self autorelease];*/
- if (reloading_ || count != 0)
- return;
- if (finish_ != nil)
- [self callFunction:finish_];
- [self reloadButtons];
+ // XXX: wtf?
+ if (![self isLoading])
+ [[self navigationItem] setTitle:title_];
}
- (bool) isLoading {
return [loading_ count] != 0;
}
-- (void) reloadButtons {
- if ([self isLoading])
- [indicator_ startAnimation];
- else
- [indicator_ stopAnimation];
- [super reloadButtons];
-}
-
-- (BOOL) webView:(WebView *)sender shouldScrollToPoint:(struct CGPoint)point forFrame:(WebFrame *)frame {
- return [webview_ webView:sender shouldScrollToPoint:point forFrame:frame];
-}
-
-- (void) webView:(WebView *)sender didReceiveViewportArguments:(id)arguments forFrame:(WebFrame *)frame {
- return [webview_ webView:sender didReceiveViewportArguments:arguments forFrame:frame];
-}
-
-- (void) webView:(WebView *)sender needsScrollNotifications:(id)notifications forFrame:(WebFrame *)frame {
- return [webview_ webView:sender needsScrollNotifications:notifications forFrame:frame];
-}
-
-- (void) webView:(WebView *)sender didCommitLoadForFrame:(WebFrame *)frame {
- [self _pushPage];
- return [webview_ webView:sender didCommitLoadForFrame:frame];
-}
-
-- (void) webView:(WebView *)sender didReceiveDocTypeForFrame:(WebFrame *)frame {
- return [webview_ webView:sender didReceiveDocTypeForFrame:frame];
-}
-
-- (void) webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame {
- [loading_ removeObject:[NSValue valueWithNonretainedObject:frame]];
- [self _finishLoading];
-
- if ([frame parentFrame] == nil) {
- if (DOMDocument *document = [frame DOMDocument])
- if (DOMNodeList<NSFastEnumeration> *bodies = [document getElementsByTagName:@"body"])
- for (DOMHTMLBodyElement *body in bodies) {
- DOMCSSStyleDeclaration *style([document getComputedStyle:body pseudoElement:nil]);
-
- bool colored(false);
-
- if (DOMCSSPrimitiveValue *color = static_cast<DOMCSSPrimitiveValue *>([style getPropertyCSSValue:@"background-color"])) {
- if ([color primitiveType] == DOM_CSS_RGBCOLOR) {
- DOMRGBColor *rgb([color getRGBColorValue]);
-
- float red([[rgb red] getFloatValue:DOM_CSS_NUMBER]);
- float green([[rgb green] getFloatValue:DOM_CSS_NUMBER]);
- float blue([[rgb blue] getFloatValue:DOM_CSS_NUMBER]);
- float alpha([[rgb alpha] getFloatValue:DOM_CSS_NUMBER]);
-
- UIColor *uic(nil);
-
- if (red == 0xc7 && green == 0xce && blue == 0xd5)
- uic = [UIColor pinStripeColor];
- else if (alpha != 0)
- uic = [UIColor
- colorWithRed:(red / 255)
- green:(green / 255)
- blue:(blue / 255)
- alpha:alpha
- ];
+- (id) initWithWidth:(float)width ofClass:(Class)_class {
+ if ((self = [super init]) != nil) {
+ class_ = _class;
+ loading_ = [[NSMutableSet alloc] initWithCapacity:5];
- if (uic != nil) {
- colored = true;
- [scroller_ setBackgroundColor:uic];
- }
- }
- }
+ indirect_ = [[IndirectDelegate alloc] initWithDelegate:self];
- if (!colored)
- [scroller_ setBackgroundColor:[UIColor pinStripeColor]];
- break;
- }
- }
+ webview_ = [[[CYWebView alloc] initWithFrame:[[self view] bounds]] autorelease];
+ [webview_ setDelegate:self];
+ [self setView:webview_];
- return [webview_ webView:sender didFinishLoadForFrame:frame];
-}
+ if ([webview_ respondsToSelector:@selector(setDataDetectorTypes:)])
+ [webview_ setDataDetectorTypes:UIDataDetectorTypeAutomatic];
+ else
+ [webview_ setDetectsPhoneNumbers:NO];
-- (void) _didFailWithError:(NSError *)error forFrame:(WebFrame *)frame {
- _trace();
- /*if ([frame parentFrame] == nil)
- [self autorelease];*/
+ [webview_ setScalesPageToFit:YES];
- [loading_ removeObject:[NSValue valueWithNonretainedObject:frame]];
- [self _finishLoading];
+ UIWebDocumentView *document([webview_ _documentView]);
- if (reloading_)
- return;
+ // XXX: I think this improves scrolling; the hardcoded-ness sucks
+ [document setTileSize:CGSizeMake(320, 500)];
- if ([frame parentFrame] == nil) {
- [self loadURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@?%@",
- [[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"error" ofType:@"html"]] absoluteString],
- [[error localizedDescription] stringByAddingPercentEscapes]
- ]]];
+ [document setBackgroundColor:[UIColor clearColor]];
+ [document setDrawsBackground:NO];
- error_ = true;
- }
-}
+ WebView *webview([document webView]);
+ WebPreferences *preferences([webview preferences]);
-- (void) webView:(WebView *)sender didFailLoadWithError:(NSError *)error forFrame:(WebFrame *)frame {
- [self _didFailWithError:error forFrame:frame];
-}
+ // XXX: I have no clue if I actually /want/ this modification
+ if ([webview respondsToSelector:@selector(_setLayoutInterval:)])
+ [webview _setLayoutInterval:0];
+ else if ([preferences respondsToSelector:@selector(_setLayoutInterval:)])
+ [preferences _setLayoutInterval:0];
-- (void) webView:(WebView *)sender didFailProvisionalLoadWithError:(NSError *)error forFrame:(WebFrame *)frame {
- [self _didFailWithError:error forFrame:frame];
-}
+ [preferences setCacheModel:WebCacheModelDocumentBrowser];
+ [preferences setOfflineWebApplicationCacheEnabled:YES];
-- (void) webView:(WebView *)sender addMessageToConsole:(NSDictionary *)dictionary {
-#if LogBrowser || ForSaurik
- lprintf("Console:%s\n", [[dictionary description] UTF8String]);
-#endif
-}
+ if ([webview_ respondsToSelector:@selector(_scrollView)]) {
+ scroller_ = [webview_ _scrollView];
-/* XXX: fix this stupid include file
-- (void) webView:(WebView *)sender frame:(WebFrame *)frame exceededDatabaseQuotaForSecurityOrigin:(WebSecurityOrigin *)origin database:(NSString *)database {
- [origin setQuota:0x500000];
-}*/
+ [scroller_ setDirectionalLockEnabled:YES];
+ [scroller_ setDecelerationRate:CYScrollViewDecelerationRateNormal];
+ [scroller_ setDelaysContentTouches:NO];
-- (void) _setTileDrawingEnabled:(BOOL)enabled {
- //[webview_ setTileDrawingEnabled:enabled];
-}
+ [scroller_ setCanCancelContentTouches:YES];
+ } else if ([webview_ respondsToSelector:@selector(_scroller)]) {
+ UIScroller *scroller([webview_ _scroller]);
+ scroller_ = (UIScrollView *) scroller;
-- (void) setViewportWidth:(float)width {
- width_ = width != 0 ? width : [[self class] defaultWidth];
- [webview_ setViewportSize:CGSizeMake(width_, UIWebViewGrowsAndShrinksToFitHeight) forDocumentTypes:0x10];
-}
+ [scroller setDirectionalScrolling:YES];
+ // XXX: we might be better off /not/ setting this on older systems
+ [scroller setScrollDecelerationFactor:CYScrollViewDecelerationRateNormal]; /* 0.989324 */
+ [scroller setScrollHysteresis:0]; /* 8 */
-- (void) willStartGesturesInView:(UIView *)view forEvent:(GSEventRef)event {
- [self _setTileDrawingEnabled:NO];
-}
+ [scroller setThumbDetectionEnabled:NO];
-- (void) didFinishGesturesInView:(UIView *)view forEvent:(GSEventRef)event {
- [self _setTileDrawingEnabled:YES];
- [webview_ redrawScaledDocument];
-}
+ // use NO with UIApplicationUseLegacyEvents(YES)
+ [scroller setEventMode:YES];
-- (void) scrollerWillStartDragging:(UIScroller *)scroller {
- [self _setTileDrawingEnabled:NO];
-}
-
-- (void) scrollerDidEndDragging:(UIScroller *)scroller willSmoothScroll:(BOOL)smooth {
- [self _setTileDrawingEnabled:YES];
-}
-
-- (void) scrollerDidEndDragging:(UIScroller *)scroller {
- [self _setTileDrawingEnabled:YES];
-}
-
-- (id) initWithBook:(RVBook *)book forWidth:(float)width ofClass:(Class)_class {
- if ((self = [super initWithBook:book]) != nil) {
- class_ = _class;
- loading_ = [[NSMutableSet alloc] initWithCapacity:3];
- popup_ = false;
-
- struct CGRect bounds = [self bounds];
-
- scroller_ = [[UIScroller alloc] initWithFrame:bounds];
- [self addSubview:scroller_];
+ // XXX: this is handled by setBounces, right?
+ //[scroller setAllowsRubberBanding:YES];
+ }
[scroller_ setFixedBackgroundPattern:YES];
- [scroller_ setBackgroundColor:[UIColor pinStripeColor]];
-
- [scroller_ setScrollingEnabled:YES];
+ [scroller_ setBackgroundColor:[UIColor groupTableViewBackgroundColor]];
[scroller_ setClipsSubviews:YES];
- [scroller_ setAllowsRubberBanding:YES];
- [scroller_ setDelegate:self];
[scroller_ setBounces:YES];
- [scroller_ setScrollHysteresis:8];
- [scroller_ setThumbDetectionEnabled:NO];
- [scroller_ setDirectionalScrolling:YES];
- [scroller_ setScrollDecelerationFactor:0.99]; /* 0.989324 */
- [scroller_ setEventMode:YES];
- [scroller_ setShowBackgroundShadow:NO]; /* YES */
- [scroller_ setAllowsRubberBanding:YES]; /* Vertical */
- [scroller_ setAdjustForContentSizeChange:YES]; /* NO */
-
- CGRect webrect = [scroller_ bounds];
- webrect.size.height = 0;
-
- WebView *webview;
-
- WebThreadLock();
-
-#if RecycleWebViews
- webview_ = [Documents_ lastObject];
- if (webview_ != nil) {
- webview_ = [webview_ retain];
- webview = [webview_ webView];
- [Documents_ removeLastObject];
- [webview_ setFrame:webrect];
- } else {
-#else
- if (true) {
-#endif
- webview_ = [[UIWebDocumentView alloc] initWithFrame:webrect];
- webview = [webview_ webView];
-
- // XXX: this is terribly (too?) expensive
- //[webview_ setDrawsBackground:NO];
- [webview setPreferencesIdentifier:@"Cydia"];
-
- [webview_ setTileSize:CGSizeMake(webrect.size.width, 500)];
-
- if ([webview_ respondsToSelector:@selector(enableReachability)])
- [webview_ enableReachability];
-
- [webview_ setAllowsMessaging:YES];
-
- if ([webview_ respondsToSelector:@selector(useSelectionAssistantWithMode:)])
- [webview_ useSelectionAssistantWithMode:0];
-
- [webview_ setTilingEnabled:YES];
- [webview_ setDrawsGrid:NO];
- [webview_ setLogsTilingChanges:NO];
- [webview_ setTileMinificationFilter:kCAFilterNearest];
-
- if ([webview_ respondsToSelector:@selector(setDataDetectorTypes:)])
- /* XXX: abstractify */
- [webview_ setDataDetectorTypes:0x80000000];
- else
- [webview_ setDetectsPhoneNumbers:NO];
-
- [webview_ setAutoresizes:YES];
-
- [webview_ setMinimumScale:0.25f forDocumentTypes:0x10];
- [webview_ setMaximumScale:5.00f forDocumentTypes:0x10];
- [webview_ setInitialScale:UIWebViewScalesToFitScale forDocumentTypes:0x10];
- //[webview_ setViewportSize:CGSizeMake(980, UIWebViewGrowsAndShrinksToFitHeight) forDocumentTypes:0x10];
-
- [webview_ setViewportSize:CGSizeMake(320, UIWebViewGrowsAndShrinksToFitHeight) forDocumentTypes:0x2];
-
- [webview_ setMinimumScale:1.00f forDocumentTypes:0x8];
- [webview_ setInitialScale:UIWebViewScalesToFitScale forDocumentTypes:0x8];
- [webview_ setViewportSize:CGSizeMake(320, UIWebViewGrowsAndShrinksToFitHeight) forDocumentTypes:0x8];
-
- [webview_ _setDocumentType:0x4];
-
- if ([webview_ respondsToSelector:@selector(UIWebDocumentView:)])
- [webview_ setZoomsFocusedFormControl:YES];
- [webview_ setContentsPosition:7];
- [webview_ setEnabledGestures:0xa];
- [webview_ setValue:[NSNumber numberWithBool:YES] forGestureAttribute:UIGestureAttributeIsZoomRubberBandEnabled];
- [webview_ setValue:[NSNumber numberWithBool:YES] forGestureAttribute:UIGestureAttributeUpdatesScroller];
-
- [webview_ setSmoothsFonts:YES];
- [webview_ setAllowsImageSheet:YES];
- [webview _setUsesLoaderCache:YES];
-
- [webview setGroupName:@"CydiaGroup"];
-
- WebPreferences *preferences([webview preferences]);
-
- if ([webview respondsToSelector:@selector(_setLayoutInterval:)])
- [webview _setLayoutInterval:0];
- else
- [preferences _setLayoutInterval:0];
- }
+ [scroller_ setScrollingEnabled:YES];
+ [scroller_ setShowBackgroundShadow:NO];
[self setViewportWidth:width];
- [webview_ setDelegate:self];
- [webview_ setGestureDelegate:self];
- [webview_ setFormEditingDelegate:self];
- [webview_ setInteractionDelegate:self];
-
- [scroller_ addSubview:webview_];
-
- //NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
-
- indirect_ = [[IndirectDelegate alloc] initWithDelegate:self];
+ reloaditem_ = [[UIBarButtonItem alloc]
+ initWithTitle:UCLocalize("RELOAD")
+ style:[self rightButtonStyle]
+ target:self
+ action:@selector(reloadButtonClicked)
+ ];
- [webview setFrameLoadDelegate:indirect_];
- [webview setPolicyDelegate:indirect_];
- [webview setResourceLoadDelegate:indirect_];
- [webview setUIDelegate:indirect_];
-
- /* XXX: do not turn this on under penalty of extreme pain */
- [webview setScriptDebugDelegate:nil];
-
- WebThreadUnlock();
+ loadingitem_ = [[UIBarButtonItem alloc]
+ initWithTitle:@" "
+ style:UIBarButtonItemStylePlain
+ target:self
+ action:@selector(reloadButtonClicked)
+ ];
CGSize indsize = [UIProgressIndicator defaultSizeForStyle:UIProgressIndicatorStyleMediumWhite];
- indicator_ = [[UIProgressIndicator alloc] initWithFrame:CGRectMake(281, 12, indsize.width, indsize.height)];
+ indicator_ = [[UIProgressIndicator alloc] initWithFrame:CGRectMake(15, 5, indsize.width, indsize.height)];
[indicator_ setStyle:UIProgressIndicatorStyleMediumWhite];
+ [indicator_ startAnimation];
+ [[loadingitem_ view] addSubview:indicator_];
- [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
- [scroller_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
-
- /*UIWebView *test([[[UIWebView alloc] initWithFrame:[self bounds]] autorelease]);
- [test loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"http://www.saurik.com/"]]];
- [self addSubview:test];*/
+ [webview_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)];
+ [indicator_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin];
} return self;
}
-- (id) initWithBook:(RVBook *)book forWidth:(float)width {
- return [self initWithBook:book forWidth:width ofClass:[self class]];
+- (id) initWithWidth:(float)width {
+ return [self initWithWidth:width ofClass:[self class]];
}
-- (id) initWithBook:(RVBook *)book {
- return [self initWithBook:book forWidth:0];
+- (id) init {
+ return [self initWithWidth:0];
}
-- (NSString *) stringByEvaluatingJavaScriptFromString:(NSString *)script {
- WebThreadLock();
- WebView *webview([webview_ webView]);
- NSString *string([webview stringByEvaluatingJavaScriptFromString:script]);
- WebThreadUnlock();
- return string;
+- (void) didDismissModalViewController {
+ if (closer_ != nil)
+ [self callFunction:closer_];
}
- (void) callFunction:(WebScriptObject *)function {
WebThreadLock();
- WebView *webview([webview_ webView]);
+ WebView *webview([[webview_ _documentView] webView]);
WebFrame *frame([webview mainFrame]);
+ WebPreferences *preferences([webview preferences]);
+
+ bool maybe([preferences javaScriptCanOpenWindowsAutomatically]);
+ [preferences setJavaScriptCanOpenWindowsAutomatically:NO];
- id _private(MSHookIvar<id>(webview, "_private"));
+ /*id _private(MSHookIvar<id>(webview, "_private"));
WebCore::Page *page(_private == nil ? NULL : MSHookIvar<WebCore::Page *>(_private, "page"));
WebCore::Settings *settings(page == NULL ? NULL : page->settings());
else {
no = settings->JavaScriptCanOpenWindowsAutomatically();
settings->setJavaScriptCanOpenWindowsAutomatically(true);
- }
+ }*/
- if (UIWindow *window = [self window])
+ if (UIWindow *window = [[self view] window])
if (UIResponder *responder = [window firstResponder])
[responder resignFirstResponder];
JSGlobalContextRef context([frame globalContext]);
JSObjectCallAsFunction(context, object, NULL, 0, NULL, NULL);
- if (settings != NULL)
- settings->setJavaScriptCanOpenWindowsAutomatically(no);
+ /*if (settings != NULL)
+ settings->setJavaScriptCanOpenWindowsAutomatically(no);*/
+
+ [preferences setJavaScriptCanOpenWindowsAutomatically:maybe];
WebThreadUnlock();
}
-- (void) didCloseBook:(RVBook *)book {
- if (closer_ != nil)
- [self callFunction:closer_];
+- (void) reloadButtonClicked {
+ [self reloadURL];
}
-- (void) __rightButtonClicked {
- reloading_ = true;
- [self reloadURL];
+- (void) _customButtonClicked {
+ [self reloadButtonClicked];
}
-- (void) _rightButtonClicked {
+- (void) customButtonClicked {
#if !AlwaysReload
if (function_ != nil)
[self callFunction:function_];
else
#endif
- [self __rightButtonClicked];
-}
-
-- (id) _rightButtonTitle {
- return UCLocalize("RELOAD");
-}
-
-- (id) rightButtonTitle {
- return [self isLoading] ? @"" : button_ != nil ? button_ : [self _rightButtonTitle];
-}
-
-- (UINavigationButtonStyle) rightButtonStyle {
- if (style_ == nil) normal:
- return UINavigationButtonStyleNormal;
- else if ([style_ isEqualToString:@"Normal"])
- return UINavigationButtonStyleNormal;
- else if ([style_ isEqualToString:@"Back"])
- return UINavigationButtonStyleBack;
- else if ([style_ isEqualToString:@"Highlighted"])
- return UINavigationButtonStyleHighlighted;
- else if ([style_ isEqualToString:@"Destructive"])
- return UINavigationButtonStyleDestructive;
- else goto normal;
-}
-
-- (NSString *) title {
- return title_ == nil ? UCLocalize("LOADING") : title_;
-}
-
-- (NSString *) backButtonTitle {
- return UCLocalize("BROWSER");
-}
-
-- (void) setPageActive:(BOOL)active {
- if (!active)
- [indicator_ removeFromSuperview];
- else
- [[book_ navigationBar] addSubview:indicator_];
-}
-
-- (void) resetViewAnimated:(BOOL)animated {
-}
-
-- (void) setPushed:(bool)pushed {
- pushed_ = pushed;
+ [self _customButtonClicked];
}
+ (float) defaultWidth {
projects / cydia.git / blobdiff