X-Git-Url: https://git.saurik.com/winterboard.git/blobdiff_plain/4f1b7acddf97d20c6667ccf8058c2c8217c36878..f7d32b1e611609527b20f43fca9e35c31f98b9d7:/Library.mm diff --git a/Library.mm b/Library.mm index 6015fd8..084ab9a 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,12 +35,36 @@ * 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 #import #import +#import + +#import +#import +#import #include @@ -49,13 +73,17 @@ #import #import #import +#import #import #import #import -#import #import #import -#import +#import +#import +#import +// XXX: #import +#import #import #import #import @@ -65,17 +93,21 @@ #import +#import #import #import #import +#import + extern "C" void __clear_cache (char *beg, char *end); @protocol WinterBoard - (void *) _node; @end +Class $MPMoviePlayerController; Class $MPVideoView; Class $WebCoreFrameBridge; @@ -85,31 +117,45 @@ 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 $SBDockIconListView; +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; +static bool IsWild_; +static bool Four_; + @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; @@ -117,7 +163,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; @@ -125,17 +171,22 @@ Class $SBWidgetApplicationIcon; @end -bool Debug_ = false; -bool Engineer_ = false; +static BOOL (*_GSFontGetUseLegacyFontMetrics)(); +#define $GSFontGetUseLegacyFontMetrics() \ + (_GSFontGetUseLegacyFontMetrics == NULL ? YES : _GSFontGetUseLegacyFontMetrics()) + +static bool Debug_ = false; +static bool Engineer_ = false; +static bool SummerBoard_ = true; +static bool SpringBoard_; static UIImage *(*_UIApplicationImageWithName)(NSString *name); static UIImage *(*_UIImageAtPath)(NSString *name, NSBundle *path); -static CGImageRef (*_UIImageRefAtPath)(NSString *name, bool cache, UIImageOrientation *orientation); +static CGImageRef (*_UIImageRefAtPath)(NSString *name, bool cache, UIImageOrientation *orientation, float *scale); static UIImage *(*_UIImageWithNameInDomain)(NSString *name, NSString *domain); static NSBundle *(*_UIKitBundle)(); -static void (*_UISharedImageInitialize)(bool); +static bool (*_UIPackedImageTableGetIdentifierForName)(NSString *, int *); static int (*_UISharedImageNameGetIdentifier)(NSString *); -static UIImage *(*_UISharedImageWithIdentifier)(int); static NSMutableDictionary *UIImages_; static NSMutableDictionary *PathImages_; @@ -187,23 +238,28 @@ static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle, bool u [names addObject:[NSString stringWithFormat:@"UIImages/%@", file]]; #define remapResourceName(oldname, newname) \ - else if ([file isEqualToString:oldname]) \ + else if ([file isEqualToString:(oldname)]) \ [names addObject:[NSString stringWithFormat:@"%@.png", newname]]; \ + bool summer(SpringBoard_ && SummerBoard_); + 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 (!summer); remapResourceName(@"FSO_BG.png", @"StatusBar") - remapResourceName(@"SBDockBG.png", @"Dock") + remapResourceName(Four_ ? @"SBDockBG-old.png" : @"SBDockBG.png", @"Dock") remapResourceName(@"SBWeatherCelsius.png", @"Icons/Weather") if (NSString *path = $getTheme$(names)) return path; + return nil; } -static NSString *$pathForIcon$(SBApplication *self) { +static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") { NSString *identifier = [self bundleIdentifier]; NSString *path = [self path]; NSString *folder = [path lastPathComponent]; @@ -215,18 +271,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]]; + [names addObject:[NSString stringWithFormat:@"Icons%@/%@.png", suffix, 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]); @@ -238,6 +301,7 @@ static NSString *$pathForIcon$(SBApplication *self) { if (NSString *path = $getTheme$(names)) return path; + return nil; } @@ -296,26 +360,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; + } } } @@ -327,17 +434,70 @@ 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); } +MSHook(UIImage *, SBApplicationIcon$generateIconImage$, SBApplicationIcon *self, SEL sel, int type) { + if (type == 2) + if (![Info_ wb$boolForKey:@"ComposeStoreIcons"]) { + if (IsWild_ && false) // XXX: delete this code, it should not be supported + if (NSString *path72 = $pathForIcon$([self application], @"-72")) + return [UIImage imageWithContentsOfFile:path72]; + if (NSString *path = $pathForIcon$([self application])) + if (UIImage *image = [UIImage imageWithContentsOfFile:path]) { + float width; + if ([$SBIcon respondsToSelector:@selector(defaultIconImageSize)]) + width = [$SBIcon defaultIconImageSize].width; + else + width = 59; + return width == 59 ? image : [image _imageScaledToProportion:(width / 59.0) interpolationQuality:5]; + } + } + return _SBApplicationIcon$generateIconImage$(self, sel, type); +} + MSHook(UIImage *, SBWidgetApplicationIcon$icon, SBWidgetApplicationIcon *self, SEL sel) { - if (NSString *path = $pathForIcon$([self application])) + if (Debug_) + NSLog(@"WB:Debug:Widget(%@:%@)", [self displayIdentifier], [self displayName]); + if (NSString *path = $getTheme$([NSArray arrayWithObject:[NSString stringWithFormat:@"Icons/%@.png", [self displayName]]])) return [UIImage imageWithContentsOfFile:path]; - return _SBApplicationIcon$icon(self, sel); + return _SBWidgetApplicationIcon$icon(self, sel); } MSHook(UIImage *, SBBookmarkIcon$icon, SBBookmarkIcon *self, SEL sel) { @@ -366,10 +526,36 @@ static UIImage *CachedImageAtPath(NSString *path) { return image; } -MSHook(CGImageRef, _UIImageRefAtPath, NSString *name, bool cache, UIImageOrientation *orientation) { +MSHook(CGImageSourceRef, CGImageSourceCreateWithURL, CFURLRef url, CFDictionaryRef options) { + if (Debug_) + NSLog(@"WB:Debug: CGImageSourceCreateWithURL(\"%@\", %s)", url, options); + NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]); + if (NSString *path = (NSString *) CFURLCopyFileSystemPath(url, kCFURLPOSIXPathStyle)) + if (NSString *themed = [path wb$themedPath]) + if (themed != path) + url = (CFURLRef) [NSURL fileURLWithPath:themed]; + CGImageSourceRef source(_CGImageSourceCreateWithURL(url, options)); + [pool release]; + return source; +} + +MSHook(CGImageRef, _UIImageRefAtPath, NSString *name, bool cache, UIImageOrientation *orientation, float *scale) { if (Debug_) - NSLog(@"WB:Debug: _UIImageRefAtPath(\"%@\", %s)", name, cache ? "true" : "false"); - return __UIImageRefAtPath([name wb$themedPath], cache, orientation); + NSLog(@"WB:Debug: _UIImageRefAtPath(\"%@\")", name); + + NSString *themed([name wb$themedPath]); + + if (false && SpringBoard_ && SummerBoard_ && themed == name) { + if ([name isEqualToString:@"/System/Library/CoreServices/SpringBoard.app/SBDockBGT-Portrait.png"]) + if (NSString *path = $getTheme$([NSArray arrayWithObject:@"Dock.png"])) { + UIImage *image([UIImage imageWithContentsOfFile:path]); + CGImageRef ref([[image _imageScaledToProportion:2.4 interpolationQuality:5] imageRef]); + CGImageRetain(ref); + return ref; + } + } + + return __UIImageRefAtPath(themed, cache, orientation, scale); } /*MSHook(UIImage *, _UIImageAtPath, NSString *name, NSBundle *bundle) { @@ -451,30 +637,34 @@ MSHook(void, SBCalendarIconContentsView$drawRect$, SBCalendarIconContentsView *s CFDateRef now(CFDateCreate(NULL, CFAbsoluteTimeGetCurrent())); - CFDateFormatterSetFormat(formatter, (CFStringRef) [bundle localizedStringForKey:@"CALENDAR_ICON_DAY_NUMBER_FORMAT" value:@"" table:@"SpringBoard"]); + CFDateFormatterSetFormat(formatter, (CFStringRef) [bundle localizedStringForKey:@"CALENDAR_ICON_DAY_NUMBER_FORMAT" value:@"d" 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(@"" + 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]; @@ -486,12 +676,22 @@ 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 base0(IsWild_ ? 89 : 70); + if ($GSFontGetUseLegacyFontMetrics()) + base0 = base0 + 1; + unsigned base1(IsWild_ ? 18 : 16); + + if (Four_) { + ++base0; + ++base1; + } + [(NSString *)date drawAtPoint:CGPointMake( - (width + 1 - datesize.width) / 2, (71 - datesize.height) / 2 + (width + 1 - datesize.width) / 2, (base0 - datesize.height) / 2 ) withStyle:datestyle]; [(NSString *)day drawAtPoint:CGPointMake( - (width + 1 - daysize.width) / 2, (16 - daysize.height) / 2 + (width + 1 - daysize.width) / 2, (base1 - daysize.height) / 2 ) withStyle:daystyle]; CFRelease(date); @@ -499,12 +699,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]; @@ -555,6 +755,8 @@ MSHook(UIImage *, UIImage$defaultDesktopImage, UIImage *self, SEL sel) { } static NSArray *Wallpapers_; +static bool Papered_; +static bool Docked_; static NSString *WallpaperFile_; static UIImageView *WallpaperImage_; static UIWebDocumentView *WallpaperPage_; @@ -566,11 +768,73 @@ 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; + UIDevice *device([UIDevice currentDevice]); + IsWild_ = [device respondsToSelector:@selector(isWildcat)] && [device isWildcat]; + + if ([Info_ objectForKey:@"UndockedIconLabels"] == nil) + [Info_ setObject:[NSNumber numberWithBool:( + !(Papered_ || GSSystemHasCapability(CFSTR("homescreen-wallpaper"))) || + [Info_ objectForKey:@"DockedIconLabelStyle"] != nil || + [Info_ objectForKey:@"UndockedIconLabelStyle"] != nil + )] forKey:@"UndockedIconLabels"]; + + if (Debug_) + NSLog(@"WB:Debug:Info = %@", [Info_ description]); + + if (Papered_) { + UIImageView *&_wallpaperView(MSHookIvar(self, "_wallpaperView")); + if (&_wallpaperView != NULL) { + [_wallpaperView removeFromSuperview]; + [_wallpaperView release]; + _wallpaperView = nil; + } + } + + UIView *&_contentLayer(MSHookIvar(self, "_contentLayer")); + UIView *&_contentView(MSHookIvar(self, "_contentView")); + + UIView **player; + if (&_contentLayer != NULL) + player = &_contentLayer; + else if (&_contentView != NULL) + player = &_contentView; + else + player = NULL; + UIView *layer(player == NULL ? nil : *player); + + UIWindow *window([[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]]); + UIView *content([[[UIView alloc] initWithFrame:[window frame]] autorelease]); + [window setContentView:content]; + + UIWindow *&_window(MSHookIvar(self, "_window")); + [window setBackgroundColor:[_window backgroundColor]]; + [_window setBackgroundColor:[UIColor clearColor]]; + + [window setLevel:-1000]; + [window setHidden:NO]; + + /*if (player != NULL) + *player = content;*/ + + [content setBackgroundColor:[layer backgroundColor]]; + [layer setBackgroundColor:[UIColor clearColor]]; + + UIView *indirect; + if (!SummerBoard_ || !IsWild_) + indirect = content; + else { + CGRect bounds([content bounds]); + bounds.origin.y = -30; + indirect = [[[UIView alloc] initWithFrame:bounds] autorelease]; + [content addSubview:indirect]; + [indirect zoomToScale:2.4]; + } + _release(WallpaperFile_); _release(WallpaperImage_); _release(WallpaperPage_); @@ -579,12 +843,38 @@ MSHook(id, SBContentLayer$initWithSize$, SBContentLayer *self, SEL sel, CGSize s if (NSString *theme = $getTheme$(Wallpapers_, true)) { NSString *mp4 = [theme stringByAppendingPathComponent:@"Wallpaper.mp4"]; if ([Manager_ fileExistsAtPath:mp4]) { - MPVideoView *video = [[[$MPVideoView alloc] initWithFrame:[self bounds]] autorelease]; +#if UseAVController + NSError *error; + + static AVController *controller_(nil); + if (controller_ == nil) { + AVQueue *queue([AVQueue avQueue]); + controller_ = [[AVController avControllerWithQueue:queue error:&error] retain]; + } + + AVQueue *queue([controller_ queue]); + + UIView *video([[[UIView alloc] initWithFrame:[indirect bounds]] autorelease]); + [controller_ setLayer:[video _layer]]; + + AVItem *item([[[AVItem alloc] initWithPath:mp4 error:&error] autorelease]); + [queue appendItem:item error:&error]; + + [controller_ play:&error]; +#elif UseMPMoviePlayerController + NSURL *url([NSURL fileURLWithPath:mp4]); + MPMoviePlayerController *controller = [[$MPMoviePlayerController alloc] initWithContentURL:url]; + controller.movieControlMode = MPMovieControlModeHidden; + [controller play]; +#else + MPVideoView *video = [[[$MPVideoView alloc] initWithFrame:[indirect bounds]] autorelease]; [video setMovieWithPath:mp4]; [video setRepeatMode:1]; - [video setRepeatGap:0]; - [self addSubview:video]; + [video setRepeatGap:-1]; [video playFromBeginning];; +#endif + + [indirect addSubview:video]; } NSString *png = [theme stringByAppendingPathComponent:@"Wallpaper.png"]; @@ -607,12 +897,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]]; + [indirect addSubview:WallpaperImage_]; } NSString *html = [theme stringByAppendingPathComponent:@"Wallpaper.html"]; if ([Manager_ fileExistsAtPath:html]) { - CGRect bounds = [self bounds]; + CGRect bounds = [indirect bounds]; UIWebDocumentView *view([[[UIWebDocumentView alloc] initWithFrame:bounds] autorelease]); [view setAutoresizes:true]; @@ -622,10 +914,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]; + [indirect addSubview:view]; } } @@ -633,7 +927,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 = [indirect bounds]; UIWebDocumentView *view([[[UIWebDocumentView alloc] initWithFrame:bounds] autorelease]); [view setAutoresizes:true]; @@ -641,24 +935,26 @@ 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]; + [indirect addSubview:view]; } } 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]; @@ -711,6 +1007,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 { @@ -738,6 +1038,7 @@ WBDelegate(time_) } - (id) initWithBadge:(NSString *)badge; +- (NSString *) description; @end @@ -753,6 +1054,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 { @@ -773,6 +1078,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")); @@ -782,20 +1093,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)); @@ -820,10 +1149,86 @@ MSHook(void, SBStatusBarTimeView$drawRect$, SBStatusBarTimeView *self, SEL sel, return _SBStatusBarTimeView$drawRect$(self, sel, rect); } -MSHook(void, SBIconController$appendIconList$, SBIconController *self, SEL sel, SBIconList *list) { - if (Debug_) - NSLog(@"appendIconList:%@", list); - return _SBIconController$appendIconList$(self, sel, list); +@interface UIView (WinterBoard) +- (bool) wb$isWBImageView; +- (void) wb$logHierarchy; +@end + +@implementation UIView (WinterBoard) + +- (bool) wb$isWBImageView { + return false; +} + +- (void) wb$logHierarchy { + WBLogHierarchy(self); +} + +@end + +@interface WBImageView : UIImageView { +} + +- (bool) wb$isWBImageView; +- (void) wb$updateFrame; +@end + +@implementation WBImageView + +- (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]); + + for (unsigned i(0), e([lists count]); i != e; ++i) + if (NSString *path = $getTheme$([NSArray arrayWithObject:[NSString stringWithFormat:@"Page%u.png", i]])) { + SBIconList *list([lists objectAtIndex:i]); + NSArray *subviews([list subviews]); + + 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); } MSHook(id, SBIconLabel$initWithSize$label$, SBIconLabel *self, SEL sel, CGSize size, NSString *label) { @@ -835,13 +1240,21 @@ 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]; return _SBIconLabel$setInDock$(self, sel, docked); } +MSHook(BOOL, SBDockIconListView$shouldShowNewDock, id self, SEL sel) { + return SummerBoard_ && Docked_ ? NO : _SBDockIconListView$shouldShowNewDock(self, sel); +} + +MSHook(void, SBDockIconListView$setFrame$, id self, SEL sel, CGRect frame) { + _SBDockIconListView$setFrame$(self, sel, frame); +} + MSHook(NSString *, NSBundle$localizedStringForKey$value$table$, NSBundle *self, SEL sel, NSString *key, NSString *value, NSString *table) { NSString *identifier = [self bundleIdentifier]; NSLocale *locale = [NSLocale currentLocale]; @@ -882,24 +1295,47 @@ MSHook(void, SBIconLabel$drawRect$, SBIconLabel *self, SEL sel, CGRect rect) { static Ivar drawMoreLegibly = object_getInstanceVariable(self, "_drawMoreLegibly", NULL); - BOOL docked; + int docked; Ivar ivar = object_getInstanceVariable(self, "_inDock", reinterpret_cast(&docked)); docked = (docked & (ivar_getOffset(ivar) == ivar_getOffset(drawMoreLegibly) ? 0x2 : 0x1)) != 0; - NSString *&label(MSHookIvar(self, "_label")); + NSString *label(MSHookIvar(self, "_label")); NSString *style = [NSString stringWithFormat:@"" "font-family: Helvetica; " "font-weight: bold; " - "font-size: 11px; " - "color: %@; " - "", docked ? @"white" : @"#b3b3b3"]; - - if (docked) + "color: %@; %@" + "", (docked || !SummerBoard_ ? @"white" : @"#b3b3b3"), (IsWild_ + ? @"font-size: 12px; " + : @"font-size: 11px; " + )]; + + if (IsWild_) + style = [style stringByAppendingString:@"text-shadow: rgba(0, 0, 0, 0.5) 0px 1px 0px; "]; + else if (docked) style = [style stringByAppendingString:@"text-shadow: rgba(0, 0, 0, 0.5) 0px -1px 0px; "]; - float max = 75, width = [label sizeWithStyle:style forWidth:320].width; - if (width > max) - style = [style stringByAppendingString:[NSString stringWithFormat:@"letter-spacing: -%f; ", ((width - max) / ([label length] - 1))]]; + + bool ellipsis(false); + float max = 75, width; + width: + width = [(ellipsis ? [label stringByAppendingString:@"..."] : label) sizeWithStyle:style forWidth:320].width; + + if (width > max) { + size_t length([label length]); + float spacing((width - max) / (length - 1)); + + if (spacing > 1.25) { + ellipsis = true; + label = [label substringToIndex:(length - 1)]; + goto width; + } + + style = [style stringByAppendingString:[NSString stringWithFormat:@"letter-spacing: -%f; ", spacing]]; + } + + if (ellipsis) + label = [label stringByAppendingString:@"..."]; + if (NSString *custom = [Info_ objectForKey:(docked ? @"DockedIconLabelStyle" : @"UndockedIconLabelStyle")]) style = [style stringByAppendingString:custom]; @@ -907,49 +1343,108 @@ 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(\"%@\")", name); + if (name == nil) + return nil; + + int identifier; + bool packed; + + if (_UIPackedImageTableGetIdentifierForName != NULL) + packed = _UIPackedImageTableGetIdentifierForName(name, &identifier); + else if (_UISharedImageNameGetIdentifier != NULL) { + identifier = _UISharedImageNameGetIdentifier(name); + packed = identifier != -1; + } else { + identifier = -1; + packed = false; + } + + if (Debug_) + NSLog(@"WB:Debug: _UISharedImageNameGetIdentifier(\"%@\") = %d", name, identifier); - if (id == -1) - return _UIImageAtPath(name, _UIKitBundle()); + if (!packed) + return __UIImageWithName(name); else { - NSNumber *key([NSNumber numberWithInt:id]); - UIImage *image = [UIImages_ objectForKey:key]; + NSNumber *key([NSNumber numberWithInt:identifier]); + UIImage *image([UIImages_ objectForKey:key]); if (image != nil) - return reinterpret_cast(image) == [NSNull null] ? nil : image; + return reinterpret_cast(image) == [NSNull null] ? __UIImageWithName(name) : 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 ? __UIImageWithName(name) : 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]])) { @@ -957,10 +1452,18 @@ 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]; + //if (NSString *scale = [Info_ objectForKey:[NSString stringWithFormat:@"FontScale-%s", name]]) + // size *= [scale floatValue]; + return _GSFontCreateWithName(name, traits, size); } #define AudioToolbox "/System/Library/Frameworks/AudioToolbox.framework/AudioToolbox" @@ -969,6 +1472,8 @@ MSHook(UIImage *, _UIImageWithNameInDomain, NSString *name, NSString *domain) { 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); @@ -977,7 +1482,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]) { @@ -1017,48 +1521,84 @@ 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)); +} + +/*static void WBImage(const struct mach_header* mh, intptr_t vmaddr_slide) { + uint32_t count(_dyld_image_count()); + for (uint32_t index(0); index != count; ++index) + if (_dyld_get_image_header(index) == mh) { + CGImageSourceRef (*CGImageSourceCreateWithURL)(CFURLRef url, CFDictionaryRef options); + dlset(CGImageSourceCreateWithURL, "CGImageSourceCreateWithURL"); + MSHookFunction(&CGImageSourceCreateWithURL, &$CGImageSourceCreateWithURL, &_CGImageSourceCreateWithURL); + } +}*/ + 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)); - - 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"; - - 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; - - MSHookFunction(_UIApplicationImageWithName, &$_UIApplicationImageWithName, &__UIApplicationImageWithName); - MSHookFunction(_UIImageRefAtPath, &$_UIImageRefAtPath, &__UIImageRefAtPath); - MSHookFunction(_UIImageWithName, &$_UIImageWithName, &__UIImageWithName); - MSHookFunction(_UIImageWithNameInDomain, &$_UIImageWithNameInDomain, &__UIImageWithNameInDomain); + dlset(_GSFontGetUseLegacyFontMetrics, "GSFontGetUseLegacyFontMetrics"); + + //if ([NSBundle bundleWithIdentifier:@"com.apple.ImageIO.framework"] != nil) + MSHookFunction(&CGImageSourceCreateWithURL, &$CGImageSourceCreateWithURL, &_CGImageSourceCreateWithURL); + //else + // _dyld_register_func_for_add_image(&WBImage); + + struct nlist nl[8]; + + if ([NSBundle bundleWithIdentifier:@"com.apple.UIKit"] != nil) { +// UIKit {{{ + 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 *) "__UIPackedImageTableGetIdentifierForName"; + nl[6].n_un.n_name = (char *) "__UISharedImageNameGetIdentifier"; + nlist(UIKit, nl); + + nlset(_UIApplicationImageWithName, nl, 0); + nlset(_UIImageAtPath, nl, 1); + nlset(_UIImageRefAtPath, nl, 2); + nlset(_UIImageWithNameInDomain, nl, 3); + nlset(_UIKitBundle, nl, 4); + nlset(_UIPackedImageTableGetIdentifierForName, nl, 5); + nlset(_UISharedImageNameGetIdentifier, nl, 6); + + MSHookFunction(_UIApplicationImageWithName, &$_UIApplicationImageWithName, &__UIApplicationImageWithName); + MSHookFunction(_UIImageRefAtPath, &$_UIImageRefAtPath, &__UIImageRefAtPath); + MSHookFunction(_UIImageWithName, &$_UIImageWithName, &__UIImageWithName); + MSHookFunction(_UIImageWithNameInDomain, &$_UIImageWithNameInDomain, &__UIImageWithNameInDomain); +// }}} + } + + MSHookFunction(&GSFontCreateWithName, &$GSFontCreateWithName, &_GSFontCreateWithName); if (dlopen(AudioToolbox, RTLD_LAZY | RTLD_NOLOAD) != NULL) { +// AudioToolbox {{{ struct nlist nl[2]; 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); +// }}} } $NSBundle = objc_getClass("NSBundle"); @@ -1072,14 +1612,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]; @@ -1089,30 +1627,32 @@ 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"]]) { +// Load Settings {{{ + 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) { \ @@ -1126,95 +1666,152 @@ 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); + + SpringBoard_ = [identifier isEqualToString:@"com.apple.springboard"]; + + if ([NSBundle bundleWithIdentifier:@"com.apple.chatkit"] != nil) +// 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); - } else if ([identifier isEqualToString:@"com.apple.springboard"]) { +// MobileSMS {{{ + if (sms) { + if (_TranscriptController$loadView == NULL) { + Class mSMSMessageTranscriptController = objc_getClass("mSMSMessageTranscriptController"); + _TranscriptController$loadView = MSHookMessage(mSMSMessageTranscriptController, @selector(loadView), &$TranscriptController$loadView); + } + } +// }}} + } else if (SpringBoard_) { +// 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"); + } - $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"); + $SBDockIconListView = objc_getClass("SBDockIconListView"); + $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"); + Four_ = $SBDockIconListView != nil; + 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(SBApplicationIcon, generateIconImage:, generateIconImage$); + } + 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, appendIconList:, appendIconList$); + WBRename(SBIconController, noteNumberOfIconListsChanged, noteNumberOfIconListsChanged); + WBRename(SBUIController, init, init); WBRename(SBWidgetApplicationIcon, icon, icon); + WBRename(SBDockIconListView, setFrame:, setFrame$); + MSHookMessage(object_getClass($SBDockIconListView), @selector(shouldShowNewDock), &$SBDockIconListView$shouldShowNewDock, &_SBDockIconListView$shouldShowNewDock); + 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(SBSlidingAlertDisplay, updateDesktopImage:, updateDesktopImage$); + 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(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]; +// }}} } Wallpapers_ = [[NSArray arrayWithObjects:@"Wallpaper.mp4", @"Wallpaper.png", @"Wallpaper.jpg", @"Wallpaper.html", nil] retain]; + Papered_ = $getTheme$(Wallpapers_) != nil; - if ([Info_ objectForKey:@"UndockedIconLabels"] == nil) - [Info_ setObject:[NSNumber numberWithBool:( - $getTheme$(Wallpapers_) == nil || - [Info_ objectForKey:@"DockedIconLabelStyle"] != nil || - [Info_ objectForKey:@"UndockedIconLabelStyle"] != nil - )] forKey:@"UndockedIconLabels"]; - - if (Debug_) - NSLog(@"WB:Debug:Info = %@", [Info_ description]); + Docked_ = $getTheme$([NSArray arrayWithObjects:@"Dock.png", nil]); [pool release]; }