X-Git-Url: https://git.saurik.com/winterboard.git/blobdiff_plain/29155933c706faa2cd66c98ebb651634b292ab14..5b21732c9da377b7ce3d36db6259f5db4e5fe77c:/Library.mm diff --git a/Library.mm b/Library.mm index 428c6a9..b4b8988 100644 --- a/Library.mm +++ b/Library.mm @@ -1,5 +1,5 @@ /* WinterBoard - Theme Manager for the iPhone - * Copyright (C) 2008-2009 Jay Freeman (saurik) + * Copyright (C) 2008-2011 Jay Freeman (saurik) */ /* @@ -47,7 +47,7 @@ bool _itv; _itv = true; \ _ltv = _ctv; \ } \ - fprintf(stderr, "%lu.%.6u[%f]:_trace()@%s:%u[%s]\n", \ + NSLog(@"%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__\ @@ -60,6 +60,7 @@ bool _itv; #import #import #import +#import #import #import @@ -100,6 +101,8 @@ bool _itv; #import +#include + extern "C" void __clear_cache (char *beg, char *end); @protocol WinterBoard @@ -108,40 +111,51 @@ extern "C" void __clear_cache (char *beg, char *end); Class $MPMoviePlayerController; Class $MPVideoView; -Class $WebCoreFrameBridge; - -Class $NSBundle; - -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 $SBIcon; -Class $SBIconBadge; -Class $SBIconController; -Class $SBIconLabel; -Class $SBIconList; -Class $SBIconModel; -//Class $SBImageCache; -Class $SBSearchView; -Class $SBSearchTableViewCell; -Class $SBStatusBarContentsView; -Class $SBStatusBarController; -Class $SBStatusBarOperatorNameView; -Class $SBStatusBarTimeView; -Class $SBUIController; -Class $SBWidgetApplicationIcon; + +MSClassHook(NSBundle) + +MSClassHook(UIImage) +MSClassHook(UINavigationBar) +MSClassHook(UIToolbar) + +MSClassHook(CKMessageCell) +MSClassHook(CKTimestampView) +MSClassHook(CKTranscriptController) +MSClassHook(CKTranscriptTableView) + +MSClassHook(SBApplication) +MSClassHook(SBApplicationIcon) +MSClassHook(SBAwayView) +MSClassHook(SBBookmarkIcon) +MSClassHook(SBButtonBar) +MSClassHook(SBCalendarIconContentsView) +MSClassHook(SBDockIconListView) +MSClassHook(SBIcon) +MSClassHook(SBIconBadge) +MSClassHook(SBIconController) +MSClassHook(SBIconLabel) +MSClassHook(SBIconList) +MSClassHook(SBIconModel) +//MSClassHook(SBImageCache) +MSClassHook(SBSearchView) +MSClassHook(SBSearchTableViewCell) +MSClassHook(SBStatusBarContentsView) +MSClassHook(SBStatusBarController) +MSClassHook(SBStatusBarOperatorNameView) +MSClassHook(SBStatusBarTimeView) +MSClassHook(SBUIController) +MSClassHook(SBWidgetApplicationIcon) + +__attribute__((__constructor__)) +static void MSFixClass() { + if ($SBIcon == nil) + $SBIcon = objc_getClass("SBIconView"); + if ($CKTranscriptController == nil) + $CKTranscriptController = objc_getClass("mSMSMessageTranscriptController"); +} + +static bool IsWild_; +static bool Four_($SBDockIconListView != nil); @interface NSDictionary (WinterBoard) - (UIColor *) wb$colorForKey:(NSString *)key; @@ -170,55 +184,81 @@ static BOOL (*_GSFontGetUseLegacyFontMetrics)(); #define $GSFontGetUseLegacyFontMetrics() \ (_GSFontGetUseLegacyFontMetrics == NULL ? YES : _GSFontGetUseLegacyFontMetrics()) -bool Debug_ = false; -bool Engineer_ = false; +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 UIImage *(*_UIImageWithNameInDomain)(NSString *name, NSString *domain); static NSBundle *(*_UIKitBundle)(); +static bool (*_UIPackedImageTableGetIdentifierForName)(NSString *, int *); static int (*_UISharedImageNameGetIdentifier)(NSString *); -static UIImage *(*_UISharedImageWithIdentifier)(int); -static NSMutableDictionary *UIImages_; -static NSMutableDictionary *PathImages_; -static NSMutableDictionary *Cache_; -static NSMutableDictionary *Strings_; -static NSMutableDictionary *Themed_; -static NSMutableDictionary *Bundles_; +static NSMutableDictionary *UIImages_ = [[NSMutableDictionary alloc] initWithCapacity:32]; +static NSMutableDictionary *PathImages_ = [[NSMutableDictionary alloc] initWithCapacity:16]; +static NSMutableDictionary *Cache_ = [[NSMutableDictionary alloc] initWithCapacity:64]; +static NSMutableDictionary *Strings_ = [[NSMutableDictionary alloc] initWithCapacity:0]; +static NSMutableDictionary *Bundles_ = [[NSMutableDictionary alloc] initWithCapacity:2]; static NSFileManager *Manager_; +static NSMutableArray *Themes_; + static NSDictionary *English_; static NSMutableDictionary *Info_; -static NSMutableArray *themes_; -static NSString *$getTheme$(NSArray *files, bool parent = false) { - if (!parent) - if (NSString *path = [Themed_ objectForKey:files]) - return reinterpret_cast(path) == [NSNull null] ? nil : path; +// $getTheme$() {{{ +static NSMutableDictionary *Themed_ = [[NSMutableDictionary alloc] initWithCapacity:128]; + +static unsigned Scale_ = 0; + +static unsigned $getScale$(NSString *path) { + NSString *name(path); + + #define StripName(strip) \ + if ([name hasSuffix:@ strip]) \ + name = [name substringWithRange:NSMakeRange(0, [name length] - sizeof(strip) - 1)]; + + StripName(".png"); + StripName(".jpg"); + StripName("~iphone"); + StripName("~ipad"); + + return [name hasSuffix:@"@2x"] ? 2 : 1; +} + +static NSString *$getTheme$(NSArray *files, bool rescale = false) { + if (NSString *path = [Themed_ objectForKey:files]) + return reinterpret_cast(path) == [NSNull null] ? nil : path; + + if (rescale && Scale_ == 0) { + UIScreen *screen([UIScreen mainScreen]); + if ([screen respondsToSelector:@selector(scale)]) + Scale_ = [screen scale]; + else + Scale_ = 1; + } if (Debug_) NSLog(@"WB:Debug: %@", [files description]); NSString *path; - for (NSString *theme in themes_) + for (NSString *theme in Themes_) for (NSString *file in files) { path = [NSString stringWithFormat:@"%@/%@", theme, file]; - if ([Manager_ fileExistsAtPath:path]) { - path = parent ? theme : path; + if ([Manager_ fileExistsAtPath:path]) goto set; - } } path = nil; set: - if (!parent) - [Themed_ setObject:(path == nil ? [NSNull null] : reinterpret_cast(path)) forKey:files]; + + [Themed_ setObject:(path == nil ? [NSNull null] : reinterpret_cast(path)) forKey:files]; return path; } - +// }}} +// $pathForFile$inBundle$() {{{ static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle, bool ui) { NSString *identifier = [bundle bundleIdentifier]; NSMutableArray *names = [NSMutableArray arrayWithCapacity:8]; @@ -231,25 +271,29 @@ 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)) + if (NSString *path = $getTheme$(names, ui)) 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]; @@ -261,18 +305,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]); @@ -284,9 +335,11 @@ static NSString *$pathForIcon$(SBApplication *self) { if (NSString *path = $getTheme$(names)) return path; + return nil; } +// -[NSBundle wb$bundleWithFile] {{{ @interface NSBundle (WinterBoard) + (NSBundle *) wb$bundleWithFile:(NSString *)path; @end @@ -315,7 +368,8 @@ static NSString *$pathForIcon$(SBApplication *self) { } @end - +// }}} +// -[NSString wb$themedPath] {{{ @interface NSString (WinterBoard) - (NSString *) wb$themedPath; @end @@ -341,6 +395,7 @@ 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); @@ -455,6 +510,25 @@ MSHook(UIImage *, SBApplicationIcon$icon, SBApplicationIcon *self, SEL sel) { 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 (Debug_) NSLog(@"WB:Debug:Widget(%@:%@)", [self displayIdentifier], [self displayName]); @@ -489,31 +563,6 @@ static UIImage *CachedImageAtPath(NSString *path) { return image; } -MSHook(CGImageRef, _UIImageRefAtPath, NSString *name, bool cache, UIImageOrientation *orientation) { - if (Debug_) - NSLog(@"WB:Debug: _UIImageRefAtPath(\"%@\", %s)", name, cache ? "true" : "false"); - return __UIImageRefAtPath([name wb$themedPath], cache, orientation); -} - -/*MSHook(UIImage *, _UIImageAtPath, NSString *name, NSBundle *bundle) { - if (bundle == nil) - return __UIImageAtPath(name, nil); - else { - NSString *key = [NSString stringWithFormat:@"B:%@/%@", [bundle bundleIdentifier], name]; - UIImage *image = [PathImages_ objectForKey:key]; - if (image != nil) - return reinterpret_cast(image) == [NSNull null] ? nil : image; - if (Debug_) - NSLog(@"WB:Debug: _UIImageAtPath(\"%@\", %@)", name, bundle); - if (NSString *path = $pathForFile$inBundle$(name, bundle, false)) - image = CachedImageAtPath(path); - if (image == nil) - image = __UIImageAtPath(name, bundle); - [PathImages_ setObject:(image == nil ? [NSNull null] : reinterpret_cast(image)) forKey:key]; - return image; - } -}*/ - MSHook(UIImage *, _UIApplicationImageWithName, NSString *name) { NSBundle *bundle = [NSBundle mainBundle]; if (Debug_) @@ -541,29 +590,16 @@ MSHook(UIImage *, _UIApplicationImageWithName, NSString *name) { NSLog(@"WB:Error: [%s forwardInvocation:(%s)]", class_getName([self class]), sel_getName(sel)); \ } -MSHook(NSString *, NSBundle$pathForResource$ofType$, NSBundle *self, SEL sel, NSString *resource, NSString *type) { +// %hook -[NSBundle pathForResource:ofType:] {{{ +MSInstanceMessageHook2(NSString *, NSBundle, pathForResource,ofType, NSString *, resource, NSString *, type) { NSString *file = type == nil ? resource : [NSString stringWithFormat:@"%@.%@", resource, type]; if (Debug_) NSLog(@"WB:Debug: [NSBundle(%@) pathForResource:\"%@\"]", [self bundleIdentifier], file); if (NSString *path = $pathForFile$inBundle$(file, self, false)) return path; - return _NSBundle$pathForResource$ofType$(self, sel, resource, type); -} - -void $setBarStyle$_(NSString *name, int &style) { - if (Debug_) - NSLog(@"WB:Debug:%@Style:%d", name, style); - NSNumber *number = nil; - if (number == nil) - number = [Info_ objectForKey:[NSString stringWithFormat:@"%@Style-%d", name, style]]; - if (number == nil) - number = [Info_ objectForKey:[NSString stringWithFormat:@"%@Style", name]]; - if (number != nil) { - style = [number intValue]; - if (Debug_) - NSLog(@"WB:Debug:%@Style=%d", name, style); - } + return MSOldCall(resource, type); } +// }}} MSHook(void, SBCalendarIconContentsView$drawRect$, SBCalendarIconContentsView *self, SEL sel, CGRect rect) { NSBundle *bundle([NSBundle mainBundle]); @@ -574,7 +610,7 @@ 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:@"cccc" table:@"SpringBoard"]); CFStringRef day(CFDateFormatterCreateStringWithDate(NULL, formatter, now)); @@ -583,21 +619,25 @@ MSHook(void, SBCalendarIconContentsView$drawRect$, SBCalendarIconContentsView *s 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]; @@ -609,57 +649,54 @@ 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($GSFontGetUseLegacyFontMetrics() ? 71 : 70); + 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, (base - 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); CFRelease(day); } -/*static id UINavigationBarBackground$initWithFrame$withBarStyle$withTintColor$(UINavigationBarBackground *self, SEL sel, CGRect frame, int style, UIColor *tint) { -_trace(); - - if (NSNumber *number = [Info_ objectForKey:@"NavigationBarStyle"]) +// %hook -[{NavigationBar,Toolbar} setBarStyle:] {{{ +void $setBarStyle$_(NSString *name, int &style) { + if (Debug_) + NSLog(@"WB:Debug:%@Style:%d", name, style); + NSNumber *number = nil; + if (number == nil) + number = [Info_ objectForKey:[NSString stringWithFormat:@"%@Style-%d", name, style]]; + if (number == nil) + number = [Info_ objectForKey:[NSString stringWithFormat:@"%@Style", name]]; + if (number != nil) { style = [number intValue]; - - if (UIColor *color = [Info_ wb$colorForKey:@"NavigationBarTint"]) - tint = color; - - return [self wb$initWithFrame:frame withBarStyle:style withTintColor:tint]; -}*/ - -/*static id UINavigationBar$initWithCoder$(SBAppWindow *self, SEL sel, CGRect frame, NSCoder *coder) { - self = [self wb$initWithCoder:coder]; - if (self == nil) - return nil; - UINavigationBar$setBarStyle$_(self); - return self; + if (Debug_) + NSLog(@"WB:Debug:%@Style=%d", name, style); + } } -static id UINavigationBar$initWithFrame$(SBAppWindow *self, SEL sel, CGRect frame) { - self = [self wb$initWithFrame:frame]; - if (self == nil) - return nil; - UINavigationBar$setBarStyle$_(self); - return self; -}*/ - -MSHook(void, UIToolbar$setBarStyle$, UIToolbar *self, SEL sel, int style) { +MSInstanceMessageHook1(void, UIToolbar, setBarStyle, int, style) { $setBarStyle$_(@"Toolbar", style); - return _UIToolbar$setBarStyle$(self, sel, style); + return MSOldCall(style); } -MSHook(void, UINavigationBar$setBarStyle$, UINavigationBar *self, SEL sel, int style) { +MSInstanceMessageHook1(void, UINavigationBar, setBarStyle, int, style) { $setBarStyle$_(@"NavigationBar", style); - return _UINavigationBar$setBarStyle$(self, sel, style); + return MSOldCall(style); } +// }}} MSHook(void, SBButtonBar$didMoveToSuperview, UIView *self, SEL sel) { [[self superview] setBackgroundColor:[UIColor clearColor]]; @@ -680,6 +717,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_; @@ -691,37 +730,106 @@ static NSURL *WallpaperURL_; object = nil; \ } while (false) -MSHook(id, SBUIController$init, SBUIController *self, SEL sel) { - self = _SBUIController$init(self, sel); +static UIImage *$getImage$(NSString *path) { + UIImage *image([UIImage imageWithContentsOfFile:path]); + + unsigned scale($getScale$(path)); + if (scale != 1 && [image respondsToSelector:@selector(setScale)]) + [image setScale:scale]; + + return image; +} + +// %hook -[SBUIController init] {{{ +MSInstanceMessageHook0(id, SBUIController, init) { + self = MSOldCall(); if (self == nil) return nil; - UIWindow *&_window(MSHookIvar(self, "_window")); + NSString *paper($getTheme$(Wallpapers_, true)); + + { + size_t size; + sysctlbyname("hw.machine", NULL, &size, NULL, 0); + char *machine = new char[size]; + + if (sysctlbyname("hw.machine", machine, &size, NULL, 0) == -1) { + perror("sysctlbyname(\"hw.machine\", ?)"); + delete [] machine; + machine = NULL; + } + + IsWild_ = machine != NULL && strncmp(machine, "iPad", 4) == 0; + } + + BOOL (*GSSystemHasCapability)(CFStringRef) = reinterpret_cast(dlsym(RTLD_DEFAULT, "GSSystemHasCapability")); + + if ([Info_ objectForKey:@"UndockedIconLabels"] == nil) + [Info_ setObject:[NSNumber numberWithBool:( + !(paper != nil || GSSystemHasCapability != NULL && GSSystemHasCapability(CFSTR("homescreen-wallpaper"))) || + [Info_ objectForKey:@"DockedIconLabelStyle"] != nil || + [Info_ objectForKey:@"UndockedIconLabelStyle"] != nil + )] forKey:@"UndockedIconLabels"]; + + if (Debug_) + NSLog(@"WB:Debug:Info = %@", [Info_ description]); + + if (paper != nil) { + 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 *layer; + UIView **player; if (&_contentLayer != NULL) - layer = _contentLayer; + player = &_contentLayer; else if (&_contentView != NULL) - layer = _contentView; + player = &_contentView; else - layer = nil; + 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;*/ - UIView *content([[[UIView alloc] initWithFrame:[layer frame]] autorelease]); [content setBackgroundColor:[layer backgroundColor]]; [layer setBackgroundColor:[UIColor clearColor]]; - [layer setFrame:[content bounds]]; - [_window setContentView:content]; + + 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_); _release(WallpaperURL_); - if (NSString *theme = $getTheme$(Wallpapers_, true)) { - NSString *mp4 = [theme stringByAppendingPathComponent:@"Wallpaper.mp4"]; - if ([Manager_ fileExistsAtPath:mp4]) { + if (NSString *path = paper) { + if ([path hasSuffix:@".mp4"]) { #if UseAVController NSError *error; @@ -733,63 +841,47 @@ MSHook(id, SBUIController$init, SBUIController *self, SEL sel) { AVQueue *queue([controller_ queue]); - UIView *video([[[UIView alloc] initWithFrame:[content bounds]] autorelease]); + UIView *video([[[UIView alloc] initWithFrame:[indirect bounds]] autorelease]); [controller_ setLayer:[video _layer]]; - AVItem *item([[[AVItem alloc] initWithPath:mp4 error:&error] autorelease]); + AVItem *item([[[AVItem alloc] initWithPath:path error:&error] autorelease]); [queue appendItem:item error:&error]; [controller_ play:&error]; #elif UseMPMoviePlayerController - NSURL *url([NSURL fileURLWithPath:mp4]); - MPMoviePlayerController *controller = [[MPMoviePlayerController alloc] initWithContentURL:url]; + NSURL *url([NSURL fileURLWithPath:path]); + MPMoviePlayerController *controller = [[$MPMoviePlayerController alloc] initWithContentURL:url]; controller.movieControlMode = MPMovieControlModeHidden; [controller play]; #else - MPVideoView *video = [[[$MPVideoView alloc] initWithFrame:[content bounds]] autorelease]; - [video setMovieWithPath:mp4]; + MPVideoView *video = [[[$MPVideoView alloc] initWithFrame:[indirect bounds]] autorelease]; + [video setMovieWithPath:path]; [video setRepeatMode:1]; [video setRepeatGap:-1]; [video playFromBeginning];; #endif - [content addSubview:video]; + [indirect addSubview:video]; } - NSString *png = [theme stringByAppendingPathComponent:@"Wallpaper.png"]; - NSString *jpg = [theme stringByAppendingPathComponent:@"Wallpaper.jpg"]; - - NSString *path; - if ([Manager_ fileExistsAtPath:png]) - path = png; - else if ([Manager_ fileExistsAtPath:jpg]) - path = jpg; - else path = nil; - - UIImage *image; - if (path != nil) { - image = [[UIImage alloc] initWithContentsOfFile:path]; - if (image != nil) - image = [image autorelease]; - } else image = nil; - - if (image != nil) { - WallpaperFile_ = [path retain]; - WallpaperImage_ = [[UIImageView alloc] initWithImage:image]; - if (NSNumber *number = [Info_ objectForKey:@"WallpaperAlpha"]) - [WallpaperImage_ setAlpha:[number floatValue]]; - [content addSubview:WallpaperImage_]; + if ([path hasSuffix:@".png"] || [path hasSuffix:@".jpg"]) { + if (UIImage *image = $getImage$(path)) { + WallpaperFile_ = [path retain]; + WallpaperImage_ = [[UIImageView alloc] initWithImage:image]; + 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 = [content bounds]; + if ([path hasSuffix:@".html"]) { + CGRect bounds = [indirect bounds]; UIWebDocumentView *view([[[UIWebDocumentView alloc] initWithFrame:bounds] autorelease]); [view setAutoresizes:true]; WallpaperPage_ = [view retain]; - WallpaperURL_ = [[NSURL fileURLWithPath:html] retain]; + WallpaperURL_ = [[NSURL fileURLWithPath:path] retain]; [WallpaperPage_ loadRequest:[NSURLRequest requestWithURL:WallpaperURL_]]; @@ -798,15 +890,15 @@ MSHook(id, SBUIController$init, SBUIController *self, SEL sel) { [view setDrawsBackground:NO]; [[view webView] setDrawsBackground:NO]; - [content addSubview:view]; + [indirect addSubview:view]; } } - for (size_t i(0), e([themes_ count]); i != e; ++i) { - NSString *theme = [themes_ objectAtIndex:(e - i - 1)]; + for (size_t i(0), e([Themes_ count]); i != e; ++i) { + NSString *theme = [Themes_ objectAtIndex:(e - i - 1)]; NSString *html = [theme stringByAppendingPathComponent:@"Widget.html"]; if ([Manager_ fileExistsAtPath:html]) { - CGRect bounds = [content bounds]; + CGRect bounds = [indirect bounds]; UIWebDocumentView *view([[[UIWebDocumentView alloc] initWithFrame:bounds] autorelease]); [view setAutoresizes:true]; @@ -819,14 +911,13 @@ MSHook(id, SBUIController$init, SBUIController *self, SEL sel) { [view setDrawsBackground:NO]; [[view webView] setDrawsBackground:NO]; - [content addSubview:view]; + [indirect addSubview:view]; } } - [content addSubview:layer]; - return self; } +// }}} MSHook(void, SBAwayView$updateDesktopImage$, SBAwayView *self, SEL sel, UIImage *image) { NSString *path = $getTheme$([NSArray arrayWithObject:@"LockBackground.html"]); @@ -959,12 +1050,37 @@ WBDelegate(badge_) @end /* }}} */ -MSHook(void, SBIcon$setAlpha$, SBIcon *self, SEL sel, float alpha) { +// IconAlpha {{{ +MSInstanceMessageHook1(void, SBIcon, setIconImageAlpha, float, alpha) { if (NSNumber *number = [Info_ objectForKey:@"IconAlpha"]) alpha = [number floatValue]; - return _SBIcon$setAlpha$(self, sel, alpha); + return MSOldCall(alpha); } +MSInstanceMessageHook1(void, SBIcon, setIconLabelAlpha, float, alpha) { + if (NSNumber *number = [Info_ objectForKey:@"IconAlpha"]) + alpha = [number floatValue]; + return MSOldCall(alpha); +} + +MSInstanceMessageHook0(id, SBIcon, initWithDefaultSize) { + if ((self = MSOldCall()) != nil) { + if (NSNumber *number = [Info_ objectForKey:@"IconAlpha"]) { + // XXX: note: this is overridden above, which is silly + float alpha([number floatValue]); + [self setIconImageAlpha:alpha]; + [self setIconLabelAlpha:alpha]; + } + } return self; +} + +MSInstanceMessageHook1(void, SBIcon, setAlpha, float, alpha) { + if (NSNumber *number = [Info_ objectForKey:@"IconAlpha"]) + alpha = [number floatValue]; + return MSOldCall(alpha); +} +// }}} + MSHook(id, SBIconBadge$initWithBadge$, SBIconBadge *self, SEL sel, NSString *badge) { if ((self = _SBIconBadge$initWithBadge$(self, sel, badge)) != nil) { id &_badge(MSHookIvar(self, "_badge")); @@ -1128,7 +1244,16 @@ MSHook(void, SBIconLabel$setInDock$, SBIconLabel *self, SEL sel, BOOL docked) { return _SBIconLabel$setInDock$(self, sel, docked); } -MSHook(NSString *, NSBundle$localizedStringForKey$value$table$, NSBundle *self, SEL sel, NSString *key, NSString *value, NSString *table) { +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); +} + +// %hook -[NSBundle localizedStringForKey:value:table:] {{{ +MSInstanceMessageHook3(NSString *, NSBundle, localizedStringForKey,value,table, NSString *, key, NSString *, value, NSString *, table) { NSString *identifier = [self bundleIdentifier]; NSLocale *locale = [NSLocale currentLocale]; NSString *language = [locale objectForKey:NSLocaleLanguageCode]; @@ -1150,25 +1275,28 @@ MSHook(NSString *, NSBundle$localizedStringForKey$value$table$, NSBundle *self, } else goto null; } else null: [Strings_ setObject:[NSNull null] forKey:name]; - return _NSBundle$localizedStringForKey$value$table$(self, sel, key, value, table); + return MSOldCall(key, value, table); } +// }}} +// %hook -[WebCoreFrameBridge renderedSizeOfNode:constrainedToWidth:] {{{ +MSClassHook(WebCoreFrameBridge) -@class WebCoreFrameBridge; -MSHook(CGSize, WebCoreFrameBridge$renderedSizeOfNode$constrainedToWidth$, WebCoreFrameBridge *self, SEL sel, id node, float width) { +MSInstanceMessageHook2(CGSize, WebCoreFrameBridge, renderedSizeOfNode,constrainedToWidth, id, node, float, width) { if (node == nil) return CGSizeZero; void **core(reinterpret_cast([node _node])); if (core == NULL || core[6] == NULL) return CGSizeZero; - return _WebCoreFrameBridge$renderedSizeOfNode$constrainedToWidth$(self, sel, node, width); + return MSOldCall(node, width); } +// }}} MSHook(void, SBIconLabel$drawRect$, SBIconLabel *self, SEL sel, CGRect rect) { CGRect bounds = [self bounds]; 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; @@ -1177,11 +1305,15 @@ MSHook(void, SBIconLabel$drawRect$, SBIconLabel *self, SEL sel, CGRect rect) { 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; "]; bool ellipsis(false); @@ -1212,37 +1344,37 @@ MSHook(void, SBIconLabel$drawRect$, SBIconLabel *self, SEL sel, CGRect rect) { [label drawAtPoint:CGPointMake((bounds.size.width - size.width) / 2, 0) withStyle:style]; } -MSHook(void, CKMessageCell$addBalloonView$, id self, SEL sel, CKBalloonView *balloon) { - _CKMessageCell$addBalloonView$(self, sel, balloon); +// ChatKit {{{ +MSInstanceMessageHook1(void, CKMessageCell, addBalloonView, CKBalloonView *, balloon) { + MSOldCall(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) { +MSInstanceMessageHook2(id, CKMessageCell, initWithStyle,reuseIdentifier, int, style, NSString *, reuse) { + if ((self = MSOldCall(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) { +MSInstanceMessageHook2(id, CKTimestampView, initWithStyle,reuseIdentifier, int, style, NSString *, reuse) { + if ((self = MSOldCall(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); +MSInstanceMessageHook1(void, CKTranscriptTableView, setSeparatorStyle, int, style) { + MSOldCall(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) { +MSInstanceMessageHook2(id, CKTranscriptTableView, initWithFrame,style, CGRect, frame, int, style) { + if ((self = MSOldCall(frame, style)) != nil) { [self setSeparatorStyle:UITableViewCellSeparatorStyleNone]; } return self; } -MSHook(void, TranscriptController$loadView, mSMSMessageTranscriptController *self, SEL sel) { - _TranscriptController$loadView(self, sel); +MSInstanceMessageHook0(void, CKTranscriptController, loadView) { + MSOldCall(); if (NSString *path = $getTheme$([NSArray arrayWithObjects:@"SMSBackground.png", @"SMSBackground.jpg", nil])) if (UIImage *image = [[UIImage alloc] initWithContentsOfFile:path]) { @@ -1269,29 +1401,49 @@ MSHook(void, TranscriptController$loadView, mSMSMessageTranscriptController *sel } } } +// }}} +// %hook _UIImageWithName() {{{ 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 (id == -1) - return _UIImageAtPath(name, _UIKitBundle()); + if (Debug_) + NSLog(@"WB:Debug: _UISharedImageNameGetIdentifier(\"%@\") = %d", name, identifier); + + 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] ? _UISharedImageWithIdentifier(id) : 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]; } [UIImages_ setObject:(image == nil ? [NSNull null] : reinterpret_cast(image)) forKey:key]; - return image == nil ? _UISharedImageWithIdentifier(id) : image; + return image == nil ? __UIImageWithName(name) : image; } } - +// }}} +// %hook _UIImageWithNameInDomain() {{{ MSHook(UIImage *, _UIImageWithNameInDomain, NSString *name, NSString *domain) { NSString *key([NSString stringWithFormat:@"D:%zu%@%@", [domain length], domain, name]); UIImage *image([PathImages_ objectForKey:key]); @@ -1299,7 +1451,7 @@ MSHook(UIImage *, _UIImageWithNameInDomain, NSString *name, NSString *domain) { 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]])) { + if (NSString *path = $getTheme$([NSArray arrayWithObject:[NSString stringWithFormat:@"Domains/%@/%@", domain, name]], true)) { image = [[UIImage alloc] initWithContentsOfFile:path]; if (image != nil) [image autorelease]; @@ -1307,14 +1459,19 @@ MSHook(UIImage *, _UIImageWithNameInDomain, NSString *name, NSString *domain) { [PathImages_ setObject:(image == nil ? [NSNull null] : reinterpret_cast(image)) forKey:key]; return image == nil ? __UIImageWithNameInDomain(name, domain) : image; } +// }}} +// %hook GSFontCreateWithName() {{{ 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" #define UIKit "/System/Library/Frameworks/UIKit.framework/UIKit" @@ -1332,7 +1489,7 @@ 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]; - for (NSString *theme in themes_) { + for (NSString *theme in Themes_) { NSString *path([NSString stringWithFormat:@"%@/UISounds/%@", theme, file]); if ([Manager_ fileExistsAtPath:path]) { strcpy(a1, [path UTF8String]); @@ -1371,6 +1528,11 @@ static void ChangeWallpaper( #define WBRename(name, sel, imp) \ _ ## name ## $ ## imp = MSHookMessage($ ## name, @selector(sel), &$ ## name ## $ ## imp) +template +static void msset(Type_ &function, MSImageRef image, const char *name) { + function = reinterpret_cast(MSFindSymbol(image, name)); +} + template static void nlset(Type_ &function, struct nlist *nl, size_t index) { struct nlist &name(nl[index]); @@ -1385,107 +1547,115 @@ static void dlset(Type_ &function, const char *name) { function = reinterpret_cast(dlsym(RTLD_DEFAULT, name)); } -extern "C" void WBInitialize() { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; +// %hook CGImageReadCreateWithFile() {{{ +MSHook(void *, CGImageReadCreateWithFile, NSString *path, int flag) { + if (Debug_) + NSLog(@"WB:Debug: CGImageReadCreateWithFile(%@, %d)", path, flag); + NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]); + void *value(_CGImageReadCreateWithFile([path wb$themedPath], flag)); + [pool release]; + return value; +} +// }}} - NSString *identifier([[NSBundle mainBundle] bundleIdentifier]); +static void SBInitialize() { + _UIImage$defaultDesktopImage = MSHookMessage(object_getClass($UIImage), @selector(defaultDesktopImage), &$UIImage$defaultDesktopImage); - NSLog(@"WB:Notice: WinterBoard"); + bool olden(dlsym(RTLD_DEFAULT, "GSLibraryCopyGenerationInfoValueForKey") == NULL); - 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 *) "__UISharedImageNameGetIdentifier"; - nl[6].n_un.n_name = (char *) "__UISharedImageWithIdentifier"; - nlist(UIKit, nl); - - 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); - MSHookFunction(_UIImageWithName, &$_UIImageWithName, &__UIImageWithName); - MSHookFunction(_UIImageWithNameInDomain, &$_UIImageWithNameInDomain, &__UIImageWithNameInDomain); - - MSHookFunction(&GSFontCreateWithName, &$GSFontCreateWithName, &_GSFontCreateWithName); - - if (dlopen(AudioToolbox, RTLD_LAZY | RTLD_NOLOAD) != NULL) { - struct nlist nl[2]; - memset(nl, 0, sizeof(nl)); - nl[0].n_un.n_name = (char *) "__Z24GetFileNameForThisActionmPcRb"; - nlist(AudioToolbox, nl); - nlset(_Z24GetFileNameForThisActionmPcRb, nl, 0); - MSHookFunction(_Z24GetFileNameForThisActionmPcRb, &$_Z24GetFileNameForThisActionmPcRb, &__Z24GetFileNameForThisActionmPcRb); + if (SummerBoard_) { + WBRename(SBApplication, pathForIcon, pathForIcon); + WBRename(SBApplicationIcon, icon, icon); + WBRename(SBApplicationIcon, generateIconImage:, generateIconImage$); } - $NSBundle = objc_getClass("NSBundle"); + WBRename(SBBookmarkIcon, icon, icon); + WBRename(SBButtonBar, didMoveToSuperview, didMoveToSuperview); + WBRename(SBCalendarIconContentsView, drawRect:, drawRect$); + WBRename(SBIconBadge, initWithBadge:, initWithBadge$); + WBRename(SBIconController, noteNumberOfIconListsChanged, noteNumberOfIconListsChanged); - _NSBundle$localizedStringForKey$value$table$ = MSHookMessage($NSBundle, @selector(localizedStringForKey:value:table:), &$NSBundle$localizedStringForKey$value$table$); - _NSBundle$pathForResource$ofType$ = MSHookMessage($NSBundle, @selector(pathForResource:ofType:), &$NSBundle$pathForResource$ofType$); + WBRename(SBWidgetApplicationIcon, icon, icon); - $UIImage = objc_getClass("UIImage"); - $UINavigationBar = objc_getClass("UINavigationBar"); - $UIToolbar = objc_getClass("UIToolbar"); + WBRename(SBDockIconListView, setFrame:, setFrame$); + MSHookMessage(object_getClass($SBDockIconListView), @selector(shouldShowNewDock), &$SBDockIconListView$shouldShowNewDock, &_SBDockIconListView$shouldShowNewDock); - _UIImage$defaultDesktopImage = MSHookMessage(object_getClass($UIImage), @selector(defaultDesktopImage), &$UIImage$defaultDesktopImage); + if (olden) + WBRename(SBIconLabel, drawRect:, drawRect$); - //WBRename("UINavigationBar", @selector(initWithCoder:", (IMP) &UINavigationBar$initWithCoder$); - //WBRename("UINavigationBarBackground", @selector(initWithFrame:withBarStyle:withTintColor:", (IMP) &UINavigationBarBackground$initWithFrame$withBarStyle$withTintColor$); + WBRename(SBIconLabel, initWithSize:label:, initWithSize$label$); + WBRename(SBIconLabel, setInDock:, setInDock$); - _UINavigationBar$setBarStyle$ = MSHookMessage($UINavigationBar, @selector(setBarStyle:), &$UINavigationBar$setBarStyle$); - _UIToolbar$setBarStyle$ = MSHookMessage($UIToolbar, @selector(setBarStyle:), &$UIToolbar$setBarStyle$); + WBRename(SBIconList, setFrame:, setFrame$); - Manager_ = [[NSFileManager defaultManager] retain]; - UIImages_ = [[NSMutableDictionary alloc] initWithCapacity:16]; - PathImages_ = [[NSMutableDictionary alloc] initWithCapacity:16]; - Strings_ = [[NSMutableDictionary alloc] initWithCapacity:0]; - Bundles_ = [[NSMutableDictionary alloc] initWithCapacity:2]; - Themed_ = [[NSMutableDictionary alloc] initWithCapacity:128]; + 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$); - themes_ = [[NSMutableArray alloc] initWithCapacity:8]; + WBRename(SBAwayView, updateDesktopImage:, updateDesktopImage$); + WBRename(SBStatusBarContentsView, didMoveToSuperview, didMoveToSuperview); + //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$); + + if (SummerBoard_) + English_ = [[NSDictionary alloc] initWithContentsOfFile:@"/System/Library/CoreServices/SpringBoard.app/English.lproj/LocalizedApplicationNames.strings"]; +} - if (NSDictionary *settings = [[NSDictionary alloc] initWithContentsOfFile:[NSString stringWithFormat:@"/User/Library/Preferences/com.saurik.WinterBoard.plist"]]) { - [settings autorelease]; +MSInitialize { + NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]); + + NSString *identifier([[NSBundle mainBundle] bundleIdentifier]); + SpringBoard_ = [identifier isEqualToString:@"com.apple.springboard"]; + + Manager_ = [[NSFileManager defaultManager] retain]; + Themes_ = [[NSMutableArray alloc] initWithCapacity:8]; + + dlset(_GSFontGetUseLegacyFontMetrics, "GSFontGetUseLegacyFontMetrics"); - if (NSNumber *debug = [settings objectForKey:@"Debug"]) - Debug_ = [debug boolValue]; + // Load Settings.plist {{{ + 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]; - 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) { \ NSString *path = [NSString stringWithFormat:format]; \ if ([Manager_ fileExistsAtPath:path]) { \ - [themes_ addObject:path]; \ + [Themes_ addObject:path]; \ continue; \ } \ } @@ -1493,136 +1663,82 @@ extern "C" void WBInitialize() { testForTheme(@"/Library/Themes/%@.theme", name) testForTheme(@"/Library/Themes/%@", name) testForTheme(@"%@/Library/SummerBoard/Themes/%@", NSHomeDirectory(), name) + } } - + // }}} + // Merge Info.plist {{{ Info_ = [[NSMutableDictionary dictionaryWithCapacity:16] retain]; - for (NSString *theme in themes_) - if (NSDictionary *info = [[NSDictionary alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/Info.plist", theme]]) { - [info autorelease]; + for (NSString *theme in Themes_) + 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); - } + // AudioToolbox {{{ + if (MSImageRef image = MSGetImageByName(AudioToolbox)) { + msset(_Z24GetFileNameForThisActionmPcRb, image, "__Z24GetFileNameForThisActionmPcRb"); + MSHookFunction(_Z24GetFileNameForThisActionmPcRb, &$_Z24GetFileNameForThisActionmPcRb, &__Z24GetFileNameForThisActionmPcRb); + } + // }}} + // GraphicsServices {{{ + if (true) { + MSHookFunction(&GSFontCreateWithName, &$GSFontCreateWithName, &_GSFontCreateWithName); + } + // }}} + // ImageIO {{{ + if (MSImageRef image = MSGetImageByName("/System/Library/Frameworks/ImageIO.framework/ImageIO")) { + void *(*CGImageReadCreateWithFile)(NSString *, int); + msset(CGImageReadCreateWithFile, image, "_CGImageReadCreateWithFile"); + MSHookFunction(CGImageReadCreateWithFile, MSHake(CGImageReadCreateWithFile)); + } + // }}} + // SpringBoard {{{ + if (SpringBoard_) { + Wallpapers_ = [[NSArray arrayWithObjects:@"Wallpaper.mp4", @"Wallpaper.png", @"Wallpaper.jpg", @"Wallpaper.html", nil] retain]; + Docked_ = $getTheme$([NSArray arrayWithObjects:@"Dock.png", nil]); - if ([identifier isEqualToString:@"com.apple.MobileSMS"]) { - 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]; - - $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"); - $SBIcon = objc_getClass("SBIcon"); - $SBIconBadge = objc_getClass("SBIconBadge"); - $SBIconController = objc_getClass("SBIconController"); - $SBIconLabel = objc_getClass("SBIconLabel"); - $SBIconList = objc_getClass("SBIconList"); - $SBIconModel = objc_getClass("SBIconModel"); - //$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); - WBRename(SBBookmarkIcon, icon, icon); - WBRename(SBButtonBar, didMoveToSuperview, didMoveToSuperview); - WBRename(SBCalendarIconContentsView, drawRect:, drawRect$); - 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$); + if ($getTheme$([NSArray arrayWithObject:@"Wallpaper.mp4"]) != nil) { + NSBundle *MediaPlayer([NSBundle bundleWithPath:@"/System/Library/Frameworks/MediaPlayer.framework"]); + if (MediaPlayer != nil) + [MediaPlayer load]; - 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(SBAwayView, updateDesktopImage:, updateDesktopImage$); - WBRename(SBStatusBarContentsView, didMoveToSuperview, didMoveToSuperview); - //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$); + $MPMoviePlayerController = objc_getClass("MPMoviePlayerController"); + $MPVideoView = objc_getClass("MPVideoView"); + } - English_ = [[NSDictionary alloc] initWithContentsOfFile:@"/System/Library/CoreServices/SpringBoard.app/English.lproj/LocalizedApplicationNames.strings"]; - Cache_ = [[NSMutableDictionary alloc] initWithCapacity:64]; + SBInitialize(); } - - Wallpapers_ = [[NSArray arrayWithObjects:@"Wallpaper.mp4", @"Wallpaper.png", @"Wallpaper.jpg", @"Wallpaper.html", nil] retain]; - - 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]); + // }}} + // UIKit {{{ + if ([NSBundle bundleWithIdentifier:@"com.apple.UIKit"] != nil) { + struct nlist nl[6]; + memset(nl, 0, sizeof(nl)); + nl[0].n_un.n_name = (char *) "__UIApplicationImageWithName"; + nl[1].n_un.n_name = (char *) "__UIImageWithNameInDomain"; + nl[2].n_un.n_name = (char *) "__UIKitBundle"; + nl[3].n_un.n_name = (char *) "__UIPackedImageTableGetIdentifierForName"; + nl[4].n_un.n_name = (char *) "__UISharedImageNameGetIdentifier"; + nlist(UIKit, nl); + + nlset(_UIApplicationImageWithName, nl, 0); + nlset(_UIImageWithNameInDomain, nl, 1); + nlset(_UIKitBundle, nl, 2); + nlset(_UIPackedImageTableGetIdentifierForName, nl, 3); + nlset(_UISharedImageNameGetIdentifier, nl, 4); + + MSHookFunction(_UIApplicationImageWithName, &$_UIApplicationImageWithName, &__UIApplicationImageWithName); + MSHookFunction(_UIImageWithName, &$_UIImageWithName, &__UIImageWithName); + MSHookFunction(_UIImageWithNameInDomain, &$_UIImageWithNameInDomain, &__UIImageWithNameInDomain); + } + // }}} [pool release]; }