The Reorganizing text must come after container_ is allocated.

[cydia.git] / UICaboodle / BrowserView.h

diff --git a/UICaboodle/BrowserView.h b/UICaboodle/BrowserView.h
index 69d0bfc874145f45ce81de183f1aa700f3a52511..2f0e4eb7c1bf4f9892c51f961e8fb9ceb86299f3 100644 (file)
--- a/UICaboodle/BrowserView.h
+++ b/UICaboodle/BrowserView.h
@@ -1,22 +1,12 @@
-#import "ResetView.h"
+#import <UICaboodle/RVPage.h>
+#import <UICaboodle/RVBook.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>
+#import <UIKit/UIKit.h>
 
+#include <WebKit/DOMNodeList.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>
 
@@ -34,18 +24,43 @@
 @class Database;
 @class IndirectDelegate;
 
+@protocol CYWebViewDelegate <UIWebViewDelegate>
+- (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;
+@end
+
+@interface CYWebView : UIWebView
+- (id<CYWebViewDelegate>) delegate;
+@end
+
 @interface WebScriptObject (UICaboodle)
-- (unsigned) count;
+- (NSUInteger) count;
 - (id) objectAtIndex:(unsigned)index;
 @end
 
-@protocol BrowserViewDelegate
-- (UCViewController *) pageForURL:(NSURL *)url hasTag:(int *)tag;
+@protocol BrowserControllerDelegate
+- (CYViewController *) pageForURL:(NSURL *)url hasTag:(int *)tag;
 @end
 
-@interface BrowserView : UCViewController {
-    UIScroller *scroller_;
-    UIWebDocumentView *document_;
+@interface BrowserController : CYViewController <
+    CYWebViewDelegate,
+    HookProtocol,
+    UIWebViewDelegate
+> {
+    CYWebView *webview_;
+    UIScrollView *scroller_;
+
     UIProgressIndicator *indicator_;
     IndirectDelegate *indirect_;
     NSURLAuthenticationChallenge *challenge_;
@@ -53,35 +68,27 @@
     bool error_;
     NSURLRequest *request_;
 
-    NSNumber *confirm_;
     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_;
-
-    CGSize size_;
-    bool editing_;
-
     Class class_;
+
+    UIBarButtonItem *reloaditem_;
+    UIBarButtonItem *loadingitem_;
 }
 
 + (void) _initialize;
 
-- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button;
-
 - (void) loadURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy;
 - (void) loadURL:(NSURL *)url;
 
@@ -89,34 +96,28 @@
 - (void) reloadURL;
 - (bool) isLoading;
 
-- (void) fixScroller;
-
-- (WebView *) webView;
-- (UIWebDocumentView *) documentView;
-
 - (id) init;
 - (id) initWithWidth:(float)width;
 - (id) initWithWidth:(float)width ofClass:(Class)_class;
 
-- (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;
-
-- (NSURLRequest *) webView:(WebView *)sender resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse fromDataSource:(WebDataSource *)source;
+- (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;
 
-- (bool) promptForSensitive:(NSString *)name;
-- (bool) allowSensitiveRequests;
+- (void) _didStartLoading;
+- (void) _didFinishLoading;
 
-@end
\ No newline at end of file
+- (void) close;
+
+@end