X-Git-Url: https://git.saurik.com/winterboard.git/blobdiff_plain/57be87b36f98cd20ed8987c51e4f69914b188cc1..eae989a318295827259fe347e40918ec59a6ea4a:/Library.mm

diff --git a/Library.mm b/Library.mm
index fd5a6d5..f3e01ae 100644
--- a/Library.mm
+++ b/Library.mm
@@ -118,11 +118,13 @@ MSClassHook(NSBundle)
 MSClassHook(NSString)
 
 MSClassHook(UIImage)
+MSMetaClassHook(UIImage)
 MSClassHook(UINavigationBar)
 MSClassHook(UIToolbar)
 
 MSClassHook(CKMessageCell)
 MSClassHook(CKTimestampView)
+MSClassHook(CKTranscriptCell)
 MSClassHook(CKTranscriptController)
 MSClassHook(CKTranscriptTableView)
 
@@ -144,11 +146,13 @@ MSClassHook(SBIconModel)
 //MSClassHook(SBImageCache)
 MSClassHook(SBSearchView)
 MSClassHook(SBSearchTableViewCell)
+MSClassHook(SBSlidingAlertDisplay)
 MSClassHook(SBStatusBarContentsView)
 MSClassHook(SBStatusBarController)
 MSClassHook(SBStatusBarOperatorNameView)
 MSClassHook(SBStatusBarTimeView)
 MSClassHook(SBUIController)
+MSClassHook(SBWallpaperView)
 MSClassHook(SBWidgetApplicationIcon)
 
 extern "C" void WKSetCurrentGraphicsContext(CGContextRef);
@@ -192,6 +196,7 @@ static BOOL (*_GSFontGetUseLegacyFontMetrics)();
     (_GSFontGetUseLegacyFontMetrics == NULL ? YES : _GSFontGetUseLegacyFontMetrics())
 
 static bool Debug_ = false;
+static bool UIDebug_ = false;
 static bool Engineer_ = false;
 static bool SummerBoard_ = true;
 static bool SpringBoard_;
