X-Git-Url: https://git.saurik.com/winterboard.git/blobdiff_plain/98fe8d526b1e894a1cfef54ba686991015fa0898..c79980f545109cc1941ef572211890a85b16d9ab:/Library.mm diff --git a/Library.mm b/Library.mm index e46acb6..a377ae0 100644 --- a/Library.mm +++ b/Library.mm @@ -1,5 +1,5 @@ /* WinterBoard - Theme Manager for the iPhone - * Copyright (C) 2008 Jay Freeman (saurik) + * Copyright (C) 2008-2010 Jay Freeman (saurik) */ /* @@ -35,7 +35,26 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#define _trace() NSLog(@"WB:_trace(%u)", __LINE__); +#include + +struct timeval _ltv; +bool _itv; + +#define _trace() do { \ + struct timeval _ctv; \ + gettimeofday(&_ctv, NULL); \ + if (!_itv) { \ + _itv = true; \ + _ltv = _ctv; \ + } \ + fprintf(stderr, "%lu.%.6u[%f]:_trace()@%s:%u[%s]\n", \ + _ctv.tv_sec, _ctv.tv_usec, \ + (_ctv.tv_sec - _ltv.tv_sec) + (_ctv.tv_usec - _ltv.tv_usec) / 1000000.0, \ + __FILE__, __LINE__, __FUNCTION__\ + ); \ + _ltv = _ctv; \ +} while (false) + #define _transient #import @@ -53,14 +72,17 @@ #import #import #import +#import #import #import #import -#import #import #import +#import #import -#import +#import +// XXX: #import +#import #import #import #import @@ -76,6 +98,8 @@ #import +#import + extern "C" void __clear_cache (char *beg, char *end); @protocol WinterBoard @@ -92,31 +116,41 @@ Class $UIImage; Class $UINavigationBar; Class $UIToolbar; +Class $CKMessageCell; +Class $CKTimestampView; +Class $CKTranscriptController; +Class $CKTranscriptTableView; + Class $SBApplication; Class $SBApplicationIcon; +Class $SBAwayView; Class $SBBookmarkIcon; Class $SBButtonBar; Class $SBCalendarIconContentsView; -Class $SBContentLayer; +Class $SBIcon; Class $SBIconBadge; Class $SBIconController; Class $SBIconLabel; +Class $SBIconList; Class $SBIconModel; -Class $SBSlidingAlertDisplay; +//Class $SBImageCache; +Class $SBSearchView; +Class $SBSearchTableViewCell; Class $SBStatusBarContentsView; Class $SBStatusBarController; Class $SBStatusBarOperatorNameView; Class $SBStatusBarTimeView; +Class $SBUIController; Class $SBWidgetApplicationIcon; @interface NSDictionary (WinterBoard) -- (UIColor *) colorForKey:(NSString *)key; -- (BOOL) boolForKey:(NSString *)key; +- (UIColor *) wb$colorForKey:(NSString *)key; +- (BOOL) wb$boolForKey:(NSString *)key; @end @implementation NSDictionary (WinterBoard) -- (UIColor *) colorForKey:(NSString *)key { +- (UIColor *) wb$colorForKey:(NSString *)key { NSString *value = [self objectForKey:key]; if (value == nil) return nil; @@ -124,7 +158,7 @@ Class $SBWidgetApplicationIcon; return nil; } -- (BOOL) boolForKey:(NSString *)key { +- (BOOL) wb$boolForKey:(NSString *)key { if (NSString *value = [self objectForKey:key]) return [value boolValue]; return false; @@ -132,15 +166,19 @@ Class $SBWidgetApplicationIcon; @end +static BOOL (*_GSFontGetUseLegacyFontMetrics)(); +#define $GSFontGetUseLegacyFontMetrics() \ + (_GSFontGetUseLegacyFontMetrics == NULL ? YES : _GSFontGetUseLegacyFontMetrics()) + bool Debug_ = false; bool Engineer_ = false; +bool SummerBoard_ = true; static UIImage *(*_UIApplicationImageWithName)(NSString *name); static UIImage *(*_UIImageAtPath)(NSString *name, NSBundle *path); static CGImageRef (*_UIImageRefAtPath)(NSString *name, bool cache, UIImageOrientation *orientation); static UIImage *(*_UIImageWithNameInDomain)(NSString *name, NSString *domain); static NSBundle *(*_UIKitBundle)(); -static void (*_UISharedImageInitialize)(bool); static int (*_UISharedImageNameGetIdentifier)(NSString *); static UIImage *(*_UISharedImageWithIdentifier)(int); @@ -198,9 +236,11 @@ static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle, bool u [names addObject:[NSString stringWithFormat:@"%@.png", newname]]; \ if (identifier == nil); + else if ([identifier isEqualToString:@"com.apple.chatkit"]) + [names addObject:[NSString stringWithFormat:@"Bundles/com.apple.MobileSMS/%@", file]]; else if ([identifier isEqualToString:@"com.apple.calculator"]) [names addObject:[NSString stringWithFormat:@"Files/Applications/Calculator.app/%@", file]]; - else if (![identifier isEqualToString:@"com.apple.springboard"]); + else if (![identifier isEqualToString:@"com.apple.springboard"] || !SummerBoard_); remapResourceName(@"FSO_BG.png", @"StatusBar") remapResourceName(@"SBDockBG.png", @"Dock") remapResourceName(@"SBWeatherCelsius.png", @"Icons/Weather") @@ -222,18 +262,25 @@ static NSString *$pathForIcon$(SBApplication *self) { NSMutableArray *names = [NSMutableArray arrayWithCapacity:8]; + /* XXX: I might need to keep this for backwards compatibility if (identifier != nil) [names addObject:[NSString stringWithFormat:@"Bundles/%@/icon.png", identifier]]; if (folder != nil) - [names addObject:[NSString stringWithFormat:@"Folders/%@/icon.png", folder]]; + [names addObject:[NSString stringWithFormat:@"Folders/%@/icon.png", folder]]; */ #define testForIcon(Name) \ if (NSString *name = Name) \ [names addObject:[NSString stringWithFormat:@"Icons/%@.png", name]]; + if (![didentifier isEqualToString:identifier]) + testForIcon(didentifier); + testForIcon(identifier); testForIcon(dname); + if ([identifier isEqualToString:@"com.apple.MobileSMS"]) + testForIcon(@"SMS"); + if (didentifier != nil) { testForIcon([English_ objectForKey:didentifier]); @@ -245,6 +292,7 @@ static NSString *$pathForIcon$(SBApplication *self) { if (NSString *path = $getTheme$(names)) return path; + return nil; } @@ -303,26 +351,69 @@ static NSString *$pathForIcon$(SBApplication *self) { @end +void WBLogRect(const char *tag, struct CGRect rect) { + NSLog(@"%s:{%f,%f+%f,%f}", tag, rect.origin.x, rect.origin.y, rect.size.width, rect.size.height); +} + +void WBLogHierarchy(UIView *view, unsigned index = 0, unsigned indent = 0) { + CGRect frame([view frame]); + NSLog(@"%*s|%2d:%p:%s : {%f,%f+%f,%f} (%@)", indent * 3, "", index, view, class_getName([view class]), frame.origin.x, frame.origin.y, frame.size.width, frame.size.height, [view backgroundColor]); + index = 0; + for (UIView *child in [view subviews]) + WBLogHierarchy(child, index++, indent + 1); +} + +UIImage *$cacheForImage$(UIImage *image) { + CGColorSpaceRef space(CGColorSpaceCreateDeviceRGB()); + CGRect rect = {CGPointMake(1, 1), [image size]}; + CGSize size = {rect.size.width + 2, rect.size.height + 2}; + + CGContextRef context(CGBitmapContextCreate(NULL, size.width, size.height, 8, 4 * size.width, space, kCGBitmapByteOrder32Little | kCGImageAlphaPremultipliedFirst)); + CGColorSpaceRelease(space); + + CGContextDrawImage(context, rect, [image CGImage]); + CGImageRef ref(CGBitmapContextCreateImage(context)); + CGContextRelease(context); + + UIImage *cache([UIImage imageWithCGImage:ref]); + CGImageRelease(ref); + + return cache; +} + +/*MSHook(id, SBImageCache$initWithName$forImageWidth$imageHeight$initialCapacity$, SBImageCache *self, SEL sel, NSString *name, unsigned width, unsigned height, unsigned capacity) { + //if ([name isEqualToString:@"icons"]) return nil; + return _SBImageCache$initWithName$forImageWidth$imageHeight$initialCapacity$(self, sel, name, width, height, capacity); +}*/ + MSHook(void, SBIconModel$cacheImageForIcon$, SBIconModel *self, SEL sel, SBIcon *icon) { - _SBIconModel$cacheImageForIcon$(self, sel, icon); NSString *key([icon displayIdentifier]); if (UIImage *image = [icon icon]) { - CGColorSpaceRef space(CGColorSpaceCreateDeviceRGB()); - CGRect rect = {CGPointMake(1, 1), [image size]}; - CGSize size = {rect.size.width + 2, rect.size.height + 2}; + CGSize size = [image size]; + if (size.width != 59 || size.height != 60) { + UIImage *cache($cacheForImage$(image)); + [Cache_ setObject:cache forKey:key]; + return; + } + } - CGContextRef context(CGBitmapContextCreate(NULL, size.width, size.height, 8, 4 * size.width, space, kCGBitmapByteOrder32Little | kCGImageAlphaPremultipliedFirst)); - CGColorSpaceRelease(space); + _SBIconModel$cacheImageForIcon$(self, sel, icon); +} - CGContextDrawImage(context, rect, [image CGImage]); - CGImageRef ref(CGBitmapContextCreateImage(context)); - CGContextRelease(context); +MSHook(void, SBIconModel$cacheImagesForIcon$, SBIconModel *self, SEL sel, SBIcon *icon) { + /* XXX: do I /really/ have to do this? figure out how to cache the small icon! */ + _SBIconModel$cacheImagesForIcon$(self, sel, icon); - UIImage *image([UIImage imageWithCGImage:ref]); - CGImageRelease(ref); + NSString *key([icon displayIdentifier]); - [Cache_ setObject:image forKey:key]; + if (UIImage *image = [icon icon]) { + CGSize size = [image size]; + if (size.width != 59 || size.height != 60) { + UIImage *cache($cacheForImage$(image)); + [Cache_ setObject:cache forKey:key]; + return; + } } } @@ -334,8 +425,40 @@ MSHook(UIImage *, SBIconModel$getCachedImagedForIcon$, SBIconModel *self, SEL se return _SBIconModel$getCachedImagedForIcon$(self, sel, icon); } +MSHook(UIImage *, SBIconModel$getCachedImagedForIcon$smallIcon$, SBIconModel *self, SEL sel, SBIcon *icon, BOOL small) { + if (small) + return _SBIconModel$getCachedImagedForIcon$smallIcon$(self, sel, icon, small); + NSString *key([icon displayIdentifier]); + if (UIImage *image = [Cache_ objectForKey:key]) + return image; + else + return _SBIconModel$getCachedImagedForIcon$smallIcon$(self, sel, icon, small); +} + +MSHook(id, SBSearchView$initWithFrame$, id /* XXX: SBSearchView */ self, SEL sel, struct CGRect frame) { + if ((self = _SBSearchView$initWithFrame$(self, sel, frame)) != nil) { + [self setBackgroundColor:[UIColor clearColor]]; + for (UIView *child in [self subviews]) + [child setBackgroundColor:[UIColor clearColor]]; + } return self; +} + +MSHook(id, SBSearchTableViewCell$initWithStyle$reuseIdentifier$, SBSearchTableViewCell *self, SEL sel, int style, NSString *reuse) { + if ((self = _SBSearchTableViewCell$initWithStyle$reuseIdentifier$(self, sel, style, reuse)) != nil) { + [self setBackgroundColor:[UIColor clearColor]]; + } return self; +} + +MSHook(void, SBSearchTableViewCell$drawRect$, SBSearchTableViewCell *self, SEL sel, struct CGRect rect, BOOL selected) { + _SBSearchTableViewCell$drawRect$(self, sel, rect, selected); + float inset([self edgeInset]); + [[UIColor clearColor] set]; + UIRectFill(CGRectMake(0, 0, inset, rect.size.height)); + UIRectFill(CGRectMake(rect.size.width - inset, 0, inset, rect.size.height)); +} + MSHook(UIImage *, SBApplicationIcon$icon, SBApplicationIcon *self, SEL sel) { - if (![Info_ boolForKey:@"ComposeStoreIcons"]) + if (![Info_ wb$boolForKey:@"ComposeStoreIcons"]) if (NSString *path = $pathForIcon$([self application])) return [UIImage imageWithContentsOfFile:path]; return _SBApplicationIcon$icon(self, sel); @@ -462,28 +585,35 @@ MSHook(void, SBCalendarIconContentsView$drawRect$, SBCalendarIconContentsView *s CFDateFormatterSetFormat(formatter, (CFStringRef) [bundle localizedStringForKey:@"CALENDAR_ICON_DAY_NUMBER_FORMAT" value:@"" table:@"SpringBoard"]); CFStringRef date(CFDateFormatterCreateStringWithDate(NULL, formatter, now)); - CFDateFormatterSetFormat(formatter, (CFStringRef) [bundle localizedStringForKey:@"CALENDAR_ICON_DAY_NAME_FORMAT" value:@"" table:@"SpringBoard"]); + CFDateFormatterSetFormat(formatter, (CFStringRef) [bundle localizedStringForKey:@"CALENDAR_ICON_DAY_NAME_FORMAT" value:@"cccc" table:@"SpringBoard"]); CFStringRef day(CFDateFormatterCreateStringWithDate(NULL, formatter, now)); CFRelease(now); CFRelease(formatter); - NSString *datestyle(@"" + UIDevice *device([UIDevice currentDevice]); + bool isWild([device respondsToSelector:@selector(isWildcat)] && [device isWildcat]); + + NSString *datestyle([@"" "font-family: Helvetica; " "font-weight: bold; " - "font-size: 39px; " "color: #333333; " "alpha: 1.0; " - ""); + "" stringByAppendingString:(isWild + ? @"font-size: 54px; " + : @"font-size: 39px; " + )]); - NSString *daystyle(@"" + NSString *daystyle([@"" "font-family: Helvetica; " "font-weight: bold; " - "font-size: 9px; " "color: white; " "text-shadow: rgba(0, 0, 0, 0.2) -1px -1px 2px; " - ""); + "" stringByAppendingString:(isWild + ? @"font-size: 11px; " + : @"font-size: 9px; " + )]); if (NSString *style = [Info_ objectForKey:@"CalendarIconDateStyle"]) datestyle = [datestyle stringByAppendingString:style]; @@ -495,12 +625,16 @@ MSHook(void, SBCalendarIconContentsView$drawRect$, SBCalendarIconContentsView *s CGSize datesize = [(NSString *)date sizeWithStyle:datestyle forWidth:(width + leeway)]; CGSize daysize = [(NSString *)day sizeWithStyle:daystyle forWidth:(width + leeway)]; + unsigned base(isWild ? 89 : 70); + if ($GSFontGetUseLegacyFontMetrics()) + base = base + 1; + [(NSString *)date drawAtPoint:CGPointMake( - (width + 1 - datesize.width) / 2, (71 - datesize.height) / 2 + (width + 1 - datesize.width) / 2, (base - datesize.height) / 2 ) withStyle:datestyle]; [(NSString *)day drawAtPoint:CGPointMake( - (width + 1 - daysize.width) / 2, (16 - daysize.height) / 2 + (width + 1 - daysize.width) / 2, ((isWild ? 18 : 16) - daysize.height) / 2 ) withStyle:daystyle]; CFRelease(date); @@ -508,12 +642,12 @@ MSHook(void, SBCalendarIconContentsView$drawRect$, SBCalendarIconContentsView *s } /*static id UINavigationBarBackground$initWithFrame$withBarStyle$withTintColor$(UINavigationBarBackground *self, SEL sel, CGRect frame, int style, UIColor *tint) { - _trace(); +_trace(); if (NSNumber *number = [Info_ objectForKey:@"NavigationBarStyle"]) style = [number intValue]; - if (UIColor *color = [Info_ colorForKey:@"NavigationBarTint"]) + if (UIColor *color = [Info_ wb$colorForKey:@"NavigationBarTint"]) tint = color; return [self wb$initWithFrame:frame withBarStyle:style withTintColor:tint]; @@ -575,11 +709,29 @@ static NSURL *WallpaperURL_; object = nil; \ } while (false) -MSHook(id, SBContentLayer$initWithSize$, SBContentLayer *self, SEL sel, CGSize size) { - self = _SBContentLayer$initWithSize$(self, sel, size); +MSHook(id, SBUIController$init, SBUIController *self, SEL sel) { + self = _SBUIController$init(self, sel); if (self == nil) return nil; + UIWindow *&_window(MSHookIvar(self, "_window")); + UIView *&_contentLayer(MSHookIvar(self, "_contentLayer")); + UIView *&_contentView(MSHookIvar(self, "_contentView")); + + UIView *layer; + if (&_contentLayer != NULL) + layer = _contentLayer; + else if (&_contentView != NULL) + layer = _contentView; + else + layer = nil; + + UIView *content([[[UIView alloc] initWithFrame:[layer frame]] autorelease]); + [content setBackgroundColor:[layer backgroundColor]]; + [layer setBackgroundColor:[UIColor clearColor]]; + [layer setFrame:[content bounds]]; + [_window setContentView:content]; + _release(WallpaperFile_); _release(WallpaperImage_); _release(WallpaperPage_); @@ -599,7 +751,7 @@ MSHook(id, SBContentLayer$initWithSize$, SBContentLayer *self, SEL sel, CGSize s AVQueue *queue([controller_ queue]); - UIView *video([[[UIView alloc] initWithFrame:[self bounds]] autorelease]); + UIView *video([[[UIView alloc] initWithFrame:[content bounds]] autorelease]); [controller_ setLayer:[video _layer]]; AVItem *item([[[AVItem alloc] initWithPath:mp4 error:&error] autorelease]); @@ -608,18 +760,18 @@ MSHook(id, SBContentLayer$initWithSize$, SBContentLayer *self, SEL sel, CGSize s [controller_ play:&error]; #elif UseMPMoviePlayerController NSURL *url([NSURL fileURLWithPath:mp4]); - MPMoviePlayerController *controller = [[MPMoviePlayerController alloc] initWithContentURL:url]; + MPMoviePlayerController *controller = [[$MPMoviePlayerController alloc] initWithContentURL:url]; controller.movieControlMode = MPMovieControlModeHidden; [controller play]; #else - MPVideoView *video = [[[$MPVideoView alloc] initWithFrame:[self bounds]] autorelease]; + MPVideoView *video = [[[$MPVideoView alloc] initWithFrame:[content bounds]] autorelease]; [video setMovieWithPath:mp4]; [video setRepeatMode:1]; [video setRepeatGap:-1]; [video playFromBeginning];; #endif - [self addSubview:video]; + [content addSubview:video]; } NSString *png = [theme stringByAppendingPathComponent:@"Wallpaper.png"]; @@ -642,12 +794,14 @@ MSHook(id, SBContentLayer$initWithSize$, SBContentLayer *self, SEL sel, CGSize s if (image != nil) { WallpaperFile_ = [path retain]; WallpaperImage_ = [[UIImageView alloc] initWithImage:image]; - [self addSubview:WallpaperImage_]; + if (NSNumber *number = [Info_ objectForKey:@"WallpaperAlpha"]) + [WallpaperImage_ setAlpha:[number floatValue]]; + [content addSubview:WallpaperImage_]; } NSString *html = [theme stringByAppendingPathComponent:@"Wallpaper.html"]; if ([Manager_ fileExistsAtPath:html]) { - CGRect bounds = [self bounds]; + CGRect bounds = [content bounds]; UIWebDocumentView *view([[[UIWebDocumentView alloc] initWithFrame:bounds] autorelease]); [view setAutoresizes:true]; @@ -657,10 +811,12 @@ MSHook(id, SBContentLayer$initWithSize$, SBContentLayer *self, SEL sel, CGSize s [WallpaperPage_ loadRequest:[NSURLRequest requestWithURL:WallpaperURL_]]; - [[view webView] setDrawsBackground:false]; [view setBackgroundColor:[UIColor clearColor]]; + if ([view respondsToSelector:@selector(setDrawsBackground:)]) + [view setDrawsBackground:NO]; + [[view webView] setDrawsBackground:NO]; - [self addSubview:view]; + [content addSubview:view]; } } @@ -668,7 +824,7 @@ MSHook(id, SBContentLayer$initWithSize$, SBContentLayer *self, SEL sel, CGSize s NSString *theme = [themes_ objectAtIndex:(e - i - 1)]; NSString *html = [theme stringByAppendingPathComponent:@"Widget.html"]; if ([Manager_ fileExistsAtPath:html]) { - CGRect bounds = [self bounds]; + CGRect bounds = [content bounds]; UIWebDocumentView *view([[[UIWebDocumentView alloc] initWithFrame:bounds] autorelease]); [view setAutoresizes:true]; @@ -676,24 +832,28 @@ MSHook(id, SBContentLayer$initWithSize$, SBContentLayer *self, SEL sel, CGSize s NSURL *url = [NSURL fileURLWithPath:html]; [view loadRequest:[NSURLRequest requestWithURL:url]]; - [[view webView] setDrawsBackground:false]; [view setBackgroundColor:[UIColor clearColor]]; + if ([view respondsToSelector:@selector(setDrawsBackground:)]) + [view setDrawsBackground:NO]; + [[view webView] setDrawsBackground:NO]; - [self addSubview:view]; + [content addSubview:view]; } } + [content addSubview:layer]; + return self; } -MSHook(void, SBSlidingAlertDisplay$updateDesktopImage$, SBSlidingAlertDisplay *self, SEL sel, UIImage *image) { +MSHook(void, SBAwayView$updateDesktopImage$, SBAwayView *self, SEL sel, UIImage *image) { NSString *path = $getTheme$([NSArray arrayWithObject:@"LockBackground.html"]); UIView *&_backgroundView(MSHookIvar(self, "_backgroundView")); if (path != nil && _backgroundView != nil) path = nil; - _SBSlidingAlertDisplay$updateDesktopImage$(self, sel, image); + _SBAwayView$updateDesktopImage$(self, sel, image); if (path != nil) { CGRect bounds = [self bounds]; @@ -746,6 +906,10 @@ extern "C" NSString *UIStyleStringFromColor(CGColorRef);*/ return self; } +- (NSString *) description { + return time_; +} + WBDelegate(time_) - (CGSize) drawAtPoint:(CGPoint)point forWidth:(float)width withFont:(UIFont *)font lineBreakMode:(int)mode { @@ -773,6 +937,7 @@ WBDelegate(time_) } - (id) initWithBadge:(NSString *)badge; +- (NSString *) description; @end @@ -788,6 +953,10 @@ WBDelegate(time_) return self; } +- (NSString *) description { + return [badge_ description]; +} + WBDelegate(badge_) - (CGSize) drawAtPoint:(CGPoint)point forWidth:(float)width withFont:(UIFont *)font lineBreakMode:(int)mode { @@ -808,6 +977,12 @@ WBDelegate(badge_) @end /* }}} */ +MSHook(void, SBIcon$setAlpha$, SBIcon *self, SEL sel, float alpha) { + if (NSNumber *number = [Info_ objectForKey:@"IconAlpha"]) + alpha = [number floatValue]; + return _SBIcon$setAlpha$(self, sel, alpha); +} + MSHook(id, SBIconBadge$initWithBadge$, SBIconBadge *self, SEL sel, NSString *badge) { if ((self = _SBIconBadge$initWithBadge$(self, sel, badge)) != nil) { id &_badge(MSHookIvar(self, "_badge")); @@ -817,20 +992,38 @@ MSHook(id, SBIconBadge$initWithBadge$, SBIconBadge *self, SEL sel, NSString *bad } return self; } -MSHook(void, SBStatusBarController$setStatusBarMode$orientation$duration$fenceID$animation$, SBStatusBarController *self, SEL sel, int mode, int orientation, float duration, int id, int animation) { +void SBStatusBarController$setStatusBarMode(int &mode) { if (Debug_) NSLog(@"WB:Debug:setStatusBarMode:%d", mode); if (mode < 100) // 104:hidden 105:glowing if (NSNumber *number = [Info_ objectForKey:@"StatusBarMode"]) mode = [number intValue]; - return _SBStatusBarController$setStatusBarMode$orientation$duration$fenceID$animation$(self, sel, mode, orientation, duration, id, animation); } -MSHook(id, SBStatusBarContentsView$initWithStatusBar$mode$, SBStatusBarContentsView *self, SEL sel, id bar, int mode) { +/*MSHook(void, SBStatusBarController$setStatusBarMode$orientation$duration$animation$, SBStatusBarController *self, SEL sel, int mode, int orientation, double duration, int animation) { + NSLog(@"mode:%d orientation:%d duration:%f animation:%d", mode, orientation, duration, animation); + SBStatusBarController$setStatusBarMode(mode); + return _SBStatusBarController$setStatusBarMode$orientation$duration$animation$(self, sel, mode, orientation, duration, animation); +}*/ + +MSHook(void, SBStatusBarController$setStatusBarMode$orientation$duration$fenceID$animation$, SBStatusBarController *self, SEL sel, int mode, int orientation, float duration, int fenceID, int animation) { + //NSLog(@"mode:%d orientation:%d duration:%f fenceID:%d animation:%d", mode, orientation, duration, fenceID, animation); + SBStatusBarController$setStatusBarMode(mode); + return _SBStatusBarController$setStatusBarMode$orientation$duration$fenceID$animation$(self, sel, mode, orientation, duration, fenceID, animation); +} + +MSHook(void, SBStatusBarController$setStatusBarMode$orientation$duration$fenceID$animation$startTime$, SBStatusBarController *self, SEL sel, int mode, int orientation, double duration, int fenceID, int animation, double startTime) { + //NSLog(@"mode:%d orientation:%d duration:%f fenceID:%d animation:%d startTime:%f", mode, orientation, duration, fenceID, animation, startTime); + SBStatusBarController$setStatusBarMode(mode); + //NSLog(@"mode=%u", mode); + return _SBStatusBarController$setStatusBarMode$orientation$duration$fenceID$animation$startTime$(self, sel, mode, orientation, duration, fenceID, animation, startTime); +} + +/*MSHook(id, SBStatusBarContentsView$initWithStatusBar$mode$, SBStatusBarContentsView *self, SEL sel, id bar, int mode) { if (NSNumber *number = [Info_ objectForKey:@"StatusBarContentsMode"]) mode = [number intValue]; return _SBStatusBarContentsView$initWithStatusBar$mode$(self, sel, bar, mode); -} +}*/ MSHook(NSString *, SBStatusBarOperatorNameView$operatorNameStyle, SBStatusBarOperatorNameView *self, SEL sel) { NSString *style(_SBStatusBarOperatorNameView$operatorNameStyle(self, sel)); @@ -856,29 +1049,59 @@ MSHook(void, SBStatusBarTimeView$drawRect$, SBStatusBarTimeView *self, SEL sel, } @interface UIView (WinterBoard) -- (bool) wb$isImageView; +- (bool) wb$isWBImageView; +- (void) wb$logHierarchy; @end @implementation UIView (WinterBoard) -- (bool) wb$isImageView { +- (bool) wb$isWBImageView { return false; } +- (void) wb$logHierarchy { + WBLogHierarchy(self); +} + @end -@interface UIImageView (WinterBoard) -- (bool) wb$isImageView; +@interface WBImageView : UIImageView { +} + +- (bool) wb$isWBImageView; +- (void) wb$updateFrame; @end -@implementation UIImageView (WinterBoard) +@implementation WBImageView -- (bool) wb$isImageView { +- (bool) wb$isWBImageView { return true; } +- (void) wb$updateFrame { + CGRect frame([self frame]); + frame.origin.y = 0; + + for (UIView *view(self); ; ) { + view = [view superview]; + if (view == nil) + break; + frame.origin.y -= [view frame].origin.y; + } + + [self setFrame:frame]; +} + @end +MSHook(void, SBIconList$setFrame$, SBIconList *self, SEL sel, CGRect frame) { + NSArray *subviews([self subviews]); + WBImageView *view([subviews count] == 0 ? nil : [subviews objectAtIndex:0]); + if (view != nil && [view wb$isWBImageView]) + [view wb$updateFrame]; + _SBIconList$setFrame$(self, sel, frame); +} + MSHook(void, SBIconController$noteNumberOfIconListsChanged, SBIconController *self, SEL sel) { SBIconModel *&_iconModel(MSHookIvar(self, "_iconModel")); NSArray *lists([_iconModel iconLists]); @@ -887,13 +1110,21 @@ MSHook(void, SBIconController$noteNumberOfIconListsChanged, SBIconController *se if (NSString *path = $getTheme$([NSArray arrayWithObject:[NSString stringWithFormat:@"Page%u.png", i]])) { SBIconList *list([lists objectAtIndex:i]); NSArray *subviews([list subviews]); - UIImageView *view([subviews count] == 0 ? nil : [subviews objectAtIndex:0]); - if (view == nil || ![view wb$isImageView]) { - view = [[[UIImageView alloc] init] autorelease]; + + WBImageView *view([subviews count] == 0 ? nil : [subviews objectAtIndex:0]); + if (view == nil || ![view wb$isWBImageView]) { + view = [[[WBImageView alloc] init] autorelease]; [list insertSubview:view atIndex:0]; } + UIImage *image([UIImage imageWithContentsOfFile:path]); + + CGRect frame([view frame]); + frame.size = [image size]; + [view setFrame:frame]; + [view setImage:image]; + [view wb$updateFrame]; } return _SBIconController$noteNumberOfIconListsChanged(self, sel); @@ -908,7 +1139,7 @@ MSHook(id, SBIconLabel$initWithSize$label$, SBIconLabel *self, SEL sel, CGSize s MSHook(void, SBIconLabel$setInDock$, SBIconLabel *self, SEL sel, BOOL docked) { id &_label(MSHookIvar(self, "_label")); - if (![Info_ boolForKey:@"UndockedIconLabels"]) + if (![Info_ wb$boolForKey:@"UndockedIconLabels"]) docked = true; if (_label != nil && [_label respondsToSelector:@selector(setInDock:)]) [_label setInDock:docked]; @@ -999,24 +1230,68 @@ MSHook(void, SBIconLabel$drawRect$, SBIconLabel *self, SEL sel, CGRect rect) { [label drawAtPoint:CGPointMake((bounds.size.width - size.width) / 2, 0) withStyle:style]; } -MSHook(void, mSMSMessageTranscriptController$loadView, mSMSMessageTranscriptController *self, SEL sel) { - _mSMSMessageTranscriptController$loadView(self, sel); +MSHook(void, CKMessageCell$addBalloonView$, id self, SEL sel, CKBalloonView *balloon) { + _CKMessageCell$addBalloonView$(self, sel, balloon); + [balloon setBackgroundColor:[UIColor clearColor]]; +} + +MSHook(id, CKMessageCell$initWithStyle$reuseIdentifier$, id self, SEL sel, int style, NSString *reuse) { + if ((self = _CKMessageCell$initWithStyle$reuseIdentifier$(self, sel, style, reuse)) != nil) { + [[self contentView] setBackgroundColor:[UIColor clearColor]]; + } return self; +} + +MSHook(id, CKTimestampView$initWithStyle$reuseIdentifier$, id self, SEL sel, int style, NSString *reuse) { + if ((self = _CKTimestampView$initWithStyle$reuseIdentifier$(self, sel, style, reuse)) != nil) { + UILabel *&_label(MSHookIvar(self, "_label")); + [_label setBackgroundColor:[UIColor clearColor]]; + } return self; +} + +MSHook(void, CKTranscriptTableView$setSeparatorStyle$, id self, SEL sel, int style) { + _CKTranscriptTableView$setSeparatorStyle$(self, sel, UITableViewCellSeparatorStyleNone); +} + +MSHook(id, CKTranscriptTableView$initWithFrame$style$, id self, SEL sel, CGRect frame, int style) { + _trace(); + if ((self = _CKTranscriptTableView$initWithFrame$style$(self, sel, frame, style)) != nil) { + [self setSeparatorStyle:UITableViewCellSeparatorStyleNone]; + } return self; +} + +MSHook(void, TranscriptController$loadView, mSMSMessageTranscriptController *self, SEL sel) { + _TranscriptController$loadView(self, sel); if (NSString *path = $getTheme$([NSArray arrayWithObjects:@"SMSBackground.png", @"SMSBackground.jpg", nil])) if (UIImage *image = [[UIImage alloc] initWithContentsOfFile:path]) { [image autorelease]; + + UIView *&_transcriptTable(MSHookIvar(self, "_transcriptTable")); UIView *&_transcriptLayer(MSHookIvar(self, "_transcriptLayer")); - UIView *parent([_transcriptLayer superview]); + UIView *table; + if (&_transcriptTable != NULL) + table = _transcriptTable; + else if (&_transcriptLayer != NULL) + table = _transcriptLayer; + else + table = nil; + + UIView *placard(table != nil ? [table superview] : MSHookIvar(self, "_backPlacard")); UIImageView *background([[[UIImageView alloc] initWithImage:image] autorelease]); - [parent insertSubview:background belowSubview:_transcriptLayer]; - [_transcriptLayer setBackgroundColor:[UIColor clearColor]]; + + if (table == nil) + [placard insertSubview:background atIndex:0]; + else { + [table setBackgroundColor:[UIColor clearColor]]; + [placard insertSubview:background belowSubview:table]; + } } } MSHook(UIImage *, _UIImageWithName, NSString *name) { int id(_UISharedImageNameGetIdentifier(name)); if (Debug_) - NSLog(@"WB:Debug: _UIImageWithName(\"%@\", %d)", name, id); + NSLog(@"WB:Debug: _UIImageWithName(\"%@\": %d)", name, id); if (id == -1) return _UIImageAtPath(name, _UIKitBundle()); @@ -1024,24 +1299,22 @@ MSHook(UIImage *, _UIImageWithName, NSString *name) { NSNumber *key([NSNumber numberWithInt:id]); UIImage *image = [UIImages_ objectForKey:key]; if (image != nil) - return reinterpret_cast(image) == [NSNull null] ? nil : image; + return reinterpret_cast(image) == [NSNull null] ? _UISharedImageWithIdentifier(id) : image; if (NSString *path = $pathForFile$inBundle$(name, _UIKitBundle(), true)) { image = [[UIImage alloc] initWithContentsOfFile:path cache:true]; if (image != nil) [image autorelease]; } - if (image == nil) - image = _UISharedImageWithIdentifier(id); [UIImages_ setObject:(image == nil ? [NSNull null] : reinterpret_cast(image)) forKey:key]; - return image; + return image == nil ? _UISharedImageWithIdentifier(id) : image; } } MSHook(UIImage *, _UIImageWithNameInDomain, NSString *name, NSString *domain) { - NSString *key = [NSString stringWithFormat:@"D:%zu%@%@", [domain length], domain, name]; - UIImage *image = [PathImages_ objectForKey:key]; + NSString *key([NSString stringWithFormat:@"D:%zu%@%@", [domain length], domain, name]); + UIImage *image([PathImages_ objectForKey:key]); if (image != nil) - return reinterpret_cast(image) == [NSNull null] ? nil : image; + return reinterpret_cast(image) == [NSNull null] ? __UIImageWithNameInDomain(name, domain) : image; if (Debug_) NSLog(@"WB:Debug: UIImageWithNameInDomain(\"%@\", \"%@\")", name, domain); if (NSString *path = $getTheme$([NSArray arrayWithObject:[NSString stringWithFormat:@"Domains/%@/%@", domain, name]])) { @@ -1049,13 +1322,13 @@ MSHook(UIImage *, _UIImageWithNameInDomain, NSString *name, NSString *domain) { if (image != nil) [image autorelease]; } - if (image == nil) - image = __UIImageWithNameInDomain(name, domain); [PathImages_ setObject:(image == nil ? [NSNull null] : reinterpret_cast(image)) forKey:key]; - return image; + return image == nil ? __UIImageWithNameInDomain(name, domain) : image; } MSHook(GSFontRef, GSFontCreateWithName, const char *name, GSFontSymbolicTraits traits, float size) { + if (Debug_) + NSLog(@"WB:Debug: GSFontCreateWithName(\"%s\", %f)", name, size); if (NSString *font = [Info_ objectForKey:[NSString stringWithFormat:@"FontName-%s", name]]) name = [font UTF8String]; return _GSFontCreateWithName(name, traits, size); @@ -1067,6 +1340,8 @@ MSHook(GSFontRef, GSFontCreateWithName, const char *name, GSFontSymbolicTraits t bool (*_Z24GetFileNameForThisActionmPcRb)(unsigned long a0, char *a1, bool &a2); MSHook(bool, _Z24GetFileNameForThisActionmPcRb, unsigned long a0, char *a1, bool &a2) { + if (Debug_) + NSLog(@"WB:Debug:GetFileNameForThisAction(%u, %p, %u)", a0, a1, a2); bool value = __Z24GetFileNameForThisActionmPcRb(a0, a1, a2); if (Debug_) NSLog(@"WB:Debug:GetFileNameForThisAction(%u, %s, %u) = %u", a0, value ? a1 : NULL, a2, value); @@ -1075,7 +1350,6 @@ MSHook(bool, _Z24GetFileNameForThisActionmPcRb, unsigned long a0, char *a1, bool NSString *path = [NSString stringWithUTF8String:a1]; if ([path hasPrefix:@"/System/Library/Audio/UISounds/"]) { NSString *file = [path substringFromIndex:31]; - NSLog(@"%@", file); for (NSString *theme in themes_) { NSString *path([NSString stringWithFormat:@"%@/UISounds/%@", theme, file]); if ([Manager_ fileExistsAtPath:path]) { @@ -1115,35 +1389,48 @@ static void ChangeWallpaper( #define WBRename(name, sel, imp) \ _ ## name ## $ ## imp = MSHookMessage($ ## name, @selector(sel), &$ ## name ## $ ## imp) +template +static void nlset(Type_ &function, struct nlist *nl, size_t index) { + struct nlist &name(nl[index]); + uintptr_t value(name.n_value); + if ((name.n_desc & N_ARM_THUMB_DEF) != 0) + value |= 0x00000001; + function = reinterpret_cast(value); +} + +template +static void dlset(Type_ &function, const char *name) { + function = reinterpret_cast(dlsym(RTLD_DEFAULT, name)); +} + extern "C" void WBInitialize() { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]); NSString *identifier([[NSBundle mainBundle] bundleIdentifier]); NSLog(@"WB:Notice: WinterBoard"); - struct nlist nl[9]; - memset(nl, 0, sizeof(nl)); + dlset(_GSFontGetUseLegacyFontMetrics, "GSFontGetUseLegacyFontMetrics"); + struct nlist nl[8]; + + memset(nl, 0, sizeof(nl)); nl[0].n_un.n_name = (char *) "__UIApplicationImageWithName"; nl[1].n_un.n_name = (char *) "__UIImageAtPath"; nl[2].n_un.n_name = (char *) "__UIImageRefAtPath"; nl[3].n_un.n_name = (char *) "__UIImageWithNameInDomain"; nl[4].n_un.n_name = (char *) "__UIKitBundle"; - nl[5].n_un.n_name = (char *) "__UISharedImageInitialize"; - nl[6].n_un.n_name = (char *) "__UISharedImageNameGetIdentifier"; - nl[7].n_un.n_name = (char *) "__UISharedImageWithIdentifier"; - + nl[5].n_un.n_name = (char *) "__UISharedImageNameGetIdentifier"; + nl[6].n_un.n_name = (char *) "__UISharedImageWithIdentifier"; nlist(UIKit, nl); - _UIApplicationImageWithName = (UIImage *(*)(NSString *)) nl[0].n_value; - _UIImageAtPath = (UIImage *(*)(NSString *, NSBundle *)) nl[1].n_value; - _UIImageRefAtPath = (CGImageRef (*)(NSString *, bool, UIImageOrientation *)) nl[2].n_value; - _UIImageWithNameInDomain = (UIImage *(*)(NSString *, NSString *)) nl[3].n_value; - _UIKitBundle = (NSBundle *(*)()) nl[4].n_value; - _UISharedImageInitialize = (void (*)(bool)) nl[5].n_value; - _UISharedImageNameGetIdentifier = (int (*)(NSString *)) nl[6].n_value; - _UISharedImageWithIdentifier = (UIImage *(*)(int)) nl[7].n_value; + nlset(_UIApplicationImageWithName, nl, 0); + nlset(_UIImageAtPath, nl, 1); + nlset(_UIImageRefAtPath, nl, 2); + nlset(_UIImageWithNameInDomain, nl, 3); + nlset(_UIKitBundle, nl, 4); + nlset(_UISharedImageNameGetIdentifier, nl, 5); + nlset(_UISharedImageWithIdentifier, nl, 6); MSHookFunction(_UIApplicationImageWithName, &$_UIApplicationImageWithName, &__UIApplicationImageWithName); MSHookFunction(_UIImageRefAtPath, &$_UIImageRefAtPath, &__UIImageRefAtPath); @@ -1157,7 +1444,7 @@ extern "C" void WBInitialize() { memset(nl, 0, sizeof(nl)); nl[0].n_un.n_name = (char *) "__Z24GetFileNameForThisActionmPcRb"; nlist(AudioToolbox, nl); - _Z24GetFileNameForThisActionmPcRb = (bool (*)(unsigned long, char *, bool &)) nl[0].n_value; + nlset(_Z24GetFileNameForThisActionmPcRb, nl, 0); MSHookFunction(_Z24GetFileNameForThisActionmPcRb, &$_Z24GetFileNameForThisActionmPcRb, &__Z24GetFileNameForThisActionmPcRb); } @@ -1172,14 +1459,12 @@ extern "C" void WBInitialize() { _UIImage$defaultDesktopImage = MSHookMessage(object_getClass($UIImage), @selector(defaultDesktopImage), &$UIImage$defaultDesktopImage); - //WBRename("UINavigationBar", @selector(initWithCoder:", (IMP) &UINavigationBar$initWithCoder$); - //WBRename("UINavigationBarBackground", @selector(initWithFrame:withBarStyle:withTintColor:", (IMP) &UINavigationBarBackground$initWithFrame$withBarStyle$withTintColor$); + //WBRename("UINavigationBar", @selector(initWithCoder:), (IMP) &UINavigationBar$initWithCoder$); + //WBRename("UINavigationBarBackground", @selector(initWithFrame:withBarStyle:withTintColor:), (IMP) &UINavigationBarBackground$initWithFrame$withBarStyle$withTintColor$); _UINavigationBar$setBarStyle$ = MSHookMessage($UINavigationBar, @selector(setBarStyle:), &$UINavigationBar$setBarStyle$); _UIToolbar$setBarStyle$ = MSHookMessage($UIToolbar, @selector(setBarStyle:), &$UIToolbar$setBarStyle$); - _UISharedImageInitialize(false); - Manager_ = [[NSFileManager defaultManager] retain]; UIImages_ = [[NSMutableDictionary alloc] initWithCapacity:16]; PathImages_ = [[NSMutableDictionary alloc] initWithCapacity:16]; @@ -1189,30 +1474,31 @@ extern "C" void WBInitialize() { themes_ = [[NSMutableArray alloc] initWithCapacity:8]; - if (NSDictionary *settings = [[NSDictionary alloc] initWithContentsOfFile:[NSString stringWithFormat:@"/User/Library/Preferences/com.saurik.WinterBoard.plist"]]) { - [settings autorelease]; + if (NSDictionary *settings = [NSDictionary dictionaryWithContentsOfFile:[NSString stringWithFormat:@"/User/Library/Preferences/com.saurik.WinterBoard.plist"]]) { + if (NSNumber *value = [settings objectForKey:@"SummerBoard"]) + SummerBoard_ = [value boolValue]; + if (NSNumber *value = [settings objectForKey:@"Debug"]) + Debug_ = [value boolValue]; - if (NSNumber *debug = [settings objectForKey:@"Debug"]) - Debug_ = [debug boolValue]; - - NSArray *themes = [settings objectForKey:@"Themes"]; + NSArray *themes([settings objectForKey:@"Themes"]); if (themes == nil) if (NSString *theme = [settings objectForKey:@"Theme"]) themes = [NSArray arrayWithObject:[NSDictionary dictionaryWithObjectsAndKeys: theme, @"Name", [NSNumber numberWithBool:true], @"Active", nil]]; + if (themes != nil) for (NSDictionary *theme in themes) { - NSNumber *active = [theme objectForKey:@"Active"]; + NSNumber *active([theme objectForKey:@"Active"]); if (![active boolValue]) continue; - NSString *name = [theme objectForKey:@"Name"]; + NSString *name([theme objectForKey:@"Name"]); if (name == nil) continue; - NSString *theme = nil; + NSString *theme(nil); #define testForTheme(format...) \ if (theme == nil) { \ @@ -1226,81 +1512,128 @@ extern "C" void WBInitialize() { testForTheme(@"/Library/Themes/%@.theme", name) testForTheme(@"/Library/Themes/%@", name) testForTheme(@"%@/Library/SummerBoard/Themes/%@", NSHomeDirectory(), name) + } } Info_ = [[NSMutableDictionary dictionaryWithCapacity:16] retain]; for (NSString *theme in themes_) - if (NSDictionary *info = [[NSDictionary alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/Info.plist", theme]]) + if (NSDictionary *info = [NSDictionary dictionaryWithContentsOfFile:[NSString stringWithFormat:@"%@/Info.plist", theme]]) for (NSString *key in [info allKeys]) if ([Info_ objectForKey:key] == nil) [Info_ setObject:[info objectForKey:key] forKey:key]; + bool sms($getTheme$([NSArray arrayWithObjects:@"SMSBackground.png", @"SMSBackground.jpg", nil]) != nil); + + if ([NSBundle bundleWithIdentifier:@"com.apple.chatkit"]) + if (sms) { + $CKMessageCell = objc_getClass("CKMessageCell"); + _CKMessageCell$addBalloonView$ = MSHookMessage($CKMessageCell, @selector(addBalloonView:), &$CKMessageCell$addBalloonView$); + _CKMessageCell$initWithStyle$reuseIdentifier$ = MSHookMessage($CKMessageCell, @selector(initWithStyle:reuseIdentifier:), &$CKMessageCell$initWithStyle$reuseIdentifier$); + + $CKTranscriptTableView = objc_getClass("CKTranscriptTableView"); + _CKTranscriptTableView$setSeparatorStyle$ = MSHookMessage($CKTranscriptTableView, @selector(setSeparatorStyle:), &$CKTranscriptTableView$setSeparatorStyle$); + _CKTranscriptTableView$initWithFrame$style$ = MSHookMessage($CKTranscriptTableView, @selector(initWithFrame:style:), &$CKTranscriptTableView$initWithFrame$style$); + + $CKTimestampView = objc_getClass("CKTimestampView"); + _CKTimestampView$initWithStyle$reuseIdentifier$ = MSHookMessage($CKTimestampView, @selector(initWithStyle:reuseIdentifier:), &$CKTimestampView$initWithStyle$reuseIdentifier$); + + $CKTranscriptController = objc_getClass("CKTranscriptController"); + _TranscriptController$loadView = MSHookMessage($CKTranscriptController, @selector(loadView), &$TranscriptController$loadView); + } + if ([identifier isEqualToString:@"com.apple.MobileSMS"]) { - Class mSMSMessageTranscriptController = objc_getClass("mSMSMessageTranscriptController"); - _mSMSMessageTranscriptController$loadView = MSHookMessage(mSMSMessageTranscriptController, @selector(loadView), &$mSMSMessageTranscriptController$loadView); + if (sms) { + if (_TranscriptController$loadView == NULL) { + Class mSMSMessageTranscriptController = objc_getClass("mSMSMessageTranscriptController"); + _TranscriptController$loadView = MSHookMessage(mSMSMessageTranscriptController, @selector(loadView), &$TranscriptController$loadView); + } + } } else if ([identifier isEqualToString:@"com.apple.springboard"]) { CFNotificationCenterAddObserver( CFNotificationCenterGetDarwinNotifyCenter(), NULL, &ChangeWallpaper, (CFStringRef) @"com.saurik.winterboard.lockbackground", NULL, 0 ); - NSBundle *MediaPlayer = [NSBundle bundleWithPath:@"/System/Library/Frameworks/MediaPlayer.framework"]; - if (MediaPlayer != nil) - [MediaPlayer load]; + if ($getTheme$([NSArray arrayWithObject:@"Wallpaper.mp4"]) != nil) { + NSBundle *MediaPlayer([NSBundle bundleWithPath:@"/System/Library/Frameworks/MediaPlayer.framework"]); + if (MediaPlayer != nil) + [MediaPlayer load]; + + $MPMoviePlayerController = objc_getClass("MPMoviePlayerController"); + $MPVideoView = objc_getClass("MPVideoView"); + } - $MPMoviePlayerController = objc_getClass("MPMoviePlayerController"); - $MPVideoView = objc_getClass("MPVideoView"); $WebCoreFrameBridge = objc_getClass("WebCoreFrameBridge"); $SBApplication = objc_getClass("SBApplication"); $SBApplicationIcon = objc_getClass("SBApplicationIcon"); + $SBAwayView = objc_getClass("SBAwayView"); $SBBookmarkIcon = objc_getClass("SBBookmarkIcon"); $SBButtonBar = objc_getClass("SBButtonBar"); $SBCalendarIconContentsView = objc_getClass("SBCalendarIconContentsView"); - $SBContentLayer = objc_getClass("SBContentLayer"); + $SBIcon = objc_getClass("SBIcon"); $SBIconBadge = objc_getClass("SBIconBadge"); $SBIconController = objc_getClass("SBIconController"); $SBIconLabel = objc_getClass("SBIconLabel"); + $SBIconList = objc_getClass("SBIconList"); $SBIconModel = objc_getClass("SBIconModel"); - $SBSlidingAlertDisplay = objc_getClass("SBSlidingAlertDisplay"); + //$SBImageCache = objc_getClass("SBImageCache"); + $SBSearchView = objc_getClass("SBSearchView"); + $SBSearchTableViewCell = objc_getClass("SBSearchTableViewCell"); $SBStatusBarContentsView = objc_getClass("SBStatusBarContentsView"); $SBStatusBarController = objc_getClass("SBStatusBarController"); $SBStatusBarOperatorNameView = objc_getClass("SBStatusBarOperatorNameView"); $SBStatusBarTimeView = objc_getClass("SBStatusBarTimeView"); + $SBUIController = objc_getClass("SBUIController"); $SBWidgetApplicationIcon = objc_getClass("SBWidgetApplicationIcon"); WBRename(WebCoreFrameBridge, renderedSizeOfNode:constrainedToWidth:, renderedSizeOfNode$constrainedToWidth$); - WBRename(SBApplication, pathForIcon, pathForIcon); - WBRename(SBApplicationIcon, icon, icon); + if (SummerBoard_) { + WBRename(SBApplication, pathForIcon, pathForIcon); + WBRename(SBApplicationIcon, icon, icon); + } + WBRename(SBBookmarkIcon, icon, icon); WBRename(SBButtonBar, didMoveToSuperview, didMoveToSuperview); WBRename(SBCalendarIconContentsView, drawRect:, drawRect$); - WBRename(SBContentLayer, initWithSize:, initWithSize$); + WBRename(SBIcon, setAlpha:, setAlpha$); WBRename(SBIconBadge, initWithBadge:, initWithBadge$); WBRename(SBIconController, noteNumberOfIconListsChanged, noteNumberOfIconListsChanged); + WBRename(SBUIController, init, init); WBRename(SBWidgetApplicationIcon, icon, icon); WBRename(SBIconLabel, drawRect:, drawRect$); WBRename(SBIconLabel, initWithSize:label:, initWithSize$label$); WBRename(SBIconLabel, setInDock:, setInDock$); + WBRename(SBIconList, setFrame:, setFrame$); + WBRename(SBIconModel, cacheImageForIcon:, cacheImageForIcon$); + WBRename(SBIconModel, cacheImagesForIcon:, cacheImagesForIcon$); WBRename(SBIconModel, getCachedImagedForIcon:, getCachedImagedForIcon$); + WBRename(SBIconModel, getCachedImagedForIcon:smallIcon:, getCachedImagedForIcon$smallIcon$); + + WBRename(SBSearchView, initWithFrame:, initWithFrame$); + WBRename(SBSearchTableViewCell, drawRect:, drawRect$); + WBRename(SBSearchTableViewCell, initWithStyle:reuseIdentifier:, initWithStyle$reuseIdentifier$); + + //WBRename(SBImageCache, initWithName:forImageWidth:imageHeight:initialCapacity:, initWithName$forImageWidth$imageHeight$initialCapacity$); - WBRename(SBSlidingAlertDisplay, updateDesktopImage:, updateDesktopImage$); + WBRename(SBAwayView, updateDesktopImage:, updateDesktopImage$); WBRename(SBStatusBarContentsView, didMoveToSuperview, didMoveToSuperview); - WBRename(SBStatusBarContentsView, initWithStatusBar:mode:, initWithStatusBar$mode$); + //WBRename(SBStatusBarContentsView, initWithStatusBar:mode:, initWithStatusBar$mode$); + //WBRename(SBStatusBarController, setStatusBarMode:orientation:duration:animation:, setStatusBarMode$orientation$duration$animation$); WBRename(SBStatusBarController, setStatusBarMode:orientation:duration:fenceID:animation:, setStatusBarMode$orientation$duration$fenceID$animation$); + WBRename(SBStatusBarController, setStatusBarMode:orientation:duration:fenceID:animation:startTime:, setStatusBarMode$orientation$duration$fenceID$animation$startTime$); WBRename(SBStatusBarOperatorNameView, operatorNameStyle, operatorNameStyle); WBRename(SBStatusBarOperatorNameView, setOperatorName:fullSize:, setOperatorName$fullSize$); WBRename(SBStatusBarTimeView, drawRect:, drawRect$); - English_ = [[NSDictionary alloc] initWithContentsOfFile:@"/System/Library/CoreServices/SpringBoard.app/English.lproj/LocalizedApplicationNames.strings"]; - if (English_ != nil) - English_ = [English_ retain]; + if (SummerBoard_) + English_ = [[NSDictionary alloc] initWithContentsOfFile:@"/System/Library/CoreServices/SpringBoard.app/English.lproj/LocalizedApplicationNames.strings"]; Cache_ = [[NSMutableDictionary alloc] initWithCapacity:64]; }