Factor $useScale$() from $getTheme$().

[winterboard.git] / Library.mm

diff --git a/Library.mm b/Library.mm
index bd88130d8ae39474a7ca9d8fec9c29f99adc7363..944cd835167d9ba93f466b4404665648b430fe27 100644 (file)
--- a/Library.mm
+++ b/Library.mm
@@ -103,6 +103,8 @@ bool _itv;
 
 #include <sys/sysctl.h>
 
 
 #include <sys/sysctl.h>
 

+#include "WBMarkup.h"
+

 extern "C" void __clear_cache (char *beg, char *end);
 
 @protocol WinterBoard
 extern "C" void __clear_cache (char *beg, char *end);
 
 @protocol WinterBoard


@@ -113,6 +115,7 @@ Class $MPMoviePlayerController;
 Class $MPVideoView;
 
 MSClassHook(NSBundle)
 Class $MPVideoView;
 
 MSClassHook(NSBundle)

+MSClassHook(NSString)

 
 MSClassHook(UIImage)
 MSClassHook(UINavigationBar)
 
 MSClassHook(UIImage)
 MSClassHook(UINavigationBar)


@@ -212,11 +215,26 @@ static NSMutableDictionary *Themed_ = [[NSMutableDictionary alloc] initWithCapac
 
 static unsigned Scale_ = 0;
 
 
 static unsigned Scale_ = 0;
 

-static NSString *$getTheme$(NSArray *files, bool rescale = false) {
-    if (NSString *path = [Themed_ objectForKey:files])
-        return reinterpret_cast<id>(path) == [NSNull null] ? nil : path;
+static unsigned $getScale$(NSString *path) {
+    NSString *name(path);
+
+    #define StripName(strip) \
+        if ([name hasSuffix:@ strip]) \
+            name = [name substringWithRange:NSMakeRange(0, [name length] - sizeof(strip) - 1)];
+
+    StripName(".png");
+    StripName(".jpg");
+    StripName("~iphone");
+    StripName("~ipad");

 
 

-    if (rescale && Scale_ == 0) {
+    return [name hasSuffix:@"@2x"] ? 2 : 1;
+}
+
+static NSArray *$useScale$(NSArray *files, bool use = true) {
+    if (!use)
+        return files;
+
+    if (Scale_ == 0) {

         UIScreen *screen([UIScreen mainScreen]);
         if ([screen respondsToSelector:@selector(scale)])
             Scale_ = [screen scale];
         UIScreen *screen([UIScreen mainScreen]);
         if ([screen respondsToSelector:@selector(scale)])
             Scale_ = [screen scale];


@@ -224,6 +242,23 @@ static NSString *$getTheme$(NSArray *files, bool rescale = false) {
             Scale_ = 1;
     }
 
             Scale_ = 1;
     }
 

+    if (Scale_ == 1)
+        return files;
+
+    NSMutableArray *scaled([NSMutableArray arrayWithCapacity:([files count] * 2)]);
+
+    for (NSString *file in files) {
+        [scaled addObject:[NSString stringWithFormat:@"%@@2x.%@", [file stringByDeletingPathExtension], [file pathExtension]]];
+        [scaled addObject:file];
+    }
+
+    return scaled;
+}
+
+static NSString *$getTheme$(NSArray *files) {
+    if (NSString *path = [Themed_ objectForKey:files])
+        return reinterpret_cast<id>(path) == [NSNull null] ? nil : path;
+

     if (Debug_)
         NSLog(@"WB:Debug: %@", [files description]);
 
     if (Debug_)
         NSLog(@"WB:Debug: %@", [files description]);
 


@@ -271,7 +306,7 @@ static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle, bool u
         remapResourceName(Four_ ? @"SBDockBG-old.png" : @"SBDockBG.png", @"Dock")
         remapResourceName(@"SBWeatherCelsius.png", @"Icons/Weather")
 
         remapResourceName(Four_ ? @"SBDockBG-old.png" : @"SBDockBG.png", @"Dock")
         remapResourceName(@"SBWeatherCelsius.png", @"Icons/Weather")
 

-    if (NSString *path = $getTheme$(names, ui))
+    if (NSString *path = $getTheme$($useScale$(names, ui)))

         return path;
 
     return nil;
         return path;
 
     return nil;


@@ -362,6 +397,9 @@ static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") {
 @implementation NSString (WinterBoard)
 
 - (NSString *) wb$themedPath {
 @implementation NSString (WinterBoard)
 
 - (NSString *) wb$themedPath {

+    if ([self hasPrefix:@"/Library/Themes/"])
+        return self;
+

     if (Debug_)
         NSLog(@"WB:Debug:Bypass(\"%@\")", self);
 
     if (Debug_)
         NSLog(@"WB:Debug:Bypass(\"%@\")", self);
 


@@ -716,21 +754,9 @@ static NSURL *WallpaperURL_;
     } while (false)
 
 static UIImage *$getImage$(NSString *path) {
     } while (false)
 
 static UIImage *$getImage$(NSString *path) {

-    NSString *name(path);
-
-    #define StripName(strip) \
-        if ([name hasSuffix:@ strip]) \
-            name = [name substringWithRange:NSMakeRange(0, [name length] - sizeof(strip) - 1)];
-
-    StripName(".png");
-    StripName(".jpg");
-    StripName("~iphone");
-    StripName("~ipad");
-
-    unsigned scale([name hasSuffix:@"@2x"] ? 2 : 1);
-

     UIImage *image([UIImage imageWithContentsOfFile:path]);
 
     UIImage *image([UIImage imageWithContentsOfFile:path]);
 

+    unsigned scale($getScale$(path));

     if (scale != 1 && [image respondsToSelector:@selector(setScale)])
         [image setScale:scale];
 
     if (scale != 1 && [image respondsToSelector:@selector(setScale)])
         [image setScale:scale];
 


@@ -743,7 +769,7 @@ MSInstanceMessageHook0(id, SBUIController, init) {
     if (self == nil)
         return nil;
 
     if (self == nil)
         return nil;
 

-    NSString *paper($getTheme$(Wallpapers_, true));
+    NSString *paper($getTheme$(Wallpapers_));

 
     {
         size_t size;
 
     {
         size_t size;


@@ -1288,7 +1314,7 @@ MSInstanceMessageHook2(CGSize, WebCoreFrameBridge, renderedSizeOfNode,constraine
 }
 // }}}
 
 }
 // }}}
 

-MSHook(void, SBIconLabel$drawRect$, SBIconLabel *self, SEL sel, CGRect rect) {
+MSInstanceMessageHook1(void, SBIconLabel, drawRect, CGRect, rect) {

     CGRect bounds = [self bounds];
 
     static Ivar drawMoreLegibly = object_getInstanceVariable(self, "_drawMoreLegibly", NULL);
     CGRect bounds = [self bounds];
 
     static Ivar drawMoreLegibly = object_getInstanceVariable(self, "_drawMoreLegibly", NULL);


@@ -1430,11 +1456,8 @@ MSHook(UIImage *, _UIImageWithName, NSString *name) {
         UIImage *image([UIImages_ objectForKey:key]);
         if (image != nil)
             return reinterpret_cast<id>(image) == [NSNull null] ? __UIImageWithName(name) : image;
         UIImage *image([UIImages_ objectForKey:key]);
         if (image != nil)
             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];
-        }
+        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;
     }
         [UIImages_ setObject:(image == nil ? [NSNull null] : reinterpret_cast<id>(image)) forKey:key];
         return image == nil ? __UIImageWithName(name) : image;
     }


@@ -1448,11 +1471,8 @@ MSHook(UIImage *, _UIImageWithNameInDomain, NSString *name, NSString *domain) {
         return reinterpret_cast<id>(image) == [NSNull null] ? __UIImageWithNameInDomain(name, domain) : image;
     if (Debug_)
         NSLog(@"WB:Debug: UIImageWithNameInDomain(\"%@\", \"%@\")", name, domain);
         return reinterpret_cast<id>(image) == [NSNull null] ? __UIImageWithNameInDomain(name, domain) : image;
     if (Debug_)
         NSLog(@"WB:Debug: UIImageWithNameInDomain(\"%@\", \"%@\")", name, domain);

-    if (NSString *path = $getTheme$([NSArray arrayWithObject:[NSString stringWithFormat:@"Domains/%@/%@", domain, name]], true)) {
-        image = [[UIImage alloc] initWithContentsOfFile:path];
-        if (image != nil)
-            [image autorelease];
-    }
+    if (NSString *path = $getTheme$($useScale$([NSArray arrayWithObject:[NSString stringWithFormat:@"Domains/%@/%@", domain, name]])))
+        image = $getImage$(path);

     [PathImages_ setObject:(image == nil ? [NSNull null] : reinterpret_cast<id>(image)) forKey:key];
     return image == nil ? __UIImageWithNameInDomain(name, domain) : image;
 }
     [PathImages_ setObject:(image == nil ? [NSNull null] : reinterpret_cast<id>(image)) forKey:key];
     return image == nil ? __UIImageWithNameInDomain(name, domain) : image;
 }


@@ -1555,10 +1575,26 @@ MSHook(void *, CGImageReadCreateWithFile, NSString *path, int flag) {
 }
 // }}}
 
 }
 // }}}
 

+extern "C" void WKSetCurrentGraphicsContext(CGContextRef);
+
+static void NSString$drawAtPoint$withStyle$(NSString *self, SEL _cmd, CGPoint point, NSString *style) {
+    WKSetCurrentGraphicsContext(UIGraphicsGetCurrentContext());
+    if (style == nil || [style length] == 0)
+        style = @"font-family: Helvetica; font-size: 12px";
+    return [[WBMarkup sharedMarkup] drawString:self atPoint:point 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";
+    return [[WBMarkup sharedMarkup] sizeOfString:self withStyle:style forWidth:width];
+}
+

 static void SBInitialize() {
 static void SBInitialize() {

-    _UIImage$defaultDesktopImage = MSHookMessage(object_getClass($UIImage), @selector(defaultDesktopImage), &$UIImage$defaultDesktopImage);
+    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");

 
 

-    bool olden(dlsym(RTLD_DEFAULT, "GSLibraryCopyGenerationInfoValueForKey") == NULL);
+    _UIImage$defaultDesktopImage = MSHookMessage(object_getClass($UIImage), @selector(defaultDesktopImage), &$UIImage$defaultDesktopImage);

 
     if (SummerBoard_) {
         WBRename(SBApplication, pathForIcon, pathForIcon);
 
     if (SummerBoard_) {
         WBRename(SBApplication, pathForIcon, pathForIcon);


@@ -1577,9 +1613,6 @@ static void SBInitialize() {
     WBRename(SBDockIconListView, setFrame:, setFrame$);
     MSHookMessage(object_getClass($SBDockIconListView), @selector(shouldShowNewDock), &$SBDockIconListView$shouldShowNewDock, &_SBDockIconListView$shouldShowNewDock);
 
     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$);
 
     WBRename(SBIconLabel, initWithSize:label:, initWithSize$label$);
     WBRename(SBIconLabel, setInDock:, setInDock$);
 


@@ -1694,7 +1727,7 @@ MSInitialize {
     // }}}
     // SpringBoard {{{
     if (SpringBoard_) {
     // }}}
     // SpringBoard {{{
     if (SpringBoard_) {

-        Wallpapers_ = [[NSArray arrayWithObjects:@"Wallpaper.mp4", @"Wallpaper.png", @"Wallpaper.jpg", @"Wallpaper.html", nil] retain];
+        Wallpapers_ = [[NSArray arrayWithObjects:@"Wallpaper.mp4", @"Wallpaper@2x.png", @"Wallpaper@2x.jpg", @"Wallpaper.png", @"Wallpaper.jpg", @"Wallpaper.html", nil] retain];

         Docked_ = $getTheme$([NSArray arrayWithObjects:@"Dock.png", nil]);
 
         CFNotificationCenterAddObserver(
         Docked_ = $getTheme$([NSArray arrayWithObjects:@"Dock.png", nil]);
 
         CFNotificationCenterAddObserver(