X-Git-Url: https://git.saurik.com/winterboard.git/blobdiff_plain/6b3f6ee58d88a6a9983a89304f608895c18ee57a..e4cbfc3e408cc38fb21d4c72ba0b1cff1d5d754b:/Library.mm
diff --git a/Library.mm b/Library.mm
index 85ee865..b3eb56c 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
@@ -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;
@@ -120,7 +106,10 @@ MSClassHook(NSString)
MSClassHook(UIImage)
MSMetaClassHook(UIImage)
MSClassHook(UINavigationBar)
+MSClassHook(UISharedArtwork)
MSClassHook(UIToolbar)
+MSClassHook(UIStatusBarTimeItemView)
+MSClassHook(UIWebDocumentView)
MSClassHook(CKBalloonView)
MSClassHook(CKMessageCell)
@@ -139,12 +128,21 @@ MSClassHook(SBCalendarApplicationIcon)
MSClassHook(SBCalendarIconContentsView)
MSClassHook(SBDockIconListView)
MSClassHook(SBIcon)
+MSClassHook(SBIconAccessoryImage)
+MSMetaClassHook(SBIconAccessoryImage)
MSClassHook(SBIconBadge)
MSClassHook(SBIconBadgeFactory)
+MSClassHook(SBIconBadgeImage)
+MSClassHook(SBIconContentView)
MSClassHook(SBIconController)
MSClassHook(SBIconLabel)
+MSClassHook(SBIconLabelImage)
+MSMetaClassHook(SBIconLabelImage)
+MSClassHook(SBIconLabelImageParameters)
MSClassHook(SBIconList)
MSClassHook(SBIconModel)
+MSClassHook(SBIconView)
+MSMetaClassHook(SBIconView)
//MSClassHook(SBImageCache)
MSClassHook(SBSearchView)
MSClassHook(SBSearchTableViewCell)
@@ -159,17 +157,23 @@ 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;
@@ -200,17 +204,18 @@ 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 UIImage *(*_UIImageWithNameUsingCurrentIdiom)(NSString *name);
+static UIImage *(*_UIImageWithDeviceSpecificName)(NSString *name);
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];
@@ -264,8 +269,7 @@ static NSArray *$useScale$(NSArray *files, bool use = true) {
if (use) {
if (Scale_ == 2) {
[scaled addObject:[NSString stringWithFormat:@"%@@2x~%@.%@", base, idiom, extension]];
- if (!IsWild_)
- [scaled addObject:[NSString stringWithFormat:@"%@@2x.%@", base, extension]];
+ [scaled addObject:[NSString stringWithFormat:@"%@@2x.%@", base, extension]];
}
[scaled addObject:[NSString stringWithFormat:@"%@~%@.%@", base, idiom, extension]];
@@ -273,20 +277,20 @@ static NSArray *$useScale$(NSArray *files, bool use = true) {
// if (!IsWild_) <- support old themes
[scaled addObject:file];
} else if ([base hasSuffix: @"@2x"]) {
- [scaled addObject:[NSString stringWithFormat:@"%@~iphone.%@", base, extension]];
+ [scaled addObject:[NSString stringWithFormat:@"%@~%@.%@", base, idiom, extension]];
[scaled addObject:file];
// XXX: this actually can't be used, as the person loading the file doesn't realize that the @2x changed
/*NSString *rest([base substringWithRange:NSMakeRange(0, [base length] - 3)]);
- [scaled addObject:[NSString stringWithFormat:@"%@~iphone.%@", rest, extension]];
+ [scaled addObject:[NSString stringWithFormat:@"%@~%@.%@", rest, idiom, extension]];
[scaled addObject:[rest stringByAppendingPathExtension:extension]];*/
} else {
// XXX: this code isn't really complete
[scaled addObject:file];
- if ([base hasSuffix:@"~iphone"])
- [scaled addObject:[[base substringWithRange:NSMakeRange(0, [base length] - 7)] stringByAppendingPathExtension:extension]];
+ if ([base hasSuffix:[NSString stringWithFormat:@"~%@", idiom]])
+ [scaled addObject:[[base substringWithRange:NSMakeRange(0, [base length] - 1 - [idiom length])] stringByAppendingPathExtension:extension]];
}
}
@@ -310,8 +314,11 @@ static NSString *$getTheme$(NSArray *files, NSArray *themes = Themes_) {
for (NSString *theme in Themes_)
for (NSString *file in files) {
path = [NSString stringWithFormat:@"%@/%@", theme, file];
- if ([Manager_ fileExistsAtPath:path])
+ if ([Manager_ fileExistsAtPath:path]) {
+ if ([[Manager_ destinationOfSymbolicLinkAtPath:path error:NULL] isEqualToString:@"/"])
+ path = nil;
goto set;
+ }
}
path = nil;
@@ -325,7 +332,7 @@ static NSString *$getTheme$(NSArray *files, NSArray *themes = Themes_) {
}
// }}}
// $pathForFile$inBundle$() {{{
-static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle, bool ui) {
+static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle, bool ui, bool use) {
NSString *identifier = [bundle bundleIdentifier];
NSMutableArray *names = [NSMutableArray arrayWithCapacity:8];
@@ -336,6 +343,8 @@ static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle, bool u
NSString *base([folder stringByDeletingPathExtension]);
if ([base hasSuffix:@"~iphone"])
[names addObject:[NSString stringWithFormat:@"Folders/%@.%@/%@", [base substringWithRange:NSMakeRange(0, [base length] - 7)], [folder pathExtension], file]];
+ if ([base hasSuffix:@"~ipad"])
+ [names addObject:[NSString stringWithFormat:@"Folders/%@.%@/%@", [base substringWithRange:NSMakeRange(0, [base length] - 5)], [folder pathExtension], file]];
}
if (ui)
[names addObject:[NSString stringWithFormat:@"UIImages/%@", file]];
@@ -351,6 +360,8 @@ static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle, bool u
[names addObject:[NSString stringWithFormat:@"Bundles/com.apple.MobileSMS/%@", file]];
else if ([identifier isEqualToString:@"com.apple.calculator"])
[names addObject:[NSString stringWithFormat:@"Files/Applications/Calculator.app/%@", file]];
+ else if ([identifier isEqualToString:@"com.apple.Maps"] && [file isEqualToString:@"Icon-57@2x.png"])
+ [names addObject:[NSString stringWithFormat:@"Bundles/com.apple.Maps/icon.png"]];
else if (!summer);
remapResourceName(@"FSO_BG.png", @"StatusBar")
remapResourceName(Four_ ? @"SBDockBG-old.png" : @"SBDockBG.png", @"Dock")
@@ -358,7 +369,7 @@ static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle, bool u
[names addObject:[NSString stringWithFormat:@"Fallback/%@", file]];
- if (NSString *path = $getTheme$($useScale$(names, ui)))
+ if (NSString *path = $getTheme$($useScale$(names, use)))
return path;
return nil;
@@ -461,7 +472,7 @@ static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") {
if ([file hasPrefix:prefix]) {
NSUInteger length([prefix length]);
if (length != [file length])
- if (NSString *path = $pathForFile$inBundle$([file substringFromIndex:(length + 1)], bundle, false))
+ if (NSString *path = $pathForFile$inBundle$([file substringFromIndex:(length + 1)], bundle, false, false))
return path;
}
}
@@ -593,7 +604,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
@@ -628,13 +639,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;
}
@@ -642,7 +653,7 @@ MSHook(UIImage *, _UIApplicationImageWithName, NSString *name) {
NSBundle *bundle = [NSBundle mainBundle];
if (Debug_)
NSLog(@"WB:Debug: _UIApplicationImageWithName(\"%@\", %@)", name, bundle);
- if (NSString *path = $pathForFile$inBundle$(name, bundle, false))
+ if (NSString *path = $pathForFile$inBundle$(name, bundle, false, false))
return CachedImageAtPath(path);
return __UIApplicationImageWithName(name);
}
@@ -670,12 +681,41 @@ MSInstanceMessageHook2(NSString *, NSBundle, pathForResource,ofType, NSString *,
NSString *file = type == nil ? resource : [NSString stringWithFormat:@"%@.%@", resource, type];
if (Debug_)
NSLog(@"WB:Debug: [NSBundle(%@) pathForResource:\"%@\"]", [self bundleIdentifier], file);
- if (NSString *path = $pathForFile$inBundle$(file, self, false))
+ if (NSString *path = $pathForFile$inBundle$(file, self, false, false))
return path;
return MSOldCall(resource, type);
}
// }}}
+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_;
@@ -683,32 +723,86 @@ static struct WBStringDrawingState {
NSString *info_;
} *stringDrawingState_;
-MSInstanceMessageHook6(CGSize, NSString, drawAtPoint,forWidth,withFont,lineBreakMode,letterSpacing,includeEmoji, CGPoint, point, float, width, UIFont *, font, int, mode, float, spacing, BOOL, emoji) {
+extern "C" CGColorSpaceRef CGContextGetFillColorSpace(CGContextRef);
+extern "C" void CGContextGetFillColor(CGContextRef, CGFloat[]);
+
+static NSString *WBColorMarkup() {
+ CGContextRef context(UIGraphicsGetCurrentContext());
+ //NSLog(@"XXX:1:%p", context);
+ if (context == NULL)
+ return @"";
+
+ CGColorSpaceRef space(CGContextGetFillColorSpace(context));
+ //NSLog(@"XXX:2:%p", space);
+ if (space == NULL)
+ return @"";
+
+ size_t number(CGColorSpaceGetNumberOfComponents(space));
+ //NSLog(@"XXX:3:%u", number);
+ if (number == 0)
+ return @"";
+
+ CGFloat components[number + 1];
+ CGContextGetFillColor(context, components);
+
+ CGFloat r, g, b, a;
+
+ switch (number) {
+ case 1:
+ r = components[0];
+ g = components[0];
+ b = components[0];
+ a = components[1];
+ break;
+
+ case 3:
+ r = components[0];
+ g = components[1];
+ b = components[2];
+ a = components[3];
+ break;
+
+ default:
+ return @"";
+ }
+
+ return [NSString stringWithFormat:@"color: rgba(%g, %g, %g, %g)", r * 255, g * 255, b * 255, a];
+}
+
+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);
+
WBStringDrawingState *state(stringDrawingState_);
if (state == NULL)
- return MSOldCall(point, width, font, mode, spacing, emoji);
+ return MSOldCall(point, width, font, mode, spacing);
- if (--state->count_ == 0)
+ if (state->count_ != 0 && --state->count_ == 0)
stringDrawingState_ = state->next_;
if (state->info_ == nil)
- return MSOldCall(point, width, font, mode, spacing, emoji);
+ return MSOldCall(point, width, font, mode, spacing);
NSString *info([Info_ objectForKey:state->info_]);
if (info == nil)
- return MSOldCall(point, width, font, mode, spacing, emoji);
+ return MSOldCall(point, width, font, mode, spacing);
NSString *base(state->base_ ?: @"");
NSString *extra([NSString stringWithFormat:@"letter-spacing: %gpx", spacing]);
- [self drawAtPoint:point withStyle:[NSString stringWithFormat:@"%@;%@;%@;%@", [font markupDescription], extra, base, info]];
+ [self drawAtPoint:point withStyle:[NSString stringWithFormat:@"%@;%@;%@;%@;%@", [font markupDescription], WBColorMarkup(), extra, base, info]];
return CGSizeZero;
}
-MSInstanceMessageHook7(CGSize, NSString, _drawInRect,withFont,lineBreakMode,alignment,lineSpacing,includeEmoji,truncationRect, CGRect, rect, UIFont *, font, int, mode, int, alignment, float, spacing, BOOL, emoji, CGRect, truncation) {
+extern "C" NSString *NSStringFromCGRect(CGRect rect);
+
+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)
+ if (state->count_ != 0 && --state->count_ == 0)
stringDrawingState_ = state->next_;
if (state->info_ == nil)
return MSOldCall(rect, font, mode, alignment, spacing, emoji, truncation);
@@ -717,18 +811,39 @@ MSInstanceMessageHook7(CGSize, NSString, _drawInRect,withFont,lineBreakMode,alig
if (info == nil)
return MSOldCall(rect, font, mode, alignment, spacing, emoji, truncation);
+ 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(@"text-align: center");
- [self drawInRect:rect withStyle:[NSString stringWithFormat:@"%@;%@;%@;%@", [font markupDescription], extra, base, info]];
+ 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]];
+
return CGSizeZero;
}
-MSInstanceMessageHook4(CGSize, NSString, sizeWithFont,forWidth,lineBreakMode,letterSpacing, UIFont *, font, float, width, int, mode, float, spacing) {
+MSInstanceMessageHook4(CGSize, NSString, sizeWithFont,forWidth,lineBreakMode,letterSpacing, UIFont *, font, float, width, UILineBreakMode, mode, float, 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)
+ if (state->count_ != 0 && --state->count_ == 0)
stringDrawingState_ = state->next_;
if (state->info_ == nil)
return MSOldCall(font, width, mode, spacing);
@@ -739,15 +854,17 @@ MSInstanceMessageHook4(CGSize, NSString, sizeWithFont,forWidth,lineBreakMode,let
NSString *base(state->base_ ?: @"");
NSString *extra([NSString stringWithFormat:@"letter-spacing: %gpx", spacing]);
- return [self sizeWithStyle:[NSString stringWithFormat:@"%@;%@;%@;%@", [font markupDescription], extra, base, info] forWidth:width];
+ return [self sizeWithStyle:[NSString stringWithFormat:@"%@;%@;%@;%@;%@", [font markupDescription], WBColorMarkup(), extra, base, info] forWidth:width];
}
MSInstanceMessageHook1(CGSize, NSString, sizeWithFont, UIFont *, font) {
+ //NSLog(@"XXX: ?\"%@\"", self);
+
WBStringDrawingState *state(stringDrawingState_);
if (state == NULL)
return MSOldCall(font);
- if (--state->count_ == 0)
+ if (state->count_ != 0 && --state->count_ == 0)
stringDrawingState_ = state->next_;
if (state->info_ == nil)
return MSOldCall(font);
@@ -757,12 +874,26 @@ MSInstanceMessageHook1(CGSize, NSString, sizeWithFont, UIFont *, font) {
return MSOldCall(font);
NSString *base(state->base_ ?: @"");
- return [self sizeWithStyle:[NSString stringWithFormat:@"%@;%@;%@", [font markupDescription], base, info] forWidth:65535];
+ return [self sizeWithStyle:[NSString stringWithFormat:@"%@;%@;%@;%@", [font markupDescription], WBColorMarkup(), base, info] forWidth:65535];
+}
+
+MSClassMessageHook2(UIImage *, SBIconAccessoryImage, checkoutAccessoryImageForIcon,location, id, icon, int, location) {
+ if ([self _imageClassForIcon:icon location:location] != $SBIconBadgeImage)
+ return MSOldCall(icon, location);
+
+ WBStringDrawingState badgeState = {NULL, 0, @""
+ , @"BadgeStyle"};
+
+ stringDrawingState_ = &badgeState;
+
+ UIImage *image(MSOldCall(icon, location));
+
+ stringDrawingState_ = NULL;
+ return image;
}
MSInstanceMessageHook1(UIImage *, SBIconBadgeFactory, checkoutBadgeImageForText, NSString *, text) {
- WBStringDrawingState badgeState = {NULL, 1, @""
- "color: white;"
+ WBStringDrawingState badgeState = {NULL, 0, @""
, @"BadgeStyle"};
stringDrawingState_ = &badgeState;
@@ -775,7 +906,6 @@ MSInstanceMessageHook1(UIImage *, SBIconBadgeFactory, checkoutBadgeImageForText,
MSInstanceMessageHook1(UIImage *, SBCalendarApplicationIcon, generateIconImage, int, type) {
WBStringDrawingState dayState = {NULL, 2, @""
- "color: white;"
// XXX: this is only correct on an iPod dock
"text-shadow: rgba(0, 0, 0, 0.2) -1px -1px 2px;"
, @"CalendarIconDayStyle"};
@@ -783,7 +913,6 @@ MSInstanceMessageHook1(UIImage *, SBCalendarApplicationIcon, generateIconImage,
WBStringDrawingState sizeState = {&dayState, 7, nil, nil};
WBStringDrawingState dateState = {&sizeState, 2, @""
- "color: #333333;"
, @"CalendarIconDateStyle"};
stringDrawingState_ = &dateState;
@@ -794,6 +923,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]);
@@ -837,7 +978,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)];
@@ -926,6 +1067,17 @@ 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);
@@ -1086,7 +1238,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];
@@ -1109,7 +1261,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];
@@ -1140,7 +1292,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)
@@ -1157,9 +1309,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 *);
@@ -1194,7 +1360,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"));;
@@ -1241,7 +1407,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; "
@@ -1277,8 +1443,12 @@ MSInstanceMessageHook0(id, SBIcon, initWithDefaultSize) {
if (NSNumber *number = [Info_ objectForKey:@"IconAlpha"]) {
// XXX: note: this is overridden above, which is silly
float alpha([number floatValue]);
- [self setIconImageAlpha:alpha];
- [self setIconLabelAlpha:alpha];
+ if ([self respondsToSelector:@selector(setIconImageAlpha:)])
+ [self setIconImageAlpha:alpha];
+ if ([self respondsToSelector:@selector(setIconLabelAlpha:)])
+ [self setIconLabelAlpha:alpha];
+ if ([self respondsToSelector:@selector(setAlpha:)])
+ [self setAlpha:alpha];
}
} return self;
}
@@ -1408,39 +1578,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);
}
@@ -1501,7 +1702,7 @@ MSInstanceMessageHook3(NSString *, NSBundle, localizedStringForKey,value,table,
return value;
} else if (NSString *path = $pathForFile$inBundle$([NSString stringWithFormat:@"%@.lproj/%@.strings",
language, file
- ], self, false)) {
+ ], self, false, false)) {
if ((strings = [[NSDictionary alloc] initWithContentsOfFile:path]) != nil) {
[Strings_ setObject:[strings autorelease] forKey:name];
goto strings;
@@ -1525,8 +1726,6 @@ MSInstanceMessageHook2(CGSize, WebCoreFrameBridge, renderedSizeOfNode,constraine
// }}}
MSInstanceMessage1(void, SBIconLabel, drawRect, CGRect, rect) {
- CGRect bounds = [self bounds];
-
static Ivar drawMoreLegibly = object_getInstanceVariable(self, "_drawMoreLegibly", NULL);
int docked;
@@ -1549,46 +1748,53 @@ MSInstanceMessage1(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: -");
- CGSize size = [label sizeWithStyle:style forWidth:bounds.size.width];
- [label drawAtPoint:CGPointMake((bounds.size.width - size.width) / 2, 0) withStyle:style];
+ stringDrawingState_ = NULL;
+ return image;
}
-MSInstanceMessage0(CGImageRef, SBIconLabel, buildLabelImage) {
- bool docked((MSHookIvar(self, "_inDock") & 0x2) != 0);
+static bool wb$inDock(id parameters) {
+ return [$objc_getAssociatedObject(parameters, @selector(wb$inDock)) boolValue];
+}
- WBStringDrawingState labelState = {NULL, 0, [NSString stringWithFormat:@""
- "color: %@;"
- ,
- (docked || !SummerBoard_ ? @"white" : @"#b3b3b3")
- ], docked ? @"DockedIconLabelStyle" : @"UndockedIconLabelStyle"};
+MSInstanceMessage0(NSUInteger, SBIconLabelImageParameters, hash) {
+ return MSOldCall() + (wb$inDock(self) ? 0xdeadbeef : 0xd15ea5e);
+}
+
+MSClassMessage2(id, SBIconView, _labelImageParametersForIcon,location, id, icon, int, location) {
+ if (id parameters = MSOldCall(icon, location)) {
+ $objc_setAssociatedObject(parameters, @selector(wb$inDock), [NSNumber numberWithBool:(location == 1)], OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+ return parameters;
+ } return nil;
+}
+
+MSClassMessage1(UIImage *, SBIconLabelImage, _drawLabelImageForParameters, id, parameters) {
+ bool docked(wb$inDock(parameters));
+
+ WBStringDrawingState labelState = {NULL, 0, @""
+ , docked ? @"DockedIconLabelStyle" : @"UndockedIconLabelStyle"};
stringDrawingState_ = &labelState;
- CGImageRef image(MSOldCall());
+ //NSLog(@"XXX: +");
+ UIImage *image(MSOldCall(parameters));
+ //NSLog(@"XXX: -");
stringDrawingState_ = NULL;
return image;
@@ -1683,66 +1889,55 @@ MSInstanceMessageHook0(void, CKTranscriptController, loadView) {
}
// }}}
+template
+static UIImage *WBCacheUIImage(const Original_ &original, NSString *name, NSString *key) {
+ if ([name rangeOfString:@"."].location == NSNotFound)
+ 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;
+}
+
// %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);
-
- 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;
-
- image = __UIImageWithName(name);
-
- if (UIDebug_) {
- NSString *path([@"/tmp/UIImages/" stringByAppendingString:name]);
- if (![Manager_ fileExistsAtPath:path])
- [UIImagePNGRepresentation(image) writeToFile:path atomically:YES];
- }
-
- return image;
- }
+ NSLog(@"WB:Debug: _UIImageWithName(\"%@\")", name);
+ return WBCacheUIImage(
+ [=](){ return __UIImageWithName(name); },
+ name, [NSString stringWithFormat:@"I:%@", name]);
}
// }}}
// %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;
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: _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]);
+}
+// }}}
+// %hook _UIImageWithDeviceUsingCurrentIdiom() {{{
+MSHook(UIImage *, _UIImageWithNameUsingCurrentIdiom, NSString *name) {
+ if (Debug_)
+ NSLog(@"WB:Debug: _UIImageWithNameUsingCurrentIdiom(\"%@\")", name);
+ return WBCacheUIImage(
+ [=](){ return __UIImageWithNameUsingCurrentIdiom(name); },
+ name, [NSString stringWithFormat:@"I:%@", name]);
+}
+// }}}
+// %hook _UIImageWithDeviceSpecificName() {{{
+MSHook(UIImage *, _UIImageWithDeviceSpecificName, NSString *name) {
+ if (Debug_)
+ NSLog(@"WB:Debug: _UIImageWithDeviceSpecificName(\"%@\")", name);
+ return WBCacheUIImage(
+ [=](){ return __UIImageWithDeviceSpecificName(name); },
+ name, [NSString stringWithFormat:@"S:%@", name]);
}
// }}}
@@ -1759,16 +1954,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];
@@ -1778,7 +1967,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;
}
}
}
@@ -1786,6 +1975,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,
@@ -1810,22 +2009,51 @@ static void ChangeWallpaper(
}
+MSHook(NSArray *, CPBitmapCreateImagesFromPath, NSString *path, NSDictionary **names, void *arg2, void *arg3) {
+ NSArray *images(_CPBitmapCreateImagesFromPath(path, names, arg2, arg3));
+ if (images != NULL && *names != nil && CFGetTypeID((CFTypeRef) *names) == CFDictionaryGetTypeID()) {
+ if (NSBundle *bundle = [NSBundle wb$bundleWithFile:path]) {
+ NSMutableArray *copy([images mutableCopy]);
+ [images release];
+ images = copy;
+
+ NSString *file([path stringByResolvingSymlinksInPath]);
+ NSString *prefix([[bundle bundlePath] stringByResolvingSymlinksInPath]);
+ if ([file hasPrefix:prefix]) {
+ NSUInteger length([prefix length]);
+ if (length != [file length]) {
+ NSEnumerator *enumerator([*names keyEnumerator]);
+ while (NSString *name = [enumerator nextObject]) {
+ NSString *png([name stringByAppendingString:@".png"]);
+ if (NSString *themed = $pathForFile$inBundle$(png, bundle, false, true)) {
+ NSUInteger index([[*names objectForKey:name] intValue]);
+ UIImage *image($getImage$(themed));
+ CGImageRef cg([image CGImage]);
+ [copy replaceObjectAtIndex:index withObject:(id)cg];
+ }
+ }
+ }
+ }
+ }
+ } return images;
+}
+
+MSHook(void, BKSDisplayServicesSetSystemAppExitedImagePath, NSString *path) {
+ if (NSString *themed = $getTheme$($useScale$([NSArray arrayWithObject:@"SystemAppExited.png"])))
+ path = themed;
+ _BKSDisplayServicesSetSystemAppExitedImagePath(path);
+}
+
#define WBRename(name, sel, imp) \
- _ ## name ## $ ## imp = MSHookMessage($ ## name, @selector(sel), &$ ## name ## $ ## imp)
+ MSHookMessage($ ## name, @selector(sel), &$ ## name ## $ ## imp, &_ ## name ## $ ## imp)
template
static void msset(Type_ &function, MSImageRef image, const char *name) {
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) {
@@ -1841,33 +2069,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 void NSString$drawInRect$withStyle$(NSString *self, SEL _cmd, CGRect rect, NSString *style) {
WKSetCurrentGraphicsContext(UIGraphicsGetCurrentContext());
if (style == nil || [style length] == 0)
style = @"font-family: Helvetica; font-size: 12px";
+ //NSLog(@"XXX:drawR(%@ | %@)", self, [style stringByReplacingOccurrencesOfString:@"\n" withString:@" "]);
return [[WBMarkup sharedMarkup] drawString:self inRect:rect withStyle:style];
}
-static CGSize NSString$sizeWithStyle$forWidth$(NSString *self, SEL _cmd, NSString *style, float width) {
+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";
- return [[WBMarkup sharedMarkup] sizeOfString:self withStyle:style forWidth:width];
+ CGSize size([[WBMarkup sharedMarkup] sizeOfString:self withStyle:style forWidth:width]);
+ //NSLog(@"XXX:size(%@ | %@) = [%g %g]", self, [style stringByReplacingOccurrencesOfString:@"\n" withString:@" "], size.width, size.height);
+ return size;
}
static void SBInitialize() {
- class_addMethod($NSString, @selector(drawAtPoint:withStyle:), (IMP) &NSString$drawAtPoint$withStyle$, "v20@0:4{CGPoint=ff}8@16");
- class_addMethod($NSString, @selector(drawInRect:withStyle:), (IMP) &NSString$drawInRect$withStyle$, "v28@0:4{CGRect={CGSize=ff}{CGSize=ff}}8@24");
- class_addMethod($NSString, @selector(sizeWithStyle:forWidth:), (IMP) &NSString$sizeWithStyle$forWidth$, "{CGSize=ff}16@0:4@8f12");
-
if (SummerBoard_) {
WBRename(SBApplication, pathForIcon, pathForIcon);
WBRename(SBApplicationIcon, icon, icon);
@@ -1885,14 +2133,20 @@ static void SBInitialize() {
WBRename(SBDockIconListView, setFrame:, setFrame$);
MSHookMessage(object_getClass($SBDockIconListView), @selector(shouldShowNewDock), &$SBDockIconListView$shouldShowNewDock, &_SBDockIconListView$shouldShowNewDock);
- if (kCFCoreFoundationVersionNumber < 600)
+ if (kCFCoreFoundationVersionNumber < 600 || SummerBoard_)
WBRename(SBIconLabel, drawRect:, drawRect$);
- else
+ else if (kCFCoreFoundationVersionNumber < 700) {
WBRename(SBIconLabel, buildLabelImage, buildLabelImage);
+ } else {
+ WBRename(SBIconLabelImageParameters, hash, hash);
+ WBRename($SBIconView, _labelImageParametersForIcon:location:, _labelImageParametersForIcon$location$);
+ WBRename($SBIconLabelImage, _drawLabelImageForParameters:, _drawLabelImageForParameters$);
+ }
WBRename(SBIconLabel, initWithSize:label:, initWithSize$label$);
WBRename(SBIconLabel, setInDock:, setInDock$);
+ WBRename(SBIconList, didMoveToSuperview, didMoveToSuperview);
WBRename(SBIconList, setFrame:, setFrame$);
WBRename(SBIconModel, cacheImageForIcon:, cacheImageForIcon$);
@@ -1900,13 +2154,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$);
@@ -1920,7 +2179,30 @@ static void SBInitialize() {
English_ = [[NSDictionary alloc] initWithContentsOfFile:@"/System/Library/CoreServices/SpringBoard.app/English.lproj/LocalizedApplicationNames.strings"];
}
+/*MSHook(int, open, const char *path, int oflag, mode_t mode) {
+ int fd(_open(path, oflag, mode));
+
+ static bool no(false);
+ if (no) return fd;
+ no = true;
+
+ if (strstr(path, "/icon") != NULL)
+ MSHookProcess(-1, "");
+
+ if (fd == -1 && errno == EFAULT)
+ NSLog(@"open(%p, %#x, %#o) = %d\n", path, oflag, mode, fd);
+ else
+ NSLog(@"open(\"%s\", %#x, %#o) = %d\n", path, oflag, mode, fd);
+
+ no = false;
+ return fd;
+}*/
+
MSInitialize {
+ $objc_setAssociatedObject = reinterpret_cast(dlsym(RTLD_DEFAULT, "objc_setAssociatedObject"));
+ $objc_getAssociatedObject = reinterpret_cast(dlsym(RTLD_DEFAULT, "objc_getAssociatedObject"));
+ $objc_removeAssociatedObjects = reinterpret_cast(dlsym(RTLD_DEFAULT, "objc_removeAssociatedObjects"));
+
NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]);
NSString *identifier([[NSBundle mainBundle] bundleIdentifier]);
@@ -1935,6 +2217,9 @@ MSInitialize {
if (NSDictionary *settings = [NSDictionary dictionaryWithContentsOfFile:[NSString stringWithFormat:@"/User/Library/Preferences/com.saurik.WinterBoard.plist"]]) {
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"])
@@ -1958,10 +2243,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]; \
@@ -1986,10 +2269,29 @@ MSInitialize {
[Info_ setObject:[info objectForKey:key] forKey:key];
// }}}
+ // AppSupport {{{
+ if (MSImageRef image = MSGetImageByName("/System/Library/PrivateFrameworks/AppSupport.framework/AppSupport")) {
+ NSArray *(*CPBitmapCreateImagesFromPath)(NSString *, NSDictionary **, void *, void *);
+ msset(CPBitmapCreateImagesFromPath, image, "_CPBitmapCreateImagesFromPath");
+ MSHookFunction(CPBitmapCreateImagesFromPath, MSHake(CPBitmapCreateImagesFromPath));
+ }
+ // }}}
// AudioToolbox {{{
if (MSImageRef image = MSGetImageByName(AudioToolbox)) {
+ bool (*_Z24GetFileNameForThisActionmPcRb)(unsigned long, char *, bool &);
msset(_Z24GetFileNameForThisActionmPcRb, image, "__Z24GetFileNameForThisActionmPcRb");
MSHookFunction(_Z24GetFileNameForThisActionmPcRb, &$_Z24GetFileNameForThisActionmPcRb, &__Z24GetFileNameForThisActionmPcRb);
+
+ bool (*_Z24GetFileNameForThisActionmPcmRb)(unsigned long, char *, unsigned long, bool &);
+ msset(_Z24GetFileNameForThisActionmPcmRb, image, "__Z24GetFileNameForThisActionmPcmRb");
+ MSHookFunction(_Z24GetFileNameForThisActionmPcmRb, &$_Z24GetFileNameForThisActionmPcmRb, &__Z24GetFileNameForThisActionmPcmRb);
+ }
+ // }}}
+ // BackBoardServices {{{
+ if (MSImageRef image = MSGetImageByName("/System/Library/PrivateFrameworks/BackBoardServices.framework/BackBoardServices")) {
+ void (*BKSDisplayServicesSetSystemAppExitedImagePath)(NSString *path);
+ msset(BKSDisplayServicesSetSystemAppExitedImagePath, image, "_BKSDisplayServicesSetSystemAppExitedImagePath");
+ MSHookFunction(BKSDisplayServicesSetSystemAppExitedImagePath, MSHake(BKSDisplayServicesSetSystemAppExitedImagePath));
}
// }}}
// GraphicsServices {{{
@@ -1998,10 +2300,27 @@ 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 {{{
@@ -2012,7 +2331,7 @@ MSInitialize {
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) {
@@ -2028,28 +2347,39 @@ 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);
+ WBHookSymbol(image, _UIPackedImageTableGetIdentifierForName);
+ WBHookSymbol(image, _UISharedImageNameGetIdentifier);
+
+ 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));
+
+ WBHookSymbol(image, _UIImageWithDeviceSpecificName);
+ MSHookFunction(_UIImageWithDeviceSpecificName, MSHake(_UIImageWithDeviceSpecificName));
}
// }}}
+ //MSHookFunction(reinterpret_cast(&open), MSHake(open));
+
if (UIDebug_ && ![Manager_ fileExistsAtPath:@"/tmp/UIImages"]) {
NSError *error(nil);
if (![Manager_ createDirectoryAtPath:@"/tmp/UIImages" withIntermediateDirectories:NO attributes:[NSDictionary dictionaryWithObjectsAndKeys: