#import <ChatKit/CKMessageCell.h>
+#include <sys/sysctl.h>
+
extern "C" void __clear_cache (char *beg, char *end);
@protocol WinterBoard
Class $SBBookmarkIcon;
Class $SBButtonBar;
Class $SBCalendarIconContentsView;
+Class $SBDockIconListView;
Class $SBIcon;
Class $SBIconBadge;
Class $SBIconController;
Class $SBIconLabel;
Class $SBIconList;
Class $SBIconModel;
+Class $SBIconView;
//Class $SBImageCache;
Class $SBSearchView;
Class $SBSearchTableViewCell;
Class $SBUIController;
Class $SBWidgetApplicationIcon;
+#define SBIconView SBIcon
+
static bool IsWild_;
+static bool Four_;
@interface NSDictionary (WinterBoard)
- (UIColor *) wb$colorForKey:(NSString *)key;
static UIImage *(*_UIApplicationImageWithName)(NSString *name);
static UIImage *(*_UIImageAtPath)(NSString *name, NSBundle *path);
-static CGImageRef (*_UIImageRefAtPath)(NSString *name, bool cache, UIImageOrientation *orientation);
+static CGImageRef (*_UIImageRefAtPath)(NSString *name, bool cache, UIImageOrientation *orientation, float *scale);
static UIImage *(*_UIImageWithNameInDomain)(NSString *name, NSString *domain);
static NSBundle *(*_UIKitBundle)();
+static bool (*_UIPackedImageTableGetIdentifierForName)(NSString *, int *);
static int (*_UISharedImageNameGetIdentifier)(NSString *);
-static UIImage *(*_UISharedImageWithIdentifier)(int);
static NSMutableDictionary *UIImages_;
static NSMutableDictionary *PathImages_;
[names addObject:[NSString stringWithFormat:@"UIImages/%@", file]];
#define remapResourceName(oldname, newname) \
- else if ([file isEqualToString:oldname]) \
+ else if ([file isEqualToString:(oldname)]) \
[names addObject:[NSString stringWithFormat:@"%@.png", newname]]; \
bool summer(SpringBoard_ && SummerBoard_);
[names addObject:[NSString stringWithFormat:@"Files/Applications/Calculator.app/%@", file]];
else if (!summer);
remapResourceName(@"FSO_BG.png", @"StatusBar")
- remapResourceName(@"SBDockBG.png", @"Dock")
+ remapResourceName(Four_ ? @"SBDockBG-old.png" : @"SBDockBG.png", @"Dock")
remapResourceName(@"SBWeatherCelsius.png", @"Icons/Weather")
if (NSString *path = $getTheme$(names))
MSHook(UIImage *, SBApplicationIcon$generateIconImage$, SBApplicationIcon *self, SEL sel, int type) {
if (type == 2)
if (![Info_ wb$boolForKey:@"ComposeStoreIcons"]) {
- if (NSString *path72 = $pathForIcon$([self application], @"-72"))
- return [UIImage imageWithContentsOfFile:path72];
- else if (NSString *path = $pathForIcon$([self application]))
- if (UIImage *image = [UIImage imageWithContentsOfFile:path])
- return [image _imageScaledToProportion:1.2 interpolationQuality:5];
+ if (IsWild_ && false) // XXX: delete this code, it should not be supported
+ if (NSString *path72 = $pathForIcon$([self application], @"-72"))
+ return [UIImage imageWithContentsOfFile:path72];
+ if (NSString *path = $pathForIcon$([self application]))
+ if (UIImage *image = [UIImage imageWithContentsOfFile:path]) {
+ float width;
+ if ([$SBIcon respondsToSelector:@selector(defaultIconImageSize)])
+ width = [$SBIcon defaultIconImageSize].width;
+ else
+ width = 59;
+ return width == 59 ? image : [image _imageScaledToProportion:(width / 59.0) interpolationQuality:5];
+ }
}
return _SBApplicationIcon$generateIconImage$(self, sel, type);
}
return source;
}
-MSHook(CGImageRef, _UIImageRefAtPath, NSString *name, bool cache, UIImageOrientation *orientation) {
+MSHook(CGImageRef, _UIImageRefAtPath, NSString *name, bool cache, UIImageOrientation *orientation, float *scale) {
if (Debug_)
- NSLog(@"WB:Debug: _UIImageRefAtPath(\"%@\", %s)", name, cache ? "true" : "false");
+ NSLog(@"WB:Debug: _UIImageRefAtPath(\"%@\")", name);
NSString *themed([name wb$themedPath]);
}
}
- return __UIImageRefAtPath(themed, cache, orientation);
+ return __UIImageRefAtPath(themed, cache, orientation, scale);
}
/*MSHook(UIImage *, _UIImageAtPath, NSString *name, NSBundle *bundle) {
CFDateRef now(CFDateCreate(NULL, CFAbsoluteTimeGetCurrent()));
- CFDateFormatterSetFormat(formatter, (CFStringRef) [bundle localizedStringForKey:@"CALENDAR_ICON_DAY_NUMBER_FORMAT" value:@"" table:@"SpringBoard"]);
+ CFDateFormatterSetFormat(formatter, (CFStringRef) [bundle localizedStringForKey:@"CALENDAR_ICON_DAY_NUMBER_FORMAT" value:@"d" table:@"SpringBoard"]);
CFStringRef date(CFDateFormatterCreateStringWithDate(NULL, formatter, now));
CFDateFormatterSetFormat(formatter, (CFStringRef) [bundle localizedStringForKey:@"CALENDAR_ICON_DAY_NAME_FORMAT" value:@"cccc" table:@"SpringBoard"]);
CFStringRef day(CFDateFormatterCreateStringWithDate(NULL, formatter, now));
CGSize datesize = [(NSString *)date sizeWithStyle:datestyle forWidth:(width + leeway)];
CGSize daysize = [(NSString *)day sizeWithStyle:daystyle forWidth:(width + leeway)];
- unsigned base(IsWild_ ? 89 : 70);
+ unsigned base0(IsWild_ ? 89 : 70);
if ($GSFontGetUseLegacyFontMetrics())
- base = base + 1;
+ base0 = base0 + 1;
+ unsigned base1(IsWild_ ? 18 : 16);
+
+ if (Four_) {
+ ++base0;
+ ++base1;
+ }
[(NSString *)date drawAtPoint:CGPointMake(
- (width + 1 - datesize.width) / 2, (base - datesize.height) / 2
+ (width + 1 - datesize.width) / 2, (base0 - datesize.height) / 2
) withStyle:datestyle];
[(NSString *)day drawAtPoint:CGPointMake(
- (width + 1 - daysize.width) / 2, ((IsWild_ ? 18 : 16) - daysize.height) / 2
+ (width + 1 - daysize.width) / 2, (base1 - daysize.height) / 2
) withStyle:daystyle];
CFRelease(date);
static NSArray *Wallpapers_;
static bool Papered_;
+static bool Docked_;
static NSString *WallpaperFile_;
static UIImageView *WallpaperImage_;
static UIWebDocumentView *WallpaperPage_;
if (self == nil)
return nil;
- UIDevice *device([UIDevice currentDevice]);
- IsWild_ = [device respondsToSelector:@selector(isWildcat)] && [device isWildcat];
+ {
+ size_t size;
+ sysctlbyname("hw.machine", NULL, &size, NULL, 0);
+ char *machine = new char[size];
+
+ if (sysctlbyname("hw.machine", machine, &size, NULL, 0) == -1) {
+ perror("sysctlbyname(\"hw.machine\", ?)");
+ delete [] machine;
+ machine = NULL;
+ }
+
+ IsWild_ = machine != NULL && strncmp(machine, "iPad", 4) == 0;
+ }
+
+ BOOL (*GSSystemHasCapability)(CFStringRef) = reinterpret_cast<BOOL (*)(CFStringRef)>(dlsym(RTLD_DEFAULT, "GSSystemHasCapability"));
+
+ if ([Info_ objectForKey:@"UndockedIconLabels"] == nil)
+ [Info_ setObject:[NSNumber numberWithBool:(
+ !(Papered_ || GSSystemHasCapability != NULL && GSSystemHasCapability(CFSTR("homescreen-wallpaper"))) ||
+ [Info_ objectForKey:@"DockedIconLabelStyle"] != nil ||
+ [Info_ objectForKey:@"UndockedIconLabelStyle"] != nil
+ )] forKey:@"UndockedIconLabels"];
+
+ if (Debug_)
+ NSLog(@"WB:Debug:Info = %@", [Info_ description]);
if (Papered_) {
- UIWindow *&_wallpaperView(MSHookIvar<UIWindow *>(self, "_wallpaperView"));
+ UIImageView *&_wallpaperView(MSHookIvar<UIImageView *>(self, "_wallpaperView"));
if (&_wallpaperView != NULL) {
[_wallpaperView removeFromSuperview];
[_wallpaperView release];
}
}
- UIWindow *&_window(MSHookIvar<UIWindow *>(self, "_window"));
UIView *&_contentLayer(MSHookIvar<UIView *>(self, "_contentLayer"));
UIView *&_contentView(MSHookIvar<UIView *>(self, "_contentView"));
- UIView *layer;
+ UIView **player;
if (&_contentLayer != NULL)
- layer = _contentLayer;
+ player = &_contentLayer;
else if (&_contentView != NULL)
- layer = _contentView;
+ player = &_contentView;
else
- layer = nil;
+ player = NULL;
+ UIView *layer(player == NULL ? nil : *player);
+
+ UIWindow *window([[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]]);
+ UIView *content([[[UIView alloc] initWithFrame:[window frame]] autorelease]);
+ [window setContentView:content];
+
+ UIWindow *&_window(MSHookIvar<UIWindow *>(self, "_window"));
+ [window setBackgroundColor:[_window backgroundColor]];
+ [_window setBackgroundColor:[UIColor clearColor]];
- UIView *content([[[UIView alloc] initWithFrame:[layer frame]] autorelease]);
+ [window setLevel:-1000];
+ [window setHidden:NO];
+
+ /*if (player != NULL)
+ *player = content;*/
[content setBackgroundColor:[layer backgroundColor]];
[layer setBackgroundColor:[UIColor clearColor]];
- [layer setFrame:[content bounds]];
- [_window setContentView:content];
UIView *indirect;
if (!SummerBoard_ || !IsWild_)
}
}
- [content addSubview:layer];
-
return self;
}
@end
/* }}} */
+MSHook(void, SBIconView$setIconImageAlpha$, SBIconView *self, SEL sel, float alpha) {
+ if (NSNumber *number = [Info_ objectForKey:@"IconAlpha"])
+ alpha = [number floatValue];
+ return _SBIconView$setIconImageAlpha$(self, sel, alpha);
+}
+
+MSHook(void, SBIconView$setIconLabelAlpha$, SBIconView *self, SEL sel, float alpha) {
+ if (NSNumber *number = [Info_ objectForKey:@"IconAlpha"])
+ alpha = [number floatValue];
+ return _SBIconView$setIconLabelAlpha$(self, sel, alpha);
+}
+
+MSHook(id, SBIconView$initWithDefaultSize, SBIconView *self, SEL sel) {
+ if ((self = _SBIconView$initWithDefaultSize(self, sel)) != nil) {
+ 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];
+ }
+ } return self;
+}
+
MSHook(void, SBIcon$setAlpha$, SBIcon *self, SEL sel, float alpha) {
if (NSNumber *number = [Info_ objectForKey:@"IconAlpha"])
alpha = [number floatValue];
return _SBIconLabel$setInDock$(self, sel, docked);
}
+MSHook(BOOL, SBDockIconListView$shouldShowNewDock, id self, SEL sel) {
+ return SummerBoard_ && Docked_ ? NO : _SBDockIconListView$shouldShowNewDock(self, sel);
+}
+
+MSHook(void, SBDockIconListView$setFrame$, id self, SEL sel, CGRect frame) {
+ _SBDockIconListView$setFrame$(self, sel, frame);
+}
+
MSHook(NSString *, NSBundle$localizedStringForKey$value$table$, NSBundle *self, SEL sel, NSString *key, NSString *value, NSString *table) {
NSString *identifier = [self bundleIdentifier];
NSLocale *locale = [NSLocale currentLocale];
}
MSHook(UIImage *, _UIImageWithName, NSString *name) {
- int id(_UISharedImageNameGetIdentifier(name));
if (Debug_)
- NSLog(@"WB:Debug: _UIImageWithName(\"%@\": %d)", name, id);
+ 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 (id == -1)
- return _UIImageAtPath(name, _UIKitBundle());
+ if (!packed)
+ return __UIImageWithName(name);
else {
- NSNumber *key([NSNumber numberWithInt:id]);
- UIImage *image = [UIImages_ objectForKey:key];
+ NSNumber *key([NSNumber numberWithInt:identifier]);
+ UIImage *image([UIImages_ objectForKey:key]);
if (image != nil)
- return reinterpret_cast<id>(image) == [NSNull null] ? _UISharedImageWithIdentifier(id) : image;
+ return reinterpret_cast<id>(image) == [NSNull null] ? __UIImageWithName(name) : image;
if (NSString *path = $pathForFile$inBundle$(name, _UIKitBundle(), true)) {
image = [[UIImage alloc] initWithContentsOfFile:path cache:true];
if (image != nil)
[image autorelease];
}
[UIImages_ setObject:(image == nil ? [NSNull null] : reinterpret_cast<id>(image)) forKey:key];
- return image == nil ? _UISharedImageWithIdentifier(id) : image;
+ return image == nil ? __UIImageWithName(name) : image;
}
}
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 *) "__UISharedImageNameGetIdentifier";
- nl[6].n_un.n_name = (char *) "__UISharedImageWithIdentifier";
+ nl[5].n_un.n_name = (char *) "__UIPackedImageTableGetIdentifierForName";
+ nl[6].n_un.n_name = (char *) "__UISharedImageNameGetIdentifier";
nlist(UIKit, nl);
nlset(_UIApplicationImageWithName, nl, 0);
nlset(_UIImageRefAtPath, nl, 2);
nlset(_UIImageWithNameInDomain, nl, 3);
nlset(_UIKitBundle, nl, 4);
- nlset(_UISharedImageNameGetIdentifier, nl, 5);
- nlset(_UISharedImageWithIdentifier, nl, 6);
+ nlset(_UIPackedImageTableGetIdentifierForName, nl, 5);
+ nlset(_UISharedImageNameGetIdentifier, nl, 6);
MSHookFunction(_UIApplicationImageWithName, &$_UIApplicationImageWithName, &__UIApplicationImageWithName);
MSHookFunction(_UIImageRefAtPath, &$_UIImageRefAtPath, &__UIImageRefAtPath);
$WebCoreFrameBridge = objc_getClass("WebCoreFrameBridge");
+ bool olden(dlsym(RTLD_DEFAULT, "GSLibraryCopyGenerationInfoValueForKey") == NULL);
+
+ if (olden)
+ $SBCalendarIconContentsView = objc_getClass("SBCalendarIconContentsView");
+
$SBApplication = objc_getClass("SBApplication");
$SBApplicationIcon = objc_getClass("SBApplicationIcon");
$SBAwayView = objc_getClass("SBAwayView");
$SBBookmarkIcon = objc_getClass("SBBookmarkIcon");
$SBButtonBar = objc_getClass("SBButtonBar");
- $SBCalendarIconContentsView = objc_getClass("SBCalendarIconContentsView");
+ $SBDockIconListView = objc_getClass("SBDockIconListView");
$SBIcon = objc_getClass("SBIcon");
$SBIconBadge = objc_getClass("SBIconBadge");
$SBIconController = objc_getClass("SBIconController");
$SBIconLabel = objc_getClass("SBIconLabel");
$SBIconList = objc_getClass("SBIconList");
$SBIconModel = objc_getClass("SBIconModel");
+ $SBIconView = objc_getClass("SBIconView");
//$SBImageCache = objc_getClass("SBImageCache");
$SBSearchView = objc_getClass("SBSearchView");
$SBSearchTableViewCell = objc_getClass("SBSearchTableViewCell");
$SBUIController = objc_getClass("SBUIController");
$SBWidgetApplicationIcon = objc_getClass("SBWidgetApplicationIcon");
+ if ($SBIconView == nil)
+ $SBIconView = $SBIcon;
+
+ Four_ = $SBDockIconListView != nil;
+
WBRename(WebCoreFrameBridge, renderedSizeOfNode:constrainedToWidth:, renderedSizeOfNode$constrainedToWidth$);
if (SummerBoard_) {
WBRename(SBIcon, setAlpha:, setAlpha$);
WBRename(SBIconBadge, initWithBadge:, initWithBadge$);
WBRename(SBIconController, noteNumberOfIconListsChanged, noteNumberOfIconListsChanged);
+ WBRename(SBIconView, initWithDefaultSize, initWithDefaultSize);
+ WBRename(SBIconView, setIconImageAlpha:, setIconImageAlpha$);
+ WBRename(SBIconView, setIconLabelAlpha:, setIconLabelAlpha$);
WBRename(SBUIController, init, init);
WBRename(SBWidgetApplicationIcon, icon, icon);
- WBRename(SBIconLabel, drawRect:, drawRect$);
+ WBRename(SBDockIconListView, setFrame:, setFrame$);
+ MSHookMessage(object_getClass($SBDockIconListView), @selector(shouldShowNewDock), &$SBDockIconListView$shouldShowNewDock, &_SBDockIconListView$shouldShowNewDock);
+
+ if (olden)
+ WBRename(SBIconLabel, drawRect:, drawRect$);
+
WBRename(SBIconLabel, initWithSize:label:, initWithSize$label$);
WBRename(SBIconLabel, setInDock:, setInDock$);
Wallpapers_ = [[NSArray arrayWithObjects:@"Wallpaper.mp4", @"Wallpaper.png", @"Wallpaper.jpg", @"Wallpaper.html", nil] retain];
Papered_ = $getTheme$(Wallpapers_) != nil;
- if ([Info_ objectForKey:@"UndockedIconLabels"] == nil)
- [Info_ setObject:[NSNumber numberWithBool:(
- !Papered_ ||
- [Info_ objectForKey:@"DockedIconLabelStyle"] != nil ||
- [Info_ objectForKey:@"UndockedIconLabelStyle"] != nil
- )] forKey:@"UndockedIconLabels"];
-
- if (Debug_)
- NSLog(@"WB:Debug:Info = %@", [Info_ description]);
+ Docked_ = $getTheme$([NSArray arrayWithObjects:@"Dock.png", nil]);
[pool release];
}
projects / winterboard.git / blobdiff