MSClassHook(NSBundle)
MSClassHook(NSString)
+MSClassHook(_UIAssetManager)
MSClassHook(UIImage)
MSMetaClassHook(UIImage)
MSClassHook(UINavigationBar)
MSClassHook(SBIconBadge)
MSClassHook(SBIconBadgeFactory)
MSClassHook(SBIconBadgeImage)
+MSClassHook(SBIconBadgeView)
+MSMetaClassHook(SBIconBadgeView)
MSClassHook(SBIconContentView)
MSClassHook(SBIconController)
MSClassHook(SBIconLabel)
@end
+@interface _UIAssetManager : NSObject
+- (NSBundle *) bundle;
+- (NSString *) carFileName;
+@end
+
static BOOL (*_GSFontGetUseLegacyFontMetrics)();
#define $GSFontGetUseLegacyFontMetrics() \
(_GSFontGetUseLegacyFontMetrics == NULL ? YES : _GSFontGetUseLegacyFontMetrics())
static UIImage *(*_UIApplicationImageWithName)(NSString *name);
static UIImage *(*_UIImageWithNameInDomain)(NSString *name, NSString *domain);
-static UIImage *(*_UIImageWithNameUsingCurrentIdiom)(NSString *name);
-static UIImage *(*_UIImageWithDeviceSpecificName)(NSString *name);
static NSBundle *(*_UIKitBundle)();
-static bool (*_UIPackedImageTableGetIdentifierForName)(NSString *, int *);
-static int (*_UISharedImageNameGetIdentifier)(NSString *);
static NSMutableDictionary *Images_ = [[NSMutableDictionary alloc] initWithCapacity:64];
static NSMutableDictionary *Cache_ = [[NSMutableDictionary alloc] initWithCapacity:64];
static NSDictionary *English_;
static NSMutableDictionary *Info_;
+// @interface WBBundle {{{
+@interface WBBundle : NSBundle {
+ NSString *identifier_;
+}
+
++ (WBBundle *) bundleWithIdentifier:(NSString *)identifier;
+
+@end
+
+@implementation WBBundle
+
+- (void) dealloc {
+ [identifier_ release];
+ return [super dealloc];
+}
+
++ (WBBundle *) bundleWithIdentifier:(NSString *)identifier {
+ return [[[self alloc] initWithIdentifier:identifier] autorelease];
+}
+
+- (id) initWithIdentifier:(NSString *)identifier {
+ if ((self = [super init]) != nil) {
+ identifier_ = [identifier retain];
+ } return self;
+}
+
+- (NSString *) bundleIdentifier {
+ return identifier_;
+}
+
+@end
+// }}}
+
// $getTheme$() {{{
static NSMutableDictionary *Themed_ = [[NSMutableDictionary alloc] initWithCapacity:128];
StripName("~iphone");
StripName("~ipad");
- return [name hasSuffix:@"@2x"] ? 2 : 1;
+ if ([name hasSuffix:@"@3x"])
+ return 3;
+ if ([name hasSuffix:@"@2x"])
+ return 2;
+ return 1;
}
static NSArray *$useScale$(NSArray *files, bool use = true) {
Scale_ = 1;
}
- if (Scale_ == 1)
- return files;
-
NSString *idiom(IsWild_ ? @"ipad" : @"iphone");
NSMutableArray *scaled([NSMutableArray arrayWithCapacity:([files count] * 4)]);
NSString *extension([file pathExtension]);
if (use) {
- if (Scale_ == 2) {
- [scaled addObject:[NSString stringWithFormat:@"%@@2x~%@.%@", base, idiom, extension]];
- [scaled addObject:[NSString stringWithFormat:@"%@@2x.%@", base, extension]];
+ for (unsigned scale(2); scale <= Scale_; ++scale) {
+ [scaled addObject:[NSString stringWithFormat:@"%@@%ux~%@.%@", base, scale, idiom, extension]];
+ [scaled addObject:[NSString stringWithFormat:@"%@@%ux.%@", base, scale, extension]];
}
[scaled addObject:[NSString stringWithFormat:@"%@~%@.%@", base, idiom, extension]];
// if (!IsWild_) <- support old themes
[scaled addObject:file];
- } else if ([base hasSuffix: @"@2x"]) {
+ } else if ([base hasSuffix: @"@2x"] || [base hasSuffix:@"@3x"]) {
[scaled addObject:[NSString stringWithFormat:@"%@~%@.%@", base, idiom, extension]];
[scaled addObject:file];
}
// }}}
// $pathForFile$inBundle$() {{{
-static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle, bool ui, bool use) {
- NSString *identifier = [bundle bundleIdentifier];
- NSMutableArray *names = [NSMutableArray arrayWithCapacity:8];
-
+static void $pathForFile$inBundle$(NSMutableArray *names, NSString *file, NSString *identifier, NSString *folder) {
if (identifier != nil)
[names addObject:[NSString stringWithFormat:@"Bundles/%@/%@", identifier, file]];
- if (NSString *folder = [[bundle bundlePath] lastPathComponent]) {
+ if (folder != nil) {
[names addObject:[NSString stringWithFormat:@"Folders/%@/%@", folder, file]];
NSString *base([folder stringByDeletingPathExtension]);
if ([base hasSuffix:@"~iphone"])
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]];
#define remapResourceName(oldname, newname) \
else if ([file isEqualToString:(oldname)]) \
bool summer(SpringBoard_ && SummerBoard_);
if (identifier == nil);
+ else if ([identifier isEqualToString:@"com.apple.uikit.Artwork"])
+ $pathForFile$inBundle$(names, file, @"com.apple.UIKit", @"UIKit.framework");
+ else if ([identifier isEqualToString:@"com.apple.uikit.LegacyArtwork"])
+ $pathForFile$inBundle$(names, file, @"com.apple.UIKit", @"UIKit.framework");
+ else if ([identifier isEqualToString:@"com.apple.UIKit"])
+ [names addObject:[NSString stringWithFormat:@"UIImages/%@", file]];
else if ([identifier isEqualToString:@"com.apple.chatkit"])
- [names addObject:[NSString stringWithFormat:@"Bundles/com.apple.MobileSMS/%@", file]];
+ $pathForFile$inBundle$(names, file, @"com.apple.MobileSMS", @"MobileSMS.app");
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"]];
+ $pathForFile$inBundle$(names, @"icon.png", identifier, folder);
else if (!summer);
remapResourceName(@"FSO_BG.png", @"StatusBar")
remapResourceName(Four_ ? @"SBDockBG-old.png" : @"SBDockBG.png", @"Dock")
remapResourceName(@"SBWeatherCelsius.png", @"Icons/Weather")
+}
+static NSString *$pathForFile$inBundle$(NSString *file, NSString *identifier, NSURL *url, bool use) {
+ NSMutableArray *names = [NSMutableArray arrayWithCapacity:8];
+ $pathForFile$inBundle$(names, file, identifier, [url lastPathComponent]);
[names addObject:[NSString stringWithFormat:@"Fallback/%@", file]];
-
if (NSString *path = $getTheme$($useScale$(names, use)))
return path;
-
return nil;
}
+
+// XXX: this cannot be merged due to WBBundle
+static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle, bool use) {
+ return $pathForFile$inBundle$(file, [bundle bundleIdentifier], [bundle bundleURL], use);
+}
+
+static NSString *$pathForFile$inBundle$(NSString *file, CFBundleRef bundle, bool use) {
+ NSString *identifier((NSString *) CFBundleGetIdentifier(bundle));
+ NSURL *url([(NSURL *) CFBundleCopyBundleURL(bundle) autorelease]);
+ return $pathForFile$inBundle$(file, identifier, url, use);
+}
// }}}
static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") {
NSString *path = [self path];
NSString *folder = [path lastPathComponent];
NSString *dname = [self displayName];
- NSString *didentifier = [self displayIdentifier];
+
+ NSString *didentifier;
+ if ([self respondsToSelector:@selector(displayIdentifier)])
+ didentifier = [self displayIdentifier];
+ else
+ didentifier = nil;
if (Debug_)
NSLog(@"WB:Debug: [SBApplication(%@:%@:%@:%@) pathForIcon]", identifier, folder, dname, didentifier);
if (NSString *name = Name) \
[names addObject:[NSString stringWithFormat:@"Icons%@/%@.png", suffix, name]];
- if (![didentifier isEqualToString:identifier])
+ if (didentifier != nil && ![didentifier isEqualToString:identifier])
testForIcon(didentifier);
testForIcon(identifier);
if (path == nil || [path length] == 0 || [path isEqualToString:@"/"])
return nil;
- NSBundle *bundle([Bundles_ objectForKey:path]);
+ NSBundle *bundle;
+ @synchronized (Bundles_) {
+ bundle = [Bundles_ objectForKey:path];
+ }
+
if (reinterpret_cast<id>(bundle) == [NSNull null])
return nil;
else if (bundle == nil) {
bundle = [NSBundle wb$bundleWithFile:path];
if (Debug_)
NSLog(@"WB:Debug:PathBundle(%@, %@)", path, bundle);
- [Bundles_ setObject:(bundle == nil ? [NSNull null] : reinterpret_cast<id>(bundle)) forKey:path];
+
+ @synchronized (Bundles_) {
+ [Bundles_ setObject:(bundle == nil ? [NSNull null] : reinterpret_cast<id>(bundle)) forKey:path];
+ }
}
return bundle;
if ([file hasPrefix:prefix]) {
NSUInteger length([prefix length]);
if (length != [file length])
- if (NSString *path = $pathForFile$inBundle$([file substringFromIndex:(length + 1)], bundle, false, false))
+ if (NSString *path = $pathForFile$inBundle$([file substringFromIndex:(length + 1)], bundle, false))
return path;
}
}
NSBundle *bundle = [NSBundle mainBundle];
if (Debug_)
NSLog(@"WB:Debug: _UIApplicationImageWithName(\"%@\", %@)", name, bundle);
- if (NSString *path = $pathForFile$inBundle$(name, bundle, false, false))
+ if (NSString *path = $pathForFile$inBundle$(name, bundle, false))
return CachedImageAtPath(path);
return __UIApplicationImageWithName(name);
}
NSLog(@"WB:Error: [%s forwardInvocation:(%s)]", class_getName([self class]), sel_getName(sel)); \
}
-// %hook -[NSBundle pathForResource:ofType:] {{{
-MSInstanceMessageHook2(NSString *, NSBundle, pathForResource,ofType, NSString *, resource, NSString *, type) {
- NSString *file = type == nil ? resource : [NSString stringWithFormat:@"%@.%@", resource, type];
+// %hook CFBundleCopyResourceURL {{{
+MSHook(CFURLRef, CFBundleCopyResourceURL, CFBundleRef bundle, CFStringRef resourceName, CFStringRef resourceType, CFStringRef subDirName) {
+ NSString *file((NSString *) resourceName);
+ if (resourceType != NULL)
+ file = [NSString stringWithFormat:@"%@.%@", file, resourceType];
+ if (subDirName != NULL)
+ file = [NSString stringWithFormat:@"%@/%@", subDirName, resourceType];
+
if (Debug_)
- NSLog(@"WB:Debug: [NSBundle(%@) pathForResource:\"%@\"]", [self bundleIdentifier], file);
- if (NSString *path = $pathForFile$inBundle$(file, self, false, false))
- return path;
- return MSOldCall(resource, type);
+ NSLog(@"WB:Debug: CFBundleCopyResourceURL(<%@>, \"%@\", \"%@\", \"%@\")", CFBundleGetIdentifier(bundle), resourceName, resourceType, subDirName);
+ if (NSString *path = $pathForFile$inBundle$(file, bundle, false))
+ return (CFURLRef) [[NSURL alloc] initFileURLWithPath:path];
+ return _CFBundleCopyResourceURL(bundle, resourceName, resourceType, subDirName);
}
// }}}
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);
-
+static NSString *WBColorMarkup(size_t number, const CGFloat *components) {
CGFloat r, g, b, a;
switch (number) {
return [NSString stringWithFormat:@"color: rgba(%g, %g, %g, %g)", r * 255, g * 255, b * 255, a];
}
+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);
+ return WBColorMarkup(number, components);
+}
+
+static NSString *WBColorMarkup(UIColor *uicolor) {
+ if (uicolor == nil)
+ return @"";
+ CGColorRef cgcolor([uicolor CGColor]);
+ if (cgcolor == NULL)
+ return @"";
+
+ CGColorSpaceRef space(CGColorGetColorSpace(cgcolor));
+ //NSLog(@"XXX:2:%p", space);
+ if (space == NULL)
+ return @"";
+
+ size_t number(CGColorGetNumberOfComponents(cgcolor));
+ //NSLog(@"XXX:3:%u", number);
+ if (number == 0)
+ return @"";
+
+ const CGFloat *components(CGColorGetComponents(cgcolor));
+ return WBColorMarkup(number, components);
+}
+
extern "C" NSString *NSStringFromCGPoint(CGPoint rect);
-MSInstanceMessageHook5(CGSize, NSString, drawAtPoint,forWidth,withFont,lineBreakMode,letterSpacing, CGPoint, point, CGFloat, width, UIFont *, font, UILineBreakMode, mode, CGFloat, spacing) {
- //NSLog(@"XXX: @\"%@\" %@ %g \"%@\" %u %g", self, NSStringFromCGPoint(point), width, font, mode, spacing);
+MSInstanceMessage6(CGSize, NSString, drawAtPoint,forWidth,withFont,lineBreakMode,letterSpacing,includeEmoji, CGPoint, point, CGFloat, width, UIFont *, font, UILineBreakMode, mode, CGFloat, spacing, BOOL, emoji) {
+ //NSLog(@"XXX: @\"%@\" %@ %g \"%@\" %u %g %u", self, NSStringFromCGPoint(point), width, font, mode, spacing, emoji);
WBStringDrawingState *state(stringDrawingState_);
if (state == NULL)
- return MSOldCall(point, width, font, mode, spacing);
+ return MSOldCall(point, width, font, mode, spacing, emoji);
if (state->count_ != 0 && --state->count_ == 0)
stringDrawingState_ = state->next_;
if (state->info_ == nil)
- return MSOldCall(point, width, font, mode, spacing);
+ return MSOldCall(point, width, font, mode, spacing, emoji);
NSString *info([Info_ objectForKey:state->info_]);
if (info == nil)
- return MSOldCall(point, width, font, mode, spacing);
+ return MSOldCall(point, width, font, mode, spacing, emoji);
NSString *base(state->base_ ?: @"");
NSString *extra([NSString stringWithFormat:@"letter-spacing: %gpx", spacing]);
return CGSizeZero;
}
-MSInstanceMessageHook4(CGSize, NSString, sizeWithFont,forWidth,lineBreakMode,letterSpacing, UIFont *, font, float, width, UILineBreakMode, mode, float, spacing) {
+MSInstanceMessage2(void, NSString, drawInRect,withAttributes, CGRect, rect, NSDictionary *, attributes) {
+ //NSLog(@"XXX: *\"%@\" %@", self, attributes);
+
+ WBStringDrawingState *state(stringDrawingState_);
+ if (state == NULL)
+ return MSOldCall(rect, attributes);
+
+ if (state->count_ != 0 && --state->count_ == 0)
+ stringDrawingState_ = state->next_;
+ if (state->info_ == nil)
+ return MSOldCall(rect, attributes);
+
+ NSString *info([Info_ objectForKey:state->info_]);
+ if (info == nil)
+ return MSOldCall(rect, attributes);
+
+ NSString *base(state->base_ ?: @"");
+
+ UIFont *font([attributes objectForKey:@"NSFont"]);
+ UIColor *color([attributes objectForKey:@"NSColor"]);
+
+ [self drawInRect:rect withStyle:[NSString stringWithFormat:@"%@;%@;%@;%@", [font markupDescription], WBColorMarkup(color), base, info]];
+}
+
+extern "C" NSString *NSStringFromCGSize(CGSize size);
+
+MSInstanceMessage4(CGRect, NSString, boundingRectWithSize,options,attributes,context, CGSize, size, NSInteger, options, NSDictionary *, attributes, id, context) {
+ //NSLog(@"XXX: $\"%@\" %@ 0x%x %@ %@", self, NSStringFromCGSize(size), unsigned(options), attributes, context);
+
+ WBStringDrawingState *state(stringDrawingState_);
+ if (state == NULL)
+ return MSOldCall(size, options, attributes, context);
+
+ if (state->count_ != 0 && --state->count_ == 0)
+ stringDrawingState_ = state->next_;
+ if (state->info_ == nil)
+ return MSOldCall(size, options, attributes, context);
+
+ NSString *info([Info_ objectForKey:state->info_]);
+ if (info == nil)
+ return MSOldCall(size, options, attributes, context);
+
+ NSString *base(state->base_ ?: @"");
+
+ UIFont *font([attributes objectForKey:@"NSFont"]);
+ UIColor *color([attributes objectForKey:@"NSColor"]);
+
+ return (CGRect) {{0, 0}, [self sizeWithStyle:[NSString stringWithFormat:@"%@;%@;%@;%@", [font markupDescription], WBColorMarkup(color), base, info] forWidth:size.width]};
+}
+
+MSInstanceMessage4(CGSize, NSString, sizeWithFont,forWidth,lineBreakMode,letterSpacing, UIFont *, font, CGFloat, width, UILineBreakMode, mode, CGFloat, spacing) {
//NSLog(@"XXX: #\"%@\" \"%@\" %g %u %g", self, font, width, mode, spacing);
WBStringDrawingState *state(stringDrawingState_);
return [self sizeWithStyle:[NSString stringWithFormat:@"%@;%@;%@;%@;%@", [font markupDescription], WBColorMarkup(), extra, base, info] forWidth:width];
}
-MSInstanceMessageHook1(CGSize, NSString, sizeWithFont, UIFont *, font) {
+MSInstanceMessage1(CGSize, NSString, sizeWithFont, UIFont *, font) {
//NSLog(@"XXX: ?\"%@\"", self);
WBStringDrawingState *state(stringDrawingState_);
return [self sizeWithStyle:[NSString stringWithFormat:@"%@;%@;%@;%@", [font markupDescription], WBColorMarkup(), base, info] forWidth:65535];
}
+MSClassMessageHook2(id, SBIconBadgeView, checkoutAccessoryImagesForIcon,location, id, icon, int, location) {
+ WBStringDrawingState badgeState = {NULL, 0, @""
+ , @"BadgeStyle"};
+
+ stringDrawingState_ = &badgeState;
+
+ id images(MSOldCall(icon, location));
+
+ stringDrawingState_ = NULL;
+ return images;
+}
+
MSClassMessageHook2(UIImage *, SBIconAccessoryImage, checkoutAccessoryImageForIcon,location, id, icon, int, location) {
if ([self _imageClassForIcon:icon location:location] != $SBIconBadgeImage)
return MSOldCall(icon, location);
"text-shadow: rgba(0, 0, 0, 0.2) -1px -1px 2px;"
, @"CalendarIconDayStyle"};
- WBStringDrawingState sizeState = {&dayState, 7, nil, nil};
+ WBStringDrawingState skipState = {&dayState,
+ unsigned(kCFCoreFoundationVersionNumber > 800 ? 16 : 7)
+ , nil, nil};
- WBStringDrawingState dateState = {&sizeState, 2, @""
+ WBStringDrawingState dateState = {&skipState, 2, @""
, @"CalendarIconDateStyle"};
stringDrawingState_ = &dateState;
if (paper != nil)
paper = [paper stringByDeletingLastPathComponent];
- {
- 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;
- }
-
if (Debug_)
NSLog(@"WB:Debug:Info = %@", [Info_ description]);
/* }}} */
// IconAlpha {{{
-MSInstanceMessageHook1(void, SBIcon, setIconImageAlpha, float, alpha) {
+MSInstanceMessageHook1(void, SBIcon, setIconImageAlpha, CGFloat, alpha) {
if (NSNumber *number = [Info_ objectForKey:@"IconAlpha"])
alpha = [number floatValue];
return MSOldCall(alpha);
}
-MSInstanceMessageHook1(void, SBIcon, setIconLabelAlpha, float, alpha) {
+MSInstanceMessageHook1(void, SBIcon, setIconLabelAlpha, CGFloat, alpha) {
if (NSNumber *number = [Info_ objectForKey:@"IconAlpha"])
alpha = [number floatValue];
return MSOldCall(alpha);
} return self;
}
-MSInstanceMessageHook1(void, SBIcon, setAlpha, float, alpha) {
+MSInstanceMessageHook1(void, SBIcon, setAlpha, CGFloat, alpha) {
if (NSNumber *number = [Info_ objectForKey:@"IconAlpha"])
alpha = [number floatValue];
return MSOldCall(alpha);
return value;
} else if (NSString *path = $pathForFile$inBundle$([NSString stringWithFormat:@"%@.lproj/%@.strings",
language, file
- ], self, false, false)) {
+ ], self, false)) {
if ((strings = [[NSDictionary alloc] initWithContentsOfFile:path]) != nil) {
[Strings_ setObject:[strings autorelease] forKey:name];
goto strings;
// }}}
template <typename Original_>
-static UIImage *WBCacheUIImage(const Original_ &original, NSString *name, NSString *key) {
- if ([name rangeOfString:@"."].location == NSNotFound)
+static UIImage *WBCacheUIImage(NSBundle *bundle, const Original_ &original, NSString *name, NSString *key) {
+ if (name == nil)
+ return original();
+ NSUInteger period([name rangeOfString:@"."].location);
+ NSUInteger length([name length]);
+ if (period == NSNotFound || length < 4 || period > length - 4)
name = [name stringByAppendingString:@".png"];
- UIImage *image(WBCacheImage(original, [=](){ return $pathForFile$inBundle$(name, _UIKitBundle(), true, true); }, key));
- if (image != nil && UIDebug_) {
- NSString *path([@"/tmp/UIImages/" stringByAppendingString:name]);
- if (![Manager_ fileExistsAtPath:path])
- [UIImagePNGRepresentation(image) writeToFile:path atomically:YES];
- } return image;
+
+ return WBCacheImage([bundle, &original, name](){
+ UIImage *image(original());
+ if (image != nil && UIDebug_) {
+ NSString *path([@"/tmp/WBImages/" stringByAppendingString:[bundle bundleIdentifier]]);
+ [Manager_ createDirectoryAtPath:path withIntermediateDirectories:YES attributes:@{NSFilePosixPermissions: @0777} error:NULL];
+ path = [NSString stringWithFormat:@"%@/%@", path, name];
+ if (![Manager_ fileExistsAtPath:path])
+ [UIImagePNGRepresentation(image) writeToFile:path atomically:YES];
+ } return image;
+ }, [=](){ return $pathForFile$inBundle$(name, bundle, true); }, key);
}
// %hook _UIImageWithName() {{{
return nil;
if (Debug_)
NSLog(@"WB:Debug: _UIImageWithName(\"%@\")", name);
- return WBCacheUIImage(
+ return WBCacheUIImage(_UIKitBundle(),
[=](){ return __UIImageWithName(name); },
name, [NSString stringWithFormat:@"I:%@", name]);
}
[NSString stringWithFormat:@"D:%zu:%@%@", size_t([domain length]), domain, name]);
}
// }}}
-// %hook _UIImageWithDeviceUsingCurrentIdiom() {{{
-MSHook(UIImage *, _UIImageWithNameUsingCurrentIdiom, NSString *name) {
+
+// UISharedArtwork (iOS 6) {{{
+MSInstanceMessageHook2(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;
+}
+
+MSInstanceMessageHook2(UIImage *, UISharedArtwork, imageNamed,device, NSString *, name, NSInteger, device) {
+ NSBundle *bundle($objc_getAssociatedObject(self, @selector(wb$bundle)));
if (Debug_)
- NSLog(@"WB:Debug: _UIImageWithNameUsingCurrentIdiom(\"%@\")", name);
- return WBCacheUIImage(
- [=](){ return __UIImageWithNameUsingCurrentIdiom(name); },
- name, [NSString stringWithFormat:@"I:%@", name]);
+ NSLog(@"WB:Debug: -[UISharedArtwork(%@) imageNamed:@\"%@\" device:%li]", [bundle bundleIdentifier], name, (long) device);
+ return WBCacheUIImage(bundle,
+ [=](){ return MSOldCall(name, device); },
+ name, [NSString stringWithFormat:@"M:%p:%@:%li", self, name, (long) device]);
}
// }}}
-// %hook _UIImageWithDeviceSpecificName() {{{
-MSHook(UIImage *, _UIImageWithDeviceSpecificName, NSString *name) {
+// _UIAssetManager (iOS 7) {{{
+MSInstanceMessageHook3(_UIAssetManager *, _UIAssetManager, initWithName,inBundle,idiom, NSString *, name, NSBundle *, bundle, NSInteger, idiom) {
+ if ((self = MSOldCall(name, bundle, idiom)) != nil) {
+ $objc_setAssociatedObject(self, @selector(wb$bundle), bundle, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+ } return self;
+}
+
+MSInstanceMessageHook5(UIImage *, _UIAssetManager, imageNamed,scale,idiom,subtype,cachingOptions, NSString *, name, CGFloat, scale, NSInteger, idiom, NSUInteger, subtype, NSUInteger, caching) {
+ NSBundle *bundle($objc_getAssociatedObject(self, @selector(wb$bundle)));
if (Debug_)
- NSLog(@"WB:Debug: _UIImageWithDeviceSpecificName(\"%@\")", name);
- return WBCacheUIImage(
- [=](){ return __UIImageWithDeviceSpecificName(name); },
- name, [NSString stringWithFormat:@"S:%@", name]);
+ NSLog(@"WB:Debug: -[_UIAssetManager(%@/%@) imageNamed:@\"%@\" scale:%g idiom:%li subtype:%lu cachingOptions:%lu]",
+ [bundle bundleIdentifier], [self carFileName],
+ name, scale, (long) idiom,
+ (unsigned long) subtype,
+ (unsigned long) caching
+ );
+
+ if (bundle == _UIKitBundle()) {
+ NSString *name([self carFileName]);
+ if (false);
+ else if ([name isEqualToString:@"UIKit_NewArtwork"])
+ bundle = [WBBundle bundleWithIdentifier:@"com.apple.uikit.Artwork"];
+ else if ([name isEqualToString:@"UIKit_OriginalArtwork"])
+ bundle = [WBBundle bundleWithIdentifier:@"com.apple.uikit.LegacyArtwork"];
+ }
+
+ return WBCacheUIImage(bundle,
+ [=](){ return MSOldCall(name, scale, idiom, subtype, caching); },
+ name, [NSString stringWithFormat:@"M:%p:%@:%g:%li:%lu", self, name, scale, (long) idiom, (unsigned long) subtype]);
+}
+// }}}
+// _UIAssetManager (iOS 8) {{{
+struct SizeClassPair {
+ NSInteger first;
+ NSInteger second;
+};
+
+MSInstanceMessageHook7(UIImage *, _UIAssetManager, imageNamed,scale,idiom,subtype,cachingOptions,sizeClassPair,attachCatalogImage, NSString *, name, CGFloat, scale, NSInteger, idiom, NSUInteger, subtype, NSUInteger, caching, SizeClassPair, size, BOOL, attach) {
+ NSBundle *bundle([self bundle]);
+ if (Debug_)
+ NSLog(@"WB:Debug: -[_UIAssetManager(%@/%@) imageNamed:@\"%@\" scale:%g idiom:%li subtype:%lu cachingOptions:%lu sizeClassPair:[%li %li] attachCatalogImage:%s]",
+ [bundle bundleIdentifier], [self carFileName],
+ name, scale, (long) idiom,
+ (unsigned long) subtype,
+ (unsigned long) caching,
+ (long) size.first, (long) size.second,
+ attach ? "YES" : "NO"
+ );
+ return WBCacheUIImage(bundle,
+ [=](){ return MSOldCall(name, scale, idiom, subtype, caching, size, attach); },
+ name, [NSString stringWithFormat:@"M:%p:%@:%g:%li:%lu:%li:%li:%c", self, name, scale, (long) idiom, (unsigned long) subtype, (long) size.first, (long) size.second, attach ? 'Y' : 'N']);
}
// }}}
}
-MSHook(NSArray *, CPBitmapCreateImagesFromPath, NSString *path, NSDictionary **names, void *arg2, void *arg3) {
+MSHook(NSArray *, CPBitmapCreateImagesFromPath, NSString *path, CFTypeRef *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];
- }
- }
- }
- }
+ if (images == nil)
+ return nil;
+ if (*names == nil)
+ return images;
+
+ NSBundle *bundle([NSBundle wb$bundleWithFile:path]);
+ if (bundle == nil)
+ return images;
+
+ NSString *file([path stringByResolvingSymlinksInPath]);
+ NSString *prefix([[bundle bundlePath] stringByResolvingSymlinksInPath]);
+ // XXX: why do I care about this?
+ if (![file hasPrefix:prefix])
+ return images;
+
+ NSMutableArray *copy([images mutableCopy]);
+ [images release];
+ images = copy;
+
+ NSDictionary *indexes;
+ NSEnumerator *enumerator;
+
+ if (CFGetTypeID((CFTypeRef) *names) == CFDictionaryGetTypeID()) {
+ indexes = (NSDictionary *) *names;
+ enumerator = [indexes keyEnumerator];
+ } else {
+ indexes = nil;
+ enumerator = [(NSArray *) *names objectEnumerator];
+ }
+
+ for (NSUInteger index(0); NSString *name = [enumerator nextObject]; ++index)
+ if (NSString *themed = $pathForFile$inBundle$([name stringByAppendingString:@".png"], bundle, true)) {
+ if (indexes != nil)
+ index = [[indexes objectForKey:name] intValue];
+ UIImage *image($getImage$(themed));
+ CGImageRef cg([image CGImage]);
+ [copy replaceObjectAtIndex:index withObject:(id)cg];
}
- } return images;
+
+ return images;
}
MSHook(void, BKSDisplayServicesSetSystemAppExitedImagePath, NSString *path) {
if (SummerBoard_)
English_ = [[NSDictionary alloc] initWithContentsOfFile:@"/System/Library/CoreServices/SpringBoard.app/English.lproj/LocalizedApplicationNames.strings"];
+
+ if (kCFCoreFoundationVersionNumber >= 800) {
+ WBRename(NSString, drawInRect:withAttributes:, drawInRect$withAttributes$);
+ WBRename(NSString, boundingRectWithSize:options:attributes:context:, boundingRectWithSize$options$attributes$context$);
+ }
}
/*MSHook(int, open, const char *path, int oflag, mode_t mode) {
no = true;
if (strstr(path, "/icon") != NULL)
- MSHookProcess(-1, "");
+ *reinterpret_cast<void *volatile *>(NULL) = NULL;
if (fd == -1 && errno == EFAULT)
NSLog(@"open(%p, %#x, %#o) = %d\n", path, oflag, mode, fd);
dlset(_GSFontGetUseLegacyFontMetrics, "GSFontGetUseLegacyFontMetrics");
+ // Initialize IsWild_ {{{
+ 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;
+ // }}}
// Load Settings.plist {{{
if (NSDictionary *settings = [NSDictionary dictionaryWithContentsOfFile:[NSString stringWithFormat:@"/User/Library/Preferences/com.saurik.WinterBoard.plist"]]) {
- if (NSNumber *value = [settings objectForKey:@"SummerBoard"])
+ if (kCFCoreFoundationVersionNumber >= 1000)
+ SummerBoard_ = false;
+ else if (NSNumber *value = [settings objectForKey:@"SummerBoard"])
SummerBoard_ = [value boolValue];
else
SummerBoard_ = true;
// AppSupport {{{
if (MSImageRef image = MSGetImageByName("/System/Library/PrivateFrameworks/AppSupport.framework/AppSupport")) {
- NSArray *(*CPBitmapCreateImagesFromPath)(NSString *, NSDictionary **, void *, void *);
+ NSArray *(*CPBitmapCreateImagesFromPath)(NSString *, CFTypeRef *, void *, void *);
msset(CPBitmapCreateImagesFromPath, image, "_CPBitmapCreateImagesFromPath");
MSHookFunction(CPBitmapCreateImagesFromPath, MSHake(CPBitmapCreateImagesFromPath));
}
MSHookFunction(BKSDisplayServicesSetSystemAppExitedImagePath, MSHake(BKSDisplayServicesSetSystemAppExitedImagePath));
}
// }}}
+ // Foundation {{{
+ if (true) {
+ MSHookFunction(CFBundleCopyResourceURL, MSHake(CFBundleCopyResourceURL));
+ }
+ // }}}
// GraphicsServices {{{
if (true) {
MSHookFunction(&GSFontCreateWithName, &$GSFontCreateWithName, &_GSFontCreateWithName);
// }}}
// SpringBoard {{{
if (SpringBoard_) {
- Wallpapers_ = [[NSArray arrayWithObjects:@"Wallpaper.mp4", @"Wallpaper@2x.png", @"Wallpaper@2x.jpg", @"Wallpaper.png", @"Wallpaper.jpg", @"Wallpaper.html", nil] retain];
+ Wallpapers_ = [[NSArray arrayWithObjects:@"Wallpaper.mp4", @"Wallpaper@3x.png", @"Wallpaper@3x.jpg", @"Wallpaper@2x.png", @"Wallpaper@2x.jpg", @"Wallpaper.png", @"Wallpaper.jpg", @"Wallpaper.html", nil] retain];
Papered_ = $getTheme$(Wallpapers_) != nil;
Docked_ = $getTheme$([NSArray arrayWithObjects:@"Dock.png", nil]) != nil;
#endif
WBHookSymbol(image, _UIKitBundle);
- WBHookSymbol(image, _UIPackedImageTableGetIdentifierForName);
- WBHookSymbol(image, _UISharedImageNameGetIdentifier);
- MSHookFunction(_UIImageWithName, MSHake(_UIImageWithName));
+ if (kCFCoreFoundationVersionNumber < 700)
+ MSHookFunction(_UIImageWithName, MSHake(_UIImageWithName));
WBHookSymbol(image, _UIApplicationImageWithName);
MSHookFunction(_UIApplicationImageWithName, MSHake(_UIApplicationImageWithName));
WBHookSymbol(image, _UIImageWithNameInDomain);
MSHookFunction(_UIImageWithNameInDomain, MSHake(_UIImageWithNameInDomain));
- WBHookSymbol(image, _UIImageWithNameUsingCurrentIdiom);
- MSHookFunction(_UIImageWithNameUsingCurrentIdiom, MSHake(_UIImageWithNameUsingCurrentIdiom));
+ SEL includeEmoji(@selector(_legacy_drawAtPoint:forWidth:withFont:lineBreakMode:letterSpacing:includeEmoji:));
+ if (![@"" respondsToSelector:includeEmoji])
+ includeEmoji = @selector(drawAtPoint:forWidth:withFont:lineBreakMode:letterSpacing:includeEmoji:);
+ MSHookMessage($NSString, includeEmoji, MSHake(NSString$drawAtPoint$forWidth$withFont$lineBreakMode$letterSpacing$includeEmoji$));
+
+ SEL letterSpacing(@selector(_legacy_sizeWithFont:forWidth:lineBreakMode:letterSpacing:));
+ if (![@"" respondsToSelector:letterSpacing])
+ letterSpacing = @selector(sizeWithFont:forWidth:lineBreakMode:letterSpacing:);
+ MSHookMessage($NSString, letterSpacing, MSHake(NSString$sizeWithFont$forWidth$lineBreakMode$letterSpacing$));
- WBHookSymbol(image, _UIImageWithDeviceSpecificName);
- MSHookFunction(_UIImageWithDeviceSpecificName, MSHake(_UIImageWithDeviceSpecificName));
+ SEL sizeWithFont(@selector(_legacy_sizeWithFont:));
+ if (![@"" respondsToSelector:sizeWithFont])
+ sizeWithFont = @selector(sizeWithFont:);
+ MSHookMessage($NSString, sizeWithFont, MSHake(NSString$sizeWithFont$));
}
// }}}
//MSHookFunction(reinterpret_cast<int (*)(const char *, int, mode_t)>(&open), MSHake(open));
- if (UIDebug_ && ![Manager_ fileExistsAtPath:@"/tmp/UIImages"]) {
- NSError *error(nil);
- if (![Manager_ createDirectoryAtPath:@"/tmp/UIImages" withIntermediateDirectories:NO attributes:[NSDictionary dictionaryWithObjectsAndKeys:
- [NSNumber numberWithShort:0777], NSFilePosixPermissions,
- nil] error:&error])
- NSLog(@"WB:Error: cannot create /tmp/UIImages (%@)", error);
- }
-
[pool release];
}
projects / winterboard.git / blobdiff