Some infrastructure for recent features.

diff --git a/UICaboodle/BrowserView.h b/UICaboodle/BrowserView.h
index 0f35cb7be3b035b3627b1b4ea71e81a5118cceb8..5be825cc5daca81d1b4cbea0e7aab9031b38ec61 100644 (file)
--- a/UICaboodle/BrowserView.h
+++ b/UICaboodle/BrowserView.h
@@ -20,6 +20,7 @@
     NSMutableArray *urls_;
     UIProgressIndicator *indicator_;
     IndirectDelegate *indirect_;
+    NSURLAuthenticationChallenge *challenge_;
 
     NSString *title_;
     bool loading_;
@@ -28,6 +29,8 @@
     bool pushed_;
 }
 
+- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button;
+
 - (void) loadURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy;
 - (void) loadURL:(NSURL *)url;
 

diff --git a/UICaboodle/UICaboodle.h b/UICaboodle/UICaboodle.h
index 2f636bd41a23d00a58ff2c43468e80f03f2ddeaa..f9a4eb3e38c524cb364d751a28e301f969a9fd05 100644 (file)
--- a/UICaboodle/UICaboodle.h
+++ b/UICaboodle/UICaboodle.h
@@ -1,3 +1,6 @@
+#define __STDC_LIMIT_MACROS
+#include <stdint.h>
+
 #include <objc/objc.h>
 
 #include <sys/time.h>
@@ -6,10 +9,22 @@
 #define _forever \
     for (;;)
 
+extern struct timeval _ltv;
+extern bool _itv;
+
 #define _trace() do { \
-    struct timeval _tv; \
-    gettimeofday(&_tv, NULL); \
-    fprintf(stderr, "%lu.%.6u:_trace()@%s:%u[%s]\n", _tv.tv_sec, _tv.tv_usec, __FILE__, __LINE__, __FUNCTION__); \
+    struct timeval _ctv; \
+    gettimeofday(&_ctv, NULL); \
+    if (!_itv) { \
+        _itv = true; \
+        _ltv = _ctv; \
+    } \
+    fprintf(stderr, "%lu.%.6u[%f]:_trace()@%s:%u[%s]\n", \
+        _ctv.tv_sec, _ctv.tv_usec, \
+        (_ctv.tv_sec - _ltv.tv_sec) + (_ctv.tv_usec - _ltv.tv_usec) / 1000000.0, \
+        __FILE__, __LINE__, __FUNCTION__\
+    ); \
+    _ltv = _ctv; \
 } while (false)
 
 #define _assert(test) do \