MSMetaClassHook(UIImage)
MSClassHook(UINavigationBar)
MSClassHook(UIToolbar)
+MSClassHook(UIStatusBarTimeItemView)
+MSClassHook(UIWebDocumentView)
MSClassHook(CKBalloonView)
MSClassHook(CKMessageCell)
MSClassHook(SBIcon)
MSClassHook(SBIconBadge)
MSClassHook(SBIconBadgeFactory)
+MSClassHook(SBIconContentView)
MSClassHook(SBIconController)
MSClassHook(SBIconLabel)
MSClassHook(SBIconList)
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);
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]];
// 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]];
}
}
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_ pathContentOfSymbolicLinkAtPath:path] isEqualToString:@"/"])
+ path = nil;
goto set;
+ }
}
path = nil;
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]];
NSString *info_;
} *stringDrawingState_;
+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];
+}
+
MSInstanceMessageHook6(CGSize, NSString, drawAtPoint,forWidth,withFont,lineBreakMode,letterSpacing,includeEmoji, CGPoint, point, float, width, UIFont *, font, UILineBreakMode, mode, float, spacing, BOOL, emoji) {
//NSLog(@"XXX: @\"%@\" %g", self, 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;
}
NSString *extra([NSString stringWithFormat:@"text-align: %@", textAlign]);
if (true)
- $drawLabel$(self, rect, [NSString stringWithFormat:@"%@;%@", [font markupDescription], base], info);
+ $drawLabel$(self, rect, [NSString stringWithFormat:@"%@;%@;%@", [font markupDescription], WBColorMarkup(), base], info);
else
- [self drawInRect:rect withStyle:[NSString stringWithFormat:@"%@;%@;%@;%@", [font markupDescription], extra, base, info]];
+ [self drawInRect:rect withStyle:[NSString stringWithFormat:@"%@;%@;%@;%@;%@", [font markupDescription], WBColorMarkup(), extra, base, info]];
return CGSizeZero;
}
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) {
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];
}
MSInstanceMessageHook1(UIImage *, SBIconBadgeFactory, checkoutBadgeImageForText, NSString *, text) {
- WBStringDrawingState badgeState = {NULL, 1, @""
- "color: white;"
+ WBStringDrawingState badgeState = {NULL, -1, @""
, @"BadgeStyle"};
stringDrawingState_ = &badgeState;
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"};
WBStringDrawingState sizeState = {&dayState, 7, nil, nil};
WBStringDrawingState dateState = {&sizeState, 2, @""
- "color: #333333;"
, @"CalendarIconDateStyle"};
stringDrawingState_ = &dateState;
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]);
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];
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];
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)
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;
}
@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<SBIconModel *>(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<NSArray *>(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<UIView *>(controller, "_dockContainerView"));
+ if (&_dockContainerView != NULL)
+ [[_dockContainerView superview] bringSubviewToFront:_dockContainerView];
+ }
+}
+MSHook(void, SBIconController$noteNumberOfIconListsChanged, SBIconController *self, SEL sel) {
+ SBIconModel *&_iconModel(MSHookIvar<SBIconModel *>(self, "_iconModel"));
+ $addPerPageViews$([_iconModel iconLists]);
return _SBIconController$noteNumberOfIconListsChanged(self, sel);
}
bool docked((MSHookIvar<unsigned>(self, "_inDock") & 0x2) != 0);
WBStringDrawingState labelState = {NULL, 0, @""
- "color: white;"
, docked ? @"DockedIconLabelStyle" : @"UndockedIconLabelStyle"};
stringDrawingState_ = &labelState;
}
#define WBRename(name, sel, imp) \
- _ ## name ## $ ## imp = MSHookMessage($ ## name, @selector(sel), &$ ## name ## $ ## imp)
+ MSHookMessage($ ## name, @selector(sel), &$ ## name ## $ ## imp, &_ ## name ## $ ## imp)
template <typename Type_>
static void msset(Type_ &function, MSImageRef image, const char *name) {
WKSetCurrentGraphicsContext(UIGraphicsGetCurrentContext());
if (style == nil || [style length] == 0)
style = @"font-family: Helvetica; font-size: 12px";
- //NSLog(@"XXX:draw(%@)", [style stringByReplacingOccurrencesOfString:@"\n" withString:@" "]);
+ //NSLog(@"XXX:drawP(%@)", [style stringByReplacingOccurrencesOfString:@"\n" withString:@" "]);
return [[WBMarkup sharedMarkup] drawString:self atPoint:point withStyle:style];
}
WKSetCurrentGraphicsContext(UIGraphicsGetCurrentContext());
if (style == nil || [style length] == 0)
style = @"font-family: Helvetica; font-size: 12px";
+ //NSLog(@"XXX:drawR(%@)", [style stringByReplacingOccurrencesOfString:@"\n" withString:@" "]);
return [[WBMarkup sharedMarkup] drawString:self inRect:rect withStyle:style];
}
}
static void SBInitialize() {
- class_addMethod($NSString, @selector(drawAtPoint:withStyle:), (IMP) &NSString$drawAtPoint$withStyle$, "v20@0:4{CGPoint=ff}8@16");
- class_addMethod($NSString, @selector(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);
WBRename(SBIconLabel, initWithSize:label:, initWithSize$label$);
WBRename(SBIconLabel, setInDock:, setInDock$);
+ WBRename(SBIconList, didMoveToSuperview, didMoveToSuperview);
WBRename(SBIconList, setFrame:, setFrame$);
WBRename(SBIconModel, cacheImageForIcon:, cacheImageForIcon$);
// }}}
// UIKit {{{
if ([NSBundle bundleWithIdentifier:@"com.apple.UIKit"] != nil) {
+ 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");
+
struct nlist nl[6];
memset(nl, 0, sizeof(nl));
nl[0].n_un.n_name = (char *) "__UIApplicationImageWithName";
projects / winterboard.git / blobdiff