#import <SpringBoard/SBIconList.h>
#import <SpringBoard/SBIconModel.h>
#import <SpringBoard/SBImageCache.h>
+// XXX: #import <SpringBoard/SBSearchView.h>
+#import <SpringBoard/SBSearchTableViewCell.h>
#import <SpringBoard/SBStatusBarContentsView.h>
#import <SpringBoard/SBStatusBarController.h>
#import <SpringBoard/SBStatusBarOperatorNameView.h>
Class $SBIconList;
Class $SBIconModel;
//Class $SBImageCache;
+Class $SBSearchView;
+Class $SBSearchTableViewCell;
Class $SBStatusBarContentsView;
Class $SBStatusBarController;
Class $SBStatusBarOperatorNameView;
Class $SBWidgetApplicationIcon;
@interface NSDictionary (WinterBoard)
-- (UIColor *) colorForKey:(NSString *)key;
-- (BOOL) boolForKey:(NSString *)key;
+- (UIColor *) wb$colorForKey:(NSString *)key;
+- (BOOL) wb$boolForKey:(NSString *)key;
@end
@implementation NSDictionary (WinterBoard)
-- (UIColor *) colorForKey:(NSString *)key {
+- (UIColor *) wb$colorForKey:(NSString *)key {
NSString *value = [self objectForKey:key];
if (value == nil)
return nil;
return nil;
}
-- (BOOL) boolForKey:(NSString *)key {
+- (BOOL) wb$boolForKey:(NSString *)key {
if (NSString *value = [self objectForKey:key])
return [value boolValue];
return false;
@end
+static BOOL (*_GSFontGetUseLegacyFontMetrics)();
+#define $GSFontGetUseLegacyFontMetrics() \
+ (_GSFontGetUseLegacyFontMetrics == NULL ? YES : _GSFontGetUseLegacyFontMetrics())
+
bool Debug_ = false;
bool Engineer_ = false;
@end
+void WBLogRect(const char *tag, struct CGRect rect) {
+ NSLog(@"%s:{%f,%f+%f,%f}", tag, rect.origin.x, rect.origin.y, rect.size.width, rect.size.height);
+}
+
+void WBLogHierarchy(UIView *view, unsigned index = 0, unsigned indent = 0) {
+ CGRect frame([view frame]);
+ NSLog(@"%*s|%2d:%s : {%f,%f+%f,%f} (%@)", indent * 3, "", index, class_getName([view class]), frame.origin.x, frame.origin.y, frame.size.width, frame.size.height, [view backgroundColor]);
+ index = 0;
+ for (UIView *child in [view subviews])
+ WBLogHierarchy(child, index++, indent + 1);
+}
+
UIImage *$cacheForImage$(UIImage *image) {
CGColorSpaceRef space(CGColorSpaceCreateDeviceRGB());
CGRect rect = {CGPointMake(1, 1), [image size]};
_SBIconModel$cacheImageForIcon$(self, sel, icon);
}
+MSHook(void, SBIconModel$cacheImagesForIcon$, SBIconModel *self, SEL sel, SBIcon *icon) {
+ /* XXX: do I /really/ have to do this? figure out how to cache the small icon! */
+ _SBIconModel$cacheImagesForIcon$(self, sel, 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;
+ }
+ }
+}
+
MSHook(UIImage *, SBIconModel$getCachedImagedForIcon$, SBIconModel *self, SEL sel, SBIcon *icon) {
NSString *key([icon displayIdentifier]);
if (UIImage *image = [Cache_ objectForKey:key])
return _SBIconModel$getCachedImagedForIcon$(self, sel, icon);
}
+MSHook(UIImage *, SBIconModel$getCachedImagedForIcon$smallIcon$, SBIconModel *self, SEL sel, SBIcon *icon, BOOL small) {
+ if (small)
+ return _SBIconModel$getCachedImagedForIcon$smallIcon$(self, sel, icon, small);
+ NSString *key([icon displayIdentifier]);
+ if (UIImage *image = [Cache_ objectForKey:key])
+ return image;
+ else
+ return _SBIconModel$getCachedImagedForIcon$smallIcon$(self, sel, icon, small);
+}
+
+MSHook(id, SBSearchView$initWithFrame$, id /* XXX: SBSearchView */ self, SEL sel, struct CGRect frame) {
+ if ((self = _SBSearchView$initWithFrame$(self, sel, frame)) != nil) {
+ [self setBackgroundColor:[UIColor clearColor]];
+ for (UIView *child in [self subviews])
+ [child setBackgroundColor:[UIColor clearColor]];
+ } return self;
+}
+
+MSHook(id, SBSearchTableViewCell$initWithStyle$reuseIdentifier$, SBSearchTableViewCell *self, SEL sel, int style, NSString *reuse) {
+ if ((self = _SBSearchTableViewCell$initWithStyle$reuseIdentifier$(self, sel, style, reuse)) != nil) {
+ [self setBackgroundColor:[UIColor clearColor]];
+ } return self;
+}
+
+MSHook(void, SBSearchTableViewCell$drawRect$, SBSearchTableViewCell *self, SEL sel, struct CGRect rect, BOOL selected) {
+ _SBSearchTableViewCell$drawRect$(self, sel, rect, selected);
+ float inset([self edgeInset]);
+ [[UIColor clearColor] set];
+ UIRectFill(CGRectMake(0, 0, inset, rect.size.height));
+ UIRectFill(CGRectMake(rect.size.width - inset, 0, inset, rect.size.height));
+}
+
MSHook(UIImage *, SBApplicationIcon$icon, SBApplicationIcon *self, SEL sel) {
- if (![Info_ boolForKey:@"ComposeStoreIcons"])
+ if (![Info_ wb$boolForKey:@"ComposeStoreIcons"])
if (NSString *path = $pathForIcon$([self application]))
return [UIImage imageWithContentsOfFile:path];
return _SBApplicationIcon$icon(self, sel);
CGSize datesize = [(NSString *)date sizeWithStyle:datestyle forWidth:(width + leeway)];
CGSize daysize = [(NSString *)day sizeWithStyle:daystyle forWidth:(width + leeway)];
+ unsigned base($GSFontGetUseLegacyFontMetrics() ? 71 : 70);
+
[(NSString *)date drawAtPoint:CGPointMake(
- (width + 1 - datesize.width) / 2, (71 - datesize.height) / 2
+ (width + 1 - datesize.width) / 2, (base - datesize.height) / 2
) withStyle:datestyle];
[(NSString *)day drawAtPoint:CGPointMake(
if (NSNumber *number = [Info_ objectForKey:@"NavigationBarStyle"])
style = [number intValue];
- if (UIColor *color = [Info_ colorForKey:@"NavigationBarTint"])
+ if (UIColor *color = [Info_ wb$colorForKey:@"NavigationBarTint"])
tint = color;
return [self wb$initWithFrame:frame withBarStyle:style withTintColor:tint];
object = nil; \
} while (false)
-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)
if (image != nil) {
WallpaperFile_ = [path retain];
WallpaperImage_ = [[UIImageView alloc] initWithImage:image];
+ if (NSNumber *number = [Info_ objectForKey:@"WallpaperAlpha"])
+ [WallpaperImage_ setAlpha:[number floatValue]];
[content addSubview:WallpaperImage_];
}
[WallpaperPage_ loadRequest:[NSURLRequest requestWithURL:WallpaperURL_]];
- [[view webView] setDrawsBackground:false];
[view setBackgroundColor:[UIColor clearColor]];
+ if ([view respondsToSelector:@selector(setDrawsBackground:)])
+ [view setDrawsBackground:NO];
+ [[view webView] setDrawsBackground:NO];
[content addSubview:view];
}
NSURL *url = [NSURL fileURLWithPath:html];
[view loadRequest:[NSURLRequest requestWithURL:url]];
- [[view webView] setDrawsBackground:false];
[view setBackgroundColor:[UIColor clearColor]];
+ if ([view respondsToSelector:@selector(setDrawsBackground:)])
+ [view setDrawsBackground:NO];
+ [[view webView] setDrawsBackground:NO];
[content addSubview:view];
}
}
[content addSubview:layer];
- DumpHierarchy(_window);
+ WBLogHierarchy(_window);
return self;
}
}
UIImage *image([UIImage imageWithContentsOfFile:path]);
+
+ CGRect frame([view frame]);
+ frame.size = [image size];
+ [view setFrame:frame];
+
[view setImage:image];
[view wb$updateFrame];
}
MSHook(void, SBIconLabel$setInDock$, SBIconLabel *self, SEL sel, BOOL docked) {
id &_label(MSHookIvar<id>(self, "_label"));
- if (![Info_ boolForKey:@"UndockedIconLabels"])
+ if (![Info_ wb$boolForKey:@"UndockedIconLabels"])
docked = true;
if (_label != nil && [_label respondsToSelector:@selector(setInDock:)])
[_label setInDock:docked];
MSHook(UIImage *, _UIImageWithName, NSString *name) {
int id(_UISharedImageNameGetIdentifier(name));
if (Debug_)
- NSLog(@"WB:Debug: _UIImageWithName(\"%@\", %d)", name, id);
+ NSLog(@"WB:Debug: _UIImageWithName(\"%@\": %d)", name, id);
if (id == -1)
return _UIImageAtPath(name, _UIKitBundle());
}
MSHook(GSFontRef, GSFontCreateWithName, const char *name, GSFontSymbolicTraits traits, float size) {
+ if (Debug_)
+ NSLog(@"WB:Debug: GSFontCreateWithName(\"%s\", %f)", name, size);
if (NSString *font = [Info_ objectForKey:[NSString stringWithFormat:@"FontName-%s", name]])
name = [font UTF8String];
return _GSFontCreateWithName(name, traits, size);
bool (*_Z24GetFileNameForThisActionmPcRb)(unsigned long a0, char *a1, bool &a2);
MSHook(bool, _Z24GetFileNameForThisActionmPcRb, unsigned long a0, char *a1, bool &a2) {
+ if (Debug_)
+ NSLog(@"WB:Debug:GetFileNameForThisAction(%u, %p, %u)", a0, a1, a2);
bool value = __Z24GetFileNameForThisActionmPcRb(a0, a1, a2);
if (Debug_)
NSLog(@"WB:Debug:GetFileNameForThisAction(%u, %s, %u) = %u", a0, value ? a1 : NULL, a2, value);
#define WBRename(name, sel, imp) \
_ ## name ## $ ## imp = MSHookMessage($ ## name, @selector(sel), &$ ## name ## $ ## imp)
+template <typename Type_>
+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<Type_>(value);
+}
+
+template <typename Type_>
+static void dlset(Type_ &function, const char *name) {
+ _GSFontGetUseLegacyFontMetrics = reinterpret_cast<Type_>(dlsym(RTLD_DEFAULT, name));
+}
+
extern "C" void WBInitialize() {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
NSLog(@"WB:Notice: WinterBoard");
+ dlset(_GSFontGetUseLegacyFontMetrics, "GSFontGetUseLegacyFontMetrics");
+
struct nlist nl[8];
- memset(nl, 0, sizeof(nl));
+ memset(nl, 0, sizeof(nl));
nl[0].n_un.n_name = (char *) "__UIApplicationImageWithName";
nl[1].n_un.n_name = (char *) "__UIImageAtPath";
nl[2].n_un.n_name = (char *) "__UIImageRefAtPath";
nl[4].n_un.n_name = (char *) "__UIKitBundle";
nl[5].n_un.n_name = (char *) "__UISharedImageNameGetIdentifier";
nl[6].n_un.n_name = (char *) "__UISharedImageWithIdentifier";
-
nlist(UIKit, nl);
- _UIApplicationImageWithName = (UIImage *(*)(NSString *)) nl[0].n_value;
- _UIImageAtPath = (UIImage *(*)(NSString *, NSBundle *)) nl[1].n_value;
- _UIImageRefAtPath = (CGImageRef (*)(NSString *, bool, UIImageOrientation *)) nl[2].n_value;
- _UIImageWithNameInDomain = (UIImage *(*)(NSString *, NSString *)) nl[3].n_value;
- _UIKitBundle = (NSBundle *(*)()) nl[4].n_value;
- _UISharedImageNameGetIdentifier = (int (*)(NSString *)) nl[5].n_value;
- _UISharedImageWithIdentifier = (UIImage *(*)(int)) nl[6].n_value;
+ nlset(_UIApplicationImageWithName, nl, 0);
+ nlset(_UIImageAtPath, nl, 1);
+ nlset(_UIImageRefAtPath, nl, 2);
+ nlset(_UIImageWithNameInDomain, nl, 3);
+ nlset(_UIKitBundle, nl, 4);
+ nlset(_UISharedImageNameGetIdentifier, nl, 5);
+ nlset(_UISharedImageWithIdentifier, nl, 6);
MSHookFunction(_UIApplicationImageWithName, &$_UIApplicationImageWithName, &__UIApplicationImageWithName);
MSHookFunction(_UIImageRefAtPath, &$_UIImageRefAtPath, &__UIImageRefAtPath);
memset(nl, 0, sizeof(nl));
nl[0].n_un.n_name = (char *) "__Z24GetFileNameForThisActionmPcRb";
nlist(AudioToolbox, nl);
- _Z24GetFileNameForThisActionmPcRb = (bool (*)(unsigned long, char *, bool &)) nl[0].n_value;
+ nlset(_Z24GetFileNameForThisActionmPcRb, nl, 0);
MSHookFunction(_Z24GetFileNameForThisActionmPcRb, &$_Z24GetFileNameForThisActionmPcRb, &__Z24GetFileNameForThisActionmPcRb);
}
$SBIconList = objc_getClass("SBIconList");
$SBIconModel = objc_getClass("SBIconModel");
//$SBImageCache = objc_getClass("SBImageCache");
+ $SBSearchView = objc_getClass("SBSearchView");
+ $SBSearchTableViewCell = objc_getClass("SBSearchTableViewCell");
$SBStatusBarContentsView = objc_getClass("SBStatusBarContentsView");
$SBStatusBarController = objc_getClass("SBStatusBarController");
$SBStatusBarOperatorNameView = objc_getClass("SBStatusBarOperatorNameView");
WBRename(SBIconList, setFrame:, setFrame$);
WBRename(SBIconModel, cacheImageForIcon:, cacheImageForIcon$);
+ WBRename(SBIconModel, cacheImagesForIcon:, cacheImagesForIcon$);
WBRename(SBIconModel, getCachedImagedForIcon:, getCachedImagedForIcon$);
+ WBRename(SBIconModel, getCachedImagedForIcon:smallIcon:, getCachedImagedForIcon$smallIcon$);
+
+ WBRename(SBSearchView, initWithFrame:, initWithFrame$);
+ WBRename(SBSearchTableViewCell, drawRect:, drawRect$);
+ WBRename(SBSearchTableViewCell, initWithStyle:reuseIdentifier:, initWithStyle$reuseIdentifier$);
//WBRename(SBImageCache, initWithName:forImageWidth:imageHeight:initialCapacity:, initWithName$forImageWidth$imageHeight$initialCapacity$);
projects / winterboard.git / blobdiff