* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#define _trace() NSLog(@"WB:_trace(%u)", __LINE__);
+#include <sys/time.h>
+
+struct timeval _ltv;
+bool _itv;
+
+#define _trace() do { \
+ struct timeval _ctv; \
+ gettimeofday(&_ctv, NULL); \
+ if (!_itv) { \
+ _itv = true; \
+ _ltv = _ctv; \
+ } \
+ fprintf(stderr, "%lu.%.6u[%f]:_trace()@%s:%u[%s]\n", \
+ _ctv.tv_sec, _ctv.tv_usec, \
+ (_ctv.tv_sec - _ltv.tv_sec) + (_ctv.tv_usec - _ltv.tv_usec) / 1000000.0, \
+ __FILE__, __LINE__, __FUNCTION__\
+ ); \
+ _ltv = _ctv; \
+} while (false)
+
#define _transient
#import <CoreFoundation/CoreFoundation.h>
#import <SpringBoard/SBBookmarkIcon.h>
#import <SpringBoard/SBButtonBar.h>
#import <SpringBoard/SBCalendarIconContentsView.h>
-#import <SpringBoard/SBContentLayer.h>
#import <SpringBoard/SBIconController.h>
#import <SpringBoard/SBIconLabel.h>
#import <SpringBoard/SBIconList.h>
#import <SpringBoard/SBIconModel.h>
+#import <SpringBoard/SBImageCache.h>
#import <SpringBoard/SBStatusBarContentsView.h>
#import <SpringBoard/SBStatusBarController.h>
#import <SpringBoard/SBStatusBarOperatorNameView.h>
Class $SBBookmarkIcon;
Class $SBButtonBar;
Class $SBCalendarIconContentsView;
-Class $SBContentLayer;
+Class $SBIcon;
Class $SBIconBadge;
Class $SBIconController;
Class $SBIconLabel;
Class $SBIconList;
Class $SBIconModel;
+//Class $SBImageCache;
Class $SBStatusBarContentsView;
Class $SBStatusBarController;
Class $SBStatusBarOperatorNameView;
Class $SBStatusBarTimeView;
+Class $SBUIController;
Class $SBWidgetApplicationIcon;
@interface NSDictionary (WinterBoard)
static CGImageRef (*_UIImageRefAtPath)(NSString *name, bool cache, UIImageOrientation *orientation);
static UIImage *(*_UIImageWithNameInDomain)(NSString *name, NSString *domain);
static NSBundle *(*_UIKitBundle)();
-static void (*_UISharedImageInitialize)(bool);
static int (*_UISharedImageNameGetIdentifier)(NSString *);
static UIImage *(*_UISharedImageWithIdentifier)(int);
path = [path stringByDeletingLastPathComponent];
if (path == nil || [path length] == 0 || [path isEqualToString:@"/"])
return nil;
+ return [NSBundle mainBundle];
NSBundle *bundle([Bundles_ objectForKey:path]);
if (reinterpret_cast<id>(bundle) == [NSNull null])
bundle = [NSBundle wb$bundleWithFile:path];
if (Debug_)
NSLog(@"WB:Debug:PathBundle(%@, %@)", path, bundle);
- [Bundles_ setObject:(bundle == nil ? [NSNull null] : reinterpret_cast<id>(bundle)) forKey:path];
+ //[Bundles_ setObject:(bundle == nil ? [NSNull null] : reinterpret_cast<id>(bundle)) forKey:path];
}
return bundle;
NSLog(@"WB:Debug:Bypass(\"%@\")", self);
if (NSBundle *bundle = [NSBundle wb$bundleWithFile:self]) {
+ return self;
NSString *file([self stringByResolvingSymlinksInPath]);
NSString *prefix([[bundle bundlePath] stringByResolvingSymlinksInPath]);
if ([file hasPrefix:prefix]) {
@end
-MSHook(void, SBIconModel$cacheImageForIcon$, SBIconModel *self, SEL sel, SBIcon *icon) {
- _SBIconModel$cacheImageForIcon$(self, sel, icon);
- NSString *key([icon displayIdentifier]);
+UIImage *$cacheForImage$(UIImage *image) {
+ CGColorSpaceRef space(CGColorSpaceCreateDeviceRGB());
+ CGRect rect = {CGPointMake(1, 1), [image size]};
+ CGSize size = {rect.size.width + 2, rect.size.height + 2};
- if (UIImage *image = [icon icon]) {
- CGColorSpaceRef space(CGColorSpaceCreateDeviceRGB());
- CGRect rect = {CGPointMake(1, 1), [image size]};
- CGSize size = {rect.size.width + 2, rect.size.height + 2};
+ CGContextRef context(CGBitmapContextCreate(NULL, size.width, size.height, 8, 4 * size.width, space, kCGBitmapByteOrder32Little | kCGImageAlphaPremultipliedFirst));
+ CGColorSpaceRelease(space);
- CGContextRef context(CGBitmapContextCreate(NULL, size.width, size.height, 8, 4 * size.width, space, kCGBitmapByteOrder32Little | kCGImageAlphaPremultipliedFirst));
- CGColorSpaceRelease(space);
+ CGContextDrawImage(context, rect, [image CGImage]);
+ CGImageRef ref(CGBitmapContextCreateImage(context));
+ CGContextRelease(context);
- CGContextDrawImage(context, rect, [image CGImage]);
- CGImageRef ref(CGBitmapContextCreateImage(context));
- CGContextRelease(context);
+ UIImage *cache([UIImage imageWithCGImage:ref]);
+ CGImageRelease(ref);
- UIImage *image([UIImage imageWithCGImage:ref]);
- CGImageRelease(ref);
+ return cache;
+}
- [Cache_ setObject:image forKey:key];
+/*MSHook(id, SBImageCache$initWithName$forImageWidth$imageHeight$initialCapacity$, SBImageCache *self, SEL sel, NSString *name, unsigned width, unsigned height, unsigned capacity) {
+ //if ([name isEqualToString:@"icons"]) return nil;
+ return _SBImageCache$initWithName$forImageWidth$imageHeight$initialCapacity$(self, sel, name, width, height, capacity);
+}*/
+
+MSHook(void, SBIconModel$cacheImageForIcon$, SBIconModel *self, SEL sel, SBIcon *icon) {
+ NSString *key([icon displayIdentifier]);
+
+ if (UIImage *image = [icon icon]) {
+ CGSize size = [image size];
+ if (size.width != 59 || size.height != 60) {
+ UIImage *cache($cacheForImage$(image));
+ [Cache_ setObject:cache forKey:key];
+ return;
+ }
}
+
+ _SBIconModel$cacheImageForIcon$(self, sel, icon);
}
MSHook(UIImage *, SBIconModel$getCachedImagedForIcon$, SBIconModel *self, SEL sel, SBIcon *icon) {
MSHook(CGImageRef, _UIImageRefAtPath, NSString *name, bool cache, UIImageOrientation *orientation) {
if (Debug_)
NSLog(@"WB:Debug: _UIImageRefAtPath(\"%@\", %s)", name, cache ? "true" : "false");
- return __UIImageRefAtPath([name wb$themedPath], cache, orientation);
+ return __UIImageRefAtPath(([name wb$themedPath], name), cache, orientation);
}
/*MSHook(UIImage *, _UIImageAtPath, NSString *name, NSBundle *bundle) {
}
/*static id UINavigationBarBackground$initWithFrame$withBarStyle$withTintColor$(UINavigationBarBackground<WinterBoard> *self, SEL sel, CGRect frame, int style, UIColor *tint) {
- _trace();
+_trace();
if (NSNumber *number = [Info_ objectForKey:@"NavigationBarStyle"])
style = [number intValue];
object = nil; \
} while (false)
-MSHook(id, SBContentLayer$initWithSize$, SBContentLayer *self, SEL sel, CGSize size) {
- self = _SBContentLayer$initWithSize$(self, sel, size);
+void DumpHierarchy(UIView *view, unsigned index = 0, unsigned indent = 0) {
+ NSLog(@"%*s|%2d:%s", indent * 3, "", index, class_getName([view class]));
+ index = 0;
+ for (UIView *child in [view subviews])
+ DumpHierarchy(child, index++, indent + 1);
+}
+
+MSHook(id, SBUIController$init, SBUIController *self, SEL sel) {
+ self = _SBUIController$init(self, sel);
if (self == nil)
return nil;
+ UIWindow *&_window(MSHookIvar<UIWindow *>(self, "_window"));
+ UIView *&_contentView(MSHookIvar<UIView *>(self, "_contentView"));
+
+ UIView *content([[[UIView alloc] initWithFrame:[_contentView frame]] autorelease]);
+ [content setBackgroundColor:[_contentView backgroundColor]];
+ [_contentView setBackgroundColor:[UIColor clearColor]];
+ [_contentView setFrame:[content bounds]];
+ [_window setContentView:content];
+
_release(WallpaperFile_);
_release(WallpaperImage_);
_release(WallpaperPage_);
AVQueue *queue([controller_ queue]);
- UIView *video([[[UIView alloc] initWithFrame:[self bounds]] autorelease]);
+ UIView *video([[[UIView alloc] initWithFrame:[_contentView bounds]] autorelease]);
[controller_ setLayer:[video _layer]];
AVItem *item([[[AVItem alloc] initWithPath:mp4 error:&error] autorelease]);
controller.movieControlMode = MPMovieControlModeHidden;
[controller play];
#else
- MPVideoView *video = [[[$MPVideoView alloc] initWithFrame:[self bounds]] autorelease];
+ MPVideoView *video = [[[$MPVideoView alloc] initWithFrame:[_contentView bounds]] autorelease];
[video setMovieWithPath:mp4];
[video setRepeatMode:1];
[video setRepeatGap:-1];
[video playFromBeginning];;
#endif
- [self addSubview:video];
+ [content addSubview:video];
}
NSString *png = [theme stringByAppendingPathComponent:@"Wallpaper.png"];
if (image != nil) {
WallpaperFile_ = [path retain];
WallpaperImage_ = [[UIImageView alloc] initWithImage:image];
- [self addSubview:WallpaperImage_];
+ [content addSubview:WallpaperImage_];
}
NSString *html = [theme stringByAppendingPathComponent:@"Wallpaper.html"];
if ([Manager_ fileExistsAtPath:html]) {
- CGRect bounds = [self bounds];
+ CGRect bounds = [content bounds];
UIWebDocumentView *view([[[UIWebDocumentView alloc] initWithFrame:bounds] autorelease]);
[view setAutoresizes:true];
[[view webView] setDrawsBackground:false];
[view setBackgroundColor:[UIColor clearColor]];
- [self addSubview:view];
+ [content addSubview:view];
}
}
NSString *theme = [themes_ objectAtIndex:(e - i - 1)];
NSString *html = [theme stringByAppendingPathComponent:@"Widget.html"];
if ([Manager_ fileExistsAtPath:html]) {
- CGRect bounds = [self bounds];
+ CGRect bounds = [content bounds];
UIWebDocumentView *view([[[UIWebDocumentView alloc] initWithFrame:bounds] autorelease]);
[view setAutoresizes:true];
[[view webView] setDrawsBackground:false];
[view setBackgroundColor:[UIColor clearColor]];
- [self addSubview:view];
+ [content addSubview:view];
}
}
+ [content addSubview:_contentView];
+ DumpHierarchy(_window);
+
return self;
}
@end
/* }}} */
+MSHook(void, SBIcon$setAlpha$, SBIcon *self, SEL sel, float alpha) {
+ if (NSNumber *number = [Info_ objectForKey:@"IconAlpha"])
+ alpha = [number floatValue];
+ return _SBIcon$setAlpha$(self, sel, alpha);
+}
+
MSHook(id, SBIconBadge$initWithBadge$, SBIconBadge *self, SEL sel, NSString *badge) {
if ((self = _SBIconBadge$initWithBadge$(self, sel, badge)) != nil) {
id &_badge(MSHookIvar<id>(self, "_badge"));
} return self;
}
-MSHook(void, SBStatusBarController$setStatusBarMode$orientation$duration$fenceID$animation$, SBStatusBarController *self, SEL sel, int mode, int orientation, float duration, int id, int animation) {
+void SBStatusBarController$setStatusBarMode(int &mode) {
if (Debug_)
NSLog(@"WB:Debug:setStatusBarMode:%d", mode);
if (mode < 100) // 104:hidden 105:glowing
if (NSNumber *number = [Info_ objectForKey:@"StatusBarMode"])
mode = [number intValue];
- return _SBStatusBarController$setStatusBarMode$orientation$duration$fenceID$animation$(self, sel, mode, orientation, duration, id, animation);
}
-MSHook(id, SBStatusBarContentsView$initWithStatusBar$mode$, SBStatusBarContentsView *self, SEL sel, id bar, int mode) {
+/*MSHook(void, SBStatusBarController$setStatusBarMode$orientation$duration$animation$, SBStatusBarController *self, SEL sel, int mode, int orientation, double duration, int animation) {
+ NSLog(@"mode:%d orientation:%d duration:%f animation:%d", mode, orientation, duration, animation);
+ SBStatusBarController$setStatusBarMode(mode);
+ return _SBStatusBarController$setStatusBarMode$orientation$duration$animation$(self, sel, mode, orientation, duration, animation);
+}*/
+
+MSHook(void, SBStatusBarController$setStatusBarMode$orientation$duration$fenceID$animation$, SBStatusBarController *self, SEL sel, int mode, int orientation, float duration, int fenceID, int animation) {
+ NSLog(@"mode:%d orientation:%d duration:%f fenceID:%d animation:%d", mode, orientation, duration, fenceID, animation);
+ SBStatusBarController$setStatusBarMode(mode);
+ return _SBStatusBarController$setStatusBarMode$orientation$duration$fenceID$animation$(self, sel, mode, orientation, duration, fenceID, animation);
+}
+
+MSHook(void, SBStatusBarController$setStatusBarMode$orientation$duration$fenceID$animation$startTime$, SBStatusBarController *self, SEL sel, int mode, int orientation, double duration, int fenceID, int animation, double startTime) {
+ NSLog(@"mode:%d orientation:%d duration:%f fenceID:%d animation:%d startTime:%f", mode, orientation, duration, fenceID, animation, startTime);
+ SBStatusBarController$setStatusBarMode(mode);
+ NSLog(@"mode=%u", mode);
+ return _SBStatusBarController$setStatusBarMode$orientation$duration$fenceID$animation$startTime$(self, sel, mode, orientation, duration, fenceID, animation, startTime);
+}
+
+/*MSHook(id, SBStatusBarContentsView$initWithStatusBar$mode$, SBStatusBarContentsView *self, SEL sel, id bar, int mode) {
if (NSNumber *number = [Info_ objectForKey:@"StatusBarContentsMode"])
mode = [number intValue];
return _SBStatusBarContentsView$initWithStatusBar$mode$(self, sel, bar, mode);
-}
+}*/
MSHook(NSString *, SBStatusBarOperatorNameView$operatorNameStyle, SBStatusBarOperatorNameView *self, SEL sel) {
NSString *style(_SBStatusBarOperatorNameView$operatorNameStyle(self, sel));
NSString *path = [NSString stringWithUTF8String:a1];
if ([path hasPrefix:@"/System/Library/Audio/UISounds/"]) {
NSString *file = [path substringFromIndex:31];
- NSLog(@"%@", file);
for (NSString *theme in themes_) {
NSString *path([NSString stringWithFormat:@"%@/UISounds/%@", theme, file]);
if ([Manager_ fileExistsAtPath:path]) {
NSLog(@"WB:Notice: WinterBoard");
- struct nlist nl[9];
+ struct nlist nl[8];
memset(nl, 0, sizeof(nl));
nl[0].n_un.n_name = (char *) "__UIApplicationImageWithName";
nl[2].n_un.n_name = (char *) "__UIImageRefAtPath";
nl[3].n_un.n_name = (char *) "__UIImageWithNameInDomain";
nl[4].n_un.n_name = (char *) "__UIKitBundle";
- nl[5].n_un.n_name = (char *) "__UISharedImageInitialize";
- nl[6].n_un.n_name = (char *) "__UISharedImageNameGetIdentifier";
- nl[7].n_un.n_name = (char *) "__UISharedImageWithIdentifier";
+ nl[5].n_un.n_name = (char *) "__UISharedImageNameGetIdentifier";
+ nl[6].n_un.n_name = (char *) "__UISharedImageWithIdentifier";
nlist(UIKit, nl);
_UIImageRefAtPath = (CGImageRef (*)(NSString *, bool, UIImageOrientation *)) nl[2].n_value;
_UIImageWithNameInDomain = (UIImage *(*)(NSString *, NSString *)) nl[3].n_value;
_UIKitBundle = (NSBundle *(*)()) nl[4].n_value;
- _UISharedImageInitialize = (void (*)(bool)) nl[5].n_value;
- _UISharedImageNameGetIdentifier = (int (*)(NSString *)) nl[6].n_value;
- _UISharedImageWithIdentifier = (UIImage *(*)(int)) nl[7].n_value;
+ _UISharedImageNameGetIdentifier = (int (*)(NSString *)) nl[5].n_value;
+ _UISharedImageWithIdentifier = (UIImage *(*)(int)) nl[6].n_value;
MSHookFunction(_UIApplicationImageWithName, &$_UIApplicationImageWithName, &__UIApplicationImageWithName);
MSHookFunction(_UIImageRefAtPath, &$_UIImageRefAtPath, &__UIImageRefAtPath);
_UINavigationBar$setBarStyle$ = MSHookMessage($UINavigationBar, @selector(setBarStyle:), &$UINavigationBar$setBarStyle$);
_UIToolbar$setBarStyle$ = MSHookMessage($UIToolbar, @selector(setBarStyle:), &$UIToolbar$setBarStyle$);
- _UISharedImageInitialize(false);
-
Manager_ = [[NSFileManager defaultManager] retain];
UIImages_ = [[NSMutableDictionary alloc] initWithCapacity:16];
PathImages_ = [[NSMutableDictionary alloc] initWithCapacity:16];
Info_ = [[NSMutableDictionary dictionaryWithCapacity:16] retain];
for (NSString *theme in themes_)
- if (NSDictionary *info = [[NSDictionary alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/Info.plist", theme]])
+ if (NSDictionary *info = [[NSDictionary alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/Info.plist", theme]]) {
+ [info autorelease];
for (NSString *key in [info allKeys])
if ([Info_ objectForKey:key] == nil)
[Info_ setObject:[info objectForKey:key] forKey:key];
+ }
if ([identifier isEqualToString:@"com.apple.MobileSMS"]) {
Class mSMSMessageTranscriptController = objc_getClass("mSMSMessageTranscriptController");
$SBBookmarkIcon = objc_getClass("SBBookmarkIcon");
$SBButtonBar = objc_getClass("SBButtonBar");
$SBCalendarIconContentsView = objc_getClass("SBCalendarIconContentsView");
- $SBContentLayer = objc_getClass("SBContentLayer");
+ $SBIcon = objc_getClass("SBIcon");
$SBIconBadge = objc_getClass("SBIconBadge");
$SBIconController = objc_getClass("SBIconController");
$SBIconLabel = objc_getClass("SBIconLabel");
$SBIconList = objc_getClass("SBIconList");
$SBIconModel = objc_getClass("SBIconModel");
+ //$SBImageCache = objc_getClass("SBImageCache");
$SBStatusBarContentsView = objc_getClass("SBStatusBarContentsView");
$SBStatusBarController = objc_getClass("SBStatusBarController");
$SBStatusBarOperatorNameView = objc_getClass("SBStatusBarOperatorNameView");
$SBStatusBarTimeView = objc_getClass("SBStatusBarTimeView");
+ $SBUIController = objc_getClass("SBUIController");
$SBWidgetApplicationIcon = objc_getClass("SBWidgetApplicationIcon");
WBRename(WebCoreFrameBridge, renderedSizeOfNode:constrainedToWidth:, renderedSizeOfNode$constrainedToWidth$);
WBRename(SBBookmarkIcon, icon, icon);
WBRename(SBButtonBar, didMoveToSuperview, didMoveToSuperview);
WBRename(SBCalendarIconContentsView, drawRect:, drawRect$);
- WBRename(SBContentLayer, initWithSize:, initWithSize$);
+ WBRename(SBIcon, setAlpha:, setAlpha$);
WBRename(SBIconBadge, initWithBadge:, initWithBadge$);
WBRename(SBIconController, noteNumberOfIconListsChanged, noteNumberOfIconListsChanged);
+ WBRename(SBUIController, init, init);
WBRename(SBWidgetApplicationIcon, icon, icon);
WBRename(SBIconLabel, drawRect:, drawRect$);
WBRename(SBIconModel, cacheImageForIcon:, cacheImageForIcon$);
WBRename(SBIconModel, getCachedImagedForIcon:, getCachedImagedForIcon$);
+ //WBRename(SBImageCache, initWithName:forImageWidth:imageHeight:initialCapacity:, initWithName$forImageWidth$imageHeight$initialCapacity$);
+
WBRename(SBAwayView, updateDesktopImage:, updateDesktopImage$);
WBRename(SBStatusBarContentsView, didMoveToSuperview, didMoveToSuperview);
- WBRename(SBStatusBarContentsView, initWithStatusBar:mode:, initWithStatusBar$mode$);
+ //WBRename(SBStatusBarContentsView, initWithStatusBar:mode:, initWithStatusBar$mode$);
+ //WBRename(SBStatusBarController, setStatusBarMode:orientation:duration:animation:, setStatusBarMode$orientation$duration$animation$);
WBRename(SBStatusBarController, setStatusBarMode:orientation:duration:fenceID:animation:, setStatusBarMode$orientation$duration$fenceID$animation$);
+ WBRename(SBStatusBarController, setStatusBarMode:orientation:duration:fenceID:animation:startTime:, setStatusBarMode$orientation$duration$fenceID$animation$startTime$);
WBRename(SBStatusBarOperatorNameView, operatorNameStyle, operatorNameStyle);
WBRename(SBStatusBarOperatorNameView, setOperatorName:fullSize:, setOperatorName$fullSize$);
WBRename(SBStatusBarTimeView, drawRect:, drawRect$);
English_ = [[NSDictionary alloc] initWithContentsOfFile:@"/System/Library/CoreServices/SpringBoard.app/English.lproj/LocalizedApplicationNames.strings"];
- if (English_ != nil)
- English_ = [English_ retain];
-
Cache_ = [[NSMutableDictionary alloc] initWithCapacity:64];
}
projects / winterboard.git / blobdiff