#include <WebCore/WebCoreThread.h>
+#include <WebKit/WebKitErrors.h>
#include <WebKit/WebPreferences.h>
#include <WebKit/DOMCSSPrimitiveValue.h>
#include <WebKit/DOMHTMLBodyElement.h>
#include <WebKit/DOMRGBColor.h>
+#include <dlfcn.h>
+#include <objc/runtime.h>
+
#define ForSaurik 0
#define DefaultTimeout_ 120.0
// XXX: centralize these special class things to some file or mechanism?
static Class $MFMailComposeViewController;
-template <typename Type_>
-static inline void CYRelease(Type_ &value) {
- if (value != nil) {
- [value release];
- value = nil;
- }
-}
-
float CYScrollViewDecelerationRateNormal;
@interface WebView (Apple)
NSLog(@"[CyteWebViewController dealloc]");
#endif
- [webview_ setDelegate:nil];
-
- [indirect_ setDelegate:nil];
- [indirect_ release];
-
- if (challenge_ != nil)
- [challenge_ release];
-
- if (title_ != nil)
- [title_ release];
-
if ([loading_ count] != 0)
[delegate_ releaseNetworkActivityIndicator];
- [loading_ release];
- [reloaditem_ release];
- [loadingitem_ release];
+ [super dealloc];
+}
- [indicator_ release];
+- (NSString *) description {
+ return [NSString stringWithFormat:@"<%s: %p, %@>", class_getName([self class]), self, [[request_ URL] absoluteString]];
+}
- [super dealloc];
+- (CyteWebView *) webView {
+ return (CyteWebView *) [self view];
}
- (NSURL *) URLWithURL:(NSURL *)url {
#endif
error_ = false;
+ ready_ = true;
WebThreadLocked lock;
- [webview_ loadRequest:request];
+ [[self webView] loadRequest:request];
}
- (void) reloadURLWithCache:(BOOL)cache {
- (void) reloadData {
[super reloadData];
- [self reloadURLWithCache:YES];
+
+ if (ready_)
+ [self dispatchEvent:@"CydiaReloadData"];
+ else
+ [self reloadURLWithCache:YES];
}
- (void) setButtonImage:(NSString *)button withStyle:(NSString *)style toFunction:(id)function {
}
- (void) _setViewportWidth {
- [[webview_ _documentView] setViewportSize:CGSizeMake(width_, UIWebViewGrowsAndShrinksToFitHeight) forDocumentTypes:0x10];
+ [[[self webView] _documentView] setViewportSize:CGSizeMake(width_, UIWebViewGrowsAndShrinksToFitHeight) forDocumentTypes:0x10];
}
- (void) setViewportWidth:(float)width {
[self dismissModalViewControllerAnimated:YES];
}
+- (void) _setupMail:(MFMailComposeViewController *)controller {
+}
+
- (void) _openMailToURL:(NSURL *)url {
if ($MFMailComposeViewController != nil && [$MFMailComposeViewController canSendMail]) {
MFMailComposeViewController *controller([[[$MFMailComposeViewController alloc] init] autorelease]);
[controller setMailToURL:url];
+ [self _setupMail:controller];
+
[self presentModalViewController:controller animated:YES];
return;
}
if ([[error domain] isEqualToString:NSURLErrorDomain] && [error code] == NSURLErrorCancelled)
return;
+ if ([[error domain] isEqualToString:WebKitErrorDomain] && [error code] == WebKitErrorFrameLoadInterruptedByPolicyChange) {
+ request_ = stage2_;
+ stage1_ = nil;
+ stage2_ = nil;
+ return;
+ }
+
if ([frame parentFrame] == nil) {
[self loadURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@?%@",
[[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"error" ofType:@"html"]] absoluteString],
action:@selector(close)
] autorelease]];
- [delegate_ unloadData];
-
[[self navigationController] presentModalViewController:navigation animated:YES];
}
}
// CyteWebViewDelegate {{{
- (void) webView:(WebView *)view addMessageToConsole:(NSDictionary *)message {
#if LogMessages
- static Pcre irritating("^(?:The page at .* displayed insecure content from .*\\.|Unsafe JavaScript attempt to access frame with URL .* from frame with URL .*\\. Domains, protocols and ports must match\\.)\\n$");
+ static Pcre irritating("^(?"
+ ":" "The page at .* displayed insecure content from .*\\."
+ "|" "Unsafe JavaScript attempt to access frame with URL .* from frame with URL .*\\. Domains, protocols and ports must match\\."
+ ")\\n$");
+
if (NSString *data = [message objectForKey:@"message"])
if (irritating(data))
return;
}
- (void) webView:(WebView *)view didDecidePolicy:(CYWebPolicyDecision)decision forNavigationAction:(NSDictionary *)action request:(NSURLRequest *)request frame:(WebFrame *)frame {
- if (decision == CYWebPolicyDecisionUse && !error_)
- request_ = request;
+ if ([frame parentFrame] == nil)
+ if (decision == CYWebPolicyDecisionUse)
+ if (!error_) {
+ stage1_ = request_;
+ request_ = request;
+ }
}
- (void) webView:(WebView *)view decidePolicyForNewWindowAction:(NSDictionary *)action request:(NSURLRequest *)request newFrameName:(NSString *)frame decisionListener:(id<WebPolicyDecisionListener>)listener {
[loading_ removeObject:[NSValue valueWithNonretainedObject:frame]];
if ([frame parentFrame] == nil) {
+ stage1_ = nil;
+ stage2_ = nil;
+
if (DOMDocument *document = [frame DOMDocument])
if (DOMNodeList<NSFastEnumeration> *bodies = [document getElementsByTagName:@"body"])
for (DOMHTMLBodyElement *body in (id) bodies) {
if ([frame parentFrame] != nil)
return;
- if (title_ != nil)
- [title_ autorelease];
- title_ = [title retain];
+ title_ = title;
[[self navigationItem] setTitle:title_];
}
- (void) webView:(WebView *)view didStartProvisionalLoadForFrame:(WebFrame *)frame {
+#if LogBrowser
+ NSLog(@"didStartProvisionalLoadForFrame:%@", frame);
+#endif
+
[loading_ addObject:[NSValue valueWithNonretainedObject:frame]];
if ([frame parentFrame] == nil) {
- CYRelease(title_);
+ title_ = nil;
custom_ = nil;
style_ = nil;
function_ = nil;
+ allowsNavigationAction_ = true;
+
+ stage2_ = stage1_;
+ stage1_ = nil;
+
[self setHidesNavigationBar:NO];
// XXX: do we still need to do this?
_nodefault
}
- [challenge_ release];
challenge_ = nil;
[alert dismissWithClickedButtonIndex:-1 animated:YES];
} else if (button == [alert firstOtherButtonIndex]) {
if (request_ != nil) {
WebThreadLocked lock;
- [webview_ loadRequest:request_];
+ [[self webView] loadRequest:request_];
}
}
else if (button == (UIBarButtonItem *) [NSNull null])
button = nil;
- [[self navigationItem] setRightBarButtonItem:button];
+ [[self navigationItem] setRightBarButtonItem:button animated:YES];
}
}
- (id) initWithWidth:(float)width ofClass:(Class)_class {
if ((self = [super init]) != nil) {
+ width_ = width;
+ class_ = _class;
+
allowsNavigationAction_ = true;
- class_ = _class;
- loading_ = [[NSMutableSet alloc] initWithCapacity:5];
+ loading_ = [NSMutableSet setWithCapacity:5];
+ indirect_ = [[[IndirectDelegate alloc] initWithDelegate:self] autorelease];
- indirect_ = [[IndirectDelegate alloc] initWithDelegate:self];
+ reloaditem_ = [[[UIBarButtonItem alloc]
+ initWithTitle:UCLocalize("RELOAD")
+ style:[self rightButtonStyle]
+ target:self
+ action:@selector(reloadButtonClicked)
+ ] autorelease];
- CGRect bounds([[self view] bounds]);
+ loadingitem_ = [[[UIBarButtonItem alloc]
+ initWithTitle:@" "
+ style:UIBarButtonItemStylePlain
+ target:self
+ action:@selector(reloadButtonClicked)
+ ] autorelease];
- webview_ = [[[CyteWebView alloc] initWithFrame:bounds] autorelease];
- [webview_ setDelegate:self];
- [self setView:webview_];
+ indicator_ = [[[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhite] autorelease];
+ [indicator_ setFrame:CGRectMake(15, 5, [indicator_ frame].size.width, [indicator_ frame].size.height)];
+ [indicator_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin];
- if ([webview_ respondsToSelector:@selector(setDataDetectorTypes:)])
- [webview_ setDataDetectorTypes:UIDataDetectorTypeAutomatic];
- else
- [webview_ setDetectsPhoneNumbers:NO];
+ [self applyLeftButton];
+ [self applyRightButton];
+ } return self;
+}
+
+- (NSString *) applicationNameForUserAgent {
+ return nil;
+}
+
+- (void) loadView {
+ CGRect bounds([[UIScreen mainScreen] applicationFrame]);
+
+ webview_ = [[[CyteWebView alloc] initWithFrame:bounds] autorelease];
+ [webview_ setDelegate:self];
+ [self setView:webview_];
+
+ if ([webview_ respondsToSelector:@selector(setDataDetectorTypes:)])
+ [webview_ setDataDetectorTypes:UIDataDetectorTypeAutomatic];
+ else
+ [webview_ setDetectsPhoneNumbers:NO];
- [webview_ setScalesPageToFit:YES];
+ [webview_ setScalesPageToFit:YES];
- UIWebDocumentView *document([webview_ _documentView]);
+ UIWebDocumentView *document([webview_ _documentView]);
- // XXX: I think this improves scrolling; the hardcoded-ness sucks
- [document setTileSize:CGSizeMake(320, 500)];
+ // XXX: I think this improves scrolling; the hardcoded-ness sucks
+ [document setTileSize:CGSizeMake(320, 500)];
- [document setBackgroundColor:[UIColor clearColor]];
+ [document setBackgroundColor:[UIColor clearColor]];
- // XXX: this is terribly (too?) expensive
- [document setDrawsBackground:NO];
+ // XXX: this is terribly (too?) expensive
+ [document setDrawsBackground:NO];
- WebView *webview([document webView]);
- WebPreferences *preferences([webview preferences]);
+ WebView *webview([document webView]);
+ WebPreferences *preferences([webview preferences]);
- // 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];
+ // 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];
- [preferences setCacheModel:WebCacheModelDocumentBrowser];
- [preferences setJavaScriptCanOpenWindowsAutomatically:YES];
- [preferences setOfflineWebApplicationCacheEnabled:YES];
+ [preferences setCacheModel:WebCacheModelDocumentBrowser];
+ [preferences setJavaScriptCanOpenWindowsAutomatically:YES];
+ [preferences setOfflineWebApplicationCacheEnabled:YES];
+
+ if (NSString *agent = [self applicationNameForUserAgent])
+ [webview setApplicationNameForUserAgent:agent];
+
+ if ([webview respondsToSelector:@selector(setShouldUpdateWhileOffscreen:)])
+ [webview setShouldUpdateWhileOffscreen:NO];
#if LogMessages
- if ([document respondsToSelector:@selector(setAllowsMessaging:)])
- [document setAllowsMessaging:YES];
- if ([webview respondsToSelector:@selector(_setAllowsMessaging:)])
- [webview _setAllowsMessaging:YES];
+ if ([document respondsToSelector:@selector(setAllowsMessaging:)])
+ [document setAllowsMessaging:YES];
+ if ([webview respondsToSelector:@selector(_setAllowsMessaging:)])
+ [webview _setAllowsMessaging:YES];
#endif
- if ([webview_ respondsToSelector:@selector(_scrollView)]) {
- scroller_ = [webview_ _scrollView];
+ if ([webview_ respondsToSelector:@selector(_scrollView)]) {
+ scroller_ = [webview_ _scrollView];
- [scroller_ setDirectionalLockEnabled:YES];
- [scroller_ setDecelerationRate:CYScrollViewDecelerationRateNormal];
- [scroller_ setDelaysContentTouches:NO];
+ [scroller_ setDirectionalLockEnabled:YES];
+ [scroller_ setDecelerationRate:CYScrollViewDecelerationRateNormal];
+ [scroller_ setDelaysContentTouches:NO];
- [scroller_ setCanCancelContentTouches:YES];
- } else if ([webview_ respondsToSelector:@selector(_scroller)]) {
- UIScroller *scroller([webview_ _scroller]);
- scroller_ = (UIScrollView *) scroller;
+ [scroller_ setCanCancelContentTouches:YES];
+ } else if ([webview_ respondsToSelector:@selector(_scroller)]) {
+ UIScroller *scroller([webview_ _scroller]);
+ scroller_ = (UIScrollView *) scroller;
- [scroller setDirectionalScrolling:YES];
- // XXX: we might be better off /not/ setting this on older systems
- [scroller setScrollDecelerationFactor:CYScrollViewDecelerationRateNormal]; /* 0.989324 */
- [scroller setScrollHysteresis:0]; /* 8 */
+ [scroller setDirectionalScrolling:YES];
+ // XXX: we might be better off /not/ setting this on older systems
+ [scroller setScrollDecelerationFactor:CYScrollViewDecelerationRateNormal]; /* 0.989324 */
+ [scroller setScrollHysteresis:0]; /* 8 */
- [scroller setThumbDetectionEnabled:NO];
+ [scroller setThumbDetectionEnabled:NO];
- // use NO with UIApplicationUseLegacyEvents(YES)
- [scroller setEventMode:YES];
+ // use NO with UIApplicationUseLegacyEvents(YES)
+ [scroller setEventMode:YES];
- // XXX: this is handled by setBounces, right?
- //[scroller setAllowsRubberBanding:YES];
- }
+ // XXX: this is handled by setBounces, right?
+ //[scroller setAllowsRubberBanding:YES];
+ }
- [scroller_ setFixedBackgroundPattern:YES];
- [scroller_ setBackgroundColor:[UIColor clearColor]];
- [scroller_ setClipsSubviews:YES];
+ [scroller_ setFixedBackgroundPattern:YES];
+ [scroller_ setBackgroundColor:[UIColor clearColor]];
+ [scroller_ setClipsSubviews:YES];
- [scroller_ setBounces:YES];
- [scroller_ setScrollingEnabled:YES];
- [scroller_ setShowBackgroundShadow:NO];
+ [scroller_ setBounces:YES];
+ [scroller_ setScrollingEnabled:YES];
+ [scroller_ setShowBackgroundShadow:NO];
- [self setViewportWidth:width];
+ [self setViewportWidth:width_];
- reloaditem_ = [[UIBarButtonItem alloc]
- initWithTitle:UCLocalize("RELOAD")
- style:[self rightButtonStyle]
- target:self
- action:@selector(reloadButtonClicked)
- ];
+ UITableView *table([[[UITableView alloc] initWithFrame:[webview_ bounds] style:UITableViewStyleGrouped] autorelease]);
+ [webview_ insertSubview:table atIndex:0];
- loadingitem_ = [[UIBarButtonItem alloc]
- initWithTitle:@" "
- style:UIBarButtonItemStylePlain
- target:self
- action:@selector(reloadButtonClicked)
- ];
+ [table setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)];
+ [webview_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)];
- indicator_ = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhite];
- [indicator_ setFrame:CGRectMake(15, 5, [indicator_ frame].size.width, [indicator_ frame].size.height)];
+ ready_ = false;
+}
- UITableView *table([[[UITableView alloc] initWithFrame:bounds style:UITableViewStyleGrouped] autorelease]);
- [webview_ insertSubview:table atIndex:0];
+- (void) releaseSubviews {
+ webview_ = nil;
+ scroller_ = nil;
- [self applyLeftButton];
- [self applyRightButton];
-
- [table setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)];
- [webview_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)];
- [indicator_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin];
- } return self;
+ [super releaseSubviews];
}
- (id) initWithWidth:(float)width {
- (void) callFunction:(WebScriptObject *)function {
WebThreadLocked lock;
- WebView *webview([[webview_ _documentView] webView]);
+ WebView *webview([[[self webView] _documentView] webView]);
WebFrame *frame([webview mainFrame]);
JSGlobalContextRef context([frame globalContext]);
}
- (void) dispatchEvent:(NSString *)event {
- [webview_ dispatchEvent:event];
+ [[self webView] dispatchEvent:event];
}
- (bool) hidesNavigationBar {
projects / cydia.git / blobdiff