-[BrowserController applyRightButton] must be used from the main thread.

[cydia.git] / UICaboodle / BrowserView.h

diff --git a/UICaboodle/BrowserView.h b/UICaboodle/BrowserView.h
index eb11d6c3e33f637bd0f8f7549f34ceb362b84097..692704a6562a82a398a0b9586930b8750fed3dfe 100644 (file)
--- a/UICaboodle/BrowserView.h
+++ b/UICaboodle/BrowserView.h
@@ -1,23 +1,12 @@
-#import "ResetView.h"
+#import <UICaboodle/RVPage.h>
+#import <UICaboodle/RVBook.h>
 
+#import <UIKit/UIKit.h>
 
-#include <WebKit/DOMCSSPrimitiveValue.h>
-#include <WebKit/DOMCSSStyleDeclaration.h>
-#include <WebKit/DOMDocument.h>
-#include <WebKit/DOMHTMLBodyElement.h>
 #include <WebKit/DOMNodeList.h>
-#include <WebKit/DOMRGBColor.h>
-
 #include <WebKit/WebFrame.h>
-#include <WebKit/WebPolicyDelegate.h>
-#include <WebKit/WebPreferences.h>
 #include <WebKit/WebScriptObject.h>
-
-#import <WebKit/WebView.h>
-#import <WebKit/WebView-WebPrivate.h>
-
-#include <WebCore/Page.h>
-#include <WebCore/Settings.h>
+#include <WebKit/WebView.h>
 
 #import <JavaScriptCore/JavaScriptCore.h>
 
@@ -26,7 +15,6 @@
 @class NSURL;
 @class NSURLRequest;
 
-@class UIProgressIndicator;
 @class UIScroller;
 @class UIDocumentWebView;
 
@@ -34,44 +22,77 @@
 
 @class Database;
 @class IndirectDelegate;
-@class CydiaObject;
 
-@interface BrowserView : RVPage <
-    RVBookHook
+@protocol CYWebViewDelegate <UIWebViewDelegate>
+- (void) webView:(WebView *)view addMessageToConsole:(NSDictionary *)message;
+- (void) webView:(WebView *)view decidePolicyForNavigationAction:(NSDictionary *)action request:(NSURLRequest *)request frame:(WebFrame *)frame decisionListener:(id<WebPolicyDecisionListener>)listener;
+- (void) webView:(WebView *)view decidePolicyForNewWindowAction:(NSDictionary *)action request:(NSURLRequest *)request newFrameName:(NSString *)name decisionListener:(id<WebPolicyDecisionListener>)listener;
+- (void) webView:(WebView *)view didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame;
+- (void) webView:(WebView *)view didFailLoadWithError:(NSError *)error forFrame:(WebFrame *)frame;
+- (void) webView:(WebView *)view didFailProvisionalLoadWithError:(NSError *)error forFrame:(WebFrame *)frame;
+- (void) webView:(WebView *)view didFinishLoadForFrame:(WebFrame *)frame;
+- (void) webView:(WebView *)view didReceiveTitle:(NSString *)title forFrame:(WebFrame *)frame;
+- (void) webView:(WebView *)view didStartProvisionalLoadForFrame:(WebFrame *)frame;
+- (NSURLRequest *) webView:(WebView *)view resource:(id)resource willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)response fromDataSource:(WebDataSource *)source;
+- (void) webViewClose:(WebView *)view;
+- (bool) webView:(WebView *)view shouldRunJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WebFrame *)frame;
+- (bool) webView:(WebView *)view shouldRunJavaScriptConfirmPanelWithMessage:(NSString *)message initiatedByFrame:(WebFrame *)frame;
+- (bool) webView:(WebView *)view shouldRunJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(NSString *)text initiatedByFrame:(WebFrame *)frame;
+- (void) webViewUpdateViewSettings:(UIWebView *)view;
+@end
+
+@interface CYWebView : UIWebView
+- (id<CYWebViewDelegate>) delegate;
+@end
+
+@interface WebScriptObject (UICaboodle)
+- (NSUInteger) count;
+- (id) objectAtIndex:(unsigned)index;
+@end
+
+@protocol BrowserControllerDelegate
+- (void) retainNetworkActivityIndicator;
+- (void) releaseNetworkActivityIndicator;
+- (CYViewController *) pageForURL:(NSURL *)url;
+@end
+
+@interface BrowserController : CYViewController <
+    CYWebViewDelegate,
+    HookProtocol,
+    UIWebViewDelegate
 > {
-    UIScroller *scroller_;
-    UIWebDocumentView *webview_;
-    UIProgressIndicator *indicator_;
+    _transient CYWebView *webview_;
+    _transient UIScrollView *scroller_;
+
+    UIActivityIndicatorView *indicator_;
     IndirectDelegate *indirect_;
-    CydiaObject *cydia_;
     NSURLAuthenticationChallenge *challenge_;
 
     bool error_;
     NSURLRequest *request_;
 
-    NSNumber *confirm_;
+    _transient NSNumber *sensitive_;
+
     NSString *title_;
     NSMutableSet *loading_;
-    bool reloading_;
 
-    NSString *button_;
+    // XXX: NSString * or UIImage *
+    id custom_;
     NSString *style_;
 
     WebScriptObject *function_;
     WebScriptObject *closer_;
-    WebScriptObject *special_;
-    WebScriptObject *finish_;
-
-    bool pushed_;
 
     float width_;
-    bool popup_;
+    Class class_;
 
-    CGSize size_;
-    bool editing_;
+    UIBarButtonItem *reloaditem_;
+    UIBarButtonItem *loadingitem_;
 }
 
-- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button;
++ (void) _initialize;
+
+- (void) setURL:(NSURL *)url;
 
 - (void) loadURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy;
 - (void) loadURL:(NSURL *)url;
@@ -80,28 +101,31 @@
 - (void) reloadURL;
 - (bool) isLoading;
 
-- (void) fixScroller;
+- (id) init;
+- (id) initWithURL:(NSURL *)url;
+- (id) initWithWidth:(float)width;
+- (id) initWithWidth:(float)width ofClass:(Class)_class;
 
-- (WebView *) webView;
-- (UIWebDocumentView *) documentView;
-
-- (id) initWithBook:(RVBook *)book;
-- (id) initWithBook:(RVBook *)book forWidth:(float)width;
-
-- (NSString *) stringByEvaluatingJavaScriptFromString:(NSString *)script;
 - (void) callFunction:(WebScriptObject *)function;
 
-- (void) webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame;
-- (void) webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame;
+- (void) webView:(WebView *)view didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame;
+- (NSURLRequest *) webView:(WebView *)view resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)response fromDataSource:(WebDataSource *)source;
 
 + (float) defaultWidth;
-- (void) setViewportWidth:(float)width;
 
 - (void) setButtonImage:(NSString *)button withStyle:(NSString *)style toFunction:(id)function;
 - (void) setButtonTitle:(NSString *)button withStyle:(NSString *)style toFunction:(id)function;
-- (void) setFinishHook:(id)function;
 - (void) setPopupHook:(id)function;
 
-- (id) _rightButtonTitle;
+- (void) alertView:(UIAlertView *)alert clickedButtonAtIndex:(NSInteger)button;
+- (void) customButtonClicked;
+- (void) applyRightButton;
+
+- (void) _didStartLoading;
+- (void) _didFinishLoading;
+
+- (void) close;
+
+- (void) dispatchEvent:(NSString *)event;
 
 @end