X-Git-Url: https://git.saurik.com/cydia.git/blobdiff_plain/daf7f6e251032ba487bf5cd0b1aa392db7b9e892..0efe9812f95b90f6ca0e69556291d5b924787cc5:/UICaboodle/BrowserView.mm diff --git a/UICaboodle/BrowserView.mm b/UICaboodle/BrowserView.mm index 13e6b08c..4523f91b 100644 --- a/UICaboodle/BrowserView.mm +++ b/UICaboodle/BrowserView.mm @@ -148,8 +148,32 @@ static Class $UIWebBrowserView; @end +@interface BrowserViewActualView : UIView { +@private + UIWebDocumentView *documentView; +} +@property (nonatomic, retain) UIWebDocumentView *documentView; +@end + +@implementation BrowserViewActualView + +@synthesize documentView; + +- (void)dealloc { + [documentView release]; + [super dealloc]; +} + +- (void)layoutSubviews { + [super layoutSubviews]; + if ([documentView respondsToSelector:@selector(setMinimumSize:)]) + [documentView setMinimumSize:documentView.bounds.size]; +} + +@end + #define ShowInternals 0 -#define LogBrowser 0 +#define LogBrowser 1 #define lprintf(args...) fprintf(stderr, args) @@ -160,7 +184,7 @@ static Class $UIWebBrowserView; #endif + (void) _initialize { - [WebView enableWebThread]; + //[WebView enableWebThread]; WebPreferences *preferences([WebPreferences standardPreferences]); [preferences setCacheModel:WebCacheModelDocumentBrowser]; @@ -191,7 +215,7 @@ static Class $UIWebBrowserView; WebThreadLock(); - WebView *webview = [webview_ webView]; + WebView *webview = [document_ webView]; [webview setFrameLoadDelegate:nil]; [webview setResourceLoadDelegate:nil]; [webview setUIDelegate:nil]; @@ -207,13 +231,13 @@ static Class $UIWebBrowserView; /* XXX: no one sets this, ever [webview setWebMailDelegate:nil];*/ - [webview_ setDelegate:nil]; - [webview_ setGestureDelegate:nil]; + [document_ setDelegate:nil]; + [document_ setGestureDelegate:nil]; - if ([webview_ respondsToSelector:@selector(setFormEditingDelegate:)]) - [webview_ setFormEditingDelegate:nil]; + if ([document_ respondsToSelector:@selector(setFormEditingDelegate:)]) + [document_ setFormEditingDelegate:nil]; - [webview_ setInteractionDelegate:nil]; + [document_ setInteractionDelegate:nil]; [indirect_ setDelegate:nil]; @@ -222,10 +246,10 @@ static Class $UIWebBrowserView; [webview close]; #if RecycleWebViews - [webview_ removeFromSuperview]; - [Documents_ addObject:[webview_ autorelease]]; + [document_ removeFromSuperview]; + [Documents_ addObject:[document_ autorelease]]; #else - [webview_ release]; + [document_ release]; #endif [indirect_ release]; @@ -275,7 +299,7 @@ static Class $UIWebBrowserView; error_ = false; WebThreadLock(); - [webview_ loadRequest:request]; + [document_ loadRequest:request]; WebThreadUnlock(); } @@ -302,16 +326,16 @@ static Class $UIWebBrowserView; } - (WebView *) webView { - return [webview_ webView]; + return [document_ webView]; } - (UIWebDocumentView *) documentView { - return webview_; + return document_; } /* XXX: WebThreadLock? */ - (void) _fixScroller:(CGRect)bounds { - float extra; + float extra; if (!editing_ || $UIFormAssistant == nil) extra = 0; @@ -330,7 +354,7 @@ static Class $UIWebBrowserView; if ([scroller_ respondsToSelector:@selector(setScrollerIndicatorSubrect:)]) [scroller_ setScrollerIndicatorSubrect:subrect]; - [webview_ setValue:[NSValue valueWithSize:NSMakeSize(subrect.size.width, subrect.size.height)] forGestureAttribute:UIGestureAttributeVisibleSize]; + [document_ setValue:[NSValue valueWithSize:NSMakeSize(subrect.size.width, subrect.size.height)] forGestureAttribute:UIGestureAttributeVisibleSize]; CGSize size(size_); size.height += extra; @@ -341,7 +365,7 @@ static Class $UIWebBrowserView; } - (void) fixScroller { - CGRect bounds([webview_ documentBounds]); + CGRect bounds([document_ documentBounds]); #if TrackResize NSLog(@"_fs:(%f,%f+%f,%f)", bounds.origin.x, bounds.origin.y, bounds.size.width, bounds.size.height); #endif @@ -360,10 +384,10 @@ static Class $UIWebBrowserView; [self view:sender didSetFrame:frame]; } -- (void) pushPage:(RVPage *)page { +- (void) pushPage:(UCViewController *)page { [page setDelegate:delegate_]; - [self setBackButtonTitle:title_]; - [book_ pushPage:page]; + [[self navigationItem] setTitle:title_]; + [[self navigationController] pushViewController:page animated:YES]; } - (void) _pushPage { @@ -371,15 +395,14 @@ static Class $UIWebBrowserView; return; // WTR: [self autorelease]; pushed_ = true; - [book_ pushPage:self]; + [[self navigationController] pushViewController:self animated:YES]; } -- (void) swapPage:(RVPage *)page { +- (void) swapPage:(UCViewController *)page { [page setDelegate:delegate_]; - if (pushed_) - [book_ swapPage:page]; - else - [book_ pushPage:page]; + if (pushed_) [[self navigationController] popViewControllerAnimated:NO]; + + [[self navigationController] pushViewController:page animated:NO]; } - (BOOL) getSpecial:(NSURL *)url swap:(BOOL)swap { @@ -387,7 +410,7 @@ static Class $UIWebBrowserView; NSLog(@"getSpecial:%@", url); #endif - if (RVPage *page = [delegate_ pageForURL:url hasTag:NULL]) { + if (UCViewController *page = [delegate_ pageForURL:url hasTag:NULL]) { if (swap) [self swapPage:page]; else @@ -532,7 +555,7 @@ static Class $UIWebBrowserView; [function_ autorelease]; function_ = function == nil ? nil : [function retain]; - [self reloadButtons]; + [self reloadButtons]; } - (void) setButtonTitle:(NSString *)button withStyle:(NSString *)style toFunction:(id)function { @@ -548,7 +571,7 @@ static Class $UIWebBrowserView; [function_ autorelease]; function_ = function == nil ? nil : [function retain]; - [self reloadButtons]; + [self reloadButtons]; } - (void) setFinishHook:(id)function { @@ -581,11 +604,11 @@ static Class $UIWebBrowserView; } - (void) webViewClose:(WebView *)sender { - [book_ close]; + [self close]; } - (void) close { - [book_ close]; + [[self navigationController] dismissModalViewControllerAnimated:YES]; } - (void) webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame { @@ -615,25 +638,32 @@ static Class $UIWebBrowserView; if ([scheme isEqualToString:@"mailto"]) [self _openMailToURL:url]; else { - RVBook *book([[[RVPopUpBook alloc] initWithFrame:[delegate_ popUpBounds]] autorelease]); - [book setHook:indirect_]; + UCNavigationController *navigation([[[UCNavigationController alloc] init] autorelease]); + [navigation setHook:indirect_]; - RVPage *page([delegate_ pageForURL:url hasTag:NULL]); + UCViewController *page([delegate_ pageForURL:url hasTag:NULL]); if (page == nil) { /* XXX: call createWebViewWithRequest instead? */ - [self setBackButtonTitle:title_]; - - BrowserView *browser([[[class_ alloc] initWithBook:book] autorelease]); + BrowserView *browser([[[class_ alloc] init] autorelease]); [browser loadURL:url]; page = browser; } - [book setDelegate:delegate_]; + [navigation setDelegate:delegate_]; [page setDelegate:delegate_]; - [book setPage:page]; - [book_ pushBook:book]; + [navigation setViewControllers:[NSArray arrayWithObject:page]]; + UIBarButtonItem *closeItem = [[UIBarButtonItem alloc] + initWithTitle:UCLocalize("CLOSE") + style:UIBarButtonItemStylePlain + target:page + action:@selector(close) + ]; + [[page navigationItem] setLeftBarButtonItem:closeItem]; + [closeItem release]; + + [[self navigationController] presentModalViewController:navigation animated:YES]; } } else goto unknown; @@ -649,7 +679,7 @@ static Class $UIWebBrowserView; // XXX: handle more mime types! [listener ignore]; - WebView *webview([webview_ webView]); + WebView *webview([document_ webView]); if (frame == [webview mainFrame]) [UIApp openURL:[request URL]]; } @@ -676,7 +706,7 @@ static Class $UIWebBrowserView; [listener use]; - WebView *webview([webview_ webView]); + WebView *webview([document_ webView]); if (frame == [webview mainFrame]) [self _pushPage]; return; @@ -811,7 +841,7 @@ static Class $UIWebBrowserView; case 2: if (request_ != nil) { WebThreadLock(); - [webview_ loadRequest:request_]; + [document_ loadRequest:request_]; WebThreadUnlock(); } break; @@ -881,25 +911,34 @@ static Class $UIWebBrowserView; NSNumber *value([features objectForKey:@"width"]); float width(value == nil ? 0 : [value floatValue]); - RVBook *book(!popup_ ? book_ : [[[RVPopUpBook alloc] initWithFrame:[delegate_ popUpBounds]] autorelease]); + UCNavigationController *navigation(!popup_ ? [self navigationController] : [[[UCNavigationController alloc] init] autorelease]); /* XXX: deal with cydia:// pages */ - BrowserView *browser([[[class_ alloc] initWithBook:book forWidth:width] autorelease]); + BrowserView *browser([[[class_ alloc] initWithWidth:width] autorelease]); if (features != nil && popup_) { - [book setDelegate:delegate_]; - [book setHook:indirect_]; + [navigation setDelegate:delegate_]; + [navigation setHook:indirect_]; [browser setDelegate:delegate_]; [browser loadRequest:request]; - [book setPage:browser]; - [book_ pushBook:book]; - } else if (request == nil) { - [self setBackButtonTitle:title_]; + [navigation setViewControllers:[NSArray arrayWithObject:browser]]; + UIBarButtonItem *closeItem = [[UIBarButtonItem alloc] + initWithTitle:UCLocalize("CLOSE") + style:UIBarButtonItemStylePlain + target:browser + action:@selector(close) + ]; + [[browser navigationItem] setLeftBarButtonItem:closeItem]; + [closeItem release]; + + [[self navigationController] presentModalViewController:navigation animated:YES]; + } /*else if (request == nil) { + [[self navigationItem] setTitle:title_]; [browser setDelegate:delegate_]; [browser retain]; - } else { + }*/ else { [self pushPage:browser]; [browser loadRequest:request]; } @@ -917,7 +956,7 @@ static Class $UIWebBrowserView; return; title_ = [title retain]; - [book_ reloadTitleForPage:self]; + [[self navigationItem] setTitle:title_]; } - (void) webView:(WebView *)sender didStartProvisionalLoadForFrame:(WebFrame *)frame { @@ -926,7 +965,7 @@ static Class $UIWebBrowserView; [loading_ addObject:[NSValue valueWithNonretainedObject:frame]]; if ([frame parentFrame] == nil) { - [webview_ resignFirstResponder]; + [document_ resignFirstResponder]; reloading_ = false; @@ -965,12 +1004,12 @@ static Class $UIWebBrowserView; special_ = nil; } - [book_ reloadTitleForPage:self]; + [[self navigationItem] setTitle:title_]; if (Wildcat_) { CGRect webrect = [scroller_ bounds]; webrect.size.height = 1; - [webview_ setFrame:webrect]; + [document_ setFrame:webrect]; } if ([scroller_ respondsToSelector:@selector(scrollPointVisibleAtTopLeft:)]) @@ -988,13 +1027,15 @@ static Class $UIWebBrowserView; if (!Wildcat_) { CGRect webrect = [scroller_ bounds]; webrect.size.height = 0; - [webview_ setFrame:webrect]; + [document_ setFrame:webrect]; } } - [self reloadButtons]; + [self reloadButtons]; } +- (void) didFinishLoading { } + - (void) _finishLoading { size_t count([loading_ count]); /*if (count == 0) @@ -1003,40 +1044,33 @@ static Class $UIWebBrowserView; return; if (finish_ != nil) [self callFunction:finish_]; - [self reloadButtons]; + + [self reloadButtons]; } - (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]; + return [document_ webView:sender shouldScrollToPoint:point forFrame:frame]; } - (void) webView:(WebView *)sender didReceiveViewportArguments:(id)arguments forFrame:(WebFrame *)frame { - return [webview_ webView:sender didReceiveViewportArguments:arguments forFrame:frame]; + return [document_ webView:sender didReceiveViewportArguments:arguments forFrame:frame]; } - (void) webView:(WebView *)sender needsScrollNotifications:(id)notifications forFrame:(WebFrame *)frame { - return [webview_ webView:sender needsScrollNotifications:notifications forFrame:frame]; + return [document_ webView:sender needsScrollNotifications:notifications forFrame:frame]; } - (void) webView:(WebView *)sender didCommitLoadForFrame:(WebFrame *)frame { [self _pushPage]; - return [webview_ webView:sender didCommitLoadForFrame:frame]; + return [document_ webView:sender didCommitLoadForFrame:frame]; } - (void) webView:(WebView *)sender didReceiveDocTypeForFrame:(WebFrame *)frame { - return [webview_ webView:sender didReceiveDocTypeForFrame:frame]; + return [document_ webView:sender didReceiveDocTypeForFrame:frame]; } - (void) webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame { @@ -1085,7 +1119,7 @@ static Class $UIWebBrowserView; } } - return [webview_ webView:sender didFinishLoadForFrame:frame]; + return [document_ webView:sender didFinishLoadForFrame:frame]; } - (void) _didFailWithError:(NSError *)error forFrame:(WebFrame *)frame { @@ -1111,8 +1145,8 @@ static Class $UIWebBrowserView; - (void) webView:(WebView *)sender didFailLoadWithError:(NSError *)error forFrame:(WebFrame *)frame { [self _didFailWithError:error forFrame:frame]; - if ([webview_ respondsToSelector:@selector(webView:didFailLoadWithError:forFrame:)]) - [webview_ webView:sender didFailLoadWithError:error forFrame:frame]; + if ([document_ respondsToSelector:@selector(webView:didFailLoadWithError:forFrame:)]) + [document_ webView:sender didFailLoadWithError:error forFrame:frame]; } - (void) webView:(WebView *)sender didFailProvisionalLoadWithError:(NSError *)error forFrame:(WebFrame *)frame { @@ -1129,38 +1163,38 @@ static Class $UIWebBrowserView; #if LogBrowser || ForSaurik lprintf("Console:%s\n", [[dictionary description] UTF8String]); #endif - if ([webview_ respondsToSelector:@selector(webView:didReceiveMessage:)]) - [webview_ webView:sender didReceiveMessage:dictionary]; + if ([document_ respondsToSelector:@selector(webView:didReceiveMessage:)]) + [document_ webView:sender didReceiveMessage:dictionary]; } - (void) webView:(id)sender willCloseFrame:(id)frame { - if ([webview_ respondsToSelector:@selector(webView:willCloseFrame:)]) - [webview_ webView:sender willCloseFrame:frame]; + if ([document_ respondsToSelector:@selector(webView:willCloseFrame:)]) + [document_ webView:sender willCloseFrame:frame]; } - (void) webView:(id)sender didFinishDocumentLoadForFrame:(id)frame { - if ([webview_ respondsToSelector:@selector(webView:didFinishDocumentLoadForFrame:)]) - [webview_ webView:sender didFinishDocumentLoadForFrame:frame]; + if ([document_ respondsToSelector:@selector(webView:didFinishDocumentLoadForFrame:)]) + [document_ webView:sender didFinishDocumentLoadForFrame:frame]; } - (void) webView:(id)sender didFirstLayoutInFrame:(id)frame { - if ([webview_ respondsToSelector:@selector(webView:didFirstLayoutInFrame:)]) - [webview_ webView:sender didFirstLayoutInFrame:frame]; + if ([document_ respondsToSelector:@selector(webView:didFirstLayoutInFrame:)]) + [document_ webView:sender didFirstLayoutInFrame:frame]; } - (void) webViewFormEditedStatusHasChanged:(id)changed { - if ([webview_ respondsToSelector:@selector(webViewFormEditedStatusHasChanged:)]) - [webview_ webViewFormEditedStatusHasChanged:changed]; + if ([document_ respondsToSelector:@selector(webViewFormEditedStatusHasChanged:)]) + [document_ webViewFormEditedStatusHasChanged:changed]; } - (void) webView:(id)sender formStateDidFocusNode:(id)formState { - if ([webview_ respondsToSelector:@selector(webView:formStateDidFocusNode:)]) - [webview_ webView:sender formStateDidFocusNode:formState]; + if ([document_ respondsToSelector:@selector(webView:formStateDidFocusNode:)]) + [document_ webView:sender formStateDidFocusNode:formState]; } - (void) webView:(id)sender formStateDidBlurNode:(id)formState { - if ([webview_ respondsToSelector:@selector(webView:formStateDidBlurNode:)]) - [webview_ webView:sender formStateDidBlurNode:formState]; + if ([document_ respondsToSelector:@selector(webView:formStateDidBlurNode:)]) + [document_ webView:sender formStateDidBlurNode:formState]; } /* XXX: fix this stupid include file @@ -1169,56 +1203,56 @@ static Class $UIWebBrowserView; }*/ - (void) webViewDidLayout:(id)sender { - [webview_ webViewDidLayout:sender]; + [document_ webViewDidLayout:sender]; } - (void) webView:(id)sender didFirstVisuallyNonEmptyLayoutInFrame:(id)frame { - [webview_ webView:sender didFirstVisuallyNonEmptyLayoutInFrame:frame]; + [document_ webView:sender didFirstVisuallyNonEmptyLayoutInFrame:frame]; } - (void) webView:(id)sender saveStateToHistoryItem:(id)item forFrame:(id)frame { - [webview_ webView:sender saveStateToHistoryItem:item forFrame:frame]; + [document_ webView:sender saveStateToHistoryItem:item forFrame:frame]; } - (void) webView:(id)sender restoreStateFromHistoryItem:(id)item forFrame:(id)frame force:(BOOL)force { - [webview_ webView:sender restoreStateFromHistoryItem:item forFrame:frame force:force]; + [document_ webView:sender restoreStateFromHistoryItem:item forFrame:frame force:force]; } - (void) webView:(id)sender attachRootLayer:(id)layer { - [webview_ webView:sender attachRootLayer:layer]; + [document_ webView:sender attachRootLayer:layer]; } - (id) webView:(id)sender plugInViewWithArguments:(id)arguments fromPlugInPackage:(id)package { - return [webview_ webView:sender plugInViewWithArguments:arguments fromPlugInPackage:package]; + return [document_ webView:sender plugInViewWithArguments:arguments fromPlugInPackage:package]; } - (void) webView:(id)sender willShowFullScreenForPlugInView:(id)view { - [webview_ webView:sender willShowFullScreenForPlugInView:view]; + [document_ webView:sender willShowFullScreenForPlugInView:view]; } - (void) webView:(id)sender didHideFullScreenForPlugInView:(id)view { - [webview_ webView:sender didHideFullScreenForPlugInView:view]; + [document_ webView:sender didHideFullScreenForPlugInView:view]; } - (void) webView:(id)sender willAddPlugInView:(id)view { - [webview_ webView:sender willAddPlugInView:view]; + [document_ webView:sender willAddPlugInView:view]; } - (void) webView:(id)sender didObserveDeferredContentChange:(int)change forFrame:(id)frame { - [webview_ webView:sender didObserveDeferredContentChange:change forFrame:frame]; + [document_ webView:sender didObserveDeferredContentChange:change forFrame:frame]; } - (void) webViewDidPreventDefaultForEvent:(id)sender { - [webview_ webViewDidPreventDefaultForEvent:sender]; + [document_ webViewDidPreventDefaultForEvent:sender]; } - (void) _setTileDrawingEnabled:(BOOL)enabled { - //[webview_ setTileDrawingEnabled:enabled]; + //[document_ setTileDrawingEnabled:enabled]; } - (void) setViewportWidth:(float)width { width_ = width != 0 ? width : [[self class] defaultWidth]; - [webview_ setViewportSize:CGSizeMake(width_, UIWebViewGrowsAndShrinksToFitHeight) forDocumentTypes:0x10]; + [document_ setViewportSize:CGSizeMake(width_, UIWebViewGrowsAndShrinksToFitHeight) forDocumentTypes:0x10]; } - (void) willStartGesturesInView:(UIView *)view forEvent:(GSEventRef)event { @@ -1227,7 +1261,7 @@ static Class $UIWebBrowserView; - (void) didFinishGesturesInView:(UIView *)view forEvent:(GSEventRef)event { [self _setTileDrawingEnabled:YES]; - [webview_ redrawScaledDocument]; + [document_ redrawScaledDocument]; } - (void) scrollerWillStartDragging:(UIScroller *)scroller { @@ -1242,16 +1276,19 @@ static Class $UIWebBrowserView; [self _setTileDrawingEnabled:YES]; } -- (id) initWithBook:(RVBook *)book forWidth:(float)width ofClass:(Class)_class { - if ((self = [super initWithBook:book]) != nil) { +- (id) initWithWidth:(float)width ofClass:(Class)_class { + if ((self = [super init]) != nil) { class_ = _class; loading_ = [[NSMutableSet alloc] initWithCapacity:3]; popup_ = false; - struct CGRect bounds = [self bounds]; + BrowserViewActualView *actualView = [[BrowserViewActualView alloc] initWithFrame:CGRectZero]; + [self setView:actualView]; + + struct CGRect bounds = [[self view] bounds]; scroller_ = [[objc_getClass(Wildcat_ ? "UIScrollView" : "UIScroller") alloc] initWithFrame:bounds]; - [self addSubview:scroller_]; + [[self view] addSubview:scroller_]; [scroller_ setFixedBackgroundPattern:YES]; [scroller_ setBackgroundColor:[UIColor pinStripeColor]]; @@ -1295,67 +1332,67 @@ static Class $UIWebBrowserView; WebThreadLock(); #if RecycleWebViews - webview_ = [Documents_ lastObject]; - if (webview_ != nil) { - webview_ = [webview_ retain]; - webview = [webview_ webView]; + document_ = [Documents_ lastObject]; + if (document_ != nil) { + document_ = [document_ retain]; + webview = [document_ webView]; [Documents_ removeLastObject]; - [webview_ setFrame:webrect]; + [document_ setFrame:webrect]; } else { #else if (true) { #endif - webview_ = [[$UIWebBrowserView alloc] initWithFrame:webrect]; - webview = [webview_ webView]; + document_ = [[$UIWebBrowserView alloc] initWithFrame:webrect]; + webview = [document_ webView]; // XXX: this is terribly (too?) expensive - //[webview_ setDrawsBackground:NO]; + //[document_ setDrawsBackground:NO]; [webview setPreferencesIdentifier:@"Cydia"]; - [webview_ setTileSize:CGSizeMake(webrect.size.width, 500)]; + [document_ setTileSize:CGSizeMake(webrect.size.width, 500)]; - if ([webview_ respondsToSelector:@selector(enableReachability)]) - [webview_ enableReachability]; - if ([webview_ respondsToSelector:@selector(setAllowsMessaging:)]) - [webview_ setAllowsMessaging:YES]; - if ([webview_ respondsToSelector:@selector(useSelectionAssistantWithMode:)]) - [webview_ useSelectionAssistantWithMode:0]; + if ([document_ respondsToSelector:@selector(enableReachability)]) + [document_ enableReachability]; + if ([document_ respondsToSelector:@selector(setAllowsMessaging:)]) + [document_ setAllowsMessaging:YES]; + if ([document_ respondsToSelector:@selector(useSelectionAssistantWithMode:)]) + [document_ useSelectionAssistantWithMode:0]; - [webview_ setTilingEnabled:YES]; - [webview_ setDrawsGrid:NO]; - [webview_ setLogsTilingChanges:NO]; - [webview_ setTileMinificationFilter:kCAFilterNearest]; + [document_ setTilingEnabled:YES]; + [document_ setDrawsGrid:NO]; + [document_ setLogsTilingChanges:NO]; + [document_ setTileMinificationFilter:kCAFilterNearest]; - if ([webview_ respondsToSelector:@selector(setDataDetectorTypes:)]) + if ([document_ respondsToSelector:@selector(setDataDetectorTypes:)]) /* XXX: abstractify */ - [webview_ setDataDetectorTypes:0x80000000]; + [document_ setDataDetectorTypes:0x80000000]; else - [webview_ setDetectsPhoneNumbers:NO]; + [document_ setDetectsPhoneNumbers:NO]; - [webview_ setAutoresizes:YES]; + [document_ 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]; + [document_ setMinimumScale:0.25f forDocumentTypes:0x10]; + [document_ setMaximumScale:5.00f forDocumentTypes:0x10]; + [document_ setInitialScale:UIWebViewScalesToFitScale forDocumentTypes:0x10]; + //[document_ setViewportSize:CGSizeMake(980, UIWebViewGrowsAndShrinksToFitHeight) forDocumentTypes:0x10]; - [webview_ setViewportSize:CGSizeMake(320, UIWebViewGrowsAndShrinksToFitHeight) forDocumentTypes:0x2]; + [document_ setViewportSize:CGSizeMake(320, UIWebViewGrowsAndShrinksToFitHeight) forDocumentTypes:0x2]; - [webview_ setMinimumScale:1.00f forDocumentTypes:0x8]; - [webview_ setInitialScale:UIWebViewScalesToFitScale forDocumentTypes:0x8]; - [webview_ setViewportSize:CGSizeMake(320, UIWebViewGrowsAndShrinksToFitHeight) forDocumentTypes:0x8]; + [document_ setMinimumScale:1.00f forDocumentTypes:0x8]; + [document_ setInitialScale:UIWebViewScalesToFitScale forDocumentTypes:0x8]; + [document_ setViewportSize:CGSizeMake(320, UIWebViewGrowsAndShrinksToFitHeight) forDocumentTypes:0x8]; - [webview_ _setDocumentType:0x4]; + [document_ _setDocumentType:0x4]; - if ([webview_ respondsToSelector:@selector(setZoomsFocusedFormControl:)]) - [webview_ setZoomsFocusedFormControl:YES]; - [webview_ setContentsPosition:7]; - [webview_ setEnabledGestures:0xa]; - [webview_ setValue:[NSNumber numberWithBool:YES] forGestureAttribute:UIGestureAttributeIsZoomRubberBandEnabled]; - [webview_ setValue:[NSNumber numberWithBool:YES] forGestureAttribute:UIGestureAttributeUpdatesScroller]; + if ([document_ respondsToSelector:@selector(setZoomsFocusedFormControl:)]) + [document_ setZoomsFocusedFormControl:YES]; + [document_ setContentsPosition:7]; + [document_ setEnabledGestures:0xa]; + [document_ setValue:[NSNumber numberWithBool:YES] forGestureAttribute:UIGestureAttributeIsZoomRubberBandEnabled]; + [document_ setValue:[NSNumber numberWithBool:YES] forGestureAttribute:UIGestureAttributeUpdatesScroller]; - [webview_ setSmoothsFonts:YES]; - [webview_ setAllowsImageSheet:YES]; + [document_ setSmoothsFonts:YES]; + [document_ setAllowsImageSheet:YES]; [webview _setUsesLoaderCache:YES]; [webview setGroupName:@"CydiaGroup"]; @@ -1367,18 +1404,21 @@ static Class $UIWebBrowserView; else [preferences _setLayoutInterval:0]; } + + actualView.documentView = document_; + [actualView release]; [self setViewportWidth:width]; - [webview_ setDelegate:self]; - [webview_ setGestureDelegate:self]; + [document_ setDelegate:self]; + [document_ setGestureDelegate:self]; - if ([webview_ respondsToSelector:@selector(setFormEditingDelegate:)]) - [webview_ setFormEditingDelegate:self]; + if ([document_ respondsToSelector:@selector(setFormEditingDelegate:)]) + [document_ setFormEditingDelegate:self]; - [webview_ setInteractionDelegate:self]; + [document_ setInteractionDelegate:self]; - [scroller_ addSubview:webview_]; + [scroller_ addSubview:document_]; //NSNotificationCenter *center = [NSNotificationCenter defaultCenter]; @@ -1395,31 +1435,31 @@ static Class $UIWebBrowserView; WebThreadUnlock(); CGSize indsize = [UIProgressIndicator defaultSizeForStyle:UIProgressIndicatorStyleMediumWhite]; - indicator_ = [[UIProgressIndicator alloc] initWithFrame:CGRectMake(bounds.size.width - 39, 12, indsize.width, indsize.height)]; + indicator_ = [[UIProgressIndicator alloc] initWithFrame:CGRectMake(15, 5, indsize.width, indsize.height)]; [indicator_ setStyle:UIProgressIndicatorStyleMediumWhite]; + [indicator_ startAnimation]; - [self setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; [scroller_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; [indicator_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin]; - [webview_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; + [document_ setAutoresizingMask:UIViewAutoresizingFlexibleWidth]; - /*UIWebView *test([[[UIWebView alloc] initWithFrame:[self bounds]] autorelease]); + /*UIWebView *test([[[UIWebView alloc] initWithFrame:[[self view] bounds]] autorelease]); [test loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"http://www.saurik.com/"]]]; - [self addSubview:test];*/ + [[self view] addSubview:test];*/ } 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]); + WebView *webview([document_ webView]); NSString *string([webview stringByEvaluatingJavaScriptFromString:script]); WebThreadUnlock(); return string; @@ -1428,7 +1468,7 @@ static Class $UIWebBrowserView; - (void) callFunction:(WebScriptObject *)function { WebThreadLock(); - WebView *webview([webview_ webView]); + WebView *webview([document_ webView]); WebFrame *frame([webview mainFrame]); id _private(MSHookIvar(webview, "_private")); @@ -1443,7 +1483,7 @@ static Class $UIWebBrowserView; settings->setJavaScriptCanOpenWindowsAutomatically(true); } - if (UIWindow *window = [self window]) + if (UIWindow *window = [[self view] window]) if (UIResponder *responder = [window firstResponder]) [responder resignFirstResponder]; @@ -1457,7 +1497,7 @@ static Class $UIWebBrowserView; WebThreadUnlock(); } -- (void) didCloseBook:(RVBook *)book { +- (void) didDismissModalViewController { if (closer_ != nil) [self callFunction:closer_]; } @@ -1476,14 +1516,6 @@ static Class $UIWebBrowserView; [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; @@ -1498,19 +1530,38 @@ static Class $UIWebBrowserView; else goto normal; } -- (NSString *) title { - return title_ == nil ? UCLocalize("LOADING") : title_; -} - -- (NSString *) backButtonTitle { - return UCLocalize("BROWSER"); +- (void) reloadButtons { + if ([self isLoading]) { + UIBarButtonItem *reloadItem = [[UIBarButtonItem alloc] + initWithTitle:@" " + style:UIBarButtonItemStylePlain + target:self + action:@selector(_rightButtonClicked) + ]; + [[self navigationItem] setRightBarButtonItem:reloadItem]; + [[reloadItem view] addSubview:indicator_]; + [[self navigationItem] setTitle:UCLocalize("LOADING")]; + [reloadItem release]; + } else { + UIBarButtonItem *reloadItem = [[UIBarButtonItem alloc] + initWithTitle:button_ ?: UCLocalize("RELOAD") + style:[self rightButtonStyle] + target:self + action:@selector(_rightButtonClicked) + ]; + [[self navigationItem] setRightBarButtonItem:reloadItem animated:YES]; + [[self navigationItem] setTitle:title_]; + [reloadItem release]; + + if (function_ == nil) [self didFinishLoading]; + } } - (void) setPageActive:(BOOL)active { if (!active) [indicator_ removeFromSuperview]; else - [[book_ navigationBar] addSubview:indicator_]; + [[[[self navigationItem] rightBarButtonItem] view] addSubview:indicator_]; } - (void) resetViewAnimated:(BOOL)animated { @@ -1524,4 +1575,4 @@ static Class $UIWebBrowserView; return 980; } -@end +@end \ No newline at end of file