Move more of sysroot's sadness into iPhonePrivate.

diff --git a/Cydia/LoadingView.mm b/Cydia/LoadingView.mm
index 715b16fbbc0ad948328f00cd66547290ce238ee1..4b54faa8d196da52e72184403420c26f862888a8 100644 (file)
--- a/Cydia/LoadingView.mm
+++ b/Cydia/LoadingView.mm
@@ -19,9 +19,11 @@
 **/
 /* }}} */
 
 **/
 /* }}} */
 

-#include "Cydia/LoadingView.h"
+#include "CyteKit/UCPlatform.h"

 #include "CyteKit/Localize.h"
 
 #include "CyteKit/Localize.h"
 

+#include "Cydia/LoadingView.h"
+

 @implementation CydiaLoadingView
 
 - (id) initWithFrame:(CGRect)frame {
 @implementation CydiaLoadingView
 
 - (id) initWithFrame:(CGRect)frame {

diff --git a/Cydia/LoadingViewController.mm b/Cydia/LoadingViewController.mm
index d5f4830e582fb795ea8742f008e65a32a4d49d58..48e33128603ed56962b4b5836bb9b3f6cface708 100644 (file)
--- a/Cydia/LoadingViewController.mm
+++ b/Cydia/LoadingViewController.mm
@@ -19,6 +19,8 @@
 **/
 /* }}} */
 
 **/
 /* }}} */
 

+#include "CyteKit/UCPlatform.h"
+

 #include "Cydia/LoadingView.h"
 #include "Cydia/LoadingViewController.h"
 
 #include "Cydia/LoadingView.h"
 #include "Cydia/LoadingViewController.h"
 

diff --git a/Cydia/MIMEAddress.mm b/Cydia/MIMEAddress.mm
index c50525af5264f033a55b660ce44af41c41c23749..a30be35f290d6a61ebd271060a033e1f700cb9e4 100644 (file)
--- a/Cydia/MIMEAddress.mm
+++ b/Cydia/MIMEAddress.mm
@@ -19,12 +19,13 @@
 **/
 /* }}} */
 
 **/
 /* }}} */
 

-#include "Cydia/MIMEAddress.h"
-
-#include <WebKit/WebScriptObject.h>
+#include "CyteKit/UCPlatform.h"

 
 

+#include "Cydia/MIMEAddress.h"

 #include "CyteKit/RegEx.hpp"
 
 #include "CyteKit/RegEx.hpp"
 

+#include "iPhonePrivate.h"
+

 @implementation MIMEAddress
 
 - (NSString *) name {
 @implementation MIMEAddress
 
 - (NSString *) name {

diff --git a/CyteKit/IndirectDelegate.h b/CyteKit/IndirectDelegate.h
index 42bbd0a66befaced9828890bd363702a0bd3b533..ae698cbebde7a8ff71c985eb0637c1f3b425f086 100644 (file)
--- a/CyteKit/IndirectDelegate.h
+++ b/CyteKit/IndirectDelegate.h
@@ -22,6 +22,8 @@
 #ifndef CyteKit_IndirectDelegate_H
 #define CyteKit_IndirectDelegate_H
 
 #ifndef CyteKit_IndirectDelegate_H
 #define CyteKit_IndirectDelegate_H
 

+#include <Foundation/Foundation.h>
+

 @interface IndirectDelegate : NSObject {
     _transient volatile id delegate_;
 }
 @interface IndirectDelegate : NSObject {
     _transient volatile id delegate_;
 }

diff --git a/CyteKit/TabBarController.h b/CyteKit/TabBarController.h
index cea17d26bd00a833a89502fef755081c4a8f250e..2849b4b3cb9369526db3ac35719d395d535bdefc 100644 (file)
--- a/CyteKit/TabBarController.h
+++ b/CyteKit/TabBarController.h
@@ -22,7 +22,6 @@
 #ifndef CyteKit_TabBarController_H
 #define CyteKit_TabBarController_H
 
 #ifndef CyteKit_TabBarController_H
 #define CyteKit_TabBarController_H
 

-#include <CyteKit/UCPlatform.h>

 #include <CyteKit/ViewController.h>
 
 #include <UIKit/UIKit.h>
 #include <CyteKit/ViewController.h>
 
 #include <UIKit/UIKit.h>

diff --git a/CyteKit/TabBarController.mm b/CyteKit/TabBarController.mm
index bb3d98b86fdb3473d05139824f28fb6a49ec12e4..27a8000f0deee6016e14d115ffaa998b553219f7 100644 (file)
--- a/CyteKit/TabBarController.mm
+++ b/CyteKit/TabBarController.mm
@@ -19,6 +19,8 @@
 **/
 /* }}} */
 
 **/
 /* }}} */
 

+#include "CyteKit/UCPlatform.h"
+

 #include "CyteKit/TabBarController.h"
 
 #include "iPhonePrivate.h"
 #include "CyteKit/TabBarController.h"
 
 #include "iPhonePrivate.h"

diff --git a/CyteKit/TableViewCell.h b/CyteKit/TableViewCell.h
index 46333aa4971ca6dec52260df69e414e45d0ad1d3..f97a592e1d17c0bd50c95d1f94ac0ac9a5fd265d 100644 (file)
--- a/CyteKit/TableViewCell.h
+++ b/CyteKit/TableViewCell.h
@@ -22,8 +22,6 @@
 #ifndef CyteKit_TableViewCell_H
 #define CyteKit_TableViewCell_H
 
 #ifndef CyteKit_TableViewCell_H
 #define CyteKit_TableViewCell_H
 

-#include <CyteKit/UCPlatform.h>
-

 #include <UIKit/UIKit.h>
 
 #include <Menes/ObjectHandle.h>
 #include <UIKit/UIKit.h>
 
 #include <Menes/ObjectHandle.h>

diff --git a/CyteKit/TableViewCell.mm b/CyteKit/TableViewCell.mm
index b4c4a4c1c73dc09cb9e68fc64f30530e8c135992..ce61ad5137c544f14208182398aa312e4ac57139 100644 (file)
--- a/CyteKit/TableViewCell.mm
+++ b/CyteKit/TableViewCell.mm
@@ -19,6 +19,8 @@
 **/
 /* }}} */
 
 **/
 /* }}} */
 

+#include "CyteKit/UCPlatform.h"
+

 #include "CyteKit/TableViewCell.h"
 
 #include "iPhonePrivate.h"
 #include "CyteKit/TableViewCell.h"
 
 #include "iPhonePrivate.h"

diff --git a/CyteKit/ViewController.h b/CyteKit/ViewController.h
index 7cc550e946fc8a08602cae100e87ff90e5ea00b2..f724837de8ffbf1e8c18a444e4c9a49d7de37535 100644 (file)
--- a/CyteKit/ViewController.h
+++ b/CyteKit/ViewController.h
@@ -22,8 +22,6 @@
 #ifndef CyteKit_ViewController_H
 #define CyteKit_ViewController_H
 
 #ifndef CyteKit_ViewController_H
 #define CyteKit_ViewController_H
 

-#include <CyteKit/UCPlatform.h>
-

 #include <UIKit/UIKit.h>
 
 #include <Menes/ObjectHandle.h>
 #include <UIKit/UIKit.h>
 
 #include <Menes/ObjectHandle.h>

diff --git a/CyteKit/ViewController.mm b/CyteKit/ViewController.mm
index ae7539c547c46624d4099397625e5e9d608df398..3bf9c41bc8853febb4b4b3c47e4db74cc566c00e 100644 (file)
--- a/CyteKit/ViewController.mm
+++ b/CyteKit/ViewController.mm
@@ -19,11 +19,13 @@
 **/
 /* }}} */
 
 **/
 /* }}} */
 

-#include "CyteKit/ViewController.h"
+#include "CyteKit/UCPlatform.h"

 
 #include <Foundation/Foundation.h>
 #include <UIKit/UIKit.h>
 
 
 #include <Foundation/Foundation.h>
 #include <UIKit/UIKit.h>
 

+#include "CyteKit/ViewController.h"
+

 #include "iPhonePrivate.h"
 
 @implementation UIViewController (Cydia)
 #include "iPhonePrivate.h"
 
 @implementation UIViewController (Cydia)

diff --git a/CyteKit/WebScriptObject-Cyte.h b/CyteKit/WebScriptObject-Cyte.h
index a7ffa29c3ae042440a92a93e6ac04ff851ed8d35..6a394bcd1851dedc948f82b2979af4d2941fa6dd 100644 (file)
--- a/CyteKit/WebScriptObject-Cyte.h
+++ b/CyteKit/WebScriptObject-Cyte.h
@@ -22,7 +22,7 @@
 #ifndef CyteKit_WebScriptObject_Cyte_H
 #define CyteKit_WebScriptObject_Cyte_H
 
 #ifndef CyteKit_WebScriptObject_Cyte_H
 #define CyteKit_WebScriptObject_Cyte_H
 

-#include <WebKit/WebScriptObject.h>
+#include "iPhonePrivate.h"

 
 @interface WebScriptObject (Cyte)
 - (NSUInteger) count;
 
 @interface WebScriptObject (Cyte)
 - (NSUInteger) count;

diff --git a/CyteKit/WebScriptObject-Cyte.mm b/CyteKit/WebScriptObject-Cyte.mm
index df1bfca4a09a9918fb14ccd1c77bf7b587ccd017..7fa851d2242865af3227a6ad5675400105256fd0 100644 (file)
--- a/CyteKit/WebScriptObject-Cyte.mm
+++ b/CyteKit/WebScriptObject-Cyte.mm
@@ -19,8 +19,12 @@
 **/
 /* }}} */
 
 **/
 /* }}} */
 

+#include "CyteKit/UCPlatform.h"
+

 #include "CyteKit/WebScriptObject-Cyte.h"
 
 #include "CyteKit/WebScriptObject-Cyte.h"
 

+#include "iPhonePrivate.h"
+

 @implementation WebScriptObject (Cyte)
 
 - (NSUInteger) count {
 @implementation WebScriptObject (Cyte)
 
 - (NSUInteger) count {

diff --git a/CyteKit/WebView.h b/CyteKit/WebView.h
index 02fce723a79fef403c9de79a246e1e81e7590649..ddf4391ce601c7079de2cfae7ed04c7508d2a407 100644 (file)
--- a/CyteKit/WebView.h
+++ b/CyteKit/WebView.h
@@ -24,13 +24,12 @@
 
 #include <UIKit/UIKit.h>
 
 
 #include <UIKit/UIKit.h>
 

-#include <WebKit/DOMNodeList.h>
-#include <WebKit/WebFrame.h>
-#include <WebKit/WebPolicyDelegate.h>
-#include <WebKit/WebScriptObject.h>
-#include <WebKit/WebView.h>
+@protocol WebPolicyDecisionListener;

 
 

-#include <JavaScriptCore/JavaScriptCore.h>
+@class WebDataSource;
+@class WebFrame;
+@class WebScriptObject;
+@class WebView;

 
 enum CYWebPolicyDecision {
     CYWebPolicyDecisionUnknown,
 
 enum CYWebPolicyDecision {
     CYWebPolicyDecisionUnknown,

diff --git a/CyteKit/WebView.mm b/CyteKit/WebView.mm
index 09bb4c7855ca72114b1d025b9018dd0944c7365b..38f6a4f92f548c37b8d9c64be730531bbd5ce480 100644 (file)
--- a/CyteKit/WebView.mm
+++ b/CyteKit/WebView.mm
@@ -19,6 +19,8 @@
 **/
 /* }}} */
 
 **/
 /* }}} */
 

+#include "CyteKit/UCPlatform.h"
+

 #include "CyteKit/dispatchEvent.h"
 #include "CyteKit/WebView.h"
 
 #include "CyteKit/dispatchEvent.h"
 #include "CyteKit/WebView.h"
 

diff --git a/CyteKit/WebViewController.mm b/CyteKit/WebViewController.mm
index 6692c6cbe232604b39c06641a14f8181b4b3fce7..18b40d945ca68943aafe83911d97dc6fe954c160 100644 (file)
--- a/CyteKit/WebViewController.mm
+++ b/CyteKit/WebViewController.mm
@@ -1,15 +1,13 @@
 #include "CyteKit/UCPlatform.h"
 #include "CyteKit/UCPlatform.h"

-#include "CyteKit/WebViewController.h"
-
-#include "CyteKit/MFMailComposeViewController-MailToURL.h"
-
-#include "iPhonePrivate.h"

 
 #include "CyteKit/IndirectDelegate.h"
 #include "CyteKit/Localize.h"
 
 #include "CyteKit/IndirectDelegate.h"
 #include "CyteKit/Localize.h"

-#include "CyteKit/WebViewController.h"
+#include "CyteKit/MFMailComposeViewController-MailToURL.h"

 #include "CyteKit/RegEx.hpp"
 #include "CyteKit/WebThreadLocked.hpp"
 #include "CyteKit/RegEx.hpp"
 #include "CyteKit/WebThreadLocked.hpp"

+#include "CyteKit/WebViewController.h"
+
+#include "iPhonePrivate.h"

 
 //#include <QuartzCore/CALayer.h>
 // XXX: fix the minimum requirement
 
 //#include <QuartzCore/CALayer.h>
 // XXX: fix the minimum requirement


@@ -17,15 +15,6 @@ extern NSString * const kCAFilterNearest;
 
 #include <WebCore/WebCoreThread.h>
 
 
 #include <WebCore/WebCoreThread.h>
 

-#import <WebKit/WebKitErrors.h>
-#import <WebKit/WebPreferences.h>
-
-#include <WebKit/DOMCSSPrimitiveValue.h>
-#include <WebKit/DOMCSSStyleDeclaration.h>
-#include <WebKit/DOMDocument.h>
-#include <WebKit/DOMHTMLBodyElement.h>
-#include <WebKit/DOMRGBColor.h>
-

 #include <dlfcn.h>
 #include <objc/runtime.h>
 
 #include <dlfcn.h>
 #include <objc/runtime.h>
 


@@ -683,7 +672,7 @@ float CYScrollViewDecelerationRateNormal;
     [alert addTextFieldWithValue:@"" label:UCLocalize("PASSWORD")];
 
     UITextField *username([alert textFieldAtIndex:0]); {
     [alert addTextFieldWithValue:@"" label:UCLocalize("PASSWORD")];
 
     UITextField *username([alert textFieldAtIndex:0]); {

-        UITextInputTraits *traits([username textInputTraits]);
+        NSObject<UITextInputTraits> *traits([username textInputTraits]);

         [traits setAutocapitalizationType:UITextAutocapitalizationTypeNone];
         [traits setAutocorrectionType:UITextAutocorrectionTypeNo];
         [traits setKeyboardType:UIKeyboardTypeASCIICapable];
         [traits setAutocapitalizationType:UITextAutocapitalizationTypeNone];
         [traits setAutocorrectionType:UITextAutocorrectionTypeNo];
         [traits setKeyboardType:UIKeyboardTypeASCIICapable];


@@ -691,7 +680,7 @@ float CYScrollViewDecelerationRateNormal;
     }
 
     UITextField *password([alert textFieldAtIndex:1]); {
     }
 
     UITextField *password([alert textFieldAtIndex:1]); {

-        UITextInputTraits *traits([password textInputTraits]);
+        NSObject<UITextInputTraits> *traits([password textInputTraits]);

         [traits setAutocapitalizationType:UITextAutocapitalizationTypeNone];
         [traits setAutocorrectionType:UITextAutocorrectionTypeNo];
         [traits setKeyboardType:UIKeyboardTypeASCIICapable];
         [traits setAutocapitalizationType:UITextAutocapitalizationTypeNone];
         [traits setAutocorrectionType:UITextAutocorrectionTypeNo];
         [traits setKeyboardType:UIKeyboardTypeASCIICapable];

diff --git a/CyteKit/WebViewTableViewCell.mm b/CyteKit/WebViewTableViewCell.mm
index ebba58a2ba09acb9d143e16f6368057d8c654a69..3756a0f5960be5141e4b8dadff46b3f99f9c5ab2 100644 (file)
--- a/CyteKit/WebViewTableViewCell.mm
+++ b/CyteKit/WebViewTableViewCell.mm
@@ -19,7 +19,10 @@
 **/
 /* }}} */
 
 **/
 /* }}} */
 

+#include "CyteKit/UCPlatform.h"
+

 #include "CyteKit/WebViewTableViewCell.h"
 #include "CyteKit/WebViewTableViewCell.h"

+

 #include "iPhonePrivate.h"
 
 @implementation CyteWebViewTableViewCell
 #include "iPhonePrivate.h"
 
 @implementation CyteWebViewTableViewCell

diff --git a/CyteKit/dispatchEvent.mm b/CyteKit/dispatchEvent.mm
index 9efe1cb4cd586ae379bd577a0150c76b6f0fdd7d..f36be8ca47045a4372f95419428392f5c468234e 100644 (file)
--- a/CyteKit/dispatchEvent.mm
+++ b/CyteKit/dispatchEvent.mm
@@ -19,15 +19,11 @@
 **/
 /* }}} */
 
 **/
 /* }}} */
 

+#include "CyteKit/UCPlatform.h"
+

 #include "CyteKit/dispatchEvent.h"
 #include "CyteKit/WebThreadLocked.hpp"
 
 #include "CyteKit/dispatchEvent.h"
 #include "CyteKit/WebThreadLocked.hpp"
 

-#include <WebCore/WebEvent.h>
-
-#include <WebKit/WebFrame.h>
-#include <WebKit/WebScriptObject.h>
-#include <WebKit/WebView.h>
-

 #include "Substrate.hpp"
 
 @implementation UIWebDocumentView (CyteDispatchEvent)
 #include "Substrate.hpp"
 
 @implementation UIWebDocumentView (CyteDispatchEvent)

diff --git a/CyteKit/stringWithUTF8Bytes.mm b/CyteKit/stringWithUTF8Bytes.mm
index 94fe1edf375dbd8d7f0194636b4e1393389f16c5..2e94dd4deb204788f0aaf19feaa9672de98ab46e 100644 (file)
--- a/CyteKit/stringWithUTF8Bytes.mm
+++ b/CyteKit/stringWithUTF8Bytes.mm
@@ -19,6 +19,8 @@
 **/
 /* }}} */
 
 **/
 /* }}} */
 

+#include "CyteKit/UCPlatform.h"
+

 #include "CyteKit/stringWithUTF8Bytes.h"
 
 @implementation NSString (Cyte)
 #include "CyteKit/stringWithUTF8Bytes.h"
 
 @implementation NSString (Cyte)

diff --git a/Menes/Function.h b/Menes/Function.h
index fffdda9e40a28f5ed7d796f0b2cb2fcdf297b7d5..37f8e9737e4a2c57e50b7da72d1014376a4a9c6d 100644 (file)
--- a/Menes/Function.h
+++ b/Menes/Function.h
@@ -22,8 +22,6 @@
 #ifndef Menes_Function_H
 #define Menes_Function_H
 
 #ifndef Menes_Function_H
 #define Menes_Function_H
 

-#include "CyteKit/UCPlatform.h"
-

 template <typename Result_, typename... Args_>
 class Function {
   private:
 template <typename Result_, typename... Args_>
 class Function {
   private:

diff --git a/Menes/ObjectHandle.h b/Menes/ObjectHandle.h
index 6369fd04d9f6dc84ef7a3d6257f00f623cacb81f..9b8d57d76ed65444e0c5f31e886edc7c20109764 100644 (file)
--- a/Menes/ObjectHandle.h
+++ b/Menes/ObjectHandle.h
@@ -22,8 +22,6 @@
 #ifndef Menes_ObjectHandle_H
 #define Menes_ObjectHandle_H
 
 #ifndef Menes_ObjectHandle_H
 #define Menes_ObjectHandle_H
 

-#include "CyteKit/UCPlatform.h"
-

 #include <CoreFoundation/CoreFoundation.h>
 #include <Foundation/Foundation.h>
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <Foundation/Foundation.h>
 

diff --git a/Menes/invocationWithSelector.mm b/Menes/invocationWithSelector.mm
index a2214fbdd18eac9d033eff047b5fe4cd029106e6..b730c4d5c58f1aa097b0e35f2829a1b482ee3c63 100644 (file)
--- a/Menes/invocationWithSelector.mm
+++ b/Menes/invocationWithSelector.mm
@@ -19,6 +19,8 @@
 **/
 /* }}} */
 
 **/
 /* }}} */
 

+#include "CyteKit/UCPlatform.h"
+

 #include "Menes/invocationWithSelector.h"
 
 @implementation NSInvocation (MenesInvocationWithSelector)
 #include "Menes/invocationWithSelector.h"
 
 @implementation NSInvocation (MenesInvocationWithSelector)

diff --git a/Menes/yieldToSelector.mm b/Menes/yieldToSelector.mm
index f8f62032602a51f5a8f131744ff1dc2eb3955b08..f47c4a02530d052ca034fe7cf2db72b3dc007fbf 100644 (file)
--- a/Menes/yieldToSelector.mm
+++ b/Menes/yieldToSelector.mm
@@ -19,6 +19,8 @@
 **/
 /* }}} */
 
 **/
 /* }}} */
 

+#include "CyteKit/UCPlatform.h"
+

 #include "Menes/yieldToSelector.h"
 
 @implementation NSObject (MenesYieldToSelector)
 #include "Menes/yieldToSelector.h"
 
 @implementation NSObject (MenesYieldToSelector)

diff --git a/MobileCydia.mm b/MobileCydia.mm
index 4f90372c400b5c7ff24fd928778c7e4f921dc34d..4e8f7189a251c783300fbcc088833357432e8ead 100644 (file)
--- a/MobileCydia.mm
+++ b/MobileCydia.mm
@@ -53,7 +53,6 @@
 #include <QuartzCore/CALayer.h>
 
 #include <WebCore/WebCoreThread.h>
 #include <QuartzCore/CALayer.h>
 
 #include <WebCore/WebCoreThread.h>

-#include <WebKit/DOMHTMLIFrameElement.h>

 
 #include <algorithm>
 #include <fstream>
 
 #include <algorithm>
 #include <fstream>


@@ -8855,7 +8854,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
     [alert setNumberOfRows:1];
     [alert addTextFieldWithValue:@"http://" label:@""];
 
     [alert setNumberOfRows:1];
     [alert addTextFieldWithValue:@"http://" label:@""];
 

-    UITextInputTraits *traits = [[alert textField] textInputTraits];
+    NSObject<UITextInputTraits> *traits = [[alert textField] textInputTraits];

     [traits setAutocapitalizationType:UITextAutocapitalizationTypeNone];
     [traits setAutocorrectionType:UITextAutocorrectionTypeNo];
     [traits setKeyboardType:UIKeyboardTypeURL];
     [traits setAutocapitalizationType:UITextAutocapitalizationTypeNone];
     [traits setAutocorrectionType:UITextAutocorrectionTypeNo];
     [traits setKeyboardType:UIKeyboardTypeURL];


@@ -9605,7 +9604,7 @@ _end
         [super applicationSuspend];
 }
 
         [super applicationSuspend];
 }
 

-- (void) applicationSuspend:(__GSEvent *)event {
+- (void) applicationSuspend:(GSEventRef)event {

     if ([self isSafeToSuspend])
         [super applicationSuspend:event];
 }
     if ([self isSafeToSuspend])
         [super applicationSuspend:event];
 }

diff --git a/Sources.mm b/Sources.mm
index f89ed1890f8d36071c6b05445e3693266ce750a1..a156ee2f404e1e73aa09cfeafff15d91f8e6d908 100644 (file)
--- a/Sources.mm
+++ b/Sources.mm
@@ -19,9 +19,10 @@
 **/
 /* }}} */
 
 **/
 /* }}} */
 

+#include "CyteKit/UCPlatform.h"
+

 #include <Foundation/Foundation.h>
 #include <Menes/ObjectHandle.h>
 #include <Foundation/Foundation.h>
 #include <Menes/ObjectHandle.h>

-#include <CyteKit/UCPlatform.h>

 
 #include <cstdio>
 
 
 #include <cstdio>
 

diff --git a/iPhonePrivate.h b/iPhonePrivate.h
index 19af1aa0351e9905c6545ced49520d3fec343a08..411ff9643680e6c263e3174cabd480624774f5a1 100644 (file)
--- a/iPhonePrivate.h
+++ b/iPhonePrivate.h
@@ -2,16 +2,14 @@
 #define CYDIA_UIKITPRIVATE_H
 
 // #include <*> {{{
 #define CYDIA_UIKITPRIVATE_H
 
 // #include <*> {{{

-#include <GraphicsServices/GraphicsServices.h>
+#include <JavaScriptCore/JavaScriptCore.h>

 #include <UIKit/UIKit.h>
 // }}}
 #include <UIKit/UIKit.h>
 // }}}

-// #import <*> {{{
-#import <WebKit/DOMHTMLIFrameElement.h>
-#import <WebKit/WebFrame.h>
-#import <WebKit/WebPreferences.h>
-#import <WebKit/WebView.h>
+// typedef GS* {{{
+typedef struct __GSEvent *GSEventRef;

 // }}}
 // }}}

-// typedef enum {*} *; {{{
+
+// enum UI* {{{

 typedef enum {
     UIGestureAttributeMinDegrees,                 /*float*/
     UIGestureAttributeMaxDegrees,                 /*float*/
 typedef enum {
     UIGestureAttributeMinDegrees,                 /*float*/
     UIGestureAttributeMaxDegrees,                 /*float*/


@@ -37,12 +35,82 @@ static const UIActivityIndicatorViewStyle UIActivityIndicatorViewStyleWhiteTiny(
 // #define * * {{{
 #define UIDataDetectorTypeAutomatic 0x80000000
 // }}}
 // #define * * {{{
 #define UIDataDetectorTypeAutomatic 0x80000000
 // }}}

+
+// @class DOM*; {{{
+@class DOMRGBColor;
+// }}}

 // @class Web*; {{{
 @class WebDataSource;
 @class WebScriptObject;
 // @class Web*; {{{
 @class WebDataSource;
 @class WebScriptObject;

+@class WebView;

 // }}}
 // }}}

-// @protocol *; {{{
-@protocol WebPolicyDecisionListener;
+
+// enum DOM_* {{{
+enum {
+    DOM_CSS_UNKNOWN = 0,
+    DOM_CSS_NUMBER = 1,
+    DOM_CSS_PERCENTAGE = 2,
+    DOM_CSS_EMS = 3,
+    DOM_CSS_EXS = 4,
+    DOM_CSS_PX = 5,
+    DOM_CSS_CM = 6,
+    DOM_CSS_MM = 7,
+    DOM_CSS_IN = 8,
+    DOM_CSS_PT = 9,
+    DOM_CSS_PC = 10,
+    DOM_CSS_DEG = 11,
+    DOM_CSS_RAD = 12,
+    DOM_CSS_GRAD = 13,
+    DOM_CSS_MS = 14,
+    DOM_CSS_S = 15,
+    DOM_CSS_HZ = 16,
+    DOM_CSS_KHZ = 17,
+    DOM_CSS_DIMENSION = 18,
+    DOM_CSS_STRING = 19,
+    DOM_CSS_URI = 20,
+    DOM_CSS_IDENT = 21,
+    DOM_CSS_ATTR = 22,
+    DOM_CSS_COUNTER = 23,
+    DOM_CSS_RECT = 24,
+    DOM_CSS_RGBCOLOR = 25,
+    DOM_CSS_VW = 26,
+    DOM_CSS_VH = 27,
+    DOM_CSS_VMIN = 28,
+    DOM_CSS_VMAX = 29
+};
+// }}}
+// enum Web* {{{
+typedef NS_ENUM(NSUInteger, WebCacheModel) {
+    WebCacheModelDocumentViewer = 0,
+    WebCacheModelDocumentBrowser = 1,
+    WebCacheModelPrimaryWebBrowser = 2
+};
+
+typedef enum {
+    WebEventMouseDown,
+    WebEventMouseUp,
+    WebEventMouseMoved,
+    WebEventScrollWheel,
+    WebEventKeyDown,
+    WebEventKeyUp,
+    WebEventTouchBegin,
+    WebEventTouchChange,
+    WebEventTouchEnd,
+    WebEventTouchCancel
+} WebEventType;
+
+enum {
+    WebKitErrorCannotShowMIMEType = 100,
+    WebKitErrorCannotShowURL = 101,
+    WebKitErrorFrameLoadInterruptedByPolicyChange = 102,
+};
+// }}}
+// @protocol Web*; {{{
+@protocol WebPolicyDecisionListener <NSObject>
+- (void) use;
+- (void) download;
+- (void) ignore;
+@end

 // }}}
 
 // @interface * : UIView {{{
 // }}}
 
 // @interface * : UIView {{{


@@ -147,26 +215,127 @@ static const UIActivityIndicatorViewStyle UIActivityIndicatorViewStyleWhiteTiny(
 + (WebDefaultUIKitDelegate *) sharedUIKitDelegate;
 @end
 // }}}
 + (WebDefaultUIKitDelegate *) sharedUIKitDelegate;
 @end
 // }}}

-// @interface UIWeb* : * {{{
-@interface UIWebBrowserView : UIWebDocumentView
+// @interface DOM* {{{
+@interface DOMObject

 @end
 
 @end
 

-@interface UIWebTouchEventsGestureRecognizer : UIGestureRecognizer
-- (int) type;
-- (NSString *) _typeDescription;
+@interface DOMCSSValue : DOMObject
+@end
+
+@interface DOMCSSPrimitiveValue : DOMCSSValue
+@property (readonly) unsigned short primitiveType;
+- (DOMRGBColor *) getRGBColorValue;
+- (float) getFloatValue:(unsigned short)unit;
+@end
+
+@interface DOMRGBColor : DOMObject
+@property (readonly, strong) DOMCSSPrimitiveValue *red;
+@property (readonly, strong) DOMCSSPrimitiveValue *green;
+@property (readonly, strong) DOMCSSPrimitiveValue *blue;
+@property (readonly, strong) DOMCSSPrimitiveValue *alpha;
+@end
+
+@interface DOMCSSStyleDeclaration : DOMObject
+- (DOMCSSValue *) getPropertyCSSValue:(NSString *)name;
+- (void) setProperty:(NSString *)name value:(NSString *)value priority:(NSString *)priority;
+@end
+
+@interface DOMNode : DOMObject
+@end
+
+@interface DOMNodeList : DOMObject
+@property (readonly) unsigned length;
+- (DOMNode *) item:(unsigned)index;
+@end
+
+@interface DOMElement : DOMNode
+@property (readonly) int scrollHeight;
+@end
+
+@interface DOMHTMLElement : DOMElement
+@property (readonly, strong) DOMCSSStyleDeclaration *style;
+@end
+
+@interface DOMHTMLBodyElement : DOMHTMLElement
+@end
+
+@interface DOMHTMLIFrameElement : DOMHTMLElement
+@end
+
+@interface DOMDocument : DOMNode
+@property (strong) DOMHTMLElement *body;
+- (DOMCSSStyleDeclaration *) getComputedStyle:(DOMElement *)element pseudoElement:(NSString *)pseudo;
+- (DOMNodeList *) getElementsByTagName:(NSString *)name;

 @end
 // }}}
 // @interface WAK* : * {{{
 @end
 // }}}
 // @interface WAK* : * {{{

+@interface WAKResponder : NSObject
+@end
+
+@interface WAKView : NSObject
++ (BOOL) hasLandscapeOrientation;
+@end
+

 @interface WAKWindow : NSObject
 + (BOOL) hasLandscapeOrientation;
 @end
 // }}}
 @interface WAKWindow : NSObject
 + (BOOL) hasLandscapeOrientation;
 @end
 // }}}

+// @interface Web* {{{
+@interface WebPreferences : NSObject
+- (void) setCacheModel:(WebCacheModel)value;
+- (void) setJavaScriptCanOpenWindowsAutomatically:(BOOL)value;
+@end
+
+@interface WebFrame : NSObject
+@property (nonatomic, readonly, copy) NSArray *childFrames;
+@property (nonatomic, readonly, strong) WebDataSource *dataSource;
+@property (nonatomic, readonly, strong) DOMDocument *DOMDocument;
+@property (nonatomic, readonly, strong) DOMHTMLElement *frameElement;
+@property (nonatomic, readonly) JSGlobalContextRef globalContext;
+@property (nonatomic, readonly, strong) WebFrame *parentFrame;
+@property (nonatomic, readonly, strong) WebDataSource *provisionalDataSource;
+@property (nonatomic, readonly, strong) WebScriptObject *windowObject;
+@end
+
+@interface WebView : WAKView
+@property (nonatomic, readonly, strong) WebFrame *mainFrame;
+@property (nonatomic, strong) WebPreferences *preferences;
+- (IBAction) reloadFromOrigin:(id)sender;
+- (void) setApplicationNameForUserAgent:(NSString *)value;
+- (void) setShouldUpdateWhileOffscreen:(BOOL)value;
+@end
+
+@interface WebScriptObject : NSObject
+- (id) evaluateWebScript:(NSString *)script;
++ (BOOL) isKeyExcludedFromWebScript:(const char *)name;
+- (JSObjectRef) JSObject;
+- (void) setWebScriptValueAtIndex:(unsigned)index value:(id)value;
+- (id) webScriptValueAtIndex:(unsigned)index;
+@end
+
+@interface WebUndefined : NSObject
++ (WebUndefined *) undefined;
+@end
+// }}}
+// @interface UIWeb* : * {{{
+@interface UIWebBrowserView : UIWebDocumentView
+@end
+
+@interface UIWebTouchEventsGestureRecognizer : UIGestureRecognizer
+- (int) type;
+- (NSString *) _typeDescription;
+@end
+// }}}

 
 // @interface NS* (*) {{{
 @interface NSMutableURLRequest (Apple)
 - (void) setHTTPShouldUsePipelining:(BOOL)pipelining;
 @end
 
 
 // @interface NS* (*) {{{
 @interface NSMutableURLRequest (Apple)
 - (void) setHTTPShouldUsePipelining:(BOOL)pipelining;
 @end
 

+@interface NSObject (Apple)
++ (BOOL) isKeyExcludedFromWebScript:(const char *)name;
+@end
+

 @interface NSString (Apple)
 - (NSString *) stringByAddingPercentEscapes;
 - (NSString *) stringByReplacingCharacter:(UniChar)from withCharacter:(UniChar)to;
 @interface NSString (Apple)
 - (NSString *) stringByAddingPercentEscapes;
 - (NSString *) stringByReplacingCharacter:(UniChar)from withCharacter:(UniChar)to;


@@ -281,7 +450,7 @@ static const UIActivityIndicatorViewStyle UIActivityIndicatorViewStyleWhiteTiny(
 @end
 
 @interface UITextField (Apple)
 @end
 
 @interface UITextField (Apple)

-- (UITextInputTraits *) textInputTraits;
+- (NSObject<UITextInputTraits> *) textInputTraits;

 @end
 
 @interface UITextView (Apple)
 @end
 
 @interface UITextView (Apple)


@@ -433,6 +602,7 @@ extern CGFloat const UIScrollViewDecelerationRateNormal;
 extern CFStringRef const kGSDisplayIdentifiersCapability;
 extern float const UIWebViewGrowsAndShrinksToFitHeight;
 extern float const UIWebViewScalesToFitScale;
 extern CFStringRef const kGSDisplayIdentifiersCapability;
 extern float const UIWebViewGrowsAndShrinksToFitHeight;
 extern float const UIWebViewScalesToFitScale;

+extern NSString *WebKitErrorDomain;

 // }}}
 // extern "C" *(); {{{
 extern "C" void *reboot2(uint64_t flags);
 // }}}
 // extern "C" *(); {{{
 extern "C" void *reboot2(uint64_t flags);

diff --git a/postinst.mm b/postinst.mm
index 1930b49ca44ae2a4f4663ed804f3b8ba827ffa07..f826f4ff3c9ffdf5b138179dc1c533e512613aad 100644 (file)
--- a/postinst.mm
+++ b/postinst.mm
@@ -1,3 +1,5 @@
+#include "CyteKit/UCPlatform.h"
+

 #include <dirent.h>
 #include <strings.h>
 
 #include <dirent.h>
 #include <strings.h>
 

diff --git a/sysroot.sh b/sysroot.sh
index 286070701a3d2ef4592282e71ce26f002b4c02f6..2a2c4b8a62abe3f2ff9e96645088d946c3588afb 100755 (executable)
--- a/sysroot.sh
+++ b/sysroot.sh
@@ -102,64 +102,9 @@ mkdir -p usr/include
 cd usr/include
 
 mkdir CoreFoundation
 cd usr/include
 
 mkdir CoreFoundation

-wget -O CoreFoundation/CFBundlePriv.h "http://www.opensource.apple.com/source/CF/CF-550/CFBundlePriv.h?txt"

 wget -O CoreFoundation/CFUniChar.h "http://www.opensource.apple.com/source/CF/CF-550/CFUniChar.h?txt"
 
 wget -O CoreFoundation/CFUniChar.h "http://www.opensource.apple.com/source/CF/CF-550/CFUniChar.h?txt"
 

-if true; then
-    mkdir -p WebCore
-    wget -O WebCore/WebCoreThread.h 'http://www.opensource.apple.com/source/WebCore/WebCore-658.28/wak/WebCoreThread.h?txt'
-    wget -O WebCore/WebEvent.h 'http://www.opensource.apple.com/source/WebCore/WebCore-658.28/platform/iphone/WebEvent.h?txt'
-else
-    wget -O WebCore.tgz http://www.opensource.apple.com/tarballs/WebCore/WebCore-658.28.tar.gz
-    tar -zx --transform 's@^[^/]*/@WebCore.d/@' -f WebCore.tgz
-
-    mkdir WebCore
-    cp -a WebCore.d/{*,rendering/style,platform/graphics/transforms}/*.h WebCore
-    cp -a WebCore.d/platform/{animation,graphics,network,text}/*.h WebCore
-    cp -a WebCore.d/{accessibility,platform{,/{graphics,network,text}}}/{cf,mac,iphone}/*.h WebCore
-    cp -a WebCore.d/bridge/objc/*.h WebCore
-
-    wget -O JavaScriptCore.tgz http://www.opensource.apple.com/tarballs/JavaScriptCore/JavaScriptCore-554.1.tar.gz
-    #tar -zx --transform 's@^[^/]*/API/@JavaScriptCore/@' -f JavaScriptCore.tgz $(tar -ztf JavaScriptCore.tgz | grep '/API/[^/]*.h$')
-    tar -zx \
-        --transform 's@^[^/]*/@@' \
-        --transform 's@^icu/@@' \
-    -f JavaScriptCore.tgz $(tar -ztf JavaScriptCore.tgz | sed -e '
-        /\/icu\/unicode\/.*\.h$/ p;
-        /\/profiler\/.*\.h$/ p;
-        /\/runtime\/.*\.h$/ p;
-        /\/wtf\/.*\.h$/ p;
-        d;
-    ')
-fi
-
-for framework in ApplicationServices CoreServices IOKit IOSurface JavaScriptCore WebKit; do
-    ln -s "${xcode}"/System/Library/Frameworks/"${framework}".framework/Headers "${framework}"
-done
-
-for framework in /System/Library/Frameworks/CoreServices.framework/Frameworks/*.framework; do
-    name=${framework}
-    name=${name%.framework}
-    name=${name##*/}
-    ln -s "${xcode}/${framework}/Headers" "${name}"
-done
+mkdir -p WebCore
+wget -O WebCore/WebCoreThread.h 'http://www.opensource.apple.com/source/WebCore/WebCore-658.28/wak/WebCoreThread.h?txt'

 
 

-mkdir -p Cocoa
-cat >Cocoa/Cocoa.h <<EOF
-#define NSImage UIImage
-#define NSView UIView
-#define NSWindow UIWindow
-
-#define NSPoint CGPoint
-#define NSRect CGRect
-
-#define NSPasteboard UIPasteboard
-#define NSSelectionAffinity int
-@protocol NSUserInterfaceValidations;
-EOF
-
-mkdir -p GraphicsServices
-cat >GraphicsServices/GraphicsServices.h <<EOF
-typedef struct __GSEvent *GSEventRef;
-typedef struct __GSFont *GSFontRef;
-EOF
+ln -s /System/Library/Frameworks/IOKit.framework/Headers IOKit