From: Jay Freeman (saurik) Date: Mon, 12 Jul 2010 09:06:23 +0000 (+0000) Subject: I hate new firmware. X-Git-Tag: v0.9.4000~36 X-Git-Url: https://git.saurik.com/cydget.git/commitdiff_plain/2140e557c938c777840c577ee112f69d6dd1c63e I hate new firmware. --- diff --git a/CydgetSettings.mm b/CydgetSettings.mm index 6c7e5c8..e610ebf 100644 --- a/CydgetSettings.mm +++ b/CydgetSettings.mm @@ -1,5 +1,5 @@ /* CydgetScript - open-source IntelliDial replacement - * Copyright (C) 2009 Jay Freeman (saurik) + * Copyright (C) 2009-2010 Jay Freeman (saurik) */ /* @@ -37,11 +37,20 @@ #import #import +#import +#import #import #import #import #import +#include +#include + +static BOOL (*IsIconHiddenDisplayId)(NSString *); +static BOOL (*HideIconViaDisplayId)(NSString *); +static BOOL (*UnHideIconViaDisplayId)(NSString *); + extern NSString *PSTableCellKey; extern "C" UIImage *_UIImageWithName(NSString *); @@ -52,6 +61,77 @@ static BOOL settingsChanged; static NSMutableDictionary *_settings; static NSString *_plist; +/* [NSObject yieldToSelector:(withObject:)] {{{*/ +@interface NSObject (wb$yieldToSelector) +- (id) wb$yieldToSelector:(SEL)selector withObject:(id)object; +- (id) wb$yieldToSelector:(SEL)selector; +@end + +@implementation NSObject (Cydia) + +- (void) wb$doNothing { +} + +- (void) wb$_yieldToContext:(NSMutableArray *)context { + NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]); + + SEL selector(reinterpret_cast([[context objectAtIndex:0] pointerValue])); + id object([[context objectAtIndex:1] nonretainedObjectValue]); + volatile bool &stopped(*reinterpret_cast([[context objectAtIndex:2] pointerValue])); + + /* XXX: deal with exceptions */ + id value([self performSelector:selector withObject:object]); + + NSMethodSignature *signature([self methodSignatureForSelector:selector]); + [context removeAllObjects]; + if ([signature methodReturnLength] != 0 && value != nil) + [context addObject:value]; + + stopped = true; + + [self + performSelectorOnMainThread:@selector(wb$doNothing) + withObject:nil + waitUntilDone:NO + ]; + + [pool release]; +} + +- (id) wb$yieldToSelector:(SEL)selector withObject:(id)object { + /*return [self performSelector:selector withObject:object];*/ + + volatile bool stopped(false); + + NSMutableArray *context([NSMutableArray arrayWithObjects: + [NSValue valueWithPointer:selector], + [NSValue valueWithNonretainedObject:object], + [NSValue valueWithPointer:const_cast(&stopped)], + nil]); + + NSThread *thread([[[NSThread alloc] + initWithTarget:self + selector:@selector(wb$_yieldToContext:) + object:context + ] autorelease]); + + [thread start]; + + NSRunLoop *loop([NSRunLoop currentRunLoop]); + NSDate *future([NSDate distantFuture]); + + while (!stopped && [loop runMode:NSDefaultRunLoopMode beforeDate:future]); + + return [context count] == 0 ? nil : [context objectAtIndex:0]; +} + +- (id) wb$yieldToSelector:(SEL)selector { + return [self wb$yieldToSelector:selector withObject:nil]; +} + +@end +/* }}} */ + /* Theme Settings Controller {{{ */ @interface CydgetOrderController: PSViewController { UITableView *_tableView; @@ -139,7 +219,8 @@ static NSString *_plist; [_tableView setDelegate:self]; [_tableView setEditing:YES]; [_tableView setAllowsSelectionDuringEditing:YES]; - [self showLeftButton:@"Cydget" withStyle:1 rightButton:nil withStyle:0]; + if ([self respondsToSelector:@selector(setView:)]) + [self setView:_tableView]; } return self; } @@ -269,36 +350,57 @@ static NSString *_plist; return; if (![data writeToFile:_plist options:NSAtomicWrite error:NULL]) return; - - unlink("/User/Library/Caches/com.apple.springboard-imagecache-icons"); - unlink("/User/Library/Caches/com.apple.springboard-imagecache-icons.plist"); - unlink("/User/Library/Caches/com.apple.springboard-imagecache-smallicons"); - unlink("/User/Library/Caches/com.apple.springboard-imagecache-smallicons.plist"); - // XXX: recursively delete directory!! - unlink("/User/Library/Caches/SpringBoardIconCache"); - unlink("/User/Library/Caches/SpringBoardIconCache-small"); system("killall SpringBoard"); } +- (void) cancelChanges { + [_settings release]; + [_plist release]; + _plist = [[NSString stringWithFormat:@"%@/Library/Preferences/com.saurik.Cydget.plist", NSHomeDirectory()] retain]; + _settings = [([NSMutableDictionary dictionaryWithContentsOfFile:_plist] ?: [NSMutableDictionary dictionary]) retain]; + + [self reloadSpecifiers]; + if (![[PSViewController class] instancesRespondToSelector:@selector(showLeftButton:withStyle:rightButton:withStyle:)]) { + [[self navigationItem] setLeftBarButtonItem:nil]; + [[self navigationItem] setRightBarButtonItem:nil]; + } else { + [self showLeftButton:nil withStyle:0 rightButton:nil withStyle:0]; + } + settingsChanged = NO; +} + - (void) navigationBarButtonClicked:(int)buttonIndex { if (!settingsChanged) { [super navigationBarButtonClicked:buttonIndex]; return; } - if (buttonIndex == 0) - settingsChanged = NO; + if (buttonIndex == 0) { + [self cancelChanges]; + return; + } [self suspend]; [self.rootController popController]; } +- (void) settingsConfirmButtonClicked:(UIBarButtonItem *)button { + [self navigationBarButtonClicked:button.tag]; +} + - (void) viewWillRedisplay { if (settingsChanged) [self settingsChanged]; [super viewWillRedisplay]; } +- (void) viewWillAppear:(BOOL)animated { + if (settingsChanged) + [self settingsChanged]; + if ([super respondsToSelector:@selector(viewWillAppear:)]) + [super viewWillAppear:animated]; +} + - (void) pushController:(id)controller { [self hideNavigationBarButtons]; [super pushController:controller]; @@ -311,7 +413,18 @@ static NSString *_plist; } - (void) settingsChanged { - [self showLeftButton:@"Respring" withStyle:2 rightButton:@"Cancel" withStyle:0]; + if (![[PSViewController class] instancesRespondToSelector:@selector(showLeftButton:withStyle:rightButton:withStyle:)]) { + UIBarButtonItem *respringButton([[UIBarButtonItem alloc] initWithTitle:@"Respring" style:UIBarButtonItemStyleDone target:self action:@selector(settingsConfirmButtonClicked:)]); + UIBarButtonItem *cancelButton([[UIBarButtonItem alloc] initWithTitle:@"Cancel" style:UIBarButtonItemStylePlain target:self action:@selector(settingsConfirmButtonClicked:)]); + cancelButton.tag = 0; + respringButton.tag = 1; + [[self navigationItem] setLeftBarButtonItem:respringButton]; + [[self navigationItem] setRightBarButtonItem:cancelButton]; + [respringButton release]; + [cancelButton release]; + } else { + [self showLeftButton:@"Respring" withStyle:2 rightButton:@"Cancel" withStyle:0]; + } settingsChanged = YES; } @@ -320,9 +433,10 @@ static NSString *_plist; } - (void) setPreferenceValue:(id)value specifier:(PSSpecifier *)spec { + NSString *key([spec propertyForKey:@"key"]); if ([[spec propertyForKey:@"negate"] boolValue]) value = [NSNumber numberWithBool:(![value boolValue])]; - [_settings setValue:value forKey:[spec propertyForKey:@"key"]]; + [_settings setValue:value forKey:key]; [self settingsChanged]; } @@ -338,3 +452,23 @@ static NSString *_plist; } @end + +#define WBSAddMethod(_class, _sel, _imp, _type) \ + if (![[_class class] instancesRespondToSelector:@selector(_sel)]) \ + class_addMethod([_class class], @selector(_sel), (IMP)_imp, _type) +void $PSRootController$popController(PSRootController *self, SEL _cmd) { + [self popViewControllerAnimated:YES]; +} + +void $PSViewController$hideNavigationBarButtons(PSRootController *self, SEL _cmd) { +} + +id $PSViewController$initForContentSize$(PSRootController *self, SEL _cmd, CGRect contentSize) { + return [self init]; +} + +static __attribute__((constructor)) void __wbsInit() { + WBSAddMethod(PSRootController, popController, $PSRootController$popController, "v@:"); + WBSAddMethod(PSViewController, hideNavigationBarButtons, $PSViewController$hideNavigationBarButtons, "v@:"); + WBSAddMethod(PSViewController, initForContentSize:, $PSViewController$initForContentSize$, "@@:{ff}"); +} diff --git a/LockScreen.mm b/LockScreen.mm index 733478c..fc710b3 100644 --- a/LockScreen.mm +++ b/LockScreen.mm @@ -121,12 +121,25 @@ static Class $CydgetController(objc_getClass("CydgetController")); static Class $UIFormAssistant(objc_getClass("UIFormAssistant")); static Class $SBStatusBarController(objc_getClass("SBStatusBarController")); +static Class $UIWebBrowserView; +static bool Wildcat_; + @interface NSString (UIKit) - (NSString *) stringByAddingPercentEscapes; @end @implementation UIWebDocumentView (WebCycript) +- (void) _initialize { + $UIWebBrowserView = objc_getClass("UIWebBrowserView"); + if ($UIWebBrowserView == nil) { + Wildcat_ = false; + $UIWebBrowserView = objc_getClass("UIWebDocumentView"); + } else { + Wildcat_ = true; + } +} + - (void) _setScrollerOffset:(CGPoint)offset { UIScroller *scroller([self _scroller]); @@ -345,7 +358,10 @@ class Pcre { [document_ setDelegate:nil]; [document_ setGestureDelegate:nil]; - [document_ setFormEditingDelegate:nil]; + + if ([document_ respondsToSelector:@selector(setFormEditingDelegate:)]) + [document_ setFormEditingDelegate:nil]; + [document_ setInteractionDelegate:nil]; [indirect_ setDelegate:nil]; @@ -374,6 +390,88 @@ class Pcre { return 980; } +- (void) webView:(WebView *)sender didReceiveMessage:(NSDictionary *)dictionary { +#if LogBrowser || ForSaurik + lprintf("Console:%s\n", [[dictionary description] UTF8String]); +#endif + if ([document_ respondsToSelector:@selector(webView:didReceiveMessage:)]) + [document_ webView:sender didReceiveMessage:dictionary]; +} + +- (void) webView:(id)sender willCloseFrame:(id)frame { + if ([document_ respondsToSelector:@selector(webView:willCloseFrame:)]) + [document_ webView:sender willCloseFrame:frame]; +} + +- (void) webView:(id)sender didFinishDocumentLoadForFrame:(id)frame { + if ([document_ respondsToSelector:@selector(webView:didFinishDocumentLoadForFrame:)]) + [document_ webView:sender didFinishDocumentLoadForFrame:frame]; +} + +- (void) webView:(id)sender didFirstLayoutInFrame:(id)frame { + if ([document_ respondsToSelector:@selector(webView:didFirstLayoutInFrame:)]) + [document_ webView:sender didFirstLayoutInFrame:frame]; +} + +- (void) webViewFormEditedStatusHasChanged:(id)changed { + if ([document_ respondsToSelector:@selector(webViewFormEditedStatusHasChanged:)]) + [document_ webViewFormEditedStatusHasChanged:changed]; +} + +- (void) webView:(id)sender formStateDidFocusNode:(id)formState { + if ([document_ respondsToSelector:@selector(webView:formStateDidFocusNode:)]) + [document_ webView:sender formStateDidFocusNode:formState]; +} + +- (void) webView:(id)sender formStateDidBlurNode:(id)formState { + if ([document_ respondsToSelector:@selector(webView:formStateDidBlurNode:)]) + [document_ webView:sender formStateDidBlurNode:formState]; +} + +- (void) webViewDidLayout:(id)sender { + [document_ webViewDidLayout:sender]; +} + +- (void) webView:(id)sender didFirstVisuallyNonEmptyLayoutInFrame:(id)frame { + [document_ webView:sender didFirstVisuallyNonEmptyLayoutInFrame:frame]; +} + +- (void) webView:(id)sender saveStateToHistoryItem:(id)item forFrame:(id)frame { + [document_ webView:sender saveStateToHistoryItem:item forFrame:frame]; +} + +- (void) webView:(id)sender restoreStateFromHistoryItem:(id)item forFrame:(id)frame force:(BOOL)force { + [document_ webView:sender restoreStateFromHistoryItem:item forFrame:frame force:force]; +} + +- (void) webView:(id)sender attachRootLayer:(id)layer { + [document_ webView:sender attachRootLayer:layer]; +} + +- (id) webView:(id)sender plugInViewWithArguments:(id)arguments fromPlugInPackage:(id)package { + return [document_ webView:sender plugInViewWithArguments:arguments fromPlugInPackage:package]; +} + +- (void) webView:(id)sender willShowFullScreenForPlugInView:(id)view { + [document_ webView:sender willShowFullScreenForPlugInView:view]; +} + +- (void) webView:(id)sender didHideFullScreenForPlugInView:(id)view { + [document_ webView:sender didHideFullScreenForPlugInView:view]; +} + +- (void) webView:(id)sender willAddPlugInView:(id)view { + [document_ webView:sender willAddPlugInView:view]; +} + +- (void) webView:(id)sender didObserveDeferredContentChange:(int)change forFrame:(id)frame { + [document_ webView:sender didObserveDeferredContentChange:change forFrame:frame]; +} + +- (void) webViewDidPreventDefaultForEvent:(id)sender { + [document_ webViewDidPreventDefaultForEvent:sender]; +} + - (void) _setTileDrawingEnabled:(BOOL)enabled { //[document_ setTileDrawingEnabled:enabled]; } @@ -433,7 +531,7 @@ class Pcre { struct CGRect bounds([self bounds]); - scroller_ = [[UIScroller alloc] initWithFrame:bounds]; + scroller_ = [[objc_getClass(Wildcat_ ? "UIScrollView" : "UIScroller") alloc] initWithFrame:bounds]; [self addSubview:scroller_]; [scroller_ setFixedBackgroundPattern:YES]; @@ -441,18 +539,34 @@ class Pcre { [scroller_ setScrollingEnabled:YES]; [scroller_ setClipsSubviews:YES]; - [scroller_ setAllowsRubberBanding:YES]; + + if (!Wildcat_) + [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]; + + if (!Wildcat_) { + [scroller_ setScrollHysteresis:8]; + [scroller_ setThumbDetectionEnabled:NO]; + [scroller_ setDirectionalScrolling:YES]; + //[scroller_ setScrollDecelerationFactor:0.99]; /* 0.989324 */ + [scroller_ setEventMode:YES]; + } + + if (Wildcat_) { + UIScrollView *scroller((UIScrollView *)scroller_); + //[scroller setDirectionalLockEnabled:NO]; + [scroller setDelaysContentTouches:NO]; + //[scroller setScrollsToTop:NO]; + //[scroller setCanCancelContentTouches:NO]; + } + [scroller_ setShowBackgroundShadow:NO]; /* YES */ - [scroller_ setAllowsRubberBanding:YES]; /* Vertical */ - [scroller_ setAdjustForContentSizeChange:YES]; /* NO */ + //[scroller_ setAllowsRubberBanding:YES]; /* Vertical */ + + if (!Wildcat_) + [scroller_ setAdjustForContentSizeChange:YES]; /* NO */ CGRect rect([scroller_ bounds]); //rect.size.height = 0; @@ -634,18 +748,19 @@ class Pcre { CGRect subrect([scroller_ frame]); subrect.size.height -= [TPBottomLockBar defaultHeight]; subrect.size.height -= extra; - [scroller_ setScrollerIndicatorSubrect:subrect]; -#undef NSSize - NSSize visible(NSMakeSize(subrect.size.width, subrect.size.height)); - [document_ setValue:[NSValue valueWithSize:visible] forGestureAttribute:UIGestureAttributeVisibleSize]; + if ([scroller_ respondsToSelector:@selector(setScrollerIndicatorSubrect:)]) + [scroller_ setScrollerIndicatorSubrect:subrect]; + + [document_ setValue:[NSValue valueWithSize:NSMakeSize(subrect.size.width, subrect.size.height)] forGestureAttribute:UIGestureAttributeVisibleSize]; CGSize size(size_); size.height += extra; size.height += [TPBottomLockBar defaultHeight]; [scroller_ setContentSize:size]; - [scroller_ releaseRubberBandIfNecessary]; + if ([scroller_ respondsToSelector:@selector(releaseRubberBandIfNecessary)]) + [scroller_ releaseRubberBandIfNecessary]; } - (void) fixScroller { @@ -754,7 +869,16 @@ class Pcre { reloading_ = false; - [scroller_ scrollPointVisibleAtTopLeft:CGPointZero]; + if (Wildcat_) { + CGRect webrect = [scroller_ bounds]; + webrect.size.height = 1; + [document_ setFrame:webrect]; + } + + if ([scroller_ respondsToSelector:@selector(scrollPointVisibleAtTopLeft:)]) + [scroller_ scrollPointVisibleAtTopLeft:CGPointZero]; + else + [scroller_ scrollRectToVisible:CGRectZero animated:NO]; if ([scroller_ respondsToSelector:@selector(setZoomScale:duration:)]) [scroller_ setZoomScale:1 duration:0]; @@ -763,9 +887,11 @@ class Pcre { /*else if ([scroller_ respondsToSelector:@selector(setZoomScale:animated:)]) [scroller_ setZoomScale:1 animated:NO];*/ - CGRect rect([scroller_ bounds]); - //rect.size.height = 0; - [document_ setFrame:rect]; + if (!Wildcat_) { + CGRect webrect = [scroller_ bounds]; + webrect.size.height = 1; + [document_ setFrame:webrect]; + } } [self reloadButtons]; @@ -793,6 +919,8 @@ class Pcre { - (void) webView:(WebView *)sender didFailLoadWithError:(NSError *)error forFrame:(WebFrame *)frame { [self _didFailWithError: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 { diff --git a/control b/control index 009fd5e..3c5300c 100644 --- a/control +++ b/control @@ -3,7 +3,7 @@ Priority: optional Section: Development Maintainer: Jay Freeman (saurik) Architecture: iphoneos-arm -Version: 0.9.3208-1 +Version: 0.9.3212-1 Description: framework for managing lock screen plugins Name: Cydget Depends: mobilesubstrate (>= 0.9.2587-1), firmware (>= 2.2), preferenceloader, apr-lib, pcre, cycript (>= 0.9.292-1)