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 NSArray *$useScale$(NSArray *files, bool use = true) {
- if (Scale_ == 0) {
+ if (use && Scale_ == 0) {
UIScreen *screen([UIScreen mainScreen]);
if ([screen respondsToSelector:@selector(scale)])
Scale_ = [screen scale];
[scaled addObject:[NSString stringWithFormat:@"%@~iphone.%@", base, extension]];
[scaled addObject:file];
- NSString *rest([base substringWithRange:NSMakeRange(0, [base length] - 3)]);
+ // 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:[rest stringByAppendingPathExtension:extension]];
+ [scaled addObject:[rest stringByAppendingPathExtension:extension]];*/
} else {
// XXX: this code isn't really complete
}
static NSString *$getTheme$(NSArray *files, NSArray *themes = Themes_) {
- if (NSString *path = [Themed_ objectForKey:files])
- return reinterpret_cast<id>(path) == [NSNull null] ? nil : path;
+ // XXX: this is not reasonable; OMG
+ id key(files);
+
+ @synchronized (Themed_) {
+ if (NSString *path = [Themed_ objectForKey:key])
+ return reinterpret_cast<id>(path) == [NSNull null] ? nil : path;
+ }
if (Debug_)
NSLog(@"WB:Debug: %@", [files description]);
path = nil;
set:
- [Themed_ setObject:(path == nil ? [NSNull null] : reinterpret_cast<id>(path)) forKey:files];
+ @synchronized (Themed_) {
+ [Themed_ setObject:(path == nil ? [NSNull null] : reinterpret_cast<id>(path)) forKey:key];
+ }
+
return path;
}
// }}}
if (identifier != nil)
[names addObject:[NSString stringWithFormat:@"Bundles/%@/%@", identifier, file]];
- if (NSString *folder = [[bundle bundlePath] lastPathComponent])
+ if (NSString *folder = [[bundle bundlePath] lastPathComponent]) {
[names addObject:[NSString stringWithFormat:@"Folders/%@/%@", folder, file]];
+ NSString *base([folder stringByDeletingPathExtension]);
+ if ([base hasSuffix:@"~iphone"])
+ [names addObject:[NSString stringWithFormat:@"Folders/%@.%@/%@", [base substringWithRange:NSMakeRange(0, [base length] - 7)], [folder pathExtension], file]];
+ }
if (ui)
[names addObject:[NSString stringWithFormat:@"UIImages/%@", file]];
remapResourceName(Four_ ? @"SBDockBG-old.png" : @"SBDockBG.png", @"Dock")
remapResourceName(@"SBWeatherCelsius.png", @"Icons/Weather")
+ [names addObject:[NSString stringWithFormat:@"Fallback/%@", file]];
+
if (NSString *path = $getTheme$($useScale$(names, ui)))
return path;
}
// }}}
+static void $drawLabel$(NSString *label, CGRect rect, NSString *style, NSString *custom) {
+ bool ellipsis(false);
+ float 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]);
+ float 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_;
NSString *info_;
} *stringDrawingState_;
-MSInstanceMessageHook4(CGSize, NSString, drawAtPoint,forWidth,withFont,lineBreakMode, CGPoint, point, float, width, UIFont *, font, int, mode) {
+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);
+
WBStringDrawingState *state(stringDrawingState_);
if (state == NULL)
- return MSOldCall(point, width, font, mode);
+ return MSOldCall(point, width, font, mode, spacing, emoji);
if (--state->count_ == 0)
stringDrawingState_ = state->next_;
if (state->info_ == nil)
- return MSOldCall(point, width, font, mode);
+ return MSOldCall(point, width, font, mode, spacing, emoji);
NSString *info([Info_ objectForKey:state->info_]);
if (info == nil)
- return MSOldCall(point, width, font, mode);
+ return MSOldCall(point, width, font, mode, spacing, emoji);
NSString *base(state->base_ ?: @"");
- [self drawAtPoint:point withStyle:[NSString stringWithFormat:@"%@;%@;%@", [font markupDescription], base, info]];
+ NSString *extra([NSString stringWithFormat:@"letter-spacing: %gpx", spacing]);
+ [self drawAtPoint:point withStyle:[NSString stringWithFormat:@"%@;%@;%@;%@", [font markupDescription], extra, base, info]];
return CGSizeZero;
}
-MSInstanceMessageHook2(CGSize, NSString, drawAtPoint,withFont, CGPoint, point, UIFont *, font) {
+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(point, font);
+ return MSOldCall(rect, font, mode, alignment, spacing, emoji, truncation);
if (--state->count_ == 0)
stringDrawingState_ = state->next_;
if (state->info_ == nil)
- return MSOldCall(point, font);
+ return MSOldCall(rect, font, mode, alignment, spacing, emoji, truncation);
NSString *info([Info_ objectForKey:state->info_]);
if (info == nil)
- return MSOldCall(point, font);
+ 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_ ?: @"");
- [self drawAtPoint:point withStyle:[NSString stringWithFormat:@"%@;%@;%@", [font markupDescription], base, info]];
+ NSString *extra([NSString stringWithFormat:@"text-align: %@", textAlign]);
+
+ if (true)
+ $drawLabel$(self, rect, [NSString stringWithFormat:@"%@;%@", [font markupDescription], base], info);
+ else
+ [self drawInRect:rect withStyle:[NSString stringWithFormat:@"%@;%@;%@;%@", [font markupDescription], extra, base, info]];
+
return CGSizeZero;
}
+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)
+ stringDrawingState_ = state->next_;
+ if (state->info_ == nil)
+ return MSOldCall(font, width, mode, spacing);
+
+ NSString *info([Info_ objectForKey:state->info_]);
+ if (info == nil)
+ return MSOldCall(font, width, mode, spacing);
+
+ NSString *base(state->base_ ?: @"");
+ NSString *extra([NSString stringWithFormat:@"letter-spacing: %gpx", spacing]);
+ return [self sizeWithStyle:[NSString stringWithFormat:@"%@;%@;%@;%@", [font markupDescription], extra, base, info] forWidth:width];
+}
+
MSInstanceMessageHook1(CGSize, NSString, sizeWithFont, UIFont *, font) {
+ //NSLog(@"XXX: ?\"%@\"", self);
+
WBStringDrawingState *state(stringDrawingState_);
if (state == NULL)
return MSOldCall(font);
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<BOOL>(view_, "_mode"));;
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; "
}
// }}}
-MSInstanceMessageHook1(void, SBIconLabel, drawRect, CGRect, rect) {
- CGRect bounds = [self bounds];
-
+MSInstanceMessage1(void, SBIconLabel, drawRect, CGRect, rect) {
static Ivar drawMoreLegibly = object_getInstanceVariable(self, "_drawMoreLegibly", NULL);
int docked;
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<unsigned>(self, "_inDock") & 0x2) != 0);
- style = [style stringByAppendingString:[NSString stringWithFormat:@"letter-spacing: -%f; ", spacing]];
- }
+ WBStringDrawingState labelState = {NULL, 0, @""
+ "color: white;"
+ , 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;
}
// ChatKit {{{
NSString *path([NSString stringWithFormat:@"%@/UISounds/%@", theme, file]);
if ([Manager_ fileExistsAtPath:path]) {
strcpy(a1, [path UTF8String]);
- continue;
+ break;
}
}
}
WKSetCurrentGraphicsContext(UIGraphicsGetCurrentContext());
if (style == nil || [style length] == 0)
style = @"font-family: Helvetica; font-size: 12px";
+ //NSLog(@"XXX:draw(%@)", [style stringByReplacingOccurrencesOfString:@"\n" withString:@" "]);
return [[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";
+ return [[WBMarkup sharedMarkup] drawString:self inRect:rect withStyle:style];
+}
+
static CGSize NSString$sizeWithStyle$forWidth$(NSString *self, SEL _cmd, NSString *style, float width) {
if (style == nil || [style length] == 0)
style = @"font-family: Helvetica; font-size: 12px";
+ //NSLog(@"XXX:size(%@)", [style stringByReplacingOccurrencesOfString:@"\n" withString:@" "]);
return [[WBMarkup sharedMarkup] sizeOfString:self withStyle:style forWidth:width];
}
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(SBDockIconListView, setFrame:, setFrame$);
MSHookMessage(object_getClass($SBDockIconListView), @selector(shouldShowNewDock), &$SBDockIconListView$shouldShowNewDock, &_SBDockIconListView$shouldShowNewDock);
+ if (kCFCoreFoundationVersionNumber < 600 || SummerBoard_)
+ WBRename(SBIconLabel, drawRect:, drawRect$);
+ else
+ WBRename(SBIconLabel, buildLabelImage, buildLabelImage);
+
WBRename(SBIconLabel, initWithSize:label:, initWithSize$label$);
WBRename(SBIconLabel, setInDock:, setInDock$);
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"])
projects / winterboard.git / blobdiff