+ +

diff --git a/Index.js b/Index.js index 4d07295..315a3b1 100644 --- a/Index.js +++ b/Index.js @@ -1,3 +1,3 @@ -with (Cycript.runtime) { +with (Cycript.all) { document.write('

[' + malloc + ']

'); } diff --git a/LockScreen.mm b/LockScreen.mm index 76c6cdc..f1963e7 100644 --- a/LockScreen.mm +++ b/LockScreen.mm @@ -717,9 +717,82 @@ MSHook(void, _ZN3JSC6Parser5parseEPNS_12JSGlobalDataEPiPNS_7UStringE, JSC::Parse return __ZN3JSC6Parser5parseEPNS_12JSGlobalDataEPiPNS_7UStringE(_this, data, line, message); }*/ +/* Cydget:// Protocol {{{ */ +@interface CydgetURLProtocol : NSURLProtocol { +} + +@end + +@implementation CydgetURLProtocol + ++ (BOOL) canInitWithRequest:(NSURLRequest *)request { + NSURL *url([request URL]); + if (url == nil) + return NO; + NSString *scheme([[url scheme] lowercaseString]); + if (scheme == nil || ![scheme isEqualToString:@"cydget"]) + return NO; + return YES; +} + ++ (NSURLRequest *) canonicalRequestForRequest:(NSURLRequest *)request { + return request; +} + +- (void) _returnPNGWithImage:(UIImage *)icon forRequest:(NSURLRequest *)request { + id client([self client]); + if (icon == nil) + [client URLProtocol:self didFailWithError:[NSError errorWithDomain:NSURLErrorDomain code:NSURLErrorFileDoesNotExist userInfo:nil]]; + else { + NSData *data(UIImagePNGRepresentation(icon)); + + NSURLResponse *response([[[NSURLResponse alloc] initWithURL:[request URL] MIMEType:@"image/png" expectedContentLength:-1 textEncodingName:nil] autorelease]); + [client URLProtocol:self didReceiveResponse:response cacheStoragePolicy:NSURLCacheStorageNotAllowed]; + [client URLProtocol:self didLoadData:data]; + [client URLProtocolDidFinishLoading:self]; + } +} + +- (void) startLoading { + id client([self client]); + NSURLRequest *request([self request]); + + NSURL *url([request URL]); + NSString *href([url absoluteString]); + + NSString *path([href substringFromIndex:9]); + NSRange slash([path rangeOfString:@"/"]); + + NSString *command; + if (slash.location == NSNotFound) { + command = path; + path = nil; + } else { + command = [path substringToIndex:slash.location]; + path = [path substringFromIndex:(slash.location + 1)]; + } + + if ([command isEqualToString:@"_UIImageWithName"]) { + if (path == nil) + goto fail; + path = [path stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; + UIImage *icon(_UIImageWithName(path)); + [self _returnPNGWithImage:icon forRequest:request]; + } else fail: { + [client URLProtocol:self didFailWithError:[NSError errorWithDomain:NSURLErrorDomain code:NSURLErrorResourceUnavailable userInfo:nil]]; + } +} + +- (void) stopLoading { +} + +@end +/* }}} */ + @implementation WebCycriptLockScreenController + (void) initialize { + [NSURLProtocol registerClass:[CydgetURLProtocol class]]; //MSHookFunction(&_ZN3JSC6Parser5parseEPNS_12JSGlobalDataEPiPNS_7UStringE, MSHake(_ZN3JSC6Parser5parseEPNS_12JSGlobalDataEPiPNS_7UStringE)); if (void *handle = dlopen("/usr/lib/libcycript.dylib", RTLD_LAZY | RTLD_GLOBAL)) CYSetupContext = reinterpret_cast(dlsym(handle, "CYSetupContext")); diff --git a/Tweak.mm b/Tweak.mm index 6702a7f..cd25dfd 100644 --- a/Tweak.mm +++ b/Tweak.mm @@ -43,6 +43,7 @@ #import #import +#import MSClassHook(SpringBoard) MSClassHook(SBAwayController) @@ -56,8 +57,9 @@ MSClassHook(SBAwayView) static bool menu_; static unsigned lock_; +static _H settings_; static _H cydgets_; -static size_t active_ = _not(size_t); +static size_t active_; @interface CydgetController : NSObject { } @@ -69,7 +71,7 @@ static size_t active_ = _not(size_t); @implementation CydgetController + (NSDictionary *) currentConfiguration { - return active_ == _not(size_t) ? nil : [[cydgets_ objectAtIndex:active_] objectForKey:@"Configuration"]; + return [[cydgets_ objectAtIndex:active_] objectForKey:@"Configuration"]; } @end @@ -82,160 +84,90 @@ static size_t active_ = _not(size_t); @implementation NSDictionary (Cydgets) - (void) enableCydget:(SBAwayController *)away { - [away enableLockScreenBundleWithName:[self objectForKey:@"Plugin"]]; + if (NSString *plugin = [self objectForKey:@"Plugin"]) + [away enableLockScreenBundleWithName:plugin]; } - (void) disableCydget:(SBAwayController *)away { - [away disableLockScreenBundleWithName:[self objectForKey:@"Plugin"]]; + if (NSString *plugin = [self objectForKey:@"Plugin"]) + [away disableLockScreenBundleWithName:plugin]; } @end -MSHook(BOOL, SBAwayController$handleMenuButtonTap, SBAwayController *self, SEL sel) { +MSInstanceMessageHook0(BOOL, SBAwayController, handleMenuButtonTap) { unsigned lock(lock_); - if (!_SBAwayController$handleMenuButtonTap(self, sel) && lock != 2) { - if (active_ != _not(size_t)) - [[cydgets_ objectAtIndex:active_] disableCydget:self]; - - size_t count([cydgets_ count]); - if ((++active_ %= count + 1) == count) - active_ = _not(size_t); - else - [[cydgets_ objectAtIndex:active_] enableCydget:self]; + if (!MSOldCall() && lock != 2) { + [[cydgets_ objectAtIndex:active_] disableCydget:self]; + active_ = (active_ + 1) % [cydgets_ count]; + [[cydgets_ objectAtIndex:active_] enableCydget:self]; } return YES; } -MSHook(void, SBAwayController$_undimScreen, SBAwayController *self, SEL sel) { +MSInstanceMessageHook0(void, SBAwayController, _undimScreen) { if (lock_ == 1) lock_ = 2; - _SBAwayController$_undimScreen(self, sel); + [[cydgets_ objectAtIndex:active_] enableCydget:[$SBAwayController sharedAwayController]]; + MSOldCall(); } -MSHook(void, SBAwayController$undimScreen, SBAwayController *self, SEL sel) { +MSInstanceMessageHook0(void, SBAwayController, undimScreen) { lock_ = menu_ ? 1 : 0; - _SBAwayController$undimScreen(self, sel); + MSOldCall(); } static void Deactivate_(SBAwayController *self) { - if (active_ != _not(size_t)) { - [[cydgets_ objectAtIndex:active_] disableCydget:self]; - active_ = _not(size_t); - } + [[cydgets_ objectAtIndex:active_] disableCydget:self]; + active_ = 0; } -MSHook(void, SBAwayController$finishedDimmingScreen, SBAwayController *self, SEL sel) { +MSInstanceMessageHook0(void, SBAwayController, finishedDimmingScreen) { Deactivate_(self); - _SBAwayController$finishedDimmingScreen(self, sel); + MSOldCall(); } -MSHook(void, SpringBoard$menuButtonUp$, UIView *self, SEL sel, GSEventRef event) { +MSInstanceMessageHook1(void, SpringBoard, menuButtonUp, GSEventRef, event) { menu_ = true; - _SpringBoard$menuButtonUp$(self, sel, event); + MSOldCall(event); menu_ = false; } -MSHook(void, SBAwayView$addGestureRecognizer$, UIView *self, SEL sel, id gr) { - //_SBAwayView$addGestureRecognizer$(self, sel, gr); -} - -MSInstanceMessageHook1(void, SBAwayController, _finishedUnlockAttemptWithStatus, BOOL, status) { - if (status) - Deactivate_(self); - MSOldCall(status); -} - -/* Cydget:// Protocol {{{ */ -@interface CydgetURLProtocol : NSURLProtocol { -} - -@end - -@implementation CydgetURLProtocol - -+ (BOOL) canInitWithRequest:(NSURLRequest *)request { - NSURL *url([request URL]); - if (url == nil) - return NO; - NSString *scheme([[url scheme] lowercaseString]); - if (scheme == nil || ![scheme isEqualToString:@"cydget"]) - return NO; - return YES; -} - -+ (NSURLRequest *) canonicalRequestForRequest:(NSURLRequest *)request { - return request; -} - -- (void) _returnPNGWithImage:(UIImage *)icon forRequest:(NSURLRequest *)request { - id client([self client]); - if (icon == nil) - [client URLProtocol:self didFailWithError:[NSError errorWithDomain:NSURLErrorDomain code:NSURLErrorFileDoesNotExist userInfo:nil]]; - else { - NSData *data(UIImagePNGRepresentation(icon)); - - NSURLResponse *response([[[NSURLResponse alloc] initWithURL:[request URL] MIMEType:@"image/png" expectedContentLength:-1 textEncodingName:nil] autorelease]); - [client URLProtocol:self didReceiveResponse:response cacheStoragePolicy:NSURLCacheStorageNotAllowed]; - [client URLProtocol:self didLoadData:data]; - [client URLProtocolDidFinishLoading:self]; - } +MSInstanceMessageHook1(void, SBAwayView, addGestureRecognizer, id, recognizer) { + // MSOldCall(recognizer); } -- (void) startLoading { - id client([self client]); - NSURLRequest *request([self request]); - - NSURL *url([request URL]); - NSString *href([url absoluteString]); +#define Cydgets_ @"/System/Library/LockCydgets" - NSString *path([href substringFromIndex:9]); - NSRange slash([path rangeOfString:@"/"]); +static void CydgetSetup() { + NSString *plist([NSString stringWithFormat:@"%@/Library/Preferences/com.saurik.Cydget.plist", NSHomeDirectory()]); + settings_ = [NSMutableDictionary dictionaryWithContentsOfFile:plist] ?: [NSMutableDictionary dictionary]; - NSString *command; - if (slash.location == NSNotFound) { - command = path; - path = nil; - } else { - command = [path substringToIndex:slash.location]; - path = [path substringFromIndex:(slash.location + 1)]; - } + NSArray *cydgets([settings_ objectForKey:@"LockCydgets"] ?: [NSArray arrayWithObjects:[NSDictionary dictionaryWithObjectsAndKeys: + @"AwayView", @"Name", [NSNumber numberWithBool:YES], @"Active", nil + ], [NSDictionary dictionaryWithObjectsAndKeys: + @"CydgetCentral", @"Name", [NSNumber numberWithBool:YES], @"Active", nil + ], nil]); - if ([command isEqualToString:@"_UIImageWithName"]) { - if (path == nil) - goto fail; - path = [path stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; - UIImage *icon(_UIImageWithName(path)); - [self _returnPNGWithImage:icon forRequest:request]; - } else fail: { - [client URLProtocol:self didFailWithError:[NSError errorWithDomain:NSURLErrorDomain code:NSURLErrorResourceUnavailable userInfo:nil]]; - } + cydgets_ = [NSMutableArray arrayWithCapacity:4]; + for (NSDictionary *cydget in cydgets) + if ([[cydget objectForKey:@"Active"] boolValue]) + if (NSDictionary *info = [NSDictionary dictionaryWithContentsOfFile:[NSString stringWithFormat:@"%@/%@.cydget/Info.plist", Cydgets_, [cydget objectForKey:@"Name"]]]) + [cydgets_ addObject:info]; } -- (void) stopLoading { +// XXX: this could happen while it is unlocked +MSInstanceMessageHook1(id, SBAwayView, initWithFrame, CGRect, frame) { + self = MSOldCall(frame); + CydgetSetup(); + [[cydgets_ objectAtIndex:active_] enableCydget:[$SBAwayController sharedAwayController]]; + return self; } -@end -/* }}} */ - -#define Cydgets_ @"/System/Library/LockCydgets" - -MSInitialize { _pooled - [NSURLProtocol registerClass:[CydgetURLProtocol class]]; - - cydgets_ = [NSMutableArray arrayWithCapacity:4]; - - for (NSString *folder in [[NSFileManager defaultManager] directoryContentsAtPath:Cydgets_]) - if ([folder hasSuffix:@".cydget"]) - [cydgets_ addObject:[NSDictionary dictionaryWithContentsOfFile:[[Cydgets_ stringByAppendingPathComponent:folder] stringByAppendingPathComponent:@"Info.plist"]]]; - - MSHookMessage1(SpringBoard, menuButtonUp); - - MSHookMessage0(SBAwayController, handleMenuButtonTap); - MSHookMessage0(SBAwayController, _undimScreen); - MSHookMessage0(SBAwayController, undimScreen); - MSHookMessage0(SBAwayController, finishedDimmingScreen); - - MSHookMessage1(SBAwayView, addGestureRecognizer); +MSInstanceMessageHook1(void, SBAwayController, _finishedUnlockAttemptWithStatus, BOOL, status) { + if (status) + Deactivate_(self); + MSOldCall(status); } diff --git a/control b/control index 159e3be..e100ed2 100644 --- a/control +++ b/control @@ -3,7 +3,7 @@ Priority: optional Section: Development Maintainer: Jay Freeman (saurik) Architecture: iphoneos-arm -Version: 0.9.3076-1 +Version: 0.9.3079-1 Description: framework for managing lock screen plugins Name: Cydget Depends: mobilesubstrate (>= 0.9.2587-1), cycript (>= 0.9.252) diff --git a/makefile b/makefile index f88b187..2108060 100644 --- a/makefile +++ b/makefile @@ -22,12 +22,13 @@ extra: mkdir -p package/System/Library/LockCydgets/CydgetCentral.cydget cp -a Index.{html,js} package/System/Library/LockCydgets/CydgetCentral.cydget cp -a CydgetCentral.plist package/System/Library/LockCydgets/CydgetCentral.cydget/Info.plist + svn export AwayView.cydget package/System/Library/LockCydgets/AwayView.cydget mkdir -p package/System/Library/SpringBoardPlugins/WebCycriptLockScreen.bundle cp -a Info.plist package/System/Library/SpringBoardPlugins/WebCycriptLockScreen.bundle cp -a WebCycriptLockScreen package/System/Library/SpringBoardPlugins/WebCycriptLockScreen.bundle mkdir -p package/Library/PreferenceLoader/Preferences mkdir -p package/System/Library/PreferenceBundles cp -a CydgetSettings.plist package/Library/PreferenceLoader/Preferences - cp -a CydgetSettings.bundle package/System/Library/PreferenceBundles + svn export CydgetSettings.bundle package/System/Library/PreferenceBundles/CydgetSettings.bundle cp -a Icon-Small.png package/System/Library/PreferenceBundles/CydgetSettings.bundle/icon.png cp -a SearchResultsCheckmarkClear.png CydgetSettings package/System/Library/PreferenceBundles/CydgetSettings.bundle