@@ -235,9 +240,6 @@ static unsigned $getScale$(NSString *path) {
 }
 
 static NSArray *$useScale$(NSArray *files, bool use = true) {
-    if (!use)
-        return files;
-
     if (Scale_ == 0) {
         UIScreen *screen([UIScreen mainScreen]);
         if ([screen respondsToSelector:@selector(scale)])
@@ -249,11 +251,40 @@ static NSArray *$useScale$(NSArray *files, bool use = true) {
     if (Scale_ == 1)
         return files;
 
-    NSMutableArray *scaled([NSMutableArray arrayWithCapacity:([files count] * 2)]);
+    NSString *idiom(IsWild_ ? @"ipad" : @"iphone");
+
+    NSMutableArray *scaled([NSMutableArray arrayWithCapacity:([files count] * 4)]);
 
     for (NSString *file in files) {
-        [scaled addObject:[NSString stringWithFormat:@"%@@2x.%@", [file stringByDeletingPathExtension], [file pathExtension]]];
-        [scaled addObject:file];
+        NSString *base([file stringByDeletingPathExtension]);
+        NSString *extension([file pathExtension]);
+
+        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:@"%@~%@.%@", 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:file];
+
+            NSString *rest([base substringWithRange:NSMakeRange(0, [base length] - 3)]);
+            [scaled addObject:[NSString stringWithFormat:@"%@~iphone.%@", rest, 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]];
+        }
     }
 
     return scaled;
@@ -630,45 +661,37 @@ MSInstanceMessageHook2(NSString *, NSBundle, pathForResource,ofType, NSString *,
 
 static struct WBStringDrawingState {
     WBStringDrawingState *next_;
-    NSString *extra_;
-    NSString *key_;
+    NSString *base_;
+    NSString *info_;
 } *stringDrawingState_;
 
 MSInstanceMessageHook4(CGSize, NSString, drawAtPoint,forWidth,withFont,lineBreakMode, CGPoint, point, float, width, UIFont *, font, int, mode) {
-    if (stringDrawingState_ == NULL)
+    if (stringDrawingState_ == NULL || stringDrawingState_->info_ == nil)
         return MSOldCall(point, width, font, mode);
 
-    NSString *style([[font markupDescription] stringByAppendingString:@";"]);
-
-    if (NSString *extra = stringDrawingState_->extra_)
-        style = [style stringByAppendingString:extra];
-
-    if (stringDrawingState_->key_ != nil)
-        if (NSString *extra = [Info_ objectForKey:stringDrawingState_->key_])
-            style = [style stringByAppendingString:extra];
+    NSString *info([Info_ objectForKey:stringDrawingState_->info_]);
+    if (info == nil)
+        return MSOldCall(point, width, font, mode);
 
+    NSString *base(stringDrawingState_->base_ ?: @"");
     stringDrawingState_ = stringDrawingState_->next_;
 
-    [self drawAtPoint:point withStyle:style];
+    [self drawAtPoint:point withStyle:[NSString stringWithFormat:@"%@;%@;%@", [font markupDescription], base, info]];
     return CGSizeZero;
 }
 
 MSInstanceMessageHook2(CGSize, NSString, drawAtPoint,withFont, CGPoint, point, UIFont *, font) {
-    if (stringDrawingState_ == NULL)
+    if (stringDrawingState_ == NULL || stringDrawingState_->info_ == nil)
         return MSOldCall(point, font);
 
-    NSString *style([[font markupDescription] stringByAppendingString:@";"]);
-
-    if (NSString *extra = stringDrawingState_->extra_)
-        style = [style stringByAppendingString:extra];
-
-    if (stringDrawingState_->key_ != nil)
-        if (NSString *extra = [Info_ objectForKey:stringDrawingState_->key_])
-            style = [style stringByAppendingString:extra];
+    NSString *info([Info_ objectForKey:stringDrawingState_->info_]);
+    if (info == nil)
+        return MSOldCall(point, font);
 
+    NSString *base(stringDrawingState_->base_ ?: @"");
     stringDrawingState_ = stringDrawingState_->next_;
 
-    [self drawAtPoint:point withStyle:style];
+    [self drawAtPoint:point withStyle:[NSString stringWithFormat:@"%@;%@;%@", [font markupDescription], base, info]];
     return CGSizeZero;
 }
 
@@ -688,6 +711,7 @@ MSInstanceMessageHook1(UIImage *, SBIconBadgeFactory, checkoutBadgeImageForText,
 MSInstanceMessageHook1(UIImage *, SBCalendarApplicationIcon, generateIconImage, int, type) {
     WBStringDrawingState dayState = {NULL, @""
         "color: white;"
+        // XXX: this is only correct on an iPod dock
         "text-shadow: rgba(0, 0, 0, 0.2) -1px -1px 2px;"
     , @"CalendarIconDayStyle"};
 
@@ -810,14 +834,6 @@ MSHook(void, SBStatusBarContentsView$didMoveToSuperview, UIView *self, SEL sel)
     _SBStatusBarContentsView$didMoveToSuperview(self, sel);
 }
 
-MSHook(UIImage *, UIImage$defaultDesktopImage, UIImage *self, SEL sel) {
-    if (Debug_)
-        NSLog(@"WB:Debug:DefaultDesktopImage");
-    if (NSString *path = $getTheme$([NSArray arrayWithObjects:@"LockBackground.png", @"LockBackground.jpg", nil]))
-        return [UIImage imageWithContentsOfFile:path];
-    return _UIImage$defaultDesktopImage(self, sel);
-}
-
 static NSArray *Wallpapers_;
 static bool Papered_;
 static bool Docked_;
@@ -842,6 +858,34 @@ static UIImage *$getImage$(NSString *path) {
     return image;
 }
 
+static UIImage *$getDefaultDesktopImage$() {
+    if (NSString *path = $getTheme$($useScale$([NSArray arrayWithObjects:@"LockBackground.png", @"LockBackground.jpg", nil])))
+        return $getImage$(path);
+    return nil;
+}
+
+MSClassMessageHook0(UIImage *, UIImage, defaultDesktopImage) {
+    return $getDefaultDesktopImage$() ?: MSOldCall();
+}
+
+MSInstanceMessageHook0(UIImage *, SBSlidingAlertDisplay, _defaultDesktopImage) {
+    return $getDefaultDesktopImage$() ?: MSOldCall();
+}
+
+MSInstanceMessageHook0(void, SBWallpaperView, resetCurrentImageToWallpaper) {
+    for (UIView *parent([self superview]); parent != nil; parent = [parent superview])
+        if ([parent isKindOfClass:$SBSlidingAlertDisplay]) {
+            if (UIImage *image = $getDefaultDesktopImage$()) {
+                [self setImage:image];
+                return;
+            }
+
+            break;
+        }
+
+    MSOldCall();
+}
+
 // %hook -[SBUIController init] {{{
 MSInstanceMessageHook0(id, SBUIController, init) {
     self = MSOldCall();
@@ -1423,7 +1467,7 @@ MSInstanceMessageHook1(void, SBIconLabel, drawRect, CGRect, rect) {
         style = [style stringByAppendingString:@"text-shadow: rgba(0, 0, 0, 0.5) 0px -1px 0px; "];
 
     bool ellipsis(false);
-    float max = 75, width;
+    float max = [self frame].size.width - 11, width;
   width:
     width = [(ellipsis ? [label stringByAppendingString:@"..."] : label) sizeWithStyle:style forWidth:320].width;
 
@@ -1456,8 +1500,20 @@ MSInstanceMessageHook1(void, CKMessageCell, addBalloonView, CKBalloonView *, bal
     [balloon setBackgroundColor:[UIColor clearColor]];
 }
 
+MSInstanceMessageHook1(void, CKTranscriptCell, setBackgroundColor, UIColor *, color) {
+    MSOldCall([UIColor clearColor]);
+}
+
+MSInstanceMessageHook2(id, CKTranscriptCell, initWithStyle,reuseIdentifier, int, style, NSString *, reuse) {
+    if ((self = MSOldCall(style, reuse)) != nil) {
+        [self setBackgroundColor:[UIColor clearColor]];
+        [[self contentView] setBackgroundColor:[UIColor clearColor]];
+    } return self;
+}
+
 MSInstanceMessageHook2(id, CKMessageCell, initWithStyle,reuseIdentifier, int, style, NSString *, reuse) {
     if ((self = MSOldCall(style, reuse)) != nil) {
+        [self setBackgroundColor:[UIColor clearColor]];
         [[self contentView] setBackgroundColor:[UIColor clearColor]];
     } return self;
 }
@@ -1482,10 +1538,8 @@ MSInstanceMessageHook2(id, CKTranscriptTableView, initWithFrame,style, CGRect, f
 MSInstanceMessageHook0(void, CKTranscriptController, loadView) {
     MSOldCall();
 
-    if (NSString *path = $getTheme$([NSArray arrayWithObjects:@"SMSBackground.png", @"SMSBackground.jpg", nil]))
-        if (UIImage *image = [[UIImage alloc] initWithContentsOfFile:path]) {
-            [image autorelease];
-
+    if (NSString *path = $getTheme$($useScale$([NSArray arrayWithObjects:@"SMSBackground.png", @"SMSBackground.jpg", nil])))
+        if (UIImage *image = $getImage$(path)) {
             UIView *&_transcriptTable(MSHookIvar<UIView *>(self, "_transcriptTable"));
             UIView *&_transcriptLayer(MSHookIvar<UIView *>(self, "_transcriptLayer"));
             UIView *table;
@@ -1542,7 +1596,18 @@ MSHook(UIImage *, _UIImageWithName, NSString *name) {
         if (NSString *path = $pathForFile$inBundle$(name, _UIKitBundle(), true))
             image = $getImage$(path);
         [UIImages_ setObject:(image == nil ? [NSNull null] : reinterpret_cast<id>(image)) forKey:key];
-        return image == nil ? __UIImageWithName(name) : image;
+        if (image != nil)
+            return image;
+
+        image = __UIImageWithName(name);
+
+        if (UIDebug_) {
+            NSString *path([@"/tmp/UIImages/" stringByAppendingString:name]);
+            if (![Manager_ fileExistsAtPath:path])
+                [UIImagePNGRepresentation(image) writeToFile:path atomically:YES];
+        }
+
+        return image;
     }
 }
 // }}}
@@ -1675,8 +1740,6 @@ static void SBInitialize() {
     class_addMethod($NSString, @selector(drawAtPoint:withStyle:), (IMP) &NSString$drawAtPoint$withStyle$, "v20@0:4{CGPoint=ff}8@16");
     class_addMethod($NSString, @selector(sizeWithStyle:forWidth:), (IMP) &NSString$sizeWithStyle$forWidth$, "{CGSize=ff}16@0:4@8f12");
 
-    _UIImage$defaultDesktopImage = MSHookMessage(object_getClass($UIImage), @selector(defaultDesktopImage), &$UIImage$defaultDesktopImage);
-
     if (SummerBoard_) {
         WBRename(SBApplication, pathForIcon, pathForIcon);
         WBRename(SBApplicationIcon, icon, icon);
@@ -1851,5 +1914,8 @@ MSInitialize {
     }
     // }}}
 
+    if (Debug_ && [Manager_ fileExistsAtPath:@"/tmp/UIImages"])
+        UIDebug_ = true;
+
     [pool release];
 }