X-Git-Url: https://git.saurik.com/cydia.git/blobdiff_plain/7b33d20196938812433b59a8b8d6ebaf4758df40..2925cbba739b54942aecf6e5316c27a021445ae3:/CyteKit/WebViewController.mm diff --git a/CyteKit/WebViewController.mm b/CyteKit/WebViewController.mm index 496d8b21..76379fb6 100644 --- a/CyteKit/WebViewController.mm +++ b/CyteKit/WebViewController.mm @@ -25,6 +25,9 @@ extern NSString * const kCAFilterNearest; #include #include +#include +#include + #define ForSaurik 0 #define DefaultTimeout_ 120.0 @@ -138,15 +141,16 @@ float CYScrollViewDecelerationRateNormal; NSLog(@"[CyteWebViewController dealloc]"); #endif - [webview_ setDelegate:nil]; - [indirect_ setDelegate:nil]; - if ([loading_ count] != 0) [delegate_ releaseNetworkActivityIndicator]; [super dealloc]; } +- (CyteWebView *) webView { + return (CyteWebView *) [self view]; +} + - (NSURL *) URLWithURL:(NSURL *)url { return url; } @@ -178,9 +182,10 @@ float CYScrollViewDecelerationRateNormal; #endif error_ = false; + ready_ = true; WebThreadLocked lock; - [webview_ loadRequest:request]; + [[self webView] loadRequest:request]; } - (void) reloadURLWithCache:(BOOL)cache { @@ -216,7 +221,11 @@ float CYScrollViewDecelerationRateNormal; - (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 { @@ -252,7 +261,7 @@ float CYScrollViewDecelerationRateNormal; } - (void) _setViewportWidth { - [[webview_ _documentView] setViewportSize:CGSizeMake(width_, UIWebViewGrowsAndShrinksToFitHeight) forDocumentTypes:0x10]; + [[[self webView] _documentView] setViewportSize:CGSizeMake(width_, UIWebViewGrowsAndShrinksToFitHeight) forDocumentTypes:0x10]; } - (void) setViewportWidth:(float)width { @@ -276,6 +285,9 @@ float CYScrollViewDecelerationRateNormal; [self dismissModalViewControllerAnimated:YES]; } +- (void) _setupMail:(MFMailComposeViewController *)controller { +} + - (void) _openMailToURL:(NSURL *)url { if ($MFMailComposeViewController != nil && [$MFMailComposeViewController canSendMail]) { MFMailComposeViewController *controller([[[$MFMailComposeViewController alloc] init] autorelease]); @@ -283,6 +295,8 @@ float CYScrollViewDecelerationRateNormal; [controller setMailToURL:url]; + [self _setupMail:controller]; + [self presentModalViewController:controller animated:YES]; return; } @@ -324,7 +338,7 @@ float CYScrollViewDecelerationRateNormal; return; if ([[error domain] isEqualToString:WebKitErrorDomain] && [error code] == WebKitErrorFrameLoadInterruptedByPolicyChange) { - request_ = (id) stage2_; + request_ = stage2_; stage1_ = nil; stage2_ = nil; return; @@ -370,8 +384,6 @@ float CYScrollViewDecelerationRateNormal; action:@selector(close) ] autorelease]]; - [delegate_ unloadData]; - [[self navigationController] presentModalViewController:navigation animated:YES]; } } @@ -414,7 +426,7 @@ float CYScrollViewDecelerationRateNormal; if ([frame parentFrame] == nil) if (decision == CYWebPolicyDecisionUse) if (!error_) { - stage1_ = (id) request_; + stage1_ = request_; request_ = request; } } @@ -525,7 +537,9 @@ float CYScrollViewDecelerationRateNormal; style_ = nil; function_ = nil; - stage2_ = (id) stage1_; + allowsNavigationAction_ = true; + + stage2_ = stage1_; stage1_ = nil; [self setHidesNavigationBar:NO]; @@ -609,7 +623,7 @@ float CYScrollViewDecelerationRateNormal; } else if (button == [alert firstOtherButtonIndex]) { if (request_ != nil) { WebThreadLocked lock; - [webview_ loadRequest:request_]; + [[self webView] loadRequest:request_]; } } @@ -691,7 +705,7 @@ float CYScrollViewDecelerationRateNormal; else if (button == (UIBarButtonItem *) [NSNull null]) button = nil; - [[self navigationItem] setRightBarButtonItem:button]; + [[self navigationItem] setRightBarButtonItem:button animated:YES]; } } @@ -730,119 +744,141 @@ float CYScrollViewDecelerationRateNormal; - (id) initWithWidth:(float)width ofClass:(Class)_class { if ((self = [super init]) != nil) { + width_ = width; + class_ = _class; + allowsNavigationAction_ = true; - class_ = _class; loading_ = [NSMutableSet setWithCapacity:5]; - indirect_ = [[[IndirectDelegate alloc] initWithDelegate:self] autorelease]; - CGRect bounds([[self view] bounds]); + reloaditem_ = [[[UIBarButtonItem alloc] + initWithTitle:UCLocalize("RELOAD") + style:[self rightButtonStyle] + target:self + action:@selector(reloadButtonClicked) + ] autorelease]; - webview_ = [[[CyteWebView alloc] initWithFrame:bounds] autorelease]; - [webview_ setDelegate:self]; - [self setView:webview_]; + loadingitem_ = [[[UIBarButtonItem alloc] + initWithTitle:@" " + style:UIBarButtonItemStylePlain + target:self + action:@selector(reloadButtonClicked) + ] autorelease]; - if ([webview_ respondsToSelector:@selector(setDataDetectorTypes:)]) - [webview_ setDataDetectorTypes:UIDataDetectorTypeAutomatic]; - else - [webview_ setDetectsPhoneNumbers:NO]; + indicator_ = [[[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhite] autorelease]; + [indicator_ setFrame:CGRectMake(15, 5, [indicator_ frame].size.width, [indicator_ frame].size.height)]; + [indicator_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin]; - [webview_ setScalesPageToFit:YES]; + [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]; - UIWebDocumentView *document([webview_ _documentView]); + [webview_ setScalesPageToFit:YES]; - // XXX: I think this improves scrolling; the hardcoded-ness sucks - [document setTileSize:CGSizeMake(320, 500)]; + UIWebDocumentView *document([webview_ _documentView]); - [document setBackgroundColor:[UIColor clearColor]]; + // XXX: I think this improves scrolling; the hardcoded-ness sucks + [document setTileSize:CGSizeMake(320, 500)]; - // XXX: this is terribly (too?) expensive - [document setDrawsBackground:NO]; + [document setBackgroundColor:[UIColor clearColor]]; - WebView *webview([document webView]); - WebPreferences *preferences([webview preferences]); + // XXX: this is terribly (too?) expensive + [document setDrawsBackground:NO]; - // 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]; + WebView *webview([document webView]); + WebPreferences *preferences([webview preferences]); - [preferences setCacheModel:WebCacheModelDocumentBrowser]; - [preferences setJavaScriptCanOpenWindowsAutomatically:YES]; - [preferences setOfflineWebApplicationCacheEnabled:YES]; + // 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]; + + 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]; - - [scroller_ setDirectionalLockEnabled:YES]; - [scroller_ setDecelerationRate:CYScrollViewDecelerationRateNormal]; - [scroller_ setDelaysContentTouches:NO]; + if ([webview_ respondsToSelector:@selector(_scrollView)]) { + scroller_ = [webview_ _scrollView]; - [scroller_ setCanCancelContentTouches:YES]; - } else if ([webview_ respondsToSelector:@selector(_scroller)]) { - UIScroller *scroller([webview_ _scroller]); - scroller_ = (UIScrollView *) scroller; + [scroller_ setDirectionalLockEnabled:YES]; + [scroller_ setDecelerationRate:CYScrollViewDecelerationRateNormal]; + [scroller_ setDelaysContentTouches:NO]; - [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_ setCanCancelContentTouches:YES]; + } else if ([webview_ respondsToSelector:@selector(_scroller)]) { + UIScroller *scroller([webview_ _scroller]); + scroller_ = (UIScrollView *) scroller; - [scroller setThumbDetectionEnabled:NO]; + [scroller setDirectionalScrolling:YES]; + // XXX: we might be better off /not/ setting this on older systems + [scroller setScrollDecelerationFactor:CYScrollViewDecelerationRateNormal]; /* 0.989324 */ + [scroller setScrollHysteresis:0]; /* 8 */ - // use NO with UIApplicationUseLegacyEvents(YES) - [scroller setEventMode:YES]; + [scroller setThumbDetectionEnabled:NO]; - // XXX: this is handled by setBounces, right? - //[scroller setAllowsRubberBanding:YES]; - } + // use NO with UIApplicationUseLegacyEvents(YES) + [scroller setEventMode:YES]; - [scroller_ setFixedBackgroundPattern:YES]; - [scroller_ setBackgroundColor:[UIColor clearColor]]; - [scroller_ setClipsSubviews:YES]; + // XXX: this is handled by setBounces, right? + //[scroller setAllowsRubberBanding:YES]; + } - [scroller_ setBounces:YES]; - [scroller_ setScrollingEnabled:YES]; - [scroller_ setShowBackgroundShadow:NO]; + [scroller_ setFixedBackgroundPattern:YES]; + [scroller_ setBackgroundColor:[UIColor clearColor]]; + [scroller_ setClipsSubviews:YES]; - [self setViewportWidth:width]; + [scroller_ setBounces:YES]; + [scroller_ setScrollingEnabled:YES]; + [scroller_ setShowBackgroundShadow:NO]; - reloaditem_ = [[[UIBarButtonItem alloc] - initWithTitle:UCLocalize("RELOAD") - style:[self rightButtonStyle] - target:self - action:@selector(reloadButtonClicked) - ] autorelease]; + [self setViewportWidth:width_]; - loadingitem_ = [[[UIBarButtonItem alloc] - initWithTitle:@" " - style:UIBarButtonItemStylePlain - target:self - action:@selector(reloadButtonClicked) - ] autorelease]; + UITableView *table([[[UITableView alloc] initWithFrame:[webview_ bounds] style:UITableViewStyleGrouped] autorelease]); + [webview_ insertSubview:table atIndex:0]; - indicator_ = [[[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhite] autorelease]; - [indicator_ setFrame:CGRectMake(15, 5, [indicator_ frame].size.width, [indicator_ frame].size.height)]; + [table setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; + [webview_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; - UITableView *table([[[UITableView alloc] initWithFrame:bounds style:UITableViewStyleGrouped] autorelease]); - [webview_ insertSubview:table atIndex:0]; + ready_ = false; +} - [self applyLeftButton]; - [self applyRightButton]; +- (void) releaseSubviews { + webview_ = nil; + scroller_ = nil; - [table setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; - [webview_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; - [indicator_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin]; - } return self; + [super releaseSubviews]; } - (id) initWithWidth:(float)width { @@ -862,7 +898,7 @@ float CYScrollViewDecelerationRateNormal; - (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]); @@ -919,7 +955,7 @@ float CYScrollViewDecelerationRateNormal; } - (void) dispatchEvent:(NSString *)event { - [webview_ dispatchEvent:event]; + [[self webView] dispatchEvent:event]; } - (bool) hidesNavigationBar {