X-Git-Url: https://git.saurik.com/winterboard.git/blobdiff_plain/895006e2139cda492033879692323b4b329b9271..c4bc3f112e49c3841c5e2bdf9a346a0b4719e9d5:/Library.mm?ds=sidebyside
diff --git a/Library.mm b/Library.mm
index 505851f..bc8084b 100644
--- a/Library.mm
+++ b/Library.mm
@@ -1,39 +1,23 @@
/* WinterBoard - Theme Manager for the iPhone
- * Copyright (C) 2008-2011 Jay Freeman (saurik)
+ * Copyright (C) 2008-2014 Jay Freeman (saurik)
*/
+/* GNU Lesser General Public License, Version 3 {{{ */
/*
- * Redistribution and use in source and binary
- * forms, with or without modification, are permitted
- * provided that the following conditions are met:
+ * WinterBoard is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
*
- * 1. Redistributions of source code must retain the
- * above copyright notice, this list of conditions
- * and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the
- * above copyright notice, this list of conditions
- * and the following disclaimer in the documentation
- * and/or other materials provided with the
- * distribution.
- * 3. The name of the author may not be used to endorse
- * or promote products derived from this software
- * without specific prior written permission.
+ * WinterBoard is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License for more details.
*
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with WinterBoard. If not, see .
+**/
+/* }}} */
#include
@@ -47,7 +31,7 @@ bool _itv;
_itv = true; \
_ltv = _ctv; \
} \
- NSLog(@"%lu.%.6u[%f]:_trace()@%s:%u[%s]\n", \
+ NSLog(@"%lu.%.6u[%f]:WB:_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__\
@@ -105,7 +89,9 @@ bool _itv;
#include "WBMarkup.h"
-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;
@@ -117,14 +103,21 @@ Class $MPVideoView;
MSClassHook(NSBundle)
MSClassHook(NSString)
+MSClassHook(_UIAssetManager)
MSClassHook(UIImage)
+MSMetaClassHook(UIImage)
MSClassHook(UINavigationBar)
+MSClassHook(UISharedArtwork)
MSClassHook(UIToolbar)
+MSClassHook(UIStatusBarTimeItemView)
+MSClassHook(UIWebDocumentView)
+MSClassHook(CKBalloonView)
MSClassHook(CKMessageCell)
MSClassHook(CKTimestampView)
MSClassHook(CKTranscriptCell)
MSClassHook(CKTranscriptController)
+MSClassHook(CKTranscriptHeaderView)
MSClassHook(CKTranscriptTableView)
MSClassHook(SBApplication)
@@ -136,35 +129,54 @@ MSClassHook(SBCalendarApplicationIcon)
MSClassHook(SBCalendarIconContentsView)
MSClassHook(SBDockIconListView)
MSClassHook(SBIcon)
+MSClassHook(SBIconAccessoryImage)
+MSMetaClassHook(SBIconAccessoryImage)
MSClassHook(SBIconBadge)
MSClassHook(SBIconBadgeFactory)
+MSClassHook(SBIconBadgeImage)
+MSClassHook(SBIconBadgeView)
+MSMetaClassHook(SBIconBadgeView)
+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)
+MSClassHook(SBSlidingAlertDisplay)
MSClassHook(SBStatusBarContentsView)
MSClassHook(SBStatusBarController)
MSClassHook(SBStatusBarOperatorNameView)
MSClassHook(SBStatusBarTimeView)
MSClassHook(SBUIController)
+MSClassHook(SBWallpaperView)
MSClassHook(SBWidgetApplicationIcon)
extern "C" void WKSetCurrentGraphicsContext(CGContextRef);
-__attribute__((__constructor__))
-static void MSFixClass() {
- if ($SBIcon == nil)
- $SBIcon = objc_getClass("SBIconView");
+static struct MSFixClass { MSFixClass() {
+ $UIWebDocumentView = objc_getClass("UIWebBrowserView") ?: $UIWebDocumentView;
+ $SBIcon = objc_getClass("SBIconView") ?: $SBIcon;
+
+ if ($SBIconList == nil)
+ $SBIconList = objc_getClass("SBIconListView");
if ($CKTranscriptController == nil)
$CKTranscriptController = objc_getClass("mSMSMessageTranscriptController");
-}
+} } 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;
@@ -188,6 +200,11 @@ static bool Four_($SBDockIconListView != nil);
@end
+@interface _UIAssetManager : NSObject
+- (NSBundle *) bundle;
+- (NSString *) carFileName;
+@end
+
static BOOL (*_GSFontGetUseLegacyFontMetrics)();
#define $GSFontGetUseLegacyFontMetrics() \
(_GSFontGetUseLegacyFontMetrics == NULL ? YES : _GSFontGetUseLegacyFontMetrics())
@@ -195,17 +212,14 @@ static BOOL (*_GSFontGetUseLegacyFontMetrics)();
static bool Debug_ = false;
static bool UIDebug_ = false;
static bool Engineer_ = false;
-static bool SummerBoard_ = true;
+static bool SummerBoard_ = false;
static bool SpringBoard_;
static UIImage *(*_UIApplicationImageWithName)(NSString *name);
static UIImage *(*_UIImageWithNameInDomain)(NSString *name, NSString *domain);
static NSBundle *(*_UIKitBundle)();
-static bool (*_UIPackedImageTableGetIdentifierForName)(NSString *, int *);
-static int (*_UISharedImageNameGetIdentifier)(NSString *);
-static NSMutableDictionary *UIImages_ = [[NSMutableDictionary alloc] initWithCapacity:32];
-static NSMutableDictionary *PathImages_ = [[NSMutableDictionary alloc] initWithCapacity:16];
+static NSMutableDictionary *Images_ = [[NSMutableDictionary alloc] initWithCapacity:64];
static NSMutableDictionary *Cache_ = [[NSMutableDictionary alloc] initWithCapacity:64];
static NSMutableDictionary *Strings_ = [[NSMutableDictionary alloc] initWithCapacity:0];
static NSMutableDictionary *Bundles_ = [[NSMutableDictionary alloc] initWithCapacity:2];
@@ -216,6 +230,39 @@ static NSMutableArray *Themes_;
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];
@@ -233,11 +280,15 @@ static unsigned $getScale$(NSString *path) {
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) {
- if (Scale_ == 0) {
+ if (use && Scale_ == 0) {
UIScreen *screen([UIScreen mainScreen]);
if ([screen respondsToSelector:@selector(scale)])
Scale_ = [screen scale];
@@ -245,25 +296,53 @@ 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] * 2)]);
+ NSMutableArray *scaled([NSMutableArray arrayWithCapacity:([files count] * 4)]);
for (NSString *file in files) {
- if (use && Scale_ == 2)
- [scaled addObject:[NSString stringWithFormat:@"%@@2x.%@", [file stringByDeletingPathExtension], [file pathExtension]]];
- if ([file hasSuffix:@"@2x~iphone.png"])
- [scaled addObject:[[file substringWithRange:NSMakeRange(0, [file length] - 11)] stringByAppendingPathExtension:@"png"]];
- [scaled addObject:file];
+ NSString *base([file stringByDeletingPathExtension]);
+ NSString *extension([file pathExtension]);
+
+ if (use) {
+ 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"] || [base hasSuffix:@"@3x"]) {
+ [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:@"%@~%@.%@", rest, idiom, extension]];
+ [scaled addObject:[rest stringByAppendingPathExtension:extension]];*/
+ } else {
+ // XXX: this code isn't really complete
+
+ [scaled addObject:file];
+
+ if ([base hasSuffix:[NSString stringWithFormat:@"~%@", idiom]])
+ [scaled addObject:[[base substringWithRange:NSMakeRange(0, [base length] - 1 - [idiom length])] stringByAppendingPathExtension:extension]];
+ }
}
return scaled;
}
static NSString *$getTheme$(NSArray *files, NSArray *themes = Themes_) {
- if (NSString *path = [Themed_ objectForKey:files])
- return reinterpret_cast(path) == [NSNull null] ? nil : path;
+ // XXX: this is not reasonable; OMG
+ id key(files);
+
+ @synchronized (Themed_) {
+ if (NSString *path = [Themed_ objectForKey:key])
+ return reinterpret_cast(path) == [NSNull null] ? nil : path;
+ }
if (Debug_)
NSLog(@"WB:Debug: %@", [files description]);
@@ -273,28 +352,35 @@ 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_ destinationOfSymbolicLinkAtPath:path error:NULL] isEqualToString:@"/"])
+ path = nil;
goto set;
+ }
}
path = nil;
set:
- [Themed_ setObject:(path == nil ? [NSNull null] : reinterpret_cast(path)) forKey:files];
+ @synchronized (Themed_) {
+ [Themed_ setObject:(path == nil ? [NSNull null] : reinterpret_cast(path)) forKey:key];
+ }
+
return path;
}
// }}}
// $pathForFile$inBundle$() {{{
-static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle, bool ui) {
- NSString *identifier = [bundle bundleIdentifier];
- NSMutableArray *names = [NSMutableArray arrayWithCapacity:8];
-
+static void $pathForFile$inBundle$(NSMutableArray *names, NSString *file, NSString *identifier, NSURL *url) {
if (identifier != nil)
[names addObject:[NSString stringWithFormat:@"Bundles/%@/%@", identifier, file]];
- if (NSString *folder = [[bundle bundlePath] lastPathComponent])
+ if (NSString *folder = [url lastPathComponent]) {
[names addObject:[NSString stringWithFormat:@"Folders/%@/%@", folder, file]];
- if (ui)
- [names addObject:[NSString stringWithFormat:@"UIImages/%@", file]];
+ 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]];
+ }
#define remapResourceName(oldname, newname) \
else if ([file isEqualToString:(oldname)]) \
@@ -303,20 +389,43 @@ static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle, bool u
bool summer(SpringBoard_ && SummerBoard_);
if (identifier == nil);
+ else if ([identifier isEqualToString:@"com.apple.uikit.Artwork"])
+ $pathForFile$inBundle$(names, file, @"com.apple.UIKit", nil);
+ else if ([identifier isEqualToString:@"com.apple.uikit.LegacyArtwork"])
+ $pathForFile$inBundle$(names, file, @"com.apple.UIKit", nil);
+ 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", nil);
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")
remapResourceName(@"SBWeatherCelsius.png", @"Icons/Weather")
+}
- if (NSString *path = $getTheme$($useScale$(names, ui)))
+static NSString *$pathForFile$inBundle$(NSString *file, NSString *identifier, NSURL *url, bool use) {
+ NSMutableArray *names = [NSMutableArray arrayWithCapacity:8];
+ $pathForFile$inBundle$(names, file, identifier, url);
+ [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 = @"") {
@@ -324,7 +433,12 @@ 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);
@@ -341,7 +455,7 @@ static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") {
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);
@@ -377,7 +491,11 @@ static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") {
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(bundle) == [NSNull null])
return nil;
else if (bundle == nil) {
@@ -387,7 +505,10 @@ static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") {
bundle = [NSBundle wb$bundleWithFile:path];
if (Debug_)
NSLog(@"WB:Debug:PathBundle(%@, %@)", path, bundle);
- [Bundles_ setObject:(bundle == nil ? [NSNull null] : reinterpret_cast(bundle)) forKey:path];
+
+ @synchronized (Bundles_) {
+ [Bundles_ setObject:(bundle == nil ? [NSNull null] : reinterpret_cast(bundle)) forKey:path];
+ }
}
return bundle;
@@ -547,7 +668,7 @@ MSHook(UIImage *, SBApplicationIcon$generateIconImage$, SBApplicationIcon *self,
return [UIImage imageWithContentsOfFile:path72];
if (NSString *path = $pathForIcon$([self application]))
if (UIImage *image = [UIImage imageWithContentsOfFile:path]) {
- float width;
+ CGFloat width;
if ([$SBIcon respondsToSelector:@selector(defaultIconImageSize)])
width = [$SBIcon defaultIconImageSize].width;
else
@@ -582,13 +703,13 @@ MSHook(NSString *, SBApplication$pathForIcon, SBApplication *self, SEL sel) {
static UIImage *CachedImageAtPath(NSString *path) {
path = [path stringByResolvingSymlinksInPath];
- UIImage *image = [PathImages_ objectForKey:path];
+ UIImage *image = [Images_ objectForKey:path];
if (image != nil)
return reinterpret_cast(image) == [NSNull null] ? nil : image;
image = [[UIImage alloc] initWithContentsOfFile:path cache:true];
if (image != nil)
image = [image autorelease];
- [PathImages_ setObject:(image == nil ? [NSNull null] : reinterpret_cast(image)) forKey:path];
+ [Images_ setObject:(image == nil ? [NSNull null] : reinterpret_cast(image)) forKey:path];
return image;
}
@@ -619,56 +740,315 @@ MSHook(UIImage *, _UIApplicationImageWithName, NSString *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))
- 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);
}
// }}}
+static void $drawLabel$(NSString *label, CGRect rect, NSString *style, NSString *custom) {
+ bool ellipsis(false);
+ CGFloat max = rect.size.width - 11, width;
+ width:
+ width = [(ellipsis ? [label stringByAppendingString:@"..."] : label) sizeWithStyle:style forWidth:320].width;
+
+ if (width > max) {
+ size_t length([label length]);
+ CGFloat spacing((width - max) / (length - 1));
+
+ if (spacing > 1.25) {
+ ellipsis = true;
+ label = [label substringToIndex:(length - 1)];
+ goto width;
+ }
+
+ style = [style stringByAppendingString:[NSString stringWithFormat:@"letter-spacing: -%f; ", spacing]];
+ }
+
+ if (ellipsis)
+ label = [label stringByAppendingString:@"..."];
+
+ if (custom != nil)
+ style = [style stringByAppendingString:custom];
+
+ CGSize size = [label sizeWithStyle:style forWidth:rect.size.width];
+ [label drawAtPoint:CGPointMake((rect.size.width - size.width) / 2 + rect.origin.x, rect.origin.y) withStyle:style];
+}
+
static struct WBStringDrawingState {
WBStringDrawingState *next_;
+ unsigned count_;
NSString *base_;
NSString *info_;
} *stringDrawingState_;
-MSInstanceMessageHook4(CGSize, NSString, drawAtPoint,forWidth,withFont,lineBreakMode, CGPoint, point, float, width, UIFont *, font, int, mode) {
- if (stringDrawingState_ == NULL || stringDrawingState_->info_ == nil)
- return MSOldCall(point, width, font, mode);
+extern "C" CGColorSpaceRef CGContextGetFillColorSpace(CGContextRef);
+extern "C" void CGContextGetFillColor(CGContextRef, CGFloat[]);
+
+static NSString *WBColorMarkup(size_t number, const CGFloat *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 @"";
+ }
- NSString *info([Info_ objectForKey:stringDrawingState_->info_]);
- if (info == nil)
- return MSOldCall(point, width, font, mode);
+ 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 @"";
- NSString *base(stringDrawingState_->base_ ?: @"");
- stringDrawingState_ = stringDrawingState_->next_;
+ 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);
+
+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, emoji);
+
+ if (state->count_ != 0 && --state->count_ == 0)
+ stringDrawingState_ = state->next_;
+ if (state->info_ == nil)
+ return MSOldCall(point, width, font, mode, spacing, emoji);
+
+ NSString *info([Info_ objectForKey:state->info_]);
+ if (info == nil)
+ return MSOldCall(point, width, font, mode, spacing, emoji);
- [self drawAtPoint:point withStyle:[NSString stringWithFormat:@"%@;%@;%@", [font markupDescription], base, info]];
+ NSString *base(state->base_ ?: @"");
+ NSString *extra([NSString stringWithFormat:@"letter-spacing: %gpx", spacing]);
+ [self drawAtPoint:point withStyle:[NSString stringWithFormat:@"%@;%@;%@;%@;%@", [font markupDescription], WBColorMarkup(), extra, base, info]];
return CGSizeZero;
}
-MSInstanceMessageHook2(CGSize, NSString, drawAtPoint,withFont, CGPoint, point, UIFont *, font) {
- if (stringDrawingState_ == NULL || stringDrawingState_->info_ == nil)
- return MSOldCall(point, font);
+extern "C" NSString *NSStringFromCGRect(CGRect rect);
- NSString *info([Info_ objectForKey:stringDrawingState_->info_]);
+MSInstanceMessageHook7(CGSize, NSString, _drawInRect,withFont,lineBreakMode,alignment,lineSpacing,includeEmoji,truncationRect, CGRect, rect, UIFont *, font, UILineBreakMode, mode, UITextAlignment, alignment, float, spacing, BOOL, emoji, CGRect, truncation) {
+ //NSLog(@"XXX: @\"%@\" %@ \"%@\" %u %u %g %u %@", self, NSStringFromCGRect(rect), font, mode, alignment, spacing, emoji, NSStringFromCGRect(truncation));
+
+ WBStringDrawingState *state(stringDrawingState_);
+ if (state == NULL)
+ return MSOldCall(rect, font, mode, alignment, spacing, emoji, truncation);
+
+ if (state->count_ != 0 && --state->count_ == 0)
+ stringDrawingState_ = state->next_;
+ if (state->info_ == nil)
+ return MSOldCall(rect, font, mode, alignment, spacing, emoji, truncation);
+
+ NSString *info([Info_ objectForKey:state->info_]);
if (info == nil)
- return MSOldCall(point, font);
+ return MSOldCall(rect, font, mode, alignment, spacing, emoji, truncation);
- NSString *base(stringDrawingState_->base_ ?: @"");
- stringDrawingState_ = stringDrawingState_->next_;
+ NSString *textAlign;
+ switch (alignment) {
+ default:
+ case UITextAlignmentLeft:
+ textAlign = @"left";
+ break;
+ case UITextAlignmentCenter:
+ textAlign = @"center";
+ break;
+ case UITextAlignmentRight:
+ textAlign = @"right";
+ break;
+ }
+
+ NSString *base(state->base_ ?: @"");
+ NSString *extra([NSString stringWithFormat:@"text-align: %@", textAlign]);
+
+ if (true)
+ $drawLabel$(self, rect, [NSString stringWithFormat:@"%@;%@;%@", [font markupDescription], WBColorMarkup(), base], info);
+ else
+ [self drawInRect:rect withStyle:[NSString stringWithFormat:@"%@;%@;%@;%@;%@", [font markupDescription], WBColorMarkup(), extra, base, info]];
- [self drawAtPoint:point withStyle:[NSString stringWithFormat:@"%@;%@;%@", [font markupDescription], base, info]];
return CGSizeZero;
}
+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_);
+ if (state == NULL)
+ return MSOldCall(font, width, mode, spacing);
+
+ if (state->count_ != 0 && --state->count_ == 0)
+ stringDrawingState_ = state->next_;
+ if (state->info_ == nil)
+ return MSOldCall(font, width, mode, spacing);
+
+ NSString *info([Info_ objectForKey:state->info_]);
+ if (info == nil)
+ return MSOldCall(font, width, mode, spacing);
+
+ NSString *base(state->base_ ?: @"");
+ NSString *extra([NSString stringWithFormat:@"letter-spacing: %gpx", spacing]);
+ return [self sizeWithStyle:[NSString stringWithFormat:@"%@;%@;%@;%@;%@", [font markupDescription], WBColorMarkup(), extra, base, info] forWidth:width];
+}
+
+MSInstanceMessage1(CGSize, NSString, sizeWithFont, UIFont *, font) {
+ //NSLog(@"XXX: ?\"%@\"", self);
+
+ WBStringDrawingState *state(stringDrawingState_);
+ if (state == NULL)
+ return MSOldCall(font);
+
+ if (state->count_ != 0 && --state->count_ == 0)
+ stringDrawingState_ = state->next_;
+ if (state->info_ == nil)
+ return MSOldCall(font);
+
+ NSString *info([Info_ objectForKey:state->info_]);
+ if (info == nil)
+ return MSOldCall(font);
+
+ NSString *base(state->base_ ?: @"");
+ 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);
+
+ WBStringDrawingState badgeState = {NULL, 0, @""
+ , @"BadgeStyle"};
+
+ stringDrawingState_ = &badgeState;
+
+ UIImage *image(MSOldCall(icon, location));
+
+ stringDrawingState_ = NULL;
+ return image;
+}
+
MSInstanceMessageHook1(UIImage *, SBIconBadgeFactory, checkoutBadgeImageForText, NSString *, text) {
- WBStringDrawingState badgeState = {NULL, @""
- "color: white;"
+ WBStringDrawingState badgeState = {NULL, 0, @""
, @"BadgeStyle"};
stringDrawingState_ = &badgeState;
@@ -680,14 +1060,16 @@ MSInstanceMessageHook1(UIImage *, SBIconBadgeFactory, checkoutBadgeImageForText,
}
MSInstanceMessageHook1(UIImage *, SBCalendarApplicationIcon, generateIconImage, int, type) {
- WBStringDrawingState dayState = {NULL, @""
- "color: white;"
+ WBStringDrawingState dayState = {NULL, 2, @""
// XXX: this is only correct on an iPod dock
"text-shadow: rgba(0, 0, 0, 0.2) -1px -1px 2px;"
, @"CalendarIconDayStyle"};
- WBStringDrawingState dateState = {&dayState, @""
- "color: #333333;"
+ WBStringDrawingState skipState = {&dayState,
+ unsigned(kCFCoreFoundationVersionNumber > 800 ? 16 : 7)
+ , nil, nil};
+
+ WBStringDrawingState dateState = {&skipState, 2, @""
, @"CalendarIconDateStyle"};
stringDrawingState_ = &dateState;
@@ -698,6 +1080,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]);
@@ -741,7 +1135,7 @@ MSHook(void, SBCalendarIconContentsView$drawRect$, SBCalendarIconContentsView *s
if (NSString *style = [Info_ objectForKey:@"CalendarIconDayStyle"])
daystyle = [daystyle stringByAppendingString:style];
- float width([self bounds].size.width);
+ CGFloat width([self bounds].size.width);
float leeway(10);
CGSize datesize = [(NSString *)date sizeWithStyle:datestyle forWidth:(width + leeway)];
CGSize daysize = [(NSString *)day sizeWithStyle:daystyle forWidth:(width + leeway)];
@@ -805,17 +1199,10 @@ MSHook(void, SBStatusBarContentsView$didMoveToSuperview, UIView *self, SEL sel)
_SBStatusBarContentsView$didMoveToSuperview(self, sel);
}
-MSHook(UIImage *, UIImage$defaultDesktopImage, UIImage *self, SEL sel) {
- if (Debug_)
- NSLog(@"WB:Debug:DefaultDesktopImage");
- if (NSString *path = $getTheme$([NSArray arrayWithObjects:@"LockBackground.png", @"LockBackground.jpg", nil]))
- return [UIImage imageWithContentsOfFile:path];
- return _UIImage$defaultDesktopImage(self, sel);
-}
-
static NSArray *Wallpapers_;
static bool Papered_;
static bool Docked_;
+static bool SMSBackgrounded_;
static NSString *WallpaperFile_;
static UIImageView *WallpaperImage_;
static UIWebDocumentView *WallpaperPage_;
@@ -837,6 +1224,45 @@ static UIImage *$getImage$(NSString *path) {
return image;
}
+template
+_finline UIImage *WBCacheImage(const Original_ &original, const Modified_ &modified, NSString *key) {
+ UIImage *image([Images_ objectForKey:key]);
+ if (image != nil)
+ return reinterpret_cast(image) == [NSNull null] ? original() : image;
+ if (NSString *path = modified())
+ image = $getImage$(path);
+ [Images_ setObject:(image == nil ? [NSNull null] : reinterpret_cast(image)) forKey:key];
+ return image == nil ? original() : image;
+}
+
+static UIImage *$getDefaultDesktopImage$() {
+ if (NSString *path = $getTheme$($useScale$([NSArray arrayWithObjects:@"LockBackground.png", @"LockBackground.jpg", nil])))
+ return $getImage$(path);
+ return nil;
+}
+
+MSClassMessageHook0(UIImage *, UIImage, defaultDesktopImage) {
+ return $getDefaultDesktopImage$() ?: MSOldCall();
+}
+
+MSInstanceMessageHook0(UIImage *, SBSlidingAlertDisplay, _defaultDesktopImage) {
+ return $getDefaultDesktopImage$() ?: MSOldCall();
+}
+
+MSInstanceMessageHook0(void, SBWallpaperView, resetCurrentImageToWallpaper) {
+ for (UIView *parent([self superview]); parent != nil; parent = [parent superview])
+ if ([parent isKindOfClass:$SBSlidingAlertDisplay]) {
+ if (UIImage *image = $getDefaultDesktopImage$()) {
+ [self setImage:image];
+ return;
+ }
+
+ break;
+ }
+
+ MSOldCall();
+}
+
// %hook -[SBUIController init] {{{
MSInstanceMessageHook0(id, SBUIController, init) {
self = MSOldCall();
@@ -861,15 +1287,6 @@ MSInstanceMessageHook0(id, SBUIController, init) {
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]);
@@ -978,7 +1395,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];
@@ -1001,7 +1418,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];
@@ -1032,7 +1449,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)
@@ -1049,9 +1466,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 *);
@@ -1086,7 +1517,7 @@ extern "C" NSString *UIStyleStringFromColor(CGColorRef);*/
WBDelegate(time_)
-- (CGSize) drawAtPoint:(CGPoint)point forWidth:(float)width withFont:(UIFont *)font lineBreakMode:(int)mode {
+- (CGSize) drawAtPoint:(CGPoint)point forWidth:(float)width withFont:(UIFont *)font lineBreakMode:(UILineBreakMode)mode {
if (NSString *custom = [Info_ objectForKey:@"TimeStyle"]) {
BOOL &_mode(MSHookIvar(view_, "_mode"));;
@@ -1133,7 +1564,7 @@ WBDelegate(time_)
WBDelegate(badge_)
-- (CGSize) drawAtPoint:(CGPoint)point forWidth:(float)width withFont:(UIFont *)font lineBreakMode:(int)mode {
+- (CGSize) drawAtPoint:(CGPoint)point forWidth:(float)width withFont:(UIFont *)font lineBreakMode:(UILineBreakMode)mode {
if (NSString *custom = [Info_ objectForKey:@"BadgeStyle"]) {
[badge_ drawAtPoint:point withStyle:[NSString stringWithFormat:@""
"font-family: Helvetica; "
@@ -1152,13 +1583,13 @@ WBDelegate(badge_)
/* }}} */
// 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);
@@ -1169,13 +1600,17 @@ 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;
}
-MSInstanceMessageHook1(void, SBIcon, setAlpha, float, alpha) {
+MSInstanceMessageHook1(void, SBIcon, setAlpha, CGFloat, alpha) {
if (NSNumber *number = [Info_ objectForKey:@"IconAlpha"])
alpha = [number floatValue];
return MSOldCall(alpha);
@@ -1250,6 +1685,7 @@ MSHook(void, SBStatusBarTimeView$drawRect$, SBStatusBarTimeView *self, SEL sel,
@interface UIView (WinterBoard)
- (bool) wb$isWBImageView;
- (void) wb$logHierarchy;
+- (void) wb$setBackgroundColor:(UIColor *)color;
@end
@implementation UIView (WinterBoard)
@@ -1262,6 +1698,12 @@ MSHook(void, SBStatusBarTimeView$drawRect$, SBStatusBarTimeView *self, SEL sel,
WBLogHierarchy(self);
}
+- (void) wb$setBackgroundColor:(UIColor *)color {
+ [self setBackgroundColor:color];
+ for (UIView *child in [self subviews])
+ [child wb$setBackgroundColor:color];
+}
+
@end
@interface WBImageView : UIImageView {
@@ -1293,39 +1735,70 @@ 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);
}
-MSHook(void, SBIconController$noteNumberOfIconListsChanged, SBIconController *self, SEL sel) {
- SBIconModel *&_iconModel(MSHookIvar(self, "_iconModel"));
- NSArray *lists([_iconModel iconLists]);
+static void $addPerPageView$(unsigned i, UIView *list) {
+ NSString *path($getTheme$([NSArray arrayWithObject:[NSString stringWithFormat:@"Page%u.png", i]]));
+ if (path == nil)
+ return;
+
+ NSArray *subviews([list subviews]);
+
+ WBImageView *view([subviews count] == 0 ? nil : [subviews objectAtIndex:0]);
+ if (view == nil || ![view wb$isWBImageView]) {
+ view = [[[WBImageView alloc] init] autorelease];
+ [list insertSubview:view atIndex:0];
+ }
+ UIImage *image([UIImage imageWithContentsOfFile:path]);
+
+ CGRect frame([view frame]);
+ frame.size = [image size];
+ [view setFrame:frame];
+
+ [view setImage:image];
+ [view wb$updateFrame];
+}
+
+static void $addPerPageViews$(NSArray *lists) {
for (unsigned i(0), e([lists count]); i != e; ++i)
- if (NSString *path = $getTheme$([NSArray arrayWithObject:[NSString stringWithFormat:@"Page%u.png", i]])) {
- SBIconList *list([lists objectAtIndex:i]);
- NSArray *subviews([list subviews]);
-
- WBImageView *view([subviews count] == 0 ? nil : [subviews objectAtIndex:0]);
- if (view == nil || ![view wb$isWBImageView]) {
- view = [[[WBImageView alloc] init] autorelease];
- [list insertSubview:view atIndex:0];
- }
+ $addPerPageView$(i, [lists objectAtIndex:i]);
+}
- UIImage *image([UIImage imageWithContentsOfFile:path]);
+MSInstanceMessageHook0(void, SBIconController, updateNumberOfRootIconLists) {
+ NSArray *&_rootIconLists(MSHookIvar(self, "_rootIconLists"));
+ $addPerPageViews$(_rootIconLists);
+ return MSOldCall();
+}
- CGRect frame([view frame]);
- frame.size = [image size];
- [view setFrame:frame];
+MSInstanceMessageHook0(void, SBIconContentView, layoutSubviews) {
+ MSOldCall();
- [view setImage:image];
- [view wb$updateFrame];
- }
+ if (SBIconController *controller = [$SBIconController sharedInstance]) {
+ UIView *&_dockContainerView(MSHookIvar(controller, "_dockContainerView"));
+ if (&_dockContainerView != NULL)
+ [[_dockContainerView superview] bringSubviewToFront:_dockContainerView];
+ }
+}
+MSHook(void, SBIconController$noteNumberOfIconListsChanged, SBIconController *self, SEL sel) {
+ SBIconModel *&_iconModel(MSHookIvar(self, "_iconModel"));
+ $addPerPageViews$([_iconModel iconLists]);
return _SBIconController$noteNumberOfIconListsChanged(self, sel);
}
@@ -1337,12 +1810,29 @@ MSHook(id, SBIconLabel$initWithSize$label$, SBIconLabel *self, SEL sel, CGSize s
}
MSHook(void, SBIconLabel$setInDock$, SBIconLabel *self, SEL sel, BOOL docked) {
+ static bool gssc(false);
+ if (!gssc) {
+ BOOL (*GSSystemHasCapability)(CFStringRef) = reinterpret_cast(dlsym(RTLD_DEFAULT, "GSSystemHasCapability"));
+ Papered_ |= GSSystemHasCapability != NULL && GSSystemHasCapability(CFSTR("homescreen-wallpaper"));
+ gssc = true;
+
+ if ([Info_ objectForKey:@"UndockedIconLabels"] == nil)
+ [Info_ setObject:[NSNumber numberWithBool:(
+ !Papered_ ||
+ [Info_ objectForKey:@"DockedIconLabelStyle"] != nil ||
+ [Info_ objectForKey:@"UndockedIconLabelStyle"] != nil
+ )] forKey:@"UndockedIconLabels"];
+ }
+
id &_label(MSHookIvar(self, "_label"));
if (![Info_ wb$boolForKey:@"UndockedIconLabels"])
docked = true;
+
if (_label != nil && [_label respondsToSelector:@selector(setInDock:)])
[_label setInDock:docked];
- return _SBIconLabel$setInDock$(self, sel, docked);
+
+ _SBIconLabel$setInDock$(self, sel, docked);
+ [self setNeedsDisplay];
}
MSHook(BOOL, SBDockIconListView$shouldShowNewDock, id self, SEL sel) {
@@ -1392,9 +1882,7 @@ MSInstanceMessageHook2(CGSize, WebCoreFrameBridge, renderedSizeOfNode,constraine
}
// }}}
-MSInstanceMessageHook1(void, SBIconLabel, drawRect, CGRect, rect) {
- CGRect bounds = [self bounds];
-
+MSInstanceMessage1(void, SBIconLabel, drawRect, CGRect, rect) {
static Ivar drawMoreLegibly = object_getInstanceVariable(self, "_drawMoreLegibly", NULL);
int docked;
@@ -1417,35 +1905,83 @@ MSInstanceMessageHook1(void, SBIconLabel, drawRect, CGRect, rect) {
else if (docked)
style = [style stringByAppendingString:@"text-shadow: rgba(0, 0, 0, 0.5) 0px -1px 0px; "];
- bool ellipsis(false);
- float max = [self frame].size.width - 11, width;
- width:
- width = [(ellipsis ? [label stringByAppendingString:@"..."] : label) sizeWithStyle:style forWidth:320].width;
+ NSString *custom([Info_ objectForKey:(docked ? @"DockedIconLabelStyle" : @"UndockedIconLabelStyle")]);
- if (width > max) {
- size_t length([label length]);
- float spacing((width - max) / (length - 1));
+ $drawLabel$(label, [self bounds], style, custom);
+}
- if (spacing > 1.25) {
- ellipsis = true;
- label = [label substringToIndex:(length - 1)];
- goto width;
- }
+MSInstanceMessage0(CGImageRef, SBIconLabel, buildLabelImage) {
+ bool docked((MSHookIvar(self, "_inDock") & 0x2) != 0);
- style = [style stringByAppendingString:[NSString stringWithFormat:@"letter-spacing: -%f; ", spacing]];
- }
+ WBStringDrawingState labelState = {NULL, 0, @""
+ , docked ? @"DockedIconLabelStyle" : @"UndockedIconLabelStyle"};
- if (ellipsis)
- label = [label stringByAppendingString:@"..."];
+ stringDrawingState_ = &labelState;
- if (NSString *custom = [Info_ objectForKey:(docked ? @"DockedIconLabelStyle" : @"UndockedIconLabelStyle")])
- style = [style stringByAppendingString:custom];
+ //NSLog(@"XXX: +");
+ CGImageRef image(MSOldCall());
+ //NSLog(@"XXX: -");
+
+ stringDrawingState_ = NULL;
+ return image;
+}
+
+static bool wb$inDock(id parameters) {
+ return [$objc_getAssociatedObject(parameters, @selector(wb$inDock)) boolValue];
+}
- CGSize size = [label sizeWithStyle:style forWidth:bounds.size.width];
- [label drawAtPoint:CGPointMake((bounds.size.width - size.width) / 2, 0) withStyle:style];
+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;
+}
+
+MSInstanceMessage0(id, SBIconView, _labelImageParameters) {
+ if (id parameters = MSOldCall()) {
+ int &location(MSHookIvar(self, "_iconLocation"));
+ if (&location != NULL)
+ $objc_setAssociatedObject(parameters, @selector(wb$inDock), [NSNumber numberWithBool:(location == 3)], 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) {
+ [self setBackgroundColor:[UIColor clearColor]];
+ } return self;
+}
+
+MSInstanceMessageHook0(BOOL, CKBalloonView, _canUseLayerBackedBalloon) {
+ return SMSBackgrounded_ ? NO : MSOldCall();
+}
+
+MSInstanceMessageHook0(void, CKTranscriptHeaderView, layoutSubviews) {
+ [self wb$setBackgroundColor:[UIColor clearColor]];
+ return MSOldCall();
+}
+
MSInstanceMessageHook1(void, CKMessageCell, addBalloonView, CKBalloonView *, balloon) {
MSOldCall(balloon);
[balloon setBackgroundColor:[UIColor clearColor]];
@@ -1453,15 +1989,18 @@ MSInstanceMessageHook1(void, CKMessageCell, addBalloonView, CKBalloonView *, bal
MSInstanceMessageHook1(void, CKTranscriptCell, setBackgroundColor, UIColor *, color) {
MSOldCall([UIColor clearColor]);
+ [[self contentView] wb$setBackgroundColor:[UIColor clearColor]];
}
+// iOS >= 5.0
MSInstanceMessageHook2(id, CKTranscriptCell, initWithStyle,reuseIdentifier, int, style, NSString *, reuse) {
if ((self = MSOldCall(style, reuse)) != nil) {
[self setBackgroundColor:[UIColor clearColor]];
- [[self contentView] setBackgroundColor:[UIColor clearColor]];
+ [[self contentView] wb$setBackgroundColor:[UIColor clearColor]];
} return self;
}
+// iOS << 5.0
MSInstanceMessageHook2(id, CKMessageCell, initWithStyle,reuseIdentifier, int, style, NSString *, reuse) {
if ((self = MSOldCall(style, reuse)) != nil) {
[self setBackgroundColor:[UIColor clearColor]];
@@ -1491,6 +2030,8 @@ MSInstanceMessageHook0(void, CKTranscriptController, loadView) {
if (NSString *path = $getTheme$($useScale$([NSArray arrayWithObjects:@"SMSBackground.png", @"SMSBackground.jpg", nil])))
if (UIImage *image = $getImage$(path)) {
+ SMSBackgrounded_ = true;
+
UIView *&_transcriptTable(MSHookIvar(self, "_transcriptTable"));
UIView *&_transcriptLayer(MSHookIvar(self, "_transcriptLayer"));
UIView *table;
@@ -1514,66 +2055,116 @@ MSInstanceMessageHook0(void, CKTranscriptController, loadView) {
}
// }}}
+template
+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"];
+
+ 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() {{{
MSHook(UIImage *, _UIImageWithName, NSString *name) {
- if (Debug_)
- NSLog(@"WB:Debug: _UIImageWithName(\"%@\")", name);
if (name == nil)
return nil;
-
- int identifier;
- bool packed;
-
- if (_UIPackedImageTableGetIdentifierForName != NULL)
- packed = _UIPackedImageTableGetIdentifierForName(name, &identifier);
- else if (_UISharedImageNameGetIdentifier != NULL) {
- identifier = _UISharedImageNameGetIdentifier(name);
- packed = identifier != -1;
- } else {
- identifier = -1;
- packed = false;
- }
-
if (Debug_)
- NSLog(@"WB:Debug: _UISharedImageNameGetIdentifier(\"%@\") = %d", name, identifier);
+ NSLog(@"WB:Debug: _UIImageWithName(\"%@\")", name);
+ return WBCacheUIImage(_UIKitBundle(),
+ [=](){ return __UIImageWithName(name); },
+ name, [NSString stringWithFormat:@"I:%@", name]);
+}
+// }}}
+// %hook _UIImageWithNameInDomain() {{{
+MSHook(UIImage *, _UIImageWithNameInDomain, NSString *name, NSString *domain) {
+ if (Debug_)
+ NSLog(@"WB:Debug: _UIImageWithNameInDomain(\"%@\", \"%@\")", name, domain);
+ return WBCacheImage(
+ [=](){ return __UIImageWithNameInDomain(name, domain); },
+ [=](){ return $getTheme$($useScale$([NSArray arrayWithObject:[NSString stringWithFormat:@"Domains/%@/%@", domain, name]])); },
+ [NSString stringWithFormat:@"D:%zu:%@%@", size_t([domain length]), domain, name]);
+}
+// }}}
- if (!packed)
- return __UIImageWithName(name);
- else {
- NSNumber *key([NSNumber numberWithInt:identifier]);
- 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))
- image = $getImage$(path);
- [UIImages_ setObject:(image == nil ? [NSNull null] : reinterpret_cast(image)) forKey:key];
- if (image != nil)
- return image;
+// 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;
+}
- image = __UIImageWithName(name);
+MSInstanceMessageHook2(UIImage *, UISharedArtwork, imageNamed,device, NSString *, name, NSInteger, device) {
+ NSBundle *bundle($objc_getAssociatedObject(self, @selector(wb$bundle)));
+ if (Debug_)
+ 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]);
+}
+// }}}
+// _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;
+}
- if (UIDebug_) {
- NSString *path([@"/tmp/UIImages/" stringByAppendingString:name]);
- if (![Manager_ fileExistsAtPath:path])
- [UIImagePNGRepresentation(image) writeToFile:path atomically:YES];
- }
+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: -[_UIAssetManager(%@/%@) imageNamed:@\"%@\" scale:%g idiom:%li subtype:%lu cachingOptions:%lu]",
+ [bundle bundleIdentifier], [self carFileName],
+ name, scale, (long) idiom,
+ (unsigned long) subtype,
+ (unsigned long) caching
+ );
- return image;
+ 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]);
}
// }}}
-// %hook _UIImageWithNameInDomain() {{{
-MSHook(UIImage *, _UIImageWithNameInDomain, NSString *name, NSString *domain) {
- NSString *key([NSString stringWithFormat:@"D:%zu%@%@", [domain length], domain, name]);
- UIImage *image([PathImages_ objectForKey:key]);
- if (image != nil)
- return reinterpret_cast(image) == [NSNull null] ? __UIImageWithNameInDomain(name, domain) : image;
+// _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: UIImageWithNameInDomain(\"%@\", \"%@\")", name, domain);
- if (NSString *path = $getTheme$($useScale$([NSArray arrayWithObject:[NSString stringWithFormat:@"Domains/%@/%@", domain, name]])))
- image = $getImage$(path);
- [PathImages_ setObject:(image == nil ? [NSNull null] : reinterpret_cast(image)) forKey:key];
- return image == nil ? __UIImageWithNameInDomain(name, domain) : image;
+ 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']);
}
// }}}
@@ -1590,16 +2181,10 @@ 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) {
+static bool GetFileNameForThisAction$(bool value, unsigned long a0, char *a1, unsigned long a2, bool &a3) {
if (Debug_)
- NSLog(@"WB:Debug:GetFileNameForThisAction(%u, %p, %u)", a0, a1, a2);
- bool value = __Z24GetFileNameForThisActionmPcRb(a0, a1, a2);
- if (Debug_)
- NSLog(@"WB:Debug:GetFileNameForThisAction(%u, %s, %u) = %u", a0, value ? a1 : NULL, a2, value);
+ NSLog(@"WB:Debug:GetFileNameForThisAction(%lu, %s, %lu, %u) = %u", a0, value ? a1 : NULL, a2, a3, value);
if (value) {
NSString *path = [NSString stringWithUTF8String:a1];
@@ -1609,7 +2194,7 @@ MSHook(bool, _Z24GetFileNameForThisActionmPcRb, unsigned long a0, char *a1, bool
NSString *path([NSString stringWithFormat:@"%@/UISounds/%@", theme, file]);
if ([Manager_ fileExistsAtPath:path]) {
strcpy(a1, [path UTF8String]);
- continue;
+ break;
}
}
}
@@ -1617,6 +2202,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,
@@ -1641,22 +2236,66 @@ static void ChangeWallpaper(
}
+MSHook(NSArray *, CPBitmapCreateImagesFromPath, NSString *path, CFTypeRef *names, void *arg2, void *arg3) {
+ NSArray *images(_CPBitmapCreateImagesFromPath(path, names, arg2, arg3));
+ 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;
+}
+
+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) {
function = reinterpret_cast(MSFindSymbol(image, name));
}
-template
-static void nlset(Type_ &function, struct nlist *nl, size_t index) {
- struct nlist &name(nl[index]);
- uintptr_t value(name.n_value);
- if ((name.n_desc & N_ARM_THUMB_DEF) != 0)
- value |= 0x00000001;
- function = reinterpret_cast(value);
-}
+#define WBHookSymbol(image, function) \
+ msset(function, image, "_" #function)
template
static void dlset(Type_ &function, const char *name) {
@@ -1672,27 +2311,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";
- 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 CGSize NSString$sizeWithStyle$forWidth$(NSString *self, SEL _cmd, NSString *style, float width) {
+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";
- return [[WBMarkup sharedMarkup] sizeOfString:self withStyle:style forWidth:width];
+ //NSLog(@"XXX:drawR(%@ | %@)", self, [style stringByReplacingOccurrencesOfString:@"\n" withString:@" "]);
+ return [[WBMarkup sharedMarkup] drawString:self inRect:rect withStyle:style];
}
-static void SBInitialize() {
- class_addMethod($NSString, @selector(drawAtPoint:withStyle:), (IMP) &NSString$drawAtPoint$withStyle$, "v20@0:4{CGPoint=ff}8@16");
- class_addMethod($NSString, @selector(sizeWithStyle:forWidth:), (IMP) &NSString$sizeWithStyle$forWidth$, "{CGSize=ff}16@0:4@8f12");
-
- _UIImage$defaultDesktopImage = MSHookMessage(object_getClass($UIImage), @selector(defaultDesktopImage), &$UIImage$defaultDesktopImage);
+static CGSize NSString$sizeWithStyle$forWidth$(NSString *self, SEL _cmd, NSString *style, CGFloat width) {
+ if (style == nil || [style length] == 0)
+ style = @"font-family: Helvetica; font-size: 12px";
+ 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() {
if (SummerBoard_) {
WBRename(SBApplication, pathForIcon, pathForIcon);
WBRename(SBApplicationIcon, icon, icon);
@@ -1710,9 +2375,21 @@ static void SBInitialize() {
WBRename(SBDockIconListView, setFrame:, setFrame$);
MSHookMessage(object_getClass($SBDockIconListView), @selector(shouldShowNewDock), &$SBDockIconListView$shouldShowNewDock, &_SBDockIconListView$shouldShowNewDock);
+ if (kCFCoreFoundationVersionNumber < 600 || SummerBoard_)
+ WBRename(SBIconLabel, drawRect:, drawRect$);
+ else if (kCFCoreFoundationVersionNumber < 700) {
+ WBRename(SBIconLabel, buildLabelImage, buildLabelImage);
+ } else {
+ WBRename(SBIconLabelImageParameters, hash, hash);
+ WBRename($SBIconView, _labelImageParametersForIcon:location:, _labelImageParametersForIcon$location$);
+ WBRename(SBIconView, _labelImageParameters, _labelImageParameters);
+ 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$);
@@ -1720,13 +2397,18 @@ static void SBInitialize() {
WBRename(SBIconModel, getCachedImagedForIcon:, getCachedImagedForIcon$);
WBRename(SBIconModel, getCachedImagedForIcon:smallIcon:, getCachedImagedForIcon$smallIcon$);
- WBRename(SBSearchView, initWithFrame:, initWithFrame$);
- WBRename(SBSearchTableViewCell, drawRect:, drawRect$);
- WBRename(SBSearchTableViewCell, initWithStyle:reuseIdentifier:, initWithStyle$reuseIdentifier$);
+ if (kCFCoreFoundationVersionNumber < 800) {
+ 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$);
+ 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$);
@@ -1738,9 +2420,37 @@ static void SBInitialize() {
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) {
+ int fd(_open(path, oflag, mode));
+
+ static bool no(false);
+ if (no) return fd;
+ no = true;
+
+ if (strstr(path, "/icon") != NULL)
+ *reinterpret_cast(NULL) = NULL;
+
+ 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]);
@@ -1753,10 +2463,17 @@ MSInitialize {
// 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;
+
if (NSNumber *value = [settings objectForKey:@"Debug"])
Debug_ = [value boolValue];
+ if (NSNumber *value = [settings objectForKey:@"RecordUI"])
+ UIDebug_ = [value boolValue];
NSArray *themes([settings objectForKey:@"Themes"]);
if (themes == nil)
@@ -1776,10 +2493,8 @@ MSInitialize {
if (name == nil)
continue;
- NSString *theme(nil);
-
#define testForTheme(format...) \
- if (theme == nil) { \
+ { \
NSString *path = [NSString stringWithFormat:format]; \
if ([Manager_ fileExistsAtPath:path]) { \
[Themes_ addObject:path]; \
@@ -1804,10 +2519,34 @@ MSInitialize {
[Info_ setObject:[info objectForKey:key] forKey:key];
// }}}
+ // AppSupport {{{
+ if (MSImageRef image = MSGetImageByName("/System/Library/PrivateFrameworks/AppSupport.framework/AppSupport")) {
+ NSArray *(*CPBitmapCreateImagesFromPath)(NSString *, CFTypeRef *, 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));
+ }
+ // }}}
+ // Foundation {{{
+ if (true) {
+ MSHookFunction(CFBundleCopyResourceURL, MSHake(CFBundleCopyResourceURL));
}
// }}}
// GraphicsServices {{{
@@ -1816,20 +2555,38 @@ MSInitialize {
}
// }}}
// ImageIO {{{
- if (MSImageRef image = MSGetImageByName("/System/Library/Frameworks/ImageIO.framework/ImageIO")) {
- void *(*CGImageReadCreateWithFile)(NSString *, int);
- msset(CGImageReadCreateWithFile, image, "_CGImageReadCreateWithFile");
- MSHookFunction(CGImageReadCreateWithFile, MSHake(CGImageReadCreateWithFile));
+ 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) = NULL;
+ if (kCFCoreFoundationVersionNumber > 700) // XXX: iOS 6.x
+ CGImageReadCreateWithFile = NULL;
+ else {
+ 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 {{{
if (SpringBoard_) {
- Wallpapers_ = [[NSArray arrayWithObjects:@"Wallpaper.mp4", @"Wallpaper@2x.png", @"Wallpaper@2x.jpg", @"Wallpaper.png", @"Wallpaper.jpg", @"Wallpaper.html", nil] retain];
- Docked_ = $getTheme$([NSArray arrayWithObjects:@"Dock.png", nil]);
+ 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;
CFNotificationCenterAddObserver(
CFNotificationCenterGetDarwinNotifyCenter(),
- NULL, &ChangeWallpaper, (CFStringRef) @"com.saurik.winterboard.lockbackground", NULL, 0
+ NULL, &ChangeWallpaper, (CFStringRef) @"com.saurik.winterboard.lockbackground", NULL, CFNotificationSuspensionBehaviorCoalesce
);
if ($getTheme$([NSArray arrayWithObject:@"Wallpaper.mp4"]) != nil) {
@@ -1845,30 +2602,46 @@ 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);
+ if (MSImageRef image = MSGetImageByName("/System/Library/Frameworks/UIKit.framework/UIKit")) {
+#ifdef __LP64__
+ class_addMethod($NSString, @selector(drawAtPoint:withStyle:), (IMP) &NSString$drawAtPoint$withStyle$, "v40@0:8{CGPoint=dd}16@32");
+ class_addMethod($NSString, @selector(drawInRect:withStyle:), (IMP) &NSString$drawInRect$withStyle$, "v56@0:8{CGRect={CGSize=dd}{CGSize=dd}}16@48");
+ class_addMethod($NSString, @selector(sizeWithStyle:forWidth:), (IMP) &NSString$sizeWithStyle$forWidth$, "{CGSize=dd}32@0:8@16d24");
+#else
+ 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");
+#endif
+
+ WBHookSymbol(image, _UIKitBundle);
+
+ if (kCFCoreFoundationVersionNumber < 700)
+ MSHookFunction(_UIImageWithName, MSHake(_UIImageWithName));
+
+ WBHookSymbol(image, _UIApplicationImageWithName);
+ MSHookFunction(_UIApplicationImageWithName, MSHake(_UIApplicationImageWithName));
+
+ WBHookSymbol(image, _UIImageWithNameInDomain);
+ MSHookFunction(_UIImageWithNameInDomain, MSHake(_UIImageWithNameInDomain));
+
+ 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$));
+
+ SEL sizeWithFont(@selector(_legacy_sizeWithFont:));
+ if (![@"" respondsToSelector:sizeWithFont])
+ sizeWithFont = @selector(sizeWithFont:);
+ MSHookMessage($NSString, sizeWithFont, MSHake(NSString$sizeWithFont$));
}
// }}}
- if (Debug_ && [Manager_ fileExistsAtPath:@"/tmp/UIImages"])
- UIDebug_ = true;
+ //MSHookFunction(reinterpret_cast(&open), MSHake(open));
[pool release];
}