Update cy+ dependencies.

[cydget.git] / Tweak.mm

diff --git a/Tweak.mm b/Tweak.mm
index cd25dfd6d10f64f5a46903614bddcd45d4cfe52b..361223f1cde0985a9f311117555eec12ff4fc92c 100644 (file)
--- a/Tweak.mm
+++ b/Tweak.mm
@@ -1,5 +1,5 @@
-/* Cydget - open-source IntelliScreen replacement
- * Copyright (C) 2009  Jay Freeman (saurik)
+/* Cydget - open-source AwayView plugin multiplexer
+ * Copyright (C) 2009-2011  Jay Freeman (saurik)

 */
 
 /*
 */
 
 /*


@@ -42,12 +42,16 @@
 #include <UIKit/UIKit.h>
 
 #import <SpringBoard/SBAwayController.h>
 #include <UIKit/UIKit.h>
 
 #import <SpringBoard/SBAwayController.h>

+#import <SpringBoard/SBAwayView.h>

 #import <SpringBoard/SBAwayWindow.h>
 #import <SpringBoard/SpringBoard.h>
 
 MSClassHook(SpringBoard)
 #import <SpringBoard/SBAwayWindow.h>
 #import <SpringBoard/SpringBoard.h>
 
 MSClassHook(SpringBoard)

+

 MSClassHook(SBAwayController)
 MSClassHook(SBAwayView)
 MSClassHook(SBAwayController)
 MSClassHook(SBAwayView)

+MSClassHook(SBAwayViewController)
+MSClassHook(SBAwayWindow)

 
 #define _trace() \
     NSLog(@"_trace(%s:%u)@%s %d", __FILE__, __LINE__, __FUNCTION__, active_)
 
 #define _trace() \
     NSLog(@"_trace(%s:%u)@%s %d", __FILE__, __LINE__, __FUNCTION__, active_)


@@ -55,11 +59,11 @@ MSClassHook(SBAwayView)
     static_cast<type>(~type())
 
 static bool menu_;
     static_cast<type>(~type())
 
 static bool menu_;

-static unsigned lock_;

 
 static _H<NSArray> settings_;
 static _H<NSArray> cydgets_;
 static size_t active_;
 
 static _H<NSArray> settings_;
 static _H<NSArray> cydgets_;
 static size_t active_;

+static unsigned online_;

 
 @interface CydgetController : NSObject {
 }
 
 @interface CydgetController : NSObject {
 }


@@ -71,7 +75,8 @@ static size_t active_;
 @implementation CydgetController
 
 + (NSDictionary *) currentConfiguration {
 @implementation CydgetController
 
 + (NSDictionary *) currentConfiguration {

-    return [[cydgets_ objectAtIndex:active_] objectForKey:@"Configuration"];
+    NSDictionary *cydget([cydgets_ objectAtIndex:active_]);
+    return [cydget objectForKey:@"CYConfiguration"] ?: [cydget objectForKey:@"Configuration"];

 }
 
 @end
 }
 
 @end


@@ -81,24 +86,63 @@ static size_t active_;
 - (void) disableCydget:(SBAwayController *)away;
 @end
 
 - (void) disableCydget:(SBAwayController *)away;
 @end
 

+@interface UIPeripheralHost : NSObject
++ (UIPeripheralHost *) sharedInstance;
++ (void) _releaseSharedInstance;
+- (void) createAutomaticKeyboardIfNeeded;
+@end
+
+MSClassHook(UIPeripheralHost)
+
+@interface UITextEffectsWindow : UIWindow
++ (UIWindow *) sharedTextEffectsWindow;
+@end
+

 @implementation NSDictionary (Cydgets)
 
 - (void) enableCydget:(SBAwayController *)away {
 @implementation NSDictionary (Cydgets)
 
 - (void) enableCydget:(SBAwayController *)away {

-    if (NSString *plugin = [self objectForKey:@"Plugin"])
+    if (NSString *plugin = [self objectForKey:@"CYPlugin"] ?: [self objectForKey:@"Plugin"]) {
+        ++online_;
+        UIKeyboardEnableAutomaticAppearance();
+
+        [[$UIPeripheralHost sharedInstance] createAutomaticKeyboardIfNeeded];
+        [[UITextEffectsWindow sharedTextEffectsWindow] setWindowLevel:1000];
+

         [away enableLockScreenBundleWithName:plugin];
         [away enableLockScreenBundleWithName:plugin];

+    }

 }
 
 - (void) disableCydget:(SBAwayController *)away {
 }
 
 - (void) disableCydget:(SBAwayController *)away {

-    if (NSString *plugin = [self objectForKey:@"Plugin"])
+    if (NSString *plugin = [self objectForKey:@"CYPlugin"] ?: [self objectForKey:@"Plugin"]) {

         [away disableLockScreenBundleWithName:plugin];
         [away disableLockScreenBundleWithName:plugin];

+
+        [$UIPeripheralHost _releaseSharedInstance];
+
+        UIKeyboardDisableAutomaticAppearance();
+        --online_;
+    }

 }
 
 @end
 
 }
 
 @end
 

-MSInstanceMessageHook0(BOOL, SBAwayController, handleMenuButtonTap) {
-    unsigned lock(lock_);
+// avoid rendering a keyboard onto the default SBAwayView while automatic keyboard is online
+MSInstanceMessageHook0(UIView *, SBAwayView, inputView) {
+    if (online_ == 0)
+        return MSOldCall();
+
+    return [[[UIView alloc] init] autorelease];
+}

 
 

-    if (!MSOldCall() && lock != 2) {
+// by default, keyboard actions are redirected to SBAwayController and press menu button
+MSInstanceMessageHook1(void, SpringBoard, handleKeyEvent, GSEventRef, event) {
+    if (online_ == 0)
+        return MSOldCall(event);
+
+    return MSSuperCall(event);
+}
+
+MSInstanceMessageHook0(BOOL, SBAwayController, handleMenuButtonTap) {
+    if (!MSOldCall() && menu_) {

         [[cydgets_ objectAtIndex:active_] disableCydget:self];
         active_ = (active_ + 1) % [cydgets_ count];
         [[cydgets_ objectAtIndex:active_] enableCydget:self];
         [[cydgets_ objectAtIndex:active_] disableCydget:self];
         active_ = (active_ + 1) % [cydgets_ count];
         [[cydgets_ objectAtIndex:active_] enableCydget:self];


@@ -108,15 +152,10 @@ MSInstanceMessageHook0(BOOL, SBAwayController, handleMenuButtonTap) {
 }
 
 MSInstanceMessageHook0(void, SBAwayController, _undimScreen) {
 }
 
 MSInstanceMessageHook0(void, SBAwayController, _undimScreen) {

-    if (lock_ == 1)
-        lock_ = 2;
-    [[cydgets_ objectAtIndex:active_] enableCydget:[$SBAwayController sharedAwayController]];
-    MSOldCall();
-}
-
-MSInstanceMessageHook0(void, SBAwayController, undimScreen) {
-    lock_ = menu_ ? 1 : 0;
-    MSOldCall();
+    menu_ = false;
+    [[cydgets_ objectAtIndex:active_] enableCydget:self];
+    [[[self awayView] window] makeKeyWindow];
+    return MSOldCall();

 }
 
 static void Deactivate_(SBAwayController *self) {
 }
 
 static void Deactivate_(SBAwayController *self) {


@@ -124,19 +163,27 @@ static void Deactivate_(SBAwayController *self) {
     active_ = 0;
 }
 
     active_ = 0;
 }
 

-MSInstanceMessageHook0(void, SBAwayController, finishedDimmingScreen) {
-    Deactivate_(self);
-    MSOldCall();
+MSInstanceMessageHook1(void, SBAwayController, dimScreen, BOOL, dim) {
+    Deactivate_([$SBAwayController sharedAwayController]);
+    MSOldCall(dim);

 }
 
 MSInstanceMessageHook1(void, SpringBoard, menuButtonUp, GSEventRef, event) {
     menu_ = true;
     MSOldCall(event);
 }
 
 MSInstanceMessageHook1(void, SpringBoard, menuButtonUp, GSEventRef, event) {
     menu_ = true;
     MSOldCall(event);

-    menu_ = false;

 }
 
 MSInstanceMessageHook1(void, SBAwayView, addGestureRecognizer, id, recognizer) {
 }
 
 MSInstanceMessageHook1(void, SBAwayView, addGestureRecognizer, id, recognizer) {

-    // MSOldCall(recognizer);
+    if (online_ == 0)
+        return MSOldCall(recognizer);
+}
+
+MSInstanceMessageHook1(void, SBAwayWindow, sendGSEvent, GSEventRef, event) {
+    NSLog(@"sendGSEvent");
+    if (online_ == 0)
+        return MSOldCall(event);
+
+    return MSSuperCall(event);

 }
 
 #define Cydgets_ @"/System/Library/LockCydgets"
 }
 
 #define Cydgets_ @"/System/Library/LockCydgets"


@@ -146,9 +193,9 @@ static void CydgetSetup() {
     settings_ = [NSMutableDictionary dictionaryWithContentsOfFile:plist] ?: [NSMutableDictionary dictionary];
 
     NSArray *cydgets([settings_ objectForKey:@"LockCydgets"] ?: [NSArray arrayWithObjects:[NSDictionary dictionaryWithObjectsAndKeys:
     settings_ = [NSMutableDictionary dictionaryWithContentsOfFile:plist] ?: [NSMutableDictionary dictionary];
 
     NSArray *cydgets([settings_ objectForKey:@"LockCydgets"] ?: [NSArray arrayWithObjects:[NSDictionary dictionaryWithObjectsAndKeys:

-        @"AwayView", @"Name", [NSNumber numberWithBool:YES], @"Active", nil
+        @"Welcome", @"Name", [NSNumber numberWithBool:YES], @"Active", nil

     ], [NSDictionary dictionaryWithObjectsAndKeys:
     ], [NSDictionary dictionaryWithObjectsAndKeys:

-        @"CydgetCentral", @"Name", [NSNumber numberWithBool:YES], @"Active", nil
+        @"AwayView", @"Name", [NSNumber numberWithBool:YES], @"Active", nil

     ], nil]);
 
     cydgets_ = [NSMutableArray arrayWithCapacity:4];
     ], nil]);
 
     cydgets_ = [NSMutableArray arrayWithCapacity:4];


@@ -156,6 +203,9 @@ static void CydgetSetup() {
         if ([[cydget objectForKey:@"Active"] boolValue])
             if (NSDictionary *info = [NSDictionary dictionaryWithContentsOfFile:[NSString stringWithFormat:@"%@/%@.cydget/Info.plist", Cydgets_, [cydget objectForKey:@"Name"]]])
                 [cydgets_ addObject:info];
         if ([[cydget objectForKey:@"Active"] boolValue])
             if (NSDictionary *info = [NSDictionary dictionaryWithContentsOfFile:[NSString stringWithFormat:@"%@/%@.cydget/Info.plist", Cydgets_, [cydget objectForKey:@"Name"]]])
                 [cydgets_ addObject:info];

+
+    if ([cydgets_ count] == 0)
+        cydgets_ = nil;

 }
 
 // XXX: this could happen while it is unlocked
 }
 
 // XXX: this could happen while it is unlocked


@@ -171,3 +221,18 @@ MSInstanceMessageHook1(void, SBAwayController, _finishedUnlockAttemptWithStatus,
         Deactivate_(self);
     MSOldCall(status);
 }
         Deactivate_(self);
     MSOldCall(status);
 }

+
+MSInstanceMessageHook0(void, SBAwayView, updateInterface) {
+    MSOldCall();
+
+    NSDictionary *cydget([cydgets_ objectAtIndex:active_]);
+
+    NSString *background([cydget objectForKey:@"CYBackground"]);
+    if ([background isEqualToString:@"Wallpaper"]) {
+        MSIvarHook(UIView *, _backgroundView);
+        [_backgroundView setAlpha:1.0f];
+    }
+
+    if ([[cydget objectForKey:@"CYShowDateTime"] boolValue])
+        [self addDateView];
+}