Update cy+ dependencies.

[cydget.git] / Tweak.mm

diff --git a/Tweak.mm b/Tweak.mm
index 5b8e843e4d25f21e65d73f584b7163a4bf085909..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)
 */
 
 /*
@@ -47,8 +47,10 @@
 #import <SpringBoard/SpringBoard.h>
 
 MSClassHook(SpringBoard)
+
 MSClassHook(SBAwayController)
 MSClassHook(SBAwayView)
+MSClassHook(SBAwayViewController)
 MSClassHook(SBAwayWindow)
 
 #define _trace() \
@@ -84,24 +86,61 @@ static unsigned online_;
 - (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 {
     if (NSString *plugin = [self objectForKey:@"CYPlugin"] ?: [self objectForKey:@"Plugin"]) {
-        [away enableLockScreenBundleWithName:plugin];
         ++online_;
+        UIKeyboardEnableAutomaticAppearance();
+
+        [[$UIPeripheralHost sharedInstance] createAutomaticKeyboardIfNeeded];
+        [[UITextEffectsWindow sharedTextEffectsWindow] setWindowLevel:1000];
+
+        [away enableLockScreenBundleWithName:plugin];
     }
 }
 
 - (void) disableCydget:(SBAwayController *)away {
     if (NSString *plugin = [self objectForKey:@"CYPlugin"] ?: [self objectForKey:@"Plugin"]) {
         [away disableLockScreenBundleWithName:plugin];
+
+        [$UIPeripheralHost _releaseSharedInstance];
+
+        UIKeyboardDisableAutomaticAppearance();
         --online_;
     }
 }
 
 @end
 
+// 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];
+}
+
+// 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];
@@ -114,8 +153,9 @@ MSInstanceMessageHook0(BOOL, SBAwayController, handleMenuButtonTap) {
 
 MSInstanceMessageHook0(void, SBAwayController, _undimScreen) {
     menu_ = false;
-    [[cydgets_ objectAtIndex:active_] enableCydget:[$SBAwayController sharedAwayController]];
-    MSOldCall();
+    [[cydgets_ objectAtIndex:active_] enableCydget:self];
+    [[[self awayView] window] makeKeyWindow];
+    return MSOldCall();
 }
 
 static void Deactivate_(SBAwayController *self) {
@@ -134,14 +174,16 @@ MSInstanceMessageHook1(void, SpringBoard, menuButtonUp, GSEventRef, event) {
 }
 
 MSInstanceMessageHook1(void, SBAwayView, addGestureRecognizer, id, recognizer) {
-    // MSOldCall(recognizer);
+    if (online_ == 0)
+        return MSOldCall(recognizer);
 }
 
 MSInstanceMessageHook1(void, SBAwayWindow, sendGSEvent, GSEventRef, event) {
-    if (online_ != 0)
-        MSSuperCall(event);
-    else
-        MSOldCall(event);
+    NSLog(@"sendGSEvent");
+    if (online_ == 0)
+        return MSOldCall(event);
+
+    return MSSuperCall(event);
 }
 
 #define Cydgets_ @"/System/Library/LockCydgets"