#include "CyteKit/IndirectDelegate.h"
#include "CyteKit/Localize.h"
#include "CyteKit/WebViewController.h"
-#include "CyteKit/PerlCompatibleRegEx.hpp"
+#include "CyteKit/RegEx.hpp"
#include "CyteKit/WebThreadLocked.hpp"
//#include <QuartzCore/CALayer.h>
#define lprintf(args...) fprintf(stderr, args)
+JSValueRef (*$JSObjectCallAsFunction)(JSContextRef, JSObjectRef, JSObjectRef, size_t, const JSValueRef[], JSValueRef *);
+
// XXX: centralize these special class things to some file or mechanism?
static Class $MFMailComposeViewController;
float CYScrollViewDecelerationRateNormal;
-@interface WebView (Apple)
-- (void) _setLayoutInterval:(float)interval;
-- (void) _setAllowsMessaging:(BOOL)allows;
+@interface WebFrame (Cydia)
+- (void) cydia$updateHeight;
@end
@implementation WebFrame (Cydia)
return [NSString stringWithFormat:@"<%s: %p, %@>", class_getName([self class]), self, [[[([self provisionalDataSource] ?: [self dataSource]) request] URL] absoluteString]];
}
+- (void) cydia$updateHeight {
+ [[[self frameElement] style]
+ setProperty:@"height"
+ value:[NSString stringWithFormat:@"%dpx",
+ [[[self DOMDocument] body] scrollHeight]]
+ priority:nil];
+}
+
@end
/* Indirect Delegate {{{ */
@implementation IndirectDelegate
+- (id) delegate {
+ return delegate_;
+}
+
- (void) setDelegate:(id)delegate {
delegate_ = delegate;
}
// XXX: WebThreadCreateNSInvocation returns nil
#if ShowInternals
- fprintf(stderr, "[%s]R?%s\n", class_getName(self->isa), sel_getName(sel));
+ fprintf(stderr, "[%s]R?%s\n", class_getName(object_getClass(self)), sel_getName(sel));
#endif
return delegate_ == nil ? NO : [delegate_ respondsToSelector:sel];
return method;
#if ShowInternals
- fprintf(stderr, "[%s]S?%s\n", class_getName(self->isa), sel_getName(sel));
+ fprintf(stderr, "[%s]S?%s\n", class_getName(object_getClass(self)), sel_getName(sel));
#endif
if (delegate_ != nil)
+ (void) _initialize {
[WebPreferences _setInitialDefaultTextEncodingToSystemEncoding];
+ void *js(NULL);
+ if (js == NULL)
+ js = dlopen("/System/Library/Frameworks/JavaScriptCore.framework/JavaScriptCore", RTLD_GLOBAL | RTLD_LAZY);
+ if (js == NULL)
+ js = dlopen("/System/Library/PrivateFrameworks/JavaScriptCore.framework/JavaScriptCore", RTLD_GLOBAL | RTLD_LAZY);
+ if (js != NULL)
+ $JSObjectCallAsFunction = reinterpret_cast<JSValueRef (*)(JSContextRef, JSObjectRef, JSObjectRef, size_t, const JSValueRef[], JSValueRef *)>(dlsym(js, "JSObjectCallAsFunction"));
+
dlopen("/System/Library/Frameworks/MessageUI.framework/MessageUI", RTLD_GLOBAL | RTLD_LAZY);
$MFMailComposeViewController = objc_getClass("MFMailComposeViewController");
}
[page setDelegate:delegate_];
+ [page setPageColor:color_];
if (!pop) {
[[self navigationItem] setTitle:title_];
// CyteWebViewDelegate {{{
- (void) webView:(WebView *)view addMessageToConsole:(NSDictionary *)message {
#if LogMessages
- static Pcre irritating("^(?"
+ static RegEx 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$");
+ ")\\n");
if (NSString *data = [message objectForKey:@"message"])
if (irritating(data))
NSLog(@"decidePolicyForNavigationAction:%@ request:%@ %@ frame:%@", action, request, [request allHTTPHeaderFields], frame);
#endif
+ NSURL *url(request == nil ? nil : [request URL]);
+ NSString *scheme([[url scheme] lowercaseString]);
+ NSString *absolute([[url absoluteString] lowercaseString]);
+
+ if (
+ [scheme isEqualToString:@"itms"] ||
+ [scheme isEqualToString:@"itmss"] ||
+ [scheme isEqualToString:@"itms-apps"] ||
+ [scheme isEqualToString:@"itms-appss"] ||
+ [absolute hasPrefix:@"http://itunes.apple.com/"] ||
+ [absolute hasPrefix:@"https://itunes.apple.com/"] ||
+ false) {
+ appstore_ = url;
+
+ UIAlertView *alert = [[[UIAlertView alloc]
+ initWithTitle:UCLocalize("APP_STORE_REDIRECT")
+ message:nil
+ delegate:self
+ cancelButtonTitle:UCLocalize("CANCEL")
+ otherButtonTitles:
+ UCLocalize("ALLOW"),
+ nil
+ ] autorelease];
+
+ [alert setContext:@"itmsappss"];
+ [alert show];
+
+ [listener ignore];
+ return;
+ }
+
if ([frame parentFrame] == nil) {
if (!error_) {
- NSURL *url(request == nil ? nil : [request URL]);
-
if (request_ != nil && ![[request_ URL] isEqual:url] && ![self allowsNavigationAction]) {
if (url != nil)
[self pushRequest:request forAction:action asPop:NO];
- (void) webView:(WebView *)view didDecidePolicy:(CYWebPolicyDecision)decision forNavigationAction:(NSDictionary *)action request:(NSURLRequest *)request frame:(WebFrame *)frame {
#if LogBrowser
- NSLog(@"didDecidePolicy:%u forNavigationAction:%@ request:%@ frame:%@", decision, action, request, [request allHTTPHeaderFields], frame);
+ NSLog(@"didDecidePolicy:%u forNavigationAction:%@ request:%@ %@ frame:%@", decision, action, request, [request allHTTPHeaderFields], frame);
#endif
if ([frame parentFrame] == nil) {
}
- (void) webView:(WebView *)view didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {
+#if LogBrowser
+ NSLog(@"didClearWindowObject:%@ forFrame:%@", window, frame);
+#endif
}
- (void) webView:(WebView *)view didCommitLoadForFrame:(WebFrame *)frame {
if ([frame parentFrame] == nil) {
if (DOMDocument *document = [frame DOMDocument])
- if (DOMNodeList<NSFastEnumeration> *bodies = [document getElementsByTagName:@"body"])
+ if (DOMNodeList *bodies = [document getElementsByTagName:@"body"])
for (DOMHTMLBodyElement *body in (id) bodies) {
DOMCSSStyleDeclaration *style([document getComputedStyle:body pseudoElement:nil]);
float blue([[rgb blue] getFloatValue:DOM_CSS_NUMBER]);
float alpha([[rgb alpha] getFloatValue:DOM_CSS_NUMBER]);
- if (red == 0xc7 && green == 0xce && blue == 0xd5)
- uic = [UIColor pinStripeColor];
- else if (alpha != 0)
+ if (alpha == 1)
uic = [UIColor
colorWithRed:(red / 255)
green:(green / 255)
}
}
- [scroller_ setBackgroundColor:(uic ?: [UIColor clearColor])];
+ [super setPageColor:uic];
+ [scroller_ setBackgroundColor:color_];
break;
}
}
style_ = nil;
function_ = nil;
+ [registered_ removeAllObjects];
+ timer_ = nil;
+
allowsNavigationAction_ = true;
[self setHidesNavigationBar:NO];
[self _didStartLoading];
}
+- (void) webView:(WebView *)view resource:(id)identifier didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge fromDataSource:(WebDataSource *)source {
+ challenge_ = [challenge retain];
+
+ NSURLProtectionSpace *space([challenge protectionSpace]);
+ NSString *realm([space realm]);
+ if (realm == nil)
+ realm = @"";
+
+ UIAlertView *alert = [[[UIAlertView alloc]
+ initWithTitle:realm
+ message:nil
+ delegate:self
+ cancelButtonTitle:UCLocalize("CANCEL")
+ otherButtonTitles:UCLocalize("LOGIN"), nil
+ ] autorelease];
+
+ [alert setContext:@"challenge"];
+ [alert setNumberOfRows:1];
+
+ [alert addTextFieldWithValue:@"" label:UCLocalize("USERNAME")];
+ [alert addTextFieldWithValue:@"" label:UCLocalize("PASSWORD")];
+
+ UITextField *username([alert textFieldAtIndex:0]); {
+ UITextInputTraits *traits([username textInputTraits]);
+ [traits setAutocapitalizationType:UITextAutocapitalizationTypeNone];
+ [traits setAutocorrectionType:UITextAutocorrectionTypeNo];
+ [traits setKeyboardType:UIKeyboardTypeASCIICapable];
+ [traits setReturnKeyType:UIReturnKeyNext];
+ }
+
+ UITextField *password([alert textFieldAtIndex:1]); {
+ UITextInputTraits *traits([password textInputTraits]);
+ [traits setAutocapitalizationType:UITextAutocapitalizationTypeNone];
+ [traits setAutocorrectionType:UITextAutocorrectionTypeNo];
+ [traits setKeyboardType:UIKeyboardTypeASCIICapable];
+ // XXX: UIReturnKeyDone
+ [traits setReturnKeyType:UIReturnKeyNext];
+ [traits setSecureTextEntry:YES];
+ }
+
+ [alert show];
+}
+
- (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);
return request;
}
+- (NSURLRequest *) webThreadWebView:(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
+
+ return request;
+}
+
- (bool) webView:(WebView *)view shouldRunJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WebFrame *)frame {
return [self _allowJavaScriptPanel];
}
// }}}
- (void) close {
- [[[self navigationController] parentViewController] dismissModalViewControllerAnimated:YES];
+ [[[self navigationController] parentOrPresentingViewController] dismissModalViewControllerAnimated:YES];
}
- (void) alertView:(UIAlertView *)alert clickedButtonAtIndex:(NSInteger)button {
} else if ([context isEqualToString:@"challenge"]) {
id<NSURLAuthenticationChallengeSender> sender([challenge_ sender]);
- switch (button) {
- case 1: {
- NSString *username([[alert textFieldAtIndex:0] text]);
- NSString *password([[alert textFieldAtIndex:1] text]);
-
- NSURLCredential *credential([NSURLCredential credentialWithUser:username password:password persistence:NSURLCredentialPersistenceForSession]);
-
- [sender useCredential:credential forAuthenticationChallenge:challenge_];
- } break;
+ if (button == [alert cancelButtonIndex])
+ [sender cancelAuthenticationChallenge:challenge_];
+ else if (button == [alert firstOtherButtonIndex]) {
+ NSString *username([[alert textFieldAtIndex:0] text]);
+ NSString *password([[alert textFieldAtIndex:1] text]);
- case 2:
- [sender cancelAuthenticationChallenge:challenge_];
- break;
+ NSURLCredential *credential([NSURLCredential credentialWithUser:username password:password persistence:NSURLCredentialPersistenceForSession]);
- _nodefault
+ [sender useCredential:credential forAuthenticationChallenge:challenge_];
}
challenge_ = nil;
+ [alert dismissWithClickedButtonIndex:-1 animated:YES];
+ } else if ([context isEqualToString:@"itmsappss"]) {
+ if (button == [alert cancelButtonIndex]) {
+ } else if (button == [alert firstOtherButtonIndex]) {
+ [delegate_ openURL:appstore_];
+ }
+
[alert dismissWithClickedButtonIndex:-1 animated:YES];
} else if ([context isEqualToString:@"submit"]) {
if (button == [alert cancelButtonIndex]) {
- (UIBarButtonItem *) customButton {
if (custom_ == nil)
return nil;
- else if (custom_ == [NSNull null])
+ else if ((/*clang:*/id) custom_ == [NSNull null])
return (UIBarButtonItem *) [NSNull null];
return [[[UIBarButtonItem alloc]
return nil;
if (UINavigationController *navigation = [self navigationController])
- if ([[navigation parentViewController] modalViewController] == navigation)
+ if ([[navigation parentOrPresentingViewController] modalViewController] == navigation)
return [[[UIBarButtonItem alloc]
initWithTitle:UCLocalize("CLOSE")
style:UIBarButtonItemStylePlain
width_ = width;
class_ = _class;
+ [super setPageColor:nil];
+
allowsNavigationAction_ = true;
loading_ = [NSMutableSet setWithCapacity:5];
+ registered_ = [NSMutableSet setWithCapacity:5];
indirect_ = [[[IndirectDelegate alloc] initWithDelegate:self] autorelease];
reloaditem_ = [[[UIBarButtonItem alloc]
] autorelease];
loadingitem_ = [[[UIBarButtonItem alloc]
- initWithTitle:@" "
+ initWithTitle:(kCFCoreFoundationVersionNumber >= 800 ? @" " : @" ")
style:UIBarButtonItemStylePlain
target:self
action:@selector(reloadButtonClicked)
] autorelease];
- indicator_ = [[[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhite] autorelease];
- [indicator_ setFrame:CGRectMake(15, 5, [indicator_ frame].size.width, [indicator_ frame].size.height)];
+ UIActivityIndicatorViewStyle style;
+ float left;
+ if (kCFCoreFoundationVersionNumber >= 800) {
+ style = UIActivityIndicatorViewStyleGray;
+ left = 7;
+ } else {
+ style = UIActivityIndicatorViewStyleWhite;
+ left = 15;
+ }
+
+ indicator_ = [[[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:style] autorelease];
+ [indicator_ setFrame:CGRectMake(left, 5, [indicator_ frame].size.width, [indicator_ frame].size.height)];
[indicator_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin];
[self applyLeftButton];
// XXX: I think this improves scrolling; the hardcoded-ness sucks
[document setTileSize:CGSizeMake(320, 500)];
- [document setBackgroundColor:[UIColor clearColor]];
-
- // XXX: this is terribly (too?) expensive
- [document setDrawsBackground:NO];
-
WebView *webview([document webView]);
WebPreferences *preferences([webview preferences]);
[preferences _setLayoutInterval:0];
[preferences setCacheModel:WebCacheModelDocumentBrowser];
- [preferences setJavaScriptCanOpenWindowsAutomatically:YES];
+ [preferences setJavaScriptCanOpenWindowsAutomatically:NO];
if ([preferences respondsToSelector:@selector(setOfflineWebApplicationCacheEnabled:)])
[preferences setOfflineWebApplicationCacheEnabled:YES];
//[scroller setAllowsRubberBanding:YES];
}
+ [webview_ setOpaque:NO];
+ [webview_ setBackgroundColor:nil];
+
[scroller_ setFixedBackgroundPattern:YES];
- [scroller_ setBackgroundColor:[UIColor clearColor]];
+ [scroller_ setBackgroundColor:color_];
[scroller_ setClipsSubviews:YES];
[scroller_ setBounces:YES];
[self setViewportWidth:width_];
- UITableView *table([[[UITableView alloc] initWithFrame:[webview_ bounds] style:UITableViewStyleGrouped] autorelease]);
- [table setScrollsToTop:NO];
- [webview_ insertSubview:table atIndex:0];
+ if ([[UIColor groupTableViewBackgroundColor] isEqual:[UIColor clearColor]]) {
+ UITableView *table([[[UITableView alloc] initWithFrame:[webview_ bounds] style:UITableViewStyleGrouped] autorelease]);
+ [table setScrollsToTop:NO];
+ [webview_ insertSubview:table atIndex:0];
+ [table setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)];
+ }
- [table setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)];
[webview_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)];
ready_ = false;
} return self;
}
++ (void) _lockJavaScript:(WebPreferences *)preferences {
+ WebThreadLocked lock;
+ [preferences setJavaScriptCanOpenWindowsAutomatically:NO];
+}
+
- (void) callFunction:(WebScriptObject *)function {
WebThreadLocked lock;
WebView *webview([[[self webView] _documentView] webView]);
- WebFrame *frame([webview mainFrame]);
+ WebPreferences *preferences([webview preferences]);
+ [preferences setJavaScriptCanOpenWindowsAutomatically:YES];
+ if ([webview respondsToSelector:@selector(_preferencesChanged:)])
+ [webview _preferencesChanged:preferences];
+ else
+ [webview _preferencesChangedNotification:[NSNotification notificationWithName:@"" object:preferences]];
+
+ WebFrame *frame([webview mainFrame]);
JSGlobalContextRef context([frame globalContext]);
+
JSObjectRef object([function JSObject]);
- JSObjectCallAsFunction(context, object, NULL, 0, NULL, NULL);
+ if ($JSObjectCallAsFunction != NULL)
+ ($JSObjectCallAsFunction)(context, object, NULL, 0, NULL, NULL);
+
+ // XXX: the JavaScript code submits a form, which seems to happen asynchronously
+ NSObject *target([CyteWebViewController class]);
+ [NSObject cancelPreviousPerformRequestsWithTarget:target selector:@selector(_lockJavaScript:) object:preferences];
+ [target performSelector:@selector(_lockJavaScript:) withObject:preferences afterDelay:1];
}
- (void) reloadButtonClicked {
[self dispatchEvent:@"CydiaViewDidDisappear"];
}
+- (void) updateHeights:(NSTimer *)timer {
+ for (WebFrame *frame in (id) registered_)
+ [frame cydia$updateHeight];
+}
+
+- (void) registerFrame:(WebFrame *)frame {
+ [registered_ addObject:frame];
+
+ if (timer_ == nil)
+ timer_ = [NSTimer scheduledTimerWithTimeInterval:0.2 target:self selector:@selector(updateHeights:) userInfo:nil repeats:YES];
+}
+
@end
projects / cydia.git / blobdiff