X-Git-Url: https://git.saurik.com/winterboard.git/blobdiff_plain/2a606c6c8279781217a5b74be66ecbee548576d7..dd1a5c4be3109ca0085fdd5c254dfa1ab8e7966e:/Library.mm diff --git a/Library.mm b/Library.mm index d03ec83..b40f67e 100644 --- a/Library.mm +++ b/Library.mm @@ -107,6 +107,10 @@ bool _itv; extern "C" void __clear_cache (char *beg, char *end); +static void (*$objc_setAssociatedObject)(id object, void *key, id value, objc_AssociationPolicy policy); +static id (*$objc_getAssociatedObject)(id object, void *key); +static void (*$objc_removeAssociatedObjects)(id object); + @protocol WinterBoard - (void *) _node; @end @@ -119,8 +123,12 @@ MSClassHook(NSString) MSClassHook(UIImage) MSMetaClassHook(UIImage) +MSClassHook(UIImageTableArtwork) MSClassHook(UINavigationBar) +MSClassHook(UISharedArtwork) MSClassHook(UIToolbar) +MSClassHook(UIStatusBarTimeItemView) +MSClassHook(UIWebDocumentView) MSClassHook(CKBalloonView) MSClassHook(CKMessageCell) @@ -139,13 +147,21 @@ MSClassHook(SBCalendarApplicationIcon) MSClassHook(SBCalendarIconContentsView) MSClassHook(SBDockIconListView) MSClassHook(SBIcon) +MSClassHook(SBIconAccessoryImage) +MSMetaClassHook(SBIconAccessoryImage) MSClassHook(SBIconBadge) MSClassHook(SBIconBadgeFactory) +MSClassHook(SBIconBadgeImage) MSClassHook(SBIconContentView) MSClassHook(SBIconController) MSClassHook(SBIconLabel) +MSClassHook(SBIconLabelImage) +MSMetaClassHook(SBIconLabelImage) +MSClassHook(SBIconLabelImageParameters) MSClassHook(SBIconList) MSClassHook(SBIconModel) +MSClassHook(SBIconView) +MSMetaClassHook(SBIconView) //MSClassHook(SBImageCache) MSClassHook(SBSearchView) MSClassHook(SBSearchTableViewCell) @@ -161,6 +177,7 @@ MSClassHook(SBWidgetApplicationIcon) extern "C" void WKSetCurrentGraphicsContext(CGContextRef); static struct MSFixClass { MSFixClass() { + $UIWebDocumentView = objc_getClass("UIWebBrowserView") ?: $UIWebDocumentView; $SBIcon = objc_getClass("SBIconView") ?: $SBIcon; if ($SBIconList == nil) @@ -172,6 +189,10 @@ static struct MSFixClass { MSFixClass() { static bool IsWild_; static bool Four_($SBDockIconListView != nil); +@interface NSObject (wb$SBIconAccessoryImage) ++ (Class) _imageClassForIcon:(SBIcon *)icon location:(int)location; +@end + @interface NSDictionary (WinterBoard) - (UIColor *) wb$colorForKey:(NSString *)key; - (BOOL) wb$boolForKey:(NSString *)key; @@ -266,8 +287,7 @@ static NSArray *$useScale$(NSArray *files, bool use = true) { if (use) { if (Scale_ == 2) { [scaled addObject:[NSString stringWithFormat:@"%@@2x~%@.%@", base, idiom, extension]]; - if (!IsWild_) - [scaled addObject:[NSString stringWithFormat:@"%@@2x.%@", base, extension]]; + [scaled addObject:[NSString stringWithFormat:@"%@@2x.%@", base, extension]]; } [scaled addObject:[NSString stringWithFormat:@"%@~%@.%@", base, idiom, extension]]; @@ -275,20 +295,20 @@ static NSArray *$useScale$(NSArray *files, bool use = true) { // if (!IsWild_) <- support old themes [scaled addObject:file]; } else if ([base hasSuffix: @"@2x"]) { - [scaled addObject:[NSString stringWithFormat:@"%@~iphone.%@", base, extension]]; + [scaled addObject:[NSString stringWithFormat:@"%@~%@.%@", base, idiom, extension]]; [scaled addObject:file]; // XXX: this actually can't be used, as the person loading the file doesn't realize that the @2x changed /*NSString *rest([base substringWithRange:NSMakeRange(0, [base length] - 3)]); - [scaled addObject:[NSString stringWithFormat:@"%@~iphone.%@", rest, extension]]; + [scaled addObject:[NSString stringWithFormat:@"%@~%@.%@", rest, idiom, extension]]; [scaled addObject:[rest stringByAppendingPathExtension:extension]];*/ } else { // XXX: this code isn't really complete [scaled addObject:file]; - if ([base hasSuffix:@"~iphone"]) - [scaled addObject:[[base substringWithRange:NSMakeRange(0, [base length] - 7)] stringByAppendingPathExtension:extension]]; + if ([base hasSuffix:[NSString stringWithFormat:@"~%@", idiom]]) + [scaled addObject:[[base substringWithRange:NSMakeRange(0, [base length] - 1 - [idiom length])] stringByAppendingPathExtension:extension]]; } } @@ -312,8 +332,11 @@ static NSString *$getTheme$(NSArray *files, NSArray *themes = Themes_) { for (NSString *theme in Themes_) for (NSString *file in files) { path = [NSString stringWithFormat:@"%@/%@", theme, file]; - if ([Manager_ fileExistsAtPath:path]) + if ([Manager_ fileExistsAtPath:path]) { + if ([[Manager_ pathContentOfSymbolicLinkAtPath:path] isEqualToString:@"/"]) + path = nil; goto set; + } } path = nil; @@ -327,7 +350,7 @@ static NSString *$getTheme$(NSArray *files, NSArray *themes = Themes_) { } // }}} // $pathForFile$inBundle$() {{{ -static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle, bool ui) { +static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle, bool ui, bool use) { NSString *identifier = [bundle bundleIdentifier]; NSMutableArray *names = [NSMutableArray arrayWithCapacity:8]; @@ -338,6 +361,8 @@ static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle, bool u NSString *base([folder stringByDeletingPathExtension]); if ([base hasSuffix:@"~iphone"]) [names addObject:[NSString stringWithFormat:@"Folders/%@.%@/%@", [base substringWithRange:NSMakeRange(0, [base length] - 7)], [folder pathExtension], file]]; + if ([base hasSuffix:@"~ipad"]) + [names addObject:[NSString stringWithFormat:@"Folders/%@.%@/%@", [base substringWithRange:NSMakeRange(0, [base length] - 5)], [folder pathExtension], file]]; } if (ui) [names addObject:[NSString stringWithFormat:@"UIImages/%@", file]]; @@ -353,6 +378,8 @@ static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle, bool u [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.Maps"] && [file isEqualToString:@"Icon-57@2x.png"]) + [names addObject:[NSString stringWithFormat:@"Bundles/com.apple.Maps/icon.png"]]; else if (!summer); remapResourceName(@"FSO_BG.png", @"StatusBar") remapResourceName(Four_ ? @"SBDockBG-old.png" : @"SBDockBG.png", @"Dock") @@ -360,7 +387,7 @@ static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle, bool u [names addObject:[NSString stringWithFormat:@"Fallback/%@", file]]; - if (NSString *path = $getTheme$($useScale$(names, ui))) + if (NSString *path = $getTheme$($useScale$(names, use))) return path; return nil; @@ -463,7 +490,7 @@ static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") { if ([file hasPrefix:prefix]) { NSUInteger length([prefix length]); if (length != [file length]) - if (NSString *path = $pathForFile$inBundle$([file substringFromIndex:(length + 1)], bundle, false)) + if (NSString *path = $pathForFile$inBundle$([file substringFromIndex:(length + 1)], bundle, false, false)) return path; } } @@ -644,7 +671,7 @@ MSHook(UIImage *, _UIApplicationImageWithName, NSString *name) { NSBundle *bundle = [NSBundle mainBundle]; if (Debug_) NSLog(@"WB:Debug: _UIApplicationImageWithName(\"%@\", %@)", name, bundle); - if (NSString *path = $pathForFile$inBundle$(name, bundle, false)) + if (NSString *path = $pathForFile$inBundle$(name, bundle, false, false)) return CachedImageAtPath(path); return __UIApplicationImageWithName(name); } @@ -672,7 +699,7 @@ MSInstanceMessageHook2(NSString *, NSBundle, pathForResource,ofType, NSString *, 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)) + if (NSString *path = $pathForFile$inBundle$(file, self, false, false)) return path; return MSOldCall(resource, type); } @@ -714,6 +741,52 @@ static struct WBStringDrawingState { NSString *info_; } *stringDrawingState_; +extern "C" CGColorSpaceRef CGContextGetFillColorSpace(CGContextRef); +extern "C" void CGContextGetFillColor(CGContextRef, CGFloat[]); + +static NSString *WBColorMarkup() { + CGContextRef context(UIGraphicsGetCurrentContext()); + //NSLog(@"XXX:1:%p", context); + if (context == NULL) + return @""; + + CGColorSpaceRef space(CGContextGetFillColorSpace(context)); + //NSLog(@"XXX:2:%p", space); + if (space == NULL) + return @""; + + size_t number(CGColorSpaceGetNumberOfComponents(space)); + //NSLog(@"XXX:3:%u", number); + if (number == 0) + return @""; + + CGFloat components[number + 1]; + CGContextGetFillColor(context, components); + + CGFloat r, g, b, a; + + switch (number) { + case 1: + r = components[0]; + g = components[0]; + b = components[0]; + a = components[1]; + break; + + case 3: + r = components[0]; + g = components[1]; + b = components[2]; + a = components[3]; + break; + + default: + return @""; + } + + return [NSString stringWithFormat:@"color: rgba(%g, %g, %g, %g)", r * 255, g * 255, b * 255, a]; +} + MSInstanceMessageHook6(CGSize, NSString, drawAtPoint,forWidth,withFont,lineBreakMode,letterSpacing,includeEmoji, CGPoint, point, float, width, UIFont *, font, UILineBreakMode, mode, float, spacing, BOOL, emoji) { //NSLog(@"XXX: @\"%@\" %g", self, spacing); @@ -732,7 +805,7 @@ MSInstanceMessageHook6(CGSize, NSString, drawAtPoint,forWidth,withFont,lineBreak NSString *base(state->base_ ?: @""); NSString *extra([NSString stringWithFormat:@"letter-spacing: %gpx", spacing]); - [self drawAtPoint:point withStyle:[NSString stringWithFormat:@"%@;%@;%@;%@", [font markupDescription], extra, base, info]]; + [self drawAtPoint:point withStyle:[NSString stringWithFormat:@"%@;%@;%@;%@;%@", [font markupDescription], WBColorMarkup(), extra, base, info]]; return CGSizeZero; } @@ -772,9 +845,9 @@ MSInstanceMessageHook7(CGSize, NSString, _drawInRect,withFont,lineBreakMode,alig NSString *extra([NSString stringWithFormat:@"text-align: %@", textAlign]); if (true) - $drawLabel$(self, rect, [NSString stringWithFormat:@"%@;%@", [font markupDescription], base], info); + $drawLabel$(self, rect, [NSString stringWithFormat:@"%@;%@;%@", [font markupDescription], WBColorMarkup(), base], info); else - [self drawInRect:rect withStyle:[NSString stringWithFormat:@"%@;%@;%@;%@", [font markupDescription], extra, base, info]]; + [self drawInRect:rect withStyle:[NSString stringWithFormat:@"%@;%@;%@;%@;%@", [font markupDescription], WBColorMarkup(), extra, base, info]]; return CGSizeZero; } @@ -797,7 +870,7 @@ MSInstanceMessageHook4(CGSize, NSString, sizeWithFont,forWidth,lineBreakMode,let NSString *base(state->base_ ?: @""); NSString *extra([NSString stringWithFormat:@"letter-spacing: %gpx", spacing]); - return [self sizeWithStyle:[NSString stringWithFormat:@"%@;%@;%@;%@", [font markupDescription], extra, base, info] forWidth:width]; + return [self sizeWithStyle:[NSString stringWithFormat:@"%@;%@;%@;%@;%@", [font markupDescription], WBColorMarkup(), extra, base, info] forWidth:width]; } MSInstanceMessageHook1(CGSize, NSString, sizeWithFont, UIFont *, font) { @@ -817,12 +890,26 @@ MSInstanceMessageHook1(CGSize, NSString, sizeWithFont, UIFont *, font) { return MSOldCall(font); NSString *base(state->base_ ?: @""); - return [self sizeWithStyle:[NSString stringWithFormat:@"%@;%@;%@", [font markupDescription], base, info] forWidth:65535]; + return [self sizeWithStyle:[NSString stringWithFormat:@"%@;%@;%@;%@", [font markupDescription], WBColorMarkup(), base, info] forWidth:65535]; +} + +MSClassMessageHook2(UIImage *, SBIconAccessoryImage, checkoutAccessoryImageForIcon,location, id, icon, int, location) { + if ([self _imageClassForIcon:icon location:location] != $SBIconBadgeImage) + return MSOldCall(icon, location); + + WBStringDrawingState badgeState = {NULL, -1, @"" + , @"BadgeStyle"}; + + stringDrawingState_ = &badgeState; + + UIImage *image(MSOldCall(icon, location)); + + stringDrawingState_ = NULL; + return image; } MSInstanceMessageHook1(UIImage *, SBIconBadgeFactory, checkoutBadgeImageForText, NSString *, text) { - WBStringDrawingState badgeState = {NULL, 1, @"" - "color: white;" + WBStringDrawingState badgeState = {NULL, -1, @"" , @"BadgeStyle"}; stringDrawingState_ = &badgeState; @@ -835,7 +922,6 @@ MSInstanceMessageHook1(UIImage *, SBIconBadgeFactory, checkoutBadgeImageForText, MSInstanceMessageHook1(UIImage *, SBCalendarApplicationIcon, generateIconImage, int, type) { WBStringDrawingState dayState = {NULL, 2, @"" - "color: white;" // XXX: this is only correct on an iPod dock "text-shadow: rgba(0, 0, 0, 0.2) -1px -1px 2px;" , @"CalendarIconDayStyle"}; @@ -843,7 +929,6 @@ MSInstanceMessageHook1(UIImage *, SBCalendarApplicationIcon, generateIconImage, WBStringDrawingState sizeState = {&dayState, 7, nil, nil}; WBStringDrawingState dateState = {&sizeState, 2, @"" - "color: #333333;" , @"CalendarIconDateStyle"}; stringDrawingState_ = &dateState; @@ -854,6 +939,18 @@ MSInstanceMessageHook1(UIImage *, SBCalendarApplicationIcon, generateIconImage, return image; } +MSInstanceMessageHook1(UIImage *, UIStatusBarTimeItemView, contentsImageForStyle, int, style) { + WBStringDrawingState timeState = {NULL, 0, @"" + , @"TimeStyle"}; + + stringDrawingState_ = &timeState; + + UIImage *image(MSOldCall(style)); + + stringDrawingState_ = NULL; + return image; +} + MSHook(void, SBCalendarIconContentsView$drawRect$, SBCalendarIconContentsView *self, SEL sel, CGRect rect) { NSBundle *bundle([NSBundle mainBundle]); @@ -1146,7 +1243,7 @@ MSInstanceMessageHook0(id, SBUIController, init) { if (NSString *path = $getTheme$([NSArray arrayWithObject:@"Wallpaper.html"], themes)) { CGRect bounds = [indirect bounds]; - UIWebDocumentView *view([[[UIWebDocumentView alloc] initWithFrame:bounds] autorelease]); + UIWebDocumentView *view([[[$UIWebDocumentView alloc] initWithFrame:bounds] autorelease]); [view setAutoresizes:true]; WallpaperPage_ = [view retain]; @@ -1169,7 +1266,7 @@ MSInstanceMessageHook0(id, SBUIController, init) { if ([Manager_ fileExistsAtPath:html]) { CGRect bounds = [indirect bounds]; - UIWebDocumentView *view([[[UIWebDocumentView alloc] initWithFrame:bounds] autorelease]); + UIWebDocumentView *view([[[$UIWebDocumentView alloc] initWithFrame:bounds] autorelease]); [view setAutoresizes:true]; NSURL *url = [NSURL fileURLWithPath:html]; @@ -1200,7 +1297,7 @@ MSHook(void, SBAwayView$updateDesktopImage$, SBAwayView *self, SEL sel, UIImage if (path != nil) { CGRect bounds = [self bounds]; - UIWebDocumentView *view([[[UIWebDocumentView alloc] initWithFrame:bounds] autorelease]); + UIWebDocumentView *view([[[$UIWebDocumentView alloc] initWithFrame:bounds] autorelease]); [view setAutoresizes:true]; if (WallpaperPage_ != nil) @@ -1217,9 +1314,23 @@ MSHook(void, SBAwayView$updateDesktopImage$, SBAwayView *self, SEL sel, UIImage [view setBackgroundColor:[UIColor clearColor]]; [self insertSubview:view aboveSubview:_backgroundView]; + + if ($objc_setAssociatedObject != NULL) + $objc_setAssociatedObject(self, @selector(wb$widgetView), view, OBJC_ASSOCIATION_RETAIN_NONATOMIC); } } +MSHook(void, SBAwayView$_addSubview$positioned$relativeTo$, SBAwayView *self, SEL sel, UIView *view, int positioned, UIView *relative) { + UIView *&_backgroundView(MSHookIvar(self, "_backgroundView")); + UIView *&_chargingView(MSHookIvar(self, "_chargingView")); + if (&_chargingView != NULL) + if (positioned == -2 && (relative == _backgroundView && _chargingView == nil || relative == _chargingView)) + if ($objc_getAssociatedObject != NULL) + if (UIView *widget = $objc_getAssociatedObject(self, @selector(wb$widgetView))) + relative = widget; + return _SBAwayView$_addSubview$positioned$relativeTo$(self, sel, view, positioned, relative); +} + /*extern "C" CGColorRef CGGStateGetSystemColor(void *); extern "C" CGColorRef CGGStateGetFillColor(void *); extern "C" CGColorRef CGGStateGetStrokeColor(void *); @@ -1337,8 +1448,12 @@ MSInstanceMessageHook0(id, SBIcon, initWithDefaultSize) { 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]; + if ([self respondsToSelector:@selector(setIconImageAlpha:)]) + [self setIconImageAlpha:alpha]; + if ([self respondsToSelector:@selector(setIconLabelAlpha:)]) + [self setIconLabelAlpha:alpha]; + if ([self respondsToSelector:@selector(setAlpha:)]) + [self setAlpha:alpha]; } } return self; } @@ -1468,11 +1583,20 @@ MSHook(void, SBStatusBarTimeView$drawRect$, SBStatusBarTimeView *self, SEL sel, @end -MSHook(void, SBIconList$setFrame$, SBIconList *self, SEL sel, CGRect frame) { +static void SBIconList$updateFrames$(SBIconList *self) { NSArray *subviews([self subviews]); WBImageView *view([subviews count] == 0 ? nil : [subviews objectAtIndex:0]); if (view != nil && [view wb$isWBImageView]) [view wb$updateFrame]; +} + +MSHook(void, SBIconList$didMoveToSuperview, SBIconList *self, SEL sel) { + SBIconList$updateFrames$(self); + _SBIconList$didMoveToSuperview(self, sel); +} + +MSHook(void, SBIconList$setFrame$, SBIconList *self, SEL sel, CGRect frame) { + SBIconList$updateFrames$(self); _SBIconList$setFrame$(self, sel, frame); } @@ -1583,7 +1707,7 @@ MSInstanceMessageHook3(NSString *, NSBundle, localizedStringForKey,value,table, return value; } else if (NSString *path = $pathForFile$inBundle$([NSString stringWithFormat:@"%@.lproj/%@.strings", language, file - ], self, false)) { + ], self, false, false)) { if ((strings = [[NSDictionary alloc] initWithContentsOfFile:path]) != nil) { [Strings_ setObject:[strings autorelease] forKey:name]; goto strings; @@ -1638,7 +1762,6 @@ MSInstanceMessage0(CGImageRef, SBIconLabel, buildLabelImage) { bool docked((MSHookIvar(self, "_inDock") & 0x2) != 0); WBStringDrawingState labelState = {NULL, 0, @"" - "color: white;" , docked ? @"DockedIconLabelStyle" : @"UndockedIconLabelStyle"}; stringDrawingState_ = &labelState; @@ -1651,6 +1774,37 @@ MSInstanceMessage0(CGImageRef, SBIconLabel, buildLabelImage) { return image; } +static bool wb$inDock(id parameters) { + return [$objc_getAssociatedObject(parameters, @selector(wb$inDock)) boolValue]; +} + +MSInstanceMessage0(NSUInteger, SBIconLabelImageParameters, hash) { + return MSOldCall() + (wb$inDock(self) ? 0xdeadbeef : 0xd15ea5e); +} + +MSClassMessage2(id, SBIconView, _labelImageParametersForIcon,location, id, icon, int, location) { + if (id parameters = MSOldCall(icon, location)) { + $objc_setAssociatedObject(parameters, @selector(wb$inDock), [NSNumber numberWithBool:(location == 1)], OBJC_ASSOCIATION_RETAIN_NONATOMIC); + return parameters; + } return nil; +} + +MSClassMessage1(UIImage *, SBIconLabelImage, _drawLabelImageForParameters, id, parameters) { + bool docked(wb$inDock(parameters)); + + WBStringDrawingState labelState = {NULL, 0, @"" + , docked ? @"DockedIconLabelStyle" : @"UndockedIconLabelStyle"}; + + stringDrawingState_ = &labelState; + + //NSLog(@"XXX: +"); + UIImage *image(MSOldCall(parameters)); + //NSLog(@"XXX: -"); + + stringDrawingState_ = NULL; + return image; +} + // ChatKit {{{ MSInstanceMessageHook2(id, CKBalloonView, initWithFrame,delegate, CGRect, frame, id, delegate) { if ((self = MSOldCall(frame, delegate)) != nil) { @@ -1740,6 +1894,38 @@ MSInstanceMessageHook0(void, CKTranscriptController, loadView) { } // }}} +MSInstanceMessage2(UISharedArtwork *, UISharedArtwork, initWithName,inBundle, NSString *, name, NSBundle *, bundle) { + if ((self = MSOldCall(name, bundle)) != nil) { + $objc_setAssociatedObject(self, @selector(wb$bundle), bundle, OBJC_ASSOCIATION_RETAIN_NONATOMIC); + } return self; +} + +MSInstanceMessage1(UIImage *, UIImageTableArtwork, imageNamed, NSString *, name) { + NSBundle *bundle($objc_getAssociatedObject(self, @selector(wb$bundle))); + if (Debug_) + NSLog(@"WB:Debug:[UIImageTableArtwork[%@] imageNamed:\"%@\"]", bundle, name); + if (bundle == nil) + return MSOldCall(name); + UIImage *image = [UIImages_ objectForKey:name]; + if (image != nil) + return reinterpret_cast(image) == [NSNull null] ? MSOldCall(name) : image; + if (NSString *path = $pathForFile$inBundle$(name, bundle, true, true)) + image = $getImage$(path); + [UIImages_ setObject:(image == nil ? [NSNull null] : reinterpret_cast(image)) forKey:name]; + if (image != nil) + return image; + + image = MSOldCall(name); + + if (UIDebug_) { + NSString *path([@"/tmp/UIImages/" stringByAppendingString:name]); + if (![Manager_ fileExistsAtPath:path]) + [UIImagePNGRepresentation(image) writeToFile:path atomically:YES]; + } + + return image; +} + // %hook _UIImageWithName() {{{ MSHook(UIImage *, _UIImageWithName, NSString *name) { if (Debug_) @@ -1770,7 +1956,7 @@ MSHook(UIImage *, _UIImageWithName, NSString *name) { UIImage *image([UIImages_ objectForKey:key]); if (image != nil) return reinterpret_cast(image) == [NSNull null] ? __UIImageWithName(name) : image; - if (NSString *path = $pathForFile$inBundle$(name, _UIKitBundle(), true)) + if (NSString *path = $pathForFile$inBundle$(name, _UIKitBundle(), true, true)) image = $getImage$(path); [UIImages_ setObject:(image == nil ? [NSNull null] : reinterpret_cast(image)) forKey:key]; if (image != nil) @@ -1818,14 +2004,9 @@ MSHook(GSFontRef, GSFontCreateWithName, const char *name, GSFontSymbolicTraits t #define AudioToolbox "/System/Library/Frameworks/AudioToolbox.framework/AudioToolbox" #define UIKit "/System/Library/Frameworks/UIKit.framework/UIKit" -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); +static bool GetFileNameForThisAction$(bool value, unsigned long a0, char *a1, unsigned long a2, bool &a3) { if (Debug_) - NSLog(@"WB:Debug:GetFileNameForThisAction(%u, %s, %u) = %u", a0, value ? a1 : NULL, a2, value); + NSLog(@"WB:Debug:GetFileNameForThisAction(%u, %s, %u, %u) = %u", a0, value ? a1 : NULL, a2, a3, value); if (value) { NSString *path = [NSString stringWithUTF8String:a1]; @@ -1843,6 +2024,16 @@ MSHook(bool, _Z24GetFileNameForThisActionmPcRb, unsigned long a0, char *a1, bool return value; } +MSHook(bool, _Z24GetFileNameForThisActionmPcRb, unsigned long a0, char *a1, bool &a3) { + bool value(__Z24GetFileNameForThisActionmPcRb(a0, a1, a3)); + return GetFileNameForThisAction$(value, a0, a1, 0, a3); +} + +MSHook(bool, _Z24GetFileNameForThisActionmPcmRb, unsigned long a0, char *a1, unsigned long a2, bool &a3) { + bool value(__Z24GetFileNameForThisActionmPcmRb(a0, a1, a2, a3)); + return GetFileNameForThisAction$(value, a0, a1, a2, a3); +} + static void ChangeWallpaper( CFNotificationCenterRef center, void *observer, @@ -1867,8 +2058,43 @@ static void ChangeWallpaper( } +MSHook(NSArray *, CPBitmapCreateImagesFromPath, NSString *path, NSDictionary **names, void *arg2, void *arg3) { + NSArray *images(_CPBitmapCreateImagesFromPath(path, names, arg2, arg3)); + if (images != NULL && *names != nil && CFGetTypeID((CFTypeRef) *names) == CFDictionaryGetTypeID()) { + if (NSBundle *bundle = [NSBundle wb$bundleWithFile:path]) { + NSMutableArray *copy([images mutableCopy]); + [images release]; + images = copy; + + NSString *file([path stringByResolvingSymlinksInPath]); + NSString *prefix([[bundle bundlePath] stringByResolvingSymlinksInPath]); + if ([file hasPrefix:prefix]) { + NSUInteger length([prefix length]); + if (length != [file length]) { + NSEnumerator *enumerator([*names keyEnumerator]); + while (NSString *name = [enumerator nextObject]) { + NSString *png([name stringByAppendingString:@".png"]); + if (NSString *themed = $pathForFile$inBundle$(png, bundle, false, true)) { + NSUInteger index([[*names objectForKey:name] intValue]); + UIImage *image($getImage$(themed)); + CGImageRef cg([image CGImage]); + [copy replaceObjectAtIndex:index withObject:(id)cg]; + } + } + } + } + } + } return images; +} + +MSHook(void, BKSDisplayServicesSetSystemAppExitedImagePath, NSString *path) { + if (NSString *themed = $getTheme$($useScale$([NSArray arrayWithObject:@"SystemAppExited.png"]))) + path = themed; + _BKSDisplayServicesSetSystemAppExitedImagePath(path); +} + #define WBRename(name, sel, imp) \ - _ ## name ## $ ## imp = MSHookMessage($ ## name, @selector(sel), &$ ## name ## $ ## imp) + MSHookMessage($ ## name, @selector(sel), &$ ## name ## $ ## imp, &_ ## name ## $ ## imp) template static void msset(Type_ &function, MSImageRef image, const char *name) { @@ -1898,35 +2124,53 @@ MSHook(void *, CGImageReadCreateWithFile, NSString *path, int flag) { [pool release]; return value; } + +MSHook(void *, CGImageSourceCreateWithFile, NSString *path, NSDictionary *options) { + if (Debug_) + NSLog(@"WB:Debug: CGImageSourceCreateWithFile(%@, %@)", path, options); + NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]); + void *value(_CGImageSourceCreateWithFile([path wb$themedPath], options)); + [pool release]; + return value; +} + +MSHook(void *, CGImageSourceCreateWithURL, NSURL *url, NSDictionary *options) { + if (Debug_) + NSLog(@"WB:Debug: CGImageSourceCreateWithURL(%@, %@)", url, options); + NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]); + if ([url isFileURL]) + url = [NSURL fileURLWithPath:[[url path] wb$themedPath]]; + void *value(_CGImageSourceCreateWithURL(url, options)); + [pool release]; + return value; +} // }}} static void NSString$drawAtPoint$withStyle$(NSString *self, SEL _cmd, CGPoint point, NSString *style) { WKSetCurrentGraphicsContext(UIGraphicsGetCurrentContext()); if (style == nil || [style length] == 0) style = @"font-family: Helvetica; font-size: 12px"; - //NSLog(@"XXX:draw(%@)", [style stringByReplacingOccurrencesOfString:@"\n" withString:@" "]); - return [[WBMarkup sharedMarkup] drawString:self atPoint:point withStyle:style]; + //NSLog(@"XXX:drawP(%@ | %@)", self, [style stringByReplacingOccurrencesOfString:@"\n" withString:@" "]); + [[WBMarkup sharedMarkup] drawString:self atPoint:point withStyle:style]; } static void NSString$drawInRect$withStyle$(NSString *self, SEL _cmd, CGRect rect, NSString *style) { WKSetCurrentGraphicsContext(UIGraphicsGetCurrentContext()); if (style == nil || [style length] == 0) style = @"font-family: Helvetica; font-size: 12px"; + //NSLog(@"XXX:drawR(%@ | %@)", self, [style stringByReplacingOccurrencesOfString:@"\n" withString:@" "]); return [[WBMarkup sharedMarkup] drawString:self inRect:rect withStyle:style]; } static CGSize NSString$sizeWithStyle$forWidth$(NSString *self, SEL _cmd, NSString *style, float width) { if (style == nil || [style length] == 0) style = @"font-family: Helvetica; font-size: 12px"; - //NSLog(@"XXX:size(%@)", [style stringByReplacingOccurrencesOfString:@"\n" withString:@" "]); - return [[WBMarkup sharedMarkup] sizeOfString:self withStyle:style forWidth:width]; + CGSize size([[WBMarkup sharedMarkup] sizeOfString:self withStyle:style forWidth:width]); + //NSLog(@"XXX:size(%@ | %@) = [%g %g]", self, [style stringByReplacingOccurrencesOfString:@"\n" withString:@" "], size.width, size.height); + return size; } static void SBInitialize() { - class_addMethod($NSString, @selector(drawAtPoint:withStyle:), (IMP) &NSString$drawAtPoint$withStyle$, "v20@0:4{CGPoint=ff}8@16"); - class_addMethod($NSString, @selector(drawInRect:withStyle:), (IMP) &NSString$drawInRect$withStyle$, "v28@0:4{CGRect={CGSize=ff}{CGSize=ff}}8@24"); - class_addMethod($NSString, @selector(sizeWithStyle:forWidth:), (IMP) &NSString$sizeWithStyle$forWidth$, "{CGSize=ff}16@0:4@8f12"); - if (SummerBoard_) { WBRename(SBApplication, pathForIcon, pathForIcon); WBRename(SBApplicationIcon, icon, icon); @@ -1946,12 +2190,18 @@ static void SBInitialize() { if (kCFCoreFoundationVersionNumber < 600 || SummerBoard_) WBRename(SBIconLabel, drawRect:, drawRect$); - else + else if (kCFCoreFoundationVersionNumber < 700) { WBRename(SBIconLabel, buildLabelImage, buildLabelImage); + } else { + WBRename(SBIconLabelImageParameters, hash, hash); + WBRename($SBIconView, _labelImageParametersForIcon:location:, _labelImageParametersForIcon$location$); + WBRename($SBIconLabelImage, _drawLabelImageForParameters:, _drawLabelImageForParameters$); + } WBRename(SBIconLabel, initWithSize:label:, initWithSize$label$); WBRename(SBIconLabel, setInDock:, setInDock$); + WBRename(SBIconList, didMoveToSuperview, didMoveToSuperview); WBRename(SBIconList, setFrame:, setFrame$); WBRename(SBIconModel, cacheImageForIcon:, cacheImageForIcon$); @@ -1966,6 +2216,9 @@ static void SBInitialize() { //WBRename(SBImageCache, initWithName:forImageWidth:imageHeight:initialCapacity:, initWithName$forImageWidth$imageHeight$initialCapacity$); WBRename(SBAwayView, updateDesktopImage:, updateDesktopImage$); + if (kCFCoreFoundationVersionNumber >= 700) + WBRename(SBAwayView, _addSubview:positioned:relativeTo:, _addSubview$positioned$relativeTo$); + WBRename(SBStatusBarContentsView, didMoveToSuperview, didMoveToSuperview); //WBRename(SBStatusBarContentsView, initWithStatusBar:mode:, initWithStatusBar$mode$); //WBRename(SBStatusBarController, setStatusBarMode:orientation:duration:animation:, setStatusBarMode$orientation$duration$animation$); @@ -1979,7 +2232,30 @@ static void SBInitialize() { English_ = [[NSDictionary alloc] initWithContentsOfFile:@"/System/Library/CoreServices/SpringBoard.app/English.lproj/LocalizedApplicationNames.strings"]; } +/*MSHook(int, open, const char *path, int oflag, mode_t mode) { + int fd(_open(path, oflag, mode)); + + static bool no(false); + if (no) return fd; + no = true; + + if (strstr(path, "/icon") != NULL) + MSHookProcess(-1, ""); + + if (fd == -1 && errno == EFAULT) + NSLog(@"open(%p, %#x, %#o) = %d\n", path, oflag, mode, fd); + else + NSLog(@"open(\"%s\", %#x, %#o) = %d\n", path, oflag, mode, fd); + + no = false; + return fd; +}*/ + MSInitialize { + $objc_setAssociatedObject = reinterpret_cast(dlsym(RTLD_DEFAULT, "objc_setAssociatedObject")); + $objc_getAssociatedObject = reinterpret_cast(dlsym(RTLD_DEFAULT, "objc_getAssociatedObject")); + $objc_removeAssociatedObjects = reinterpret_cast(dlsym(RTLD_DEFAULT, "objc_removeAssociatedObjects")); + NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]); NSString *identifier([[NSBundle mainBundle] bundleIdentifier]); @@ -2048,10 +2324,29 @@ MSInitialize { [Info_ setObject:[info objectForKey:key] forKey:key]; // }}} + // AppSupport {{{ + if (MSImageRef image = MSGetImageByName("/System/Library/PrivateFrameworks/AppSupport.framework/AppSupport")) { + NSArray *(*CPBitmapCreateImagesFromPath)(NSString *, NSDictionary **, void *, void *); + msset(CPBitmapCreateImagesFromPath, image, "_CPBitmapCreateImagesFromPath"); + MSHookFunction(CPBitmapCreateImagesFromPath, MSHake(CPBitmapCreateImagesFromPath)); + } + // }}} // AudioToolbox {{{ if (MSImageRef image = MSGetImageByName(AudioToolbox)) { + bool (*_Z24GetFileNameForThisActionmPcRb)(unsigned long, char *, bool &); msset(_Z24GetFileNameForThisActionmPcRb, image, "__Z24GetFileNameForThisActionmPcRb"); MSHookFunction(_Z24GetFileNameForThisActionmPcRb, &$_Z24GetFileNameForThisActionmPcRb, &__Z24GetFileNameForThisActionmPcRb); + + bool (*_Z24GetFileNameForThisActionmPcmRb)(unsigned long, char *, unsigned long, bool &); + msset(_Z24GetFileNameForThisActionmPcmRb, image, "__Z24GetFileNameForThisActionmPcmRb"); + MSHookFunction(_Z24GetFileNameForThisActionmPcmRb, &$_Z24GetFileNameForThisActionmPcmRb, &__Z24GetFileNameForThisActionmPcmRb); + } + // }}} + // BackBoardServices {{{ + if (MSImageRef image = MSGetImageByName("/System/Library/PrivateFrameworks/BackBoardServices.framework/BackBoardServices")) { + void (*BKSDisplayServicesSetSystemAppExitedImagePath)(NSString *path); + msset(BKSDisplayServicesSetSystemAppExitedImagePath, image, "_BKSDisplayServicesSetSystemAppExitedImagePath"); + MSHookFunction(BKSDisplayServicesSetSystemAppExitedImagePath, MSHake(BKSDisplayServicesSetSystemAppExitedImagePath)); } // }}} // GraphicsServices {{{ @@ -2060,10 +2355,23 @@ MSInitialize { } // }}} // ImageIO {{{ - if (MSImageRef image = MSGetImageByName("/System/Library/Frameworks/ImageIO.framework/ImageIO")) { + MSImageRef imageio = MSGetImageByName("/System/Library/Frameworks/ImageIO.framework/ImageIO"); + if (imageio == NULL) + imageio = MSGetImageByName("/System/Library/PrivateFrameworks/ImageIO.framework/ImageIO"); + if (MSImageRef image = imageio) { void *(*CGImageReadCreateWithFile)(NSString *, int); msset(CGImageReadCreateWithFile, image, "_CGImageReadCreateWithFile"); MSHookFunction(CGImageReadCreateWithFile, MSHake(CGImageReadCreateWithFile)); + + if (CGImageReadCreateWithFile == NULL) { + void *(*CGImageSourceCreateWithFile)(NSString *, NSDictionary *); + msset(CGImageSourceCreateWithFile, image, "_CGImageSourceCreateWithFile"); + MSHookFunction(CGImageSourceCreateWithFile, MSHake(CGImageSourceCreateWithFile)); + + void *(*CGImageSourceCreateWithURL)(NSURL *, NSDictionary *); + msset(CGImageSourceCreateWithURL, image, "_CGImageSourceCreateWithURL"); + MSHookFunction(CGImageSourceCreateWithURL, MSHake(CGImageSourceCreateWithURL)); + } } // }}} // SpringBoard {{{ @@ -2091,27 +2399,38 @@ MSInitialize { // }}} // 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); + class_addMethod($NSString, @selector(drawAtPoint:withStyle:), (IMP) &NSString$drawAtPoint$withStyle$, "v20@0:4{CGPoint=ff}8@16"); + class_addMethod($NSString, @selector(drawInRect:withStyle:), (IMP) &NSString$drawInRect$withStyle$, "v28@0:4{CGRect={CGSize=ff}{CGSize=ff}}8@24"); + class_addMethod($NSString, @selector(sizeWithStyle:forWidth:), (IMP) &NSString$sizeWithStyle$forWidth$, "{CGSize=ff}16@0:4@8f12"); + + if (kCFCoreFoundationVersionNumber > 700) { // XXX: iOS 6.x + WBRename(UISharedArtwork, initWithName:inBundle:, initWithName$inBundle$); + WBRename(UIImageTableArtwork, imageNamed:, imageNamed$); + } else { + 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); + } } // }}} + //MSHookFunction(reinterpret_cast(&open), MSHake(open)); + if (UIDebug_ && ![Manager_ fileExistsAtPath:@"/tmp/UIImages"]) { NSError *error(nil); if (![Manager_ createDirectoryAtPath:@"/tmp/UIImages" withIntermediateDirectories:NO attributes:[NSDictionary dictionaryWithObjectsAndKeys: