Make nil a completely valid object in a CPArray.

Closes #630.

AppKit/CPApplication.j

@@ -54,7 +54,7 @@ CPRunStoppedResponse    = -1000;
 CPRunAbortedResponse    = -1001;
 CPRunContinuesResponse  = -1002;
 
-/*! 
+/*!
     @ingroup appkit
     @class CPApplication
 
@@ -62,7 +62,7 @@ CPRunContinuesResponse  = -1002;
     Every GUI application has exactly one instance of CPApplication (or of a custom subclass of
     CPApplication). Your program's main() function can create that instance by calling the
     \c CPApplicationMain function. A simple example looks like this:
-    
+
     <pre>
     function main(args, namedArgs)
     {
@@ -82,25 +82,25 @@ CPRunContinuesResponse  = -1002;
 @implementation CPApplication : CPResponder
 {
     CPArray                 _eventListeners;
-    
+
     CPEvent                 _currentEvent;
-    
+
     CPArray                 _windows;
     CPWindow                _keyWindow;
     CPWindow                _mainWindow;
     CPWindow                _previousKeyWindow;
     CPWindow                _previousMainWindow;
-    
+
     CPMenu                  _mainMenu;
     CPDocumentController    _documentController;
-    
+
     CPModalSession          _currentSession;
-    
+
     //
     id                      _delegate;
     BOOL                    _finishedLaunching;
     BOOL                    _isActive;
-    
+
     CPDictionary            _namedArgs;
     CPArray                 _args;
     CPString                _fullArgsString;
@@ -119,7 +119,7 @@ CPRunContinuesResponse  = -1002;
 {
     if (!CPApp)
         CPApp = [[CPApplication alloc] init];
-    
+
     return CPApp;
 }
 
@@ -131,73 +131,18 @@ CPRunContinuesResponse  = -1002;
 - (id)init
 {
     self = [super init];
-    
+
+    CPApp = self;
+
     if (self)
     {
         _eventListeners = [];
-        
+
         _windows = [];
-        
+
         [_windows addObject:nil];
-    
-        // FIXME: This should be read from the cib.
-        _mainMenu = [[CPMenu alloc] initWithTitle:@"MainMenu"];
-        
-        // FIXME: We should implement autoenabling.
-        [_mainMenu setAutoenablesItems:NO];
-
-        var bundle = [CPBundle bundleForClass:[CPApplication class]],
-            newMenuItem = [[CPMenuItem alloc] initWithTitle:@"New" action:@selector(newDocument:) keyEquivalent:@"n"];
-
-        [newMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/New.png"] size:CGSizeMake(16.0, 16.0)]];
-        [newMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/NewHighlighted.png"] size:CGSizeMake(16.0, 16.0)]];
-
-        [_mainMenu addItem:newMenuItem];
-        
-        var openMenuItem = [[CPMenuItem alloc] initWithTitle:@"Open" action:@selector(openDocument:) keyEquivalent:@"o"];
-        
-        [openMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/Open.png"] size:CGSizeMake(16.0, 16.0)]];
-        [openMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/OpenHighlighted.png"] size:CGSizeMake(16.0, 16.0)]];
-        
-        [_mainMenu addItem:openMenuItem];
-        
-        var saveMenu = [[CPMenu alloc] initWithTitle:@"Save"],
-            saveMenuItem = [[CPMenuItem alloc] initWithTitle:@"Save" action:@selector(saveDocument:) keyEquivalent:nil];
-        
-        [saveMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/Save.png"] size:CGSizeMake(16.0, 16.0)]];
-        [saveMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/SaveHighlighted.png"] size:CGSizeMake(16.0, 16.0)]];        
-        
-        [saveMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Save" action:@selector(saveDocument:) keyEquivalent:@"s"]];
-        [saveMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Save As" action:@selector(saveDocumentAs:) keyEquivalent:nil]];
-        
-        [saveMenuItem setSubmenu:saveMenu];
-        
-        [_mainMenu addItem:saveMenuItem];
-        
-        var editMenuItem = [[CPMenuItem alloc] initWithTitle:@"Edit" action:nil keyEquivalent:nil],
-            editMenu = [[CPMenu alloc] initWithTitle:@"Edit"],
-            
-            undoMenuItem = [[CPMenuItem alloc] initWithTitle:@"Undo" action:@selector(undo:) keyEquivalent:CPUndoKeyEquivalent],
-            redoMenuItem = [[CPMenuItem alloc] initWithTitle:@"Redo" action:@selector(redo:) keyEquivalent:CPRedoKeyEquivalent];
-
-        [undoMenuItem setKeyEquivalentModifierMask:CPUndoKeyEquivalentModifierMask];        
-        [redoMenuItem setKeyEquivalentModifierMask:CPRedoKeyEquivalentModifierMask];
-        
-        [editMenu addItem:undoMenuItem];
-        [editMenu addItem:redoMenuItem];
-        
-        [editMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Cut" action:@selector(cut:) keyEquivalent:@"x"]],
-        [editMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Copy" action:@selector(copy:) keyEquivalent:@"c"]],
-        [editMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Paste" action:@selector(paste:) keyEquivalent:@"v"]];
-    
-        [editMenuItem setSubmenu:editMenu];
-        [editMenuItem setHidden:YES];
-        
-        [_mainMenu addItem:editMenuItem];
-        
-        [_mainMenu addItem:[CPMenuItem separatorItem]];
     }
-    
+
     return self;
 }
 
@@ -278,28 +223,28 @@ CPRunContinuesResponse  = -1002;
 
     // We also want to set the default cursor on the body, so that buttons and things don't have an iBeam
     [[CPCursor arrowCursor] set];
-    
+
     var bundle = [CPBundle mainBundle],
         types = [bundle objectForInfoDictionaryKey:@"CPBundleDocumentTypes"];
-        
+
     if ([types count] > 0)
         _documentController = [CPDocumentController sharedDocumentController];
-        
+
     var delegateClassName = [bundle objectForInfoDictionaryKey:@"CPApplicationDelegateClass"];
-    
+
     if (delegateClassName)
     {
         var delegateClass = objj_getClass(delegateClassName);
-        
+
         if (delegateClass)
             if ([_documentController class] == delegateClass)
                 [self setDelegate:_documentController];
             else
                 [self setDelegate:[[delegateClass alloc] init]];
     }
-    
+
     var defaultCenter = [CPNotificationCenter defaultCenter];
-    
+
     [defaultCenter
         postNotificationName:CPApplicationWillFinishLaunchingNotification
         object:self];
@@ -388,14 +333,14 @@ CPRunContinuesResponse  = -1002;
             versionLabel = [contentView viewWithTag:3],
             copyrightLabel = [contentView viewWithTag:4],
             standardPath = [[CPBundle bundleForClass:[self class]] pathForResource:@"standardApplicationIcon.png"];
-    
+
         // FIXME move this into the CIB eventually
         [applicationLabel setFont:[CPFont boldSystemFontOfSize:14.0]];
         [applicationLabel setAlignment:CPCenterTextAlignment];
         [versionLabel setAlignment:CPCenterTextAlignment];
         [copyrightLabel setAlignment:CPCenterTextAlignment];
 
-        [imageView setImage:applicationIcon || [[CPImage alloc] initWithContentsOfFile:standardPath 
+        [imageView setImage:applicationIcon || [[CPImage alloc] initWithContentsOfFile:standardPath
                                                                                   size:CGSizeMake(256, 256)]];
 
         [applicationLabel setStringValue:applicationTitle || ""];
@@ -499,10 +444,10 @@ CPRunContinuesResponse  = -1002;
         return;
         // raise exception;
     }
-    
+
     _currentSession._state = aCode;
     _currentSession = _currentSession._previous;
-    
+
 //    if (aCode == CPRunAbortedResponse)
         [self _removeRunModalLoop];
 }
@@ -511,12 +456,12 @@ CPRunContinuesResponse  = -1002;
 - (void)_removeRunModalLoop
 {
     var count = _eventListeners.length;
-    
+
     while (count--)
         if (_eventListeners[count]._callback === _CPRunModalLoop)
         {
             _eventListeners.splice(count, 1);
-            
+
             return;
         }
 }
@@ -554,12 +499,12 @@ CPRunContinuesResponse  = -1002;
 {
     aModalSession._previous = _currentSession;
     _currentSession = aModalSession;
-    
+
     var theWindow = aModalSession._window;
 
     [theWindow center];
     [theWindow makeKeyAndOrderFront:self];
-    
+
 //    [theWindow._bridge _obscureWindowsBelowModalWindow];
 
     [CPApp setCallback:_CPRunModalLoop forNextEventMatchingMask:CPAnyEventMask untilDate:nil inMode:0 dequeue:NO];
@@ -573,7 +518,7 @@ CPRunContinuesResponse  = -1002;
 {
     if (!_currentSession)
         return nil;
-    
+
     return _currentSession._window;
 }
 
@@ -618,7 +563,7 @@ CPRunContinuesResponse  = -1002;
     {
         if (_eventListeners[_eventListeners.length - 1]._mask & (1 << [anEvent type]))
             _eventListeners.pop()._callback(anEvent);
-        
+
         return;
     }
 
@@ -729,11 +674,11 @@ CPRunContinuesResponse  = -1002;
 
     if ([super tryToPerform:anAction with:anObject])
         return YES;
-    
+
     if([_delegate respondsToSelector:anAction])
     {
         [_delegate performSelector:anAction withObject:anObject];
-        
+
         return YES;
     }
 
@@ -753,9 +698,9 @@ CPRunContinuesResponse  = -1002;
 
     if (!target)
         return NO;
-    
+
     [target performSelector:anAction withObject:aSender];
-    
+
     return YES;
 }
 
@@ -774,10 +719,10 @@ CPRunContinuesResponse  = -1002;
 {
     if (!anAction)
         return nil;
-        
+
     if (aTarget)
         return aTarget;
-        
+
     return [self targetForAction:anAction];
 }
 
@@ -802,28 +747,28 @@ CPRunContinuesResponse  = -1002;
 {
     var responder = [aWindow firstResponder],
         checkWindow = YES;
-    
+
     while (responder)
     {
         if ([responder respondsToSelector:anAction])
             return responder;
-        
+
         if (responder == aWindow)
             checkWindow = NO;
-        
+
         responder = [responder nextResponder];
     }
-    
+
     if (checkWindow && [aWindow respondsToSelector:anAction])
         return aWindow;
-    
+
     var delegate = [aWindow delegate];
-    
+
     if ([delegate respondsToSelector:anAction])
         return delegate;
 
     var windowController = [aWindow windowController];
-    
+
     if ([windowController respondsToSelector:anAction])
         return windowController;
 
@@ -852,26 +797,26 @@ CPRunContinuesResponse  = -1002;
 {
     if (!anAction)
         return nil;
-    
+
     var target = [self _targetForWindow:[self keyWindow] action:anAction];
-    
+
     if (target)
         return target;
-        
+
     target = [self _targetForWindow:[self mainWindow] action:anAction];
-    
+
     if (target)
         return target;
-    
+
     if ([self respondsToSelector:anAction])
         return self;
-    
+
     if ([_delegate respondsToSelector:anAction])
         return _delegate;
-        
+
     if ([_documentController respondsToSelector:anAction])
         return _documentController;
-    
+
     return nil;
 }
 
@@ -901,14 +846,14 @@ CPRunContinuesResponse  = -1002;
     @param aContextInfo
 */
 - (void)beginSheet:(CPWindow)aSheet modalForWindow:(CPWindow)aWindow modalDelegate:(id)aModalDelegate didEndSelector:(SEL)aDidEndSelector contextInfo:(id)aContextInfo
-{    
+{
     var styleMask = [aSheet styleMask];
     if (!(styleMask & CPDocModalWindowMask))
     {
         [CPException raise:CPInternalInconsistencyException reason:@"Currently only CPDocModalWindowMask style mask is supported for attached sheets"];
         return;
     }
-    
+
     [aWindow orderFront:self];
     [aWindow _attachSheet:aSheet modalDelegate:aModalDelegate didEndSelector:aDidEndSelector contextInfo:aContextInfo];
 }
@@ -916,15 +861,15 @@ CPRunContinuesResponse  = -1002;
 - (void)endSheet:(CPWindow)sheet returnCode:(int)returnCode
 {
     var count = [_windows count];
-    
+
     while (--count >= 0)
     {
         var aWindow = [_windows objectAtIndex:count];
         var context = aWindow._sheetContext;
-    
+
         if (context != nil && context["sheet"] === sheet)
         {
-            context["returnCode"] = returnCode; 
+            context["returnCode"] = returnCode;
             [aWindow _detachSheetWindow];
             return;
         }
@@ -940,7 +885,7 @@ CPRunContinuesResponse  = -1002;
 {
     if(_fullArgsString !== window.location.hash)
         [self _reloadArguments];
-    
+
     return _args;
 }
 
@@ -950,28 +895,28 @@ CPRunContinuesResponse  = -1002;
     {
         _args = [];
         window.location.hash = @"#";
-        
+
         return;
     }
-    
+
     if([args class] != CPArray)
         args = [CPArray arrayWithObject:args];
-    
+
     _args = args;
-    
+
     var toEncode = [_args copy];
     for(var i=0, count = toEncode.length; i<count; i++)
         toEncode[i] = encodeURIComponent(toEncode[i]);
-    
+
     var hash = [toEncode componentsJoinedByString:@"/"];
-    
+
     window.location.hash = @"#" + hash;
 }
 
 - (void)_reloadArguments
 {
     _fullArgsString = window.location.hash;
-    
+
     if (_fullArgsString.length)
     {
         var args = _fullArgsString.substring(1).split("/");
@@ -1006,18 +951,18 @@ CPRunContinuesResponse  = -1002;
 
 - (void)_willBecomeActive
 {
-    [[CPNotificationCenter defaultCenter] postNotificationName:CPApplicationWillBecomeActiveNotification 
-                                                        object:self 
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPApplicationWillBecomeActiveNotification
+                                                        object:self
                                                       userInfo:nil];
 }
 
 - (void)_didBecomeActive
 {
-    if (![self keyWindow] && _previousKeyWindow && 
+    if (![self keyWindow] && _previousKeyWindow &&
         [[self windows] indexOfObjectIdenticalTo:_previousKeyWindow] !== CPNotFound)
         [_previousKeyWindow makeKeyWindow];
 
-    if (![self mainWindow] && _previousMainWindow && 
+    if (![self mainWindow] && _previousMainWindow &&
         [[self windows] indexOfObjectIdenticalTo:_previousMainWindow] !== CPNotFound)
         [_previousMainWindow makeMainWindow];
 
@@ -1031,15 +976,15 @@ CPRunContinuesResponse  = -1002;
     _previousKeyWindow = nil;
     _previousMainWindow = nil;
 
-    [[CPNotificationCenter defaultCenter] postNotificationName:CPApplicationDidBecomeActiveNotification 
-                                                        object:self 
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPApplicationDidBecomeActiveNotification
+                                                        object:self
                                                       userInfo:nil];
 }
 
 - (void)_willResignActive
 {
-    [[CPNotificationCenter defaultCenter] postNotificationName:CPApplicationWillResignActiveNotification 
-                                                        object:self 
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPApplicationWillResignActiveNotification
+                                                        object:self
                                                       userInfo:nil];
 }
 
@@ -1060,8 +1005,8 @@ CPRunContinuesResponse  = -1002;
         [_previousMainWindow resignMainWindow];
     }
 
-    [[CPNotificationCenter defaultCenter] postNotificationName:CPApplicationDidResignActiveNotification 
-                                                        object:self 
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPApplicationDidResignActiveNotification
+                                                        object:self
                                                       userInfo:nil];
 }
 
@@ -1089,7 +1034,7 @@ var _CPRunModalLoop = function(anEvent)
 
     var theWindow = [anEvent window],
         modalSession = CPApp._currentSession;
-    
+
     if (theWindow == modalSession._window || [theWindow worksWhenModal])
         [theWindow sendEvent:anEvent];
 }
@@ -1188,10 +1133,73 @@ var _CPAppBootstrapperActions = nil;
 
         return YES;
     }
+    else
+        [self loadCiblessBrowserMainMenu];
 
     return NO;
 }
 
++ (void)loadCiblessBrowserMainMenu
+{
+    var mainMenu = [[CPMenu alloc] initWithTitle:@"MainMenu"];
+
+    // FIXME: We should implement autoenabling.
+    [mainMenu setAutoenablesItems:NO];
+
+    var bundle = [CPBundle bundleForClass:[CPApplication class]],
+        newMenuItem = [[CPMenuItem alloc] initWithTitle:@"New" action:@selector(newDocument:) keyEquivalent:@"n"];
+
+    [newMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/New.png"] size:CGSizeMake(16.0, 16.0)]];
+    [newMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/NewHighlighted.png"] size:CGSizeMake(16.0, 16.0)]];
+
+    [mainMenu addItem:newMenuItem];
+
+    var openMenuItem = [[CPMenuItem alloc] initWithTitle:@"Open" action:@selector(openDocument:) keyEquivalent:@"o"];
+
+    [openMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/Open.png"] size:CGSizeMake(16.0, 16.0)]];
+    [openMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/OpenHighlighted.png"] size:CGSizeMake(16.0, 16.0)]];
+
+    [mainMenu addItem:openMenuItem];
+
+    var saveMenu = [[CPMenu alloc] initWithTitle:@"Save"],
+        saveMenuItem = [[CPMenuItem alloc] initWithTitle:@"Save" action:@selector(saveDocument:) keyEquivalent:nil];
+
+    [saveMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/Save.png"] size:CGSizeMake(16.0, 16.0)]];
+    [saveMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/SaveHighlighted.png"] size:CGSizeMake(16.0, 16.0)]];
+
+    [saveMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Save" action:@selector(saveDocument:) keyEquivalent:@"s"]];
+    [saveMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Save As" action:@selector(saveDocumentAs:) keyEquivalent:nil]];
+
+    [saveMenuItem setSubmenu:saveMenu];
+
+    [mainMenu addItem:saveMenuItem];
+
+    var editMenuItem = [[CPMenuItem alloc] initWithTitle:@"Edit" action:nil keyEquivalent:nil],
+        editMenu = [[CPMenu alloc] initWithTitle:@"Edit"],
+
+        undoMenuItem = [[CPMenuItem alloc] initWithTitle:@"Undo" action:@selector(undo:) keyEquivalent:CPUndoKeyEquivalent],
+        redoMenuItem = [[CPMenuItem alloc] initWithTitle:@"Redo" action:@selector(redo:) keyEquivalent:CPRedoKeyEquivalent];
+
+    [undoMenuItem setKeyEquivalentModifierMask:CPUndoKeyEquivalentModifierMask];
+    [redoMenuItem setKeyEquivalentModifierMask:CPRedoKeyEquivalentModifierMask];
+
+    [editMenu addItem:undoMenuItem];
+    [editMenu addItem:redoMenuItem];
+
+    [editMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Cut" action:@selector(cut:) keyEquivalent:@"x"]],
+    [editMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Copy" action:@selector(copy:) keyEquivalent:@"c"]],
+    [editMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Paste" action:@selector(paste:) keyEquivalent:@"v"]];
+
+    [editMenuItem setSubmenu:editMenu];
+    [editMenuItem setHidden:YES];
+
+    [mainMenu addItem:editMenuItem];
+
+    [mainMenu addItem:[CPMenuItem separatorItem]];
+
+    [CPApp setMainMenu:mainMenu];
+}
+
 + (void)cibDidFinishLoading:(CPCib)aCib
 {
     [self performActions];

AppKit/CPBrowser.j

@@ -64,14 +64,14 @@
 
 + (CPImage)branchImage
 {
-    return [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[self class]] 
+    return [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPBrowser class]] 
                                                     pathForResource:"browser-leaf.png"]
                                               size:CGSizeMake(9,9)];
 }
 
 + (CPImage)highlightedBranchImage
 {
-    return [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[self class]] 
+    return [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPBrowser class]] 
                                                     pathForResource:"browser-leaf-highlighted.png"]
                                               size:CGSizeMake(9,9)];
 }
@@ -213,8 +213,6 @@
     [table setAllowsEmptySelection:_allowsEmptySelection];
     [table registerForDraggedTypes:[self registeredDraggedTypes]];
 
-    [self setNextResponder:table];
-
     [self _addTableColumnsToTableView:table forColumnIndex:index];
 
     var delegate = [[_CPBrowserTableDelegate alloc] init];
@@ -314,6 +312,39 @@
     [_contentView setFrameSize:CGSizeMake(xOrigin, height)];
 }
 
+- (unsigned)rowAtPoint:(CGPoint)aPoint
+{
+    var column = [self columnAtPoint:aPoint];
+    if (column === -1)
+        return -1;
+
+    var tableView = _tableViews[column];
+    return [tableView rowAtPoint:[tableView convertPoint:aPoint fromView:self]];
+}
+
+- (unsigned)columnAtPoint:(CGPoint)aPoint
+{
+    var adjustedPoint = [_contentView convertPoint:aPoint fromView:self];
+
+    for (var i = 0, count = _tableViews.length; i < count; i++)
+    {
+        var frame = [[_tableViews[i] enclosingScrollView] frame];
+        if (CGRectContainsPoint(frame, adjustedPoint))
+            return i;
+    }
+
+    return -1;
+}
+
+- (CGRect)rectOfRow:(unsigned)aRow inColumn:(unsigned)aColumn
+{
+    var tableView = _tableViews[aColumn],
+        rect = [tableView rectOfRow:aRow];
+
+    rect.origin = [self convertPoint:rect.origin fromView:tableView];
+    return rect;
+}
+
 // ITEMS
 
 - (id)itemAtRow:(int)row inColumn:(int)column
@@ -357,6 +388,10 @@
 
 // CLICK EVENTS
 
+- (void)trackMouse:(CPEvent)anEvent
+{
+}
+
 - (void)_column:(unsigned)columnIndex clickedRow:(unsigned)rowIndex
 {
     [self setLastColumn:columnIndex];
@@ -382,6 +417,15 @@
     [self sendAction:_doubleAction to:_target];
 }
 
+- (void)keyDown:(CPEvent)anEvent
+{
+    var column = [self selectedColumn];
+    if (column === -1)
+        return;
+
+    [_tableViews[column] keyDown:anEvent];
+}
+
 // SIZING
 
 - (float)columnContentWidthForColumnWidth:(float)aWidth
@@ -526,6 +570,9 @@
 
 - (CPIndexSet)selectedRowIndexesInColumn:(unsigned)column
 {
+    if (column < 0 || column > [self lastColumn] +1)
+        return [CPIndexSet indexSet];
+
     return [[self tableViewInColumn:column] selectedRowIndexes];
 }
 
@@ -551,8 +598,6 @@
 
     [[self tableViewInColumn:column] selectRowIndexes:indexSet byExtendingSelection:NO];
 
-    [self setNextResponder:[self tableViewInColumn:[self lastColumn]]];
-
     [self scrollColumnToVisible:column];
 
     if ([_delegate respondsToSelector:@selector(browserSelectionDidChange:)])
@@ -604,6 +649,8 @@
 
 @end
 
+var _CPBrowserResizeControlBackgroundImage = nil;
+
 @implementation _CPBrowserResizeControl : CPView
 {
     CGPoint     _mouseDownX;
@@ -612,6 +659,26 @@
     unsigned    _width;
 }
 
++ (CPImage)backgroundImage
+{
+    if (!_CPBrowserResizeControlBackgroundImage)
+    {
+        var path = [[CPBundle bundleForClass:[self class]] pathForResource:"browser-resize-control.png"];
+        _CPBrowserResizeControlBackgroundImage = [[CPImage alloc] initWithContentsOfFile:path
+                                                                                    size:CGSizeMake(15, 14)];
+    }
+
+    return _CPBrowserResizeControlBackgroundImage;
+}
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    if (self = [super initWithFrame:aFrame])
+        [self setBackgroundColor:[CPColor colorWithPatternImage:[[self class] backgroundImage]]];
+
+    return self;
+}
+
 - (void)mouseDown:(CPEvent)anEvent
 {
     _mouseDownX = [anEvent locationInWindow].x;
@@ -626,9 +693,11 @@
     [_browser setWidth:_width + deltaX ofColumn:_index];
 }
 
-@end
+- (void)mouseUp:(CPEvent)anEvent
+{
+}
 
-var _CPBrowserResizeControlBackgroundImage = nil;
+@end
 
 @implementation _CPBrowserScrollView : CPScrollView
 {
@@ -636,24 +705,11 @@ var _CPBrowserResizeControlBackgroundImage = nil;
     CPBrowser                _browser @accessors;
 }
 
-+ (CPImage)backgroundImage
-{
-    if (!_CPBrowserResizeControlBackgroundImage)
-    {
-        var path = [[CPBundle bundleForClass:[self class]] pathForResource:"browser-resize-control.png"];
-        _CPBrowserResizeControlBackgroundImage = [[CPImage alloc] initWithContentsOfFile:path
-                                                                                    size:CGSizeMake(15, 14)];
-    }
-
-    return _CPBrowserResizeControlBackgroundImage;
-}
-
 - (void)initWithFrame:(CGRect)aFrame
 {
     if (self = [super initWithFrame:aFrame])
     {
         _resizeControl = [[_CPBrowserResizeControl alloc] initWithFrame:CGRectMakeZero()];
-        [_resizeControl setBackgroundColor:[CPColor colorWithPatternImage:[[self class] backgroundImage]]];
         [self addSubview:_resizeControl];
     }
 

AppKit/CPButtonBar.j

@@ -14,8 +14,9 @@
 + (id)plusButton
 {
     var button = [[CPButton alloc] initWithFrame:CGRectMake(0, 0, 35, 25)],
-        image = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:self] pathForResource:@"plus_button.png"] size:CGSizeMake(11, 12)];
+        image = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPButtonBar class]] pathForResource:@"plus_button.png"] size:CGSizeMake(11, 12)];
 
+    [button setBordered:NO];
     [button setImage:image];
     [button setImagePosition:CPImageOnly];
 
@@ -25,14 +26,30 @@
 + (id)minusButton
 {
     var button = [[CPButton alloc] initWithFrame:CGRectMake(0, 0, 35, 25)],
-        image = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:self] pathForResource:@"minus_button.png"] size:CGSizeMake(11, 4)];
+        image = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPButtonBar class]] pathForResource:@"minus_button.png"] size:CGSizeMake(11, 4)];
 
+    [button setBordered:NO];
     [button setImage:image];
     [button setImagePosition:CPImageOnly];
 
     return button;
 }
 
++ (id)actionPopupButton
+{
+    var button = [[CPPopUpButton alloc] initWithFrame:CGRectMake(0, 0, 35, 25)],
+        image = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPButtonBar class]] pathForResource:@"action_button.png"] size:CGSizeMake(22, 14)];
+
+    [button addItemWithTitle:nil];
+    [[button lastItem] setImage:image];
+    [button setImagePosition:CPImageOnly];
+    [button setValue:CGInsetMake(0, 0, 0, 0) forThemeAttribute:"content-inset"];
+
+    [button setPullsDown:YES];
+
+    return button;
+}
+
 + (CPString)themeClass
 {
     return @"button-bar";
@@ -40,8 +57,8 @@
 
 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[CGInsetMake(0.0, 0.0, 0.0, 0.0), CGSizeMakeZero(), [CPNull null], [CPNull null], [CPNull null]]
-                                       forKeys:[@"resize-control-inset", @"resize-control-size", @"resize-control-color", @"bezel-color", @"button-bezel-color"]];
+    return [CPDictionary dictionaryWithObjects:[CGInsetMake(0.0, 0.0, 0.0, 0.0), CGSizeMakeZero(), [CPNull null], [CPNull null], [CPNull null], [CPNull null]]
+                                       forKeys:[@"resize-control-inset", @"resize-control-size", @"resize-control-color", @"bezel-color", @"button-bezel-color", @"button-text-color"]];
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -82,25 +99,8 @@
     _buttons = [CPArray arrayWithArray:buttons];
 
     for (var i = 0, count = [_buttons count]; i < count; i++)
-    {
-        var button = _buttons[i];
+        [_buttons[i] setBordered:YES];
 
-        var normalColor = [self valueForThemeAttribute:@"button-bezel-color" inState:CPThemeStateNormal],
-            highlightedColor = [self valueForThemeAttribute:@"button-bezel-color" inState:CPThemeStateHighlighted],
-            disabledColor = [self valueForThemeAttribute:@"button-bezel-color" inState:CPThemeStateDisabled];
-
-        [button setValue:normalColor forThemeAttribute:@"bezel-color" inState:CPThemeStateNormal|CPThemeStateBordered];    
-        [button setValue:highlightedColor forThemeAttribute:@"bezel-color" inState:CPThemeStateHighlighted|CPThemeStateBordered];    
-        [button setValue:disabledColor forThemeAttribute:@"bezel-color" inState:CPThemeStateDisabled|CPThemeStateBordered];    
-
-        // FIXME shouldn't need this
-        [button setValue:normalColor forThemeAttribute:@"bezel-color" inState:CPThemeStateNormal|CPThemeStateBordered|CPPopUpButtonStatePullsDown];    
-        [button setValue:highlightedColor forThemeAttribute:@"bezel-color" inState:CPThemeStateHighlighted|CPThemeStateBordered|CPPopUpButtonStatePullsDown];    
-        [button setValue:disabledColor forThemeAttribute:@"bezel-color" inState:CPThemeStateDisabled|CPThemeStateBordered|CPPopUpButtonStatePullsDown];    
-
-        [button setBordered:YES];
-    }
-    
     [self setNeedsLayout];
 }
 
@@ -176,6 +176,11 @@
 {
     [self setBackgroundColor:[self currentValueForThemeAttribute:@"bezel-color"]];
 
+    var normalColor = [self valueForThemeAttribute:@"button-bezel-color" inState:CPThemeStateNormal],
+        highlightedColor = [self valueForThemeAttribute:@"button-bezel-color" inState:CPThemeStateHighlighted],
+        disabledColor = [self valueForThemeAttribute:@"button-bezel-color" inState:CPThemeStateDisabled],
+        textColor = [self valueForThemeAttribute:@"button-text-color" inState:CPThemeStateNormal];
+
     var buttonsNotHidden = [CPArray arrayWithArray:_buttons],
         count = [buttonsNotHidden count];
 
@@ -184,13 +189,23 @@
             [buttonsNotHidden removeObject:buttonsNotHidden[count]];
 
     var currentButtonOffset = _resizeControlIsLeftAligned ? CGRectGetMaxX([self bounds]) + 1 : -1,
-        height = CGRectGetHeight([self bounds]) - 1;
+        bounds = [self bounds],
+        height = CGRectGetHeight(bounds) - 1,
+        frameWidth = CGRectGetWidth(bounds),
+        resizeRect = _hasResizeControl ? [self rectForEphemeralSubviewNamed:"resize-control-view"] : CGRectMakeZero(),
+        resizeWidth = CGRectGetWidth(resizeRect),
+        availableWidth = frameWidth - resizeWidth - 1;
 
     for (var i = 0, count = [buttonsNotHidden count]; i < count; i++)
     {   
         var button = buttonsNotHidden[i],
             width = CGRectGetWidth([button frame]);
 
+        if (availableWidth > width)
+            availableWidth -=width;
+        else
+            break;
+
         if (_resizeControlIsLeftAligned)
         {
             [button setFrame:CGRectMake(currentButtonOffset - width, 1, width, height)];
@@ -202,6 +217,16 @@
             currentButtonOffset += width - 1;
         }
 
+        [button setValue:normalColor forThemeAttribute:@"bezel-color" inState:CPThemeStateNormal|CPThemeStateBordered];    
+        [button setValue:highlightedColor forThemeAttribute:@"bezel-color" inState:CPThemeStateHighlighted|CPThemeStateBordered];    
+        [button setValue:disabledColor forThemeAttribute:@"bezel-color" inState:CPThemeStateDisabled|CPThemeStateBordered];    
+        [button setValue:textColor forThemeAttribute:@"text-color" inState:CPThemeStateBordered];    
+
+        // FIXME shouldn't need this
+        [button setValue:normalColor forThemeAttribute:@"bezel-color" inState:CPThemeStateNormal|CPThemeStateBordered|CPPopUpButtonStatePullsDown];    
+        [button setValue:highlightedColor forThemeAttribute:@"bezel-color" inState:CPThemeStateHighlighted|CPThemeStateBordered|CPPopUpButtonStatePullsDown];    
+        [button setValue:disabledColor forThemeAttribute:@"bezel-color" inState:CPThemeStateDisabled|CPThemeStateBordered|CPPopUpButtonStatePullsDown];    
+
         [self addSubview:button];
     }
 
@@ -216,6 +241,12 @@
     }
 }
 
+- (void)setFrameSize:(CGSize)aSize
+{
+    [super setFrameSize:aSize];
+    [self setNeedsLayout];
+}
+
 @end
 
 var CPButtonBarHasResizeControlKey = @"CPButtonBarHasResizeControlKey",
@@ -246,4 +277,3 @@ var CPButtonBarHasResizeControlKey = @"CPButtonBarHasResizeControlKey",
 }
 
 @end
-

AppKit/CPCheckBox.j

@@ -61,4 +61,27 @@
     return self;
 }
 
+- (void)takeStateFromKeyPath:(CPString)aKeyPath ofObjects:(CPArray)objects
+{
+    var count = objects.length,
+        value = [objects[0] valueForKeyPath:aKeyPath] ? CPOnState : CPOffState;
+
+    [self setAllowsMixedState:NO];
+    [self setState:value];
+
+    while (count-- > 1)
+    {
+        if (value !== ([objects[count] valueForKeyPath:aKeyPath] ? CPOnState : CPOffState))
+        {
+            [self setAllowsMixedState:YES];
+            [self setState:CPMixedState];
+        }
+    }
+}
+
+- (void)takeValueFromKeyPath:(CPString)aKeyPath ofObjects:(CPArray)objects
+{
+    [self takeStateFromKeyPath:aKeyPath ofObjects:objects];
+}
+
 @end

AppKit/CPClipView.j

@@ -190,17 +190,39 @@
 - (BOOL)autoscroll:(CPEvent)anEvent 
 {
     var bounds = [self bounds],
-        eventLocation = [self convertPoint:[anEvent locationInWindow] fromView:nil];
+        eventLocation = [self convertPoint:[anEvent locationInWindow] fromView:nil],
+        superview = [self superview],
+        deltaX = 0,
+        deltaY = 0;
 
-    if (CPRectContainsPoint(bounds, eventLocation))
+    if (CGRectContainsPoint(bounds, eventLocation))
         return NO;
 
-    var newRect = CGRectMakeZero();
+    if (![superview isKindOfClass:[CPScrollView class]] || [superview hasVerticalScroller])
+    {
+        if (eventLocation.y < CGRectGetMinY(bounds))
+            deltaY = CGRectGetMinY(bounds) - eventLocation.y;
+        else if (eventLocation.y > CGRectGetMaxY(bounds))
+            deltaY = CGRectGetMaxY(bounds) - eventLocation.y;
+        if (deltaY < -bounds.size.height)
+            deltaY = -bounds.size.height;
+        if (deltaY > bounds.size.height)
+            deltaY = bounds.size.height;
+    }
 
-    newRect.origin = eventLocation;
-    newRect.size = CPSizeMake(10, 10);
+    if (![superview isKindOfClass:[CPScrollView class]] || [superview hasHorizontalScroller])
+    {
+        if (eventLocation.x < CGRectGetMinX(bounds))
+            deltaX = CGRectGetMinX(bounds) - eventLocation.x;
+        else if (eventLocation.x > CGRectGetMaxX(bounds))
+            deltaX = CGRectGetMaxX(bounds) - eventLocation.x;
+        if (deltaX < -bounds.size.width)
+            deltaX = -bounds.size.width;
+        if (deltaX > bounds.size.width)
+            deltaX = bounds.size.width;
+    }
 
-	return [_documentView scrollRectToVisible:newRect];
+	return [self scrollToPoint:CGPointMake(bounds.origin.x - deltaX, bounds.origin.y - deltaY)];
 }
 
 @end

AppKit/CPCollectionView.j

@@ -30,16 +30,16 @@
 @import "CPCollectionViewItem.j"
 
 
-/*! 
+/*!
     @ingroup appkit
     @class CPCollectionView
 
-    This class displays an array as a grid of objects, where each object is represented by a view. 
-    The view is controlled by creating a CPCollectionViewItem and specifying its view, then 
+    This class displays an array as a grid of objects, where each object is represented by a view.
+    The view is controlled by creating a CPCollectionViewItem and specifying its view, then
     setting that item as the collection view prototype.
-    
+
     @par Delegate Methods
-    
+
     @delegate -(void)collectionViewDidChangeSelection:(CPCollectionView)collectionView;
     Called when the selection in the collection view has changed.
     @param collectionView the collection view who's selection changed
@@ -67,35 +67,35 @@
 {
     CPArray                 _content;
     CPArray                 _items;
-    
+
     CPData                  _itemData;
     CPCollectionViewItem    _itemPrototype;
     CPCollectionViewItem    _itemForDragging;
     CPMutableArray          _cachedItems;
-    
+
     unsigned                _maxNumberOfRows;
     unsigned                _maxNumberOfColumns;
-    
+
     CGSize                  _minItemSize;
     CGSize                  _maxItemSize;
 
     CPArray                 _backgroundColors;
 
     float                   _tileWidth;
-    
+
     BOOL                    _isSelectable;
     BOOL                    _allowsMultipleSelection;
     BOOL                    _allowsEmptySelection;
     CPIndexSet              _selectionIndexes;
-    
+
     CGSize                  _itemSize;
-    
+
     float                   _horizontalMargin;
     float                   _verticalMargin;
-    
+
     unsigned                _numberOfRows;
     unsigned                _numberOfColumns;
-    
+
     id                      _delegate;
 
     CPEvent                 _mouseDownEvent;
@@ -104,14 +104,14 @@
 - (id)initWithFrame:(CGRect)aFrame
 {
     self = [super initWithFrame:aFrame];
-    
+
     if (self)
     {
         _items = [];
         _content = [];
-        
+
         _cachedItems = [];
-        
+
         _itemSize = CGSizeMakeZero();
         _minItemSize = CGSizeMakeZero();
         _maxItemSize = CGSizeMakeZero();
@@ -120,12 +120,12 @@
 
         _verticalMargin = 5.0;
         _tileWidth = -1.0;
-        
+
         _selectionIndexes = [CPIndexSet indexSet];
         _allowsEmptySelection = YES;
         _isSelectable = YES;
     }
-    
+
     return self;
 }
 
@@ -196,8 +196,8 @@
 
 // Setting the Content
 /*!
-    Sets the content of the collection view to the content in \c anArray. 
-    This array can be of any type, and each element will be passed to the \c -setRepresentedObject: method.  
+    Sets the content of the collection view to the content in \c anArray.
+    This array can be of any type, and each element will be passed to the \c -setRepresentedObject: method.
     It's the responsibility of your custom collection view item to interpret the object.
     @param anArray the content array
 */
@@ -205,9 +205,9 @@
 {
     if (_content == anArray)
         return;
-    
+
     _content = anArray;
-    
+
     [self reloadContent];
 }
 
@@ -236,13 +236,13 @@
 {
     if (_isSelectable == isSelectable)
         return;
-    
+
     _isSelectable = isSelectable;
-    
+
     if (!_isSelectable)
     {
         var index = CPNotFound;
-        
+
         while ((index = [_selectionIndexes indexGreaterThanIndex:index]) != CPNotFound)
             [_items[index] setSelected:NO];
     }
@@ -299,19 +299,19 @@
 {
     if (_selectionIndexes == anIndexSet || !_isSelectable)
         return;
-    
+
     var index = CPNotFound;
-    
+
     while ((index = [_selectionIndexes indexGreaterThanIndex:index]) != CPNotFound)
         [_items[index] setSelected:NO];
-    
+
     _selectionIndexes = anIndexSet;
-    
+
     var index = CPNotFound;
-    
+
     while ((index = [_selectionIndexes indexGreaterThanIndex:index]) != CPNotFound)
         [_items[index] setSelected:YES];
-    
+
     if ([_delegate respondsToSelector:@selector(collectionViewDidChangeSelection:)])
         [_delegate collectionViewDidChangeSelection:self]
 }
@@ -326,10 +326,10 @@
 
 /* @ignore */
 - (void)reloadContent
-{   
+{
     // Remove current views
     var count = _items.length;
-    
+
     while (count--)
     {
         [[_items[count] view] removeFromSuperview];
@@ -337,7 +337,7 @@
 
         _cachedItems.push(_items[count]);
     }
-    
+
     _items = [];
 
     if (!_itemPrototype || !_content)
@@ -350,7 +350,7 @@
     for (; index < count; ++index)
     {
         _items.push([self newItemForRepresentedObject:_content[index]]);
-    
+
         [self addSubview:[_items[index] view]];
     }
 
@@ -365,49 +365,49 @@
 - (void)tile
 {
     var width = CGRectGetWidth([self bounds]);
-        
+
     if (![_content count] || width == _tileWidth)
         return;
-        
-    // We try to fit as many views per row as possible.  Any remaining space is then 
+
+    // We try to fit as many views per row as possible.  Any remaining space is then
     // either proportioned out to the views (if their minSize != maxSize) or used as
     // margin
     var itemSize = CGSizeMakeCopy(_minItemSize);
-    
+
     _numberOfColumns = MAX(1.0, FLOOR(width / itemSize.width));
-    
+
     if (_maxNumberOfColumns > 0)
         _numberOfColumns = MIN(_maxNumberOfColumns, _numberOfColumns);
-            
+
     var remaining = width - _numberOfColumns * itemSize.width,
         itemsNeedSizeUpdate = NO;
-        
+
     if (remaining > 0 && itemSize.width < _maxItemSize.width)
         itemSize.width = MIN(_maxItemSize.width, itemSize.width + FLOOR(remaining / _numberOfColumns));
-    
+
     // When we ONE column and a non-integral width, the FLOORing above can cause the item width to be smaller than the total width.
     if (_maxNumberOfColumns == 1 && itemSize.width < _maxItemSize.width && itemSize.width < width)
         itemSize.width = MIN(_maxItemSize.width, width);
-    
+
     if (!CGSizeEqualToSize(_itemSize, itemSize))
     {
         _itemSize = itemSize;
         itemsNeedSizeUpdate = YES;
     }
-    
+
     var index = 0,
         count = _items.length;
-    
+
     if (_maxNumberOfColumns > 0 && _maxNumberOfRows > 0)
         count = MIN(count, _maxNumberOfColumns * _maxNumberOfRows);
-    
+
     _numberOfRows = CEIL(count / _numberOfColumns);
 
     _horizontalMargin = FLOOR((width - _numberOfColumns * itemSize.width) / (_numberOfColumns + 1));
-        
+
     var x = _horizontalMargin,
         y = -itemSize.height;
-    
+
     for (; index < count; ++index)
     {
         if (index % _numberOfColumns == 0)
@@ -415,19 +415,28 @@
             x = _horizontalMargin;
             y += _verticalMargin + itemSize.height;
         }
-        
+
         var view = [_items[index] view];
-        
+
         [view setFrameOrigin:CGPointMake(x, y)];
-        
+
         if (itemsNeedSizeUpdate)
             [view setFrameSize:_itemSize];
-            
+
         x += itemSize.width + _horizontalMargin;
     }
-    
+
+    var superview = [self superview],
+        proposedHeight =  y + itemSize.height + _verticalMargin;
+
+    if ([superview isKindOfClass:[CPClipView class]])
+    {
+        var superviewSize = [superview bounds].size;
+        proposedHeight = MAX(superviewSize.height, proposedHeight);
+    }
+
     _tileWidth = width;
-    [self setFrameSize:CGSizeMake(width, y + itemSize.height + _verticalMargin)];
+    [self setFrameSize:CGSizeMake(width, proposedHeight)];
     _tileWidth = -1.0;
 }
 
@@ -445,9 +454,9 @@
 {
     if (_maxNumberOfRows == aMaxNumberOfRows)
         return;
-    
+
     _maxNumberOfRows = aMaxNumberOfRows;
-    
+
     [self tile];
 }
 
@@ -467,9 +476,9 @@
 {
     if (_maxNumberOfColumns == aMaxNumberOfColumns)
         return;
-    
+
     _maxNumberOfColumns = aMaxNumberOfColumns;
-    
+
     [self tile];
 }
 
@@ -506,9 +515,9 @@
 {
     if (CGSizeEqualToSize(_minItemSize, aSize))
         return;
-    
+
     _minItemSize = CGSizeMakeCopy(aSize);
-    
+
     [self tile];
 }
 
@@ -528,9 +537,9 @@
 {
     if (CGSizeEqualToSize(_maxItemSize, aSize))
         return;
-    
+
     _maxItemSize = CGSizeMakeCopy(aSize);
-    
+
     [self tile];
 }
 
@@ -590,6 +599,14 @@
 
 - (void)mouseDragged:(CPEvent)anEvent
 {
+    var locationInWindow = [anEvent locationInWindow],
+        mouseDownLocationInWindow = [_mouseDownEvent locationInWindow];
+
+    // FIXME: This is because Safari's drag hysteresis is 3px x 3px
+    if ((ABS(locationInWindow.x - mouseDownLocationInWindow.x) < 3) &&
+        (ABS(locationInWindow.y - mouseDownLocationInWindow.y) < 3))
+        return;
+
     if (![_delegate respondsToSelector:@selector(collectionView:dragTypesForItemsAtIndexes:)])
         return;
 
@@ -648,9 +665,9 @@
 {
     if (_verticalMargin == aVerticalMargin)
         return;
-    
+
     _verticalMargin = aVerticalMargin;
-    
+
     [self tile];
 }
 
@@ -701,7 +718,7 @@
         count = [indexArray count];
 
     for (; index < count; ++index)
-        frame = CGRectUnion(frame, [self rectForItemAtIndex:indexArray[index]]);
+        frame = CGRectUnion(frame, [self frameForItemAtIndex:indexArray[index]]);
 
     return frame;
 }
@@ -721,7 +738,7 @@
 - (void)moveLeft:(id)sender
 {
     var index = [[self selectionIndexes] firstIndex];
-    if (index === CPNotFound) 
+    if (index === CPNotFound)
         index = [[self items] count];
 
     index = MAX(index - 1, 0);
@@ -749,7 +766,7 @@
 - (void)moveUp:(id)sender
 {
     var index = [[self selectionIndexes] firstIndex];
-    if (index == CPNotFound) 
+    if (index == CPNotFound)
         index = [[self items] count];
 
     index = MAX(0, index - [self numberOfColumns]);
@@ -821,20 +838,20 @@ var CPCollectionViewMinItemSizeKey      = @"CPCollectionViewMinItemSizeKey",
         _cachedItems = [];
 
         _itemSize = CGSizeMakeZero();
-        
+
         _minItemSize = [aCoder decodeSizeForKey:CPCollectionViewMinItemSizeKey] || CGSizeMakeZero();
         _maxItemSize = [aCoder decodeSizeForKey:CPCollectionViewMaxItemSizeKey] || CGSizeMakeZero();
-        
+
         _verticalMargin = [aCoder decodeFloatForKey:CPCollectionViewVerticalMarginKey];
-        
+
         _isSelectable = [aCoder decodeBoolForKey:CPCollectionViewSelectableKey];
 
         [self setBackgroundColors:[aCoder decodeObjectForKey:CPCollectionViewBackgroundColorsKey]];
-          
+
         _tileWidth = -1.0;
 
         _selectionIndexes = [CPIndexSet indexSet];
-        
+
         _allowsEmptySelection = YES;
     }
 
@@ -847,12 +864,12 @@ var CPCollectionViewMinItemSizeKey      = @"CPCollectionViewMinItemSizeKey",
 
     if (!CGSizeEqualToSize(_minItemSize, CGSizeMakeZero()))
       [aCoder encodeSize:_minItemSize forKey:CPCollectionViewMinItemSizeKey];
-    
+
     if (!CGSizeEqualToSize(_maxItemSize, CGSizeMakeZero()))
       [aCoder encodeSize:_maxItemSize forKey:CPCollectionViewMaxItemSizeKey];
-    
+
     [aCoder encodeBool:_isSelectable forKey:CPCollectionViewSelectableKey];
-    
+
     [aCoder encodeFloat:_verticalMargin forKey:CPCollectionViewVerticalMarginKey];
 
     [aCoder encodeObject:_backgroundColors forKey:CPCollectionViewBackgroundColorsKey];

AppKit/CPColorWell.j

@@ -231,11 +231,17 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
 
 - (void)mouseDown:(CPEvent)anEvent
 {
+    if (![self isEnabled])
+        return;
+
     [self drawBezelWithHighlight:YES];
 }
 
 - (void)mouseDragged:(CPEvent)anEvent
 {
+    if (![self isEnabled])
+        return;
+
     [self drawBezelWithHighlight:CGRectContainsPoint([self bounds], [self convertPoint:[anEvent locationInWindow] fromView:nil])];
 }
 
@@ -243,7 +249,7 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
 {
     [self drawBezelWithHighlight:NO];
 
-    if (!CGRectContainsPoint([self bounds], [self convertPoint:[anEvent locationInWindow] fromView:nil]))
+    if (!CGRectContainsPoint([self bounds], [self convertPoint:[anEvent locationInWindow] fromView:nil]) || ![self isEnabled])
         return;
         
     [self activate:YES];

AppKit/CPDragServer.j

@@ -40,29 +40,10 @@ CPDragOperationEvery    = -1;
 
 #define DRAGGING_WINDOW(anObject) ([anObject isKindOfClass:[CPWindow class]] ? anObject : [anObject window])
 
-var    CPDragServerPreviousEvent      = nil,
-CPDragServerAutoscrollInterval = nil;
-/*
-var CPDragServerAutoscroll = function()
-{
-    [CPDragServerSource autoscroll:CPDragServerPreviousEvent];
-}
+var CPDragServerPreviousEvent = nil,
+    CPDragServerPeriodicUpdateInterval = 0.05;
 
-    if (CPDragServerAutoscrollInterval === nil)
-    {
-        if ([CPDragServerSource respondsToSelector:@selector(autoscroll:)])
-            CPDragServerAutoscrollInterval = setInterval(CPDragServerAutoscroll, 100);
-    }
-
-    CPDragServerPreviousEvent = anEvent;
-
-        if (CPDragServerAutoscrollInterval !== nil)
-            clearInterval(CPDragServerAutoscrollInterval);
-
-        CPDragServerAutoscrollInterval = nil;
-*/
-
-var CPSharedDragServer     = nil;
+var CPSharedDragServer = nil;
 
 var CPDragServerSource             = nil;
 var CPDragServerDraggingInfo       = nil;
@@ -150,10 +131,13 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
 
     CGPoint         _draggingLocation;
     id              _draggingDestination;
+    BOOL            _draggingDestinationWantsPeriodicUpdates;
 
     CGPoint         _startDragLocation;
     BOOL            _shouldSlideBack;
     unsigned        _dragOperation;
+
+    CPTimer         _draggingUpdateTimer;
 }
 
 /*
@@ -234,6 +218,9 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
 
 - (CPDragOperation)draggingUpdatedInPlatformWindow:(CPPlatformWindow)aPlatformWindow location:(CGPoint)aLocation
 {
+    [_draggingUpdateTimer invalidate];
+    _draggingUpdateTimer = nil;
+
     var dragOperation = CPDragOperationCopy;
     // We have to convert base to bridge since the drag event comes from the source window, not the drag window.
     var draggingDestination = [aPlatformWindow _dragHitTest:aLocation pasteboard:[CPDragServerDraggingInfo draggingPasteboard]];
@@ -243,25 +230,89 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
 
     if(draggingDestination !== _draggingDestination)
     {
-        if (_draggingDestination && [_draggingDestination respondsToSelector:@selector(draggingExited:)])
+        if ([_draggingDestination respondsToSelector:@selector(draggingExited:)])
             [_draggingDestination draggingExited:CPDragServerDraggingInfo];
 
         _draggingDestination = draggingDestination;
 
-        if (_draggingDestination && [_draggingDestination respondsToSelector:@selector(draggingEntered:)])
+        if ([_draggingDestination respondsToSelector:@selector(wantsPeriodicDraggingUpdates)])
+            _draggingDestinationWantsPeriodicUpdates = [_draggingDestination wantsPeriodicDraggingUpdates];
+        else
+            _draggingDestinationWantsPeriodicUpdates = YES;
+
+        if ([_draggingDestination respondsToSelector:@selector(draggingEntered:)])
             dragOperation = [_draggingDestination draggingEntered:CPDragServerDraggingInfo];
     }
-    else if (_draggingDestination && [_draggingDestination respondsToSelector:@selector(draggingUpdated:)])
+    else if ([_draggingDestination respondsToSelector:@selector(draggingUpdated:)])
         dragOperation = [_draggingDestination draggingUpdated:CPDragServerDraggingInfo];
 
     if (!_draggingDestination)
         dragOperation = CPDragOperationNone;
+    else
+    {
+        if (_draggingDestinationWantsPeriodicUpdates)
+            _draggingUpdateTimer = [CPTimer scheduledTimerWithTimeInterval:CPDragServerPeriodicUpdateInterval
+                                                                    target:self
+                                                                  selector:@selector(_sendPeriodicDraggingUpdate:)
+                                                                  userInfo:[CPDictionary dictionaryWithJSObject:{platformWindow:aPlatformWindow, location:aLocation}]
+                                                                   repeats:NO];
+
+        var scrollView = [_draggingDestination isKindOfClass:[CPView class]] ? [_draggingDestination enclosingScrollView] : nil;
+        if (scrollView)
+        {
+            var contentView = [scrollView contentView],
+                bounds = [contentView bounds],
+                insetBounds = CGRectInset(bounds, 10, 10)
+                eventLocation = [contentView convertPoint:_draggingLocation fromView:nil],
+                deltaX = 0,
+                deltaY = 0;
+
+            if (!CGRectContainsPoint(insetBounds, eventLocation))
+            {
+                if ([scrollView hasVerticalScroller])
+                {
+                    if (eventLocation.y < CGRectGetMinY(insetBounds))
+                        deltaY = CGRectGetMinY(insetBounds) - eventLocation.y;
+                    else if (eventLocation.y > CGRectGetMaxY(insetBounds))
+                        deltaY = CGRectGetMaxY(insetBounds) - eventLocation.y;
+                    if (deltaY < -insetBounds.size.height)
+                        deltaY = -insetBounds.size.height;
+                    if (deltaY > insetBounds.size.height)
+                        deltaY = insetBounds.size.height;
+                }
+
+                if ([scrollView hasHorizontalScroller])
+                {
+                    if (eventLocation.x < CGRectGetMinX(insetBounds))
+                        deltaX = CGRectGetMinX(insetBounds) - eventLocation.x;
+                    else if (eventLocation.x > CGRectGetMaxX(insetBounds))
+                        deltaX = CGRectGetMaxX(insetBounds) - eventLocation.x;
+                    if (deltaX < -insetBounds.size.width)
+                        deltaX = -insetBounds.size.width;
+                    if (deltaX > insetBounds.size.width)
+                        deltaX = insetBounds.size.width;
+                }
+
+                [contentView scrollToPoint:CGPointMake(bounds.origin.x - deltaX, bounds.origin.y - deltaY)];
+            }
+        }
+    }
 
     return dragOperation;
 }
 
+- (void)_sendPeriodicDraggingUpdate:(CPTimer)aTimer
+{
+    var userInfo = [aTimer userInfo];
+    _dragOperation = [self draggingUpdatedInPlatformWindow:[userInfo objectForKey:@"platformWindow"] 
+                                                  location:[userInfo objectForKey:@"location"]];
+}
+
 - (void)draggingEndedInPlatformWindow:(CPPlatformWindow)aPlatformWindow globalLocation:(CGPoint)aLocation operation:(CPDragOperation)anOperation
 {
+    [_draggingUpdateTimer invalidate];
+    _draggingUpdateTimer = nil;
+
     [_draggedView removeFromSuperview];
 
     if (![CPPlatform supportsDragAndDrop])
@@ -404,13 +455,25 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
         // Stop tracking events.
         return;
     }
-
-    [self draggingSourceUpdatedWithGlobalLocation:platformWindowLocation];
-    _dragOperation = [self draggingUpdatedInPlatformWindow:platformWindow location:platformWindowLocation];
+    else if (type === CPKeyDown)
+    {
+        var keyCode = [anEvent keyCode];
+        if (keyCode === CPEscapeKeyCode)
+        {
+            _dragOperation = CPDragOperationNone;
+            [self draggingEndedInPlatformWindow:platformWindow globalLocation:CGPointMakeZero() operation:_dragOperation];
+            return;
+        }
+    }
+    else
+    {
+        [self draggingSourceUpdatedWithGlobalLocation:platformWindowLocation];
+        _dragOperation = [self draggingUpdatedInPlatformWindow:platformWindow location:platformWindowLocation];
+    }
 
     // If we're not a mouse up, then we're going to want to grab the next event.
     [CPApp setTarget:self selector:@selector(trackDragging:)
-        forNextEventMatchingMask:CPMouseMovedMask | CPLeftMouseDraggedMask | CPLeftMouseUpMask
+        forNextEventMatchingMask:CPMouseMovedMask | CPLeftMouseDraggedMask | CPLeftMouseUpMask | CPKeyDownMask
         untilDate:nil inMode:0 dequeue:NO];
 }
 

AppKit/CPPopUpButton.j

@@ -703,6 +703,23 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
     [self sendAction:[self action] to:[self target]];
 }
 
+- (void)takeValueFromKeyPath:(CPString)aKeyPath ofObjects:(CPArray)objects
+{
+    var count = objects.length,
+        value = [objects[0] valueForKeyPath:aKeyPath];
+
+    [self selectItemWithTag:value];
+    [self setEnabled:YES];
+
+    while (count-- > 1)
+    {
+        if (value !== [objects[count] valueForKeyPath:aKeyPath])
+        {
+            [[self selectedItem] setState:CPOffState];
+        }
+    }
+}
+
 @end
 
 var CPPopUpButtonMenuKey            = @"CPPopUpButtonMenuKey",

AppKit/CPScrollView.j

@@ -445,9 +445,7 @@
 
 - (CPView)_headerView
 {
-    var headerClipViewSubviews = [_headerClipView subviews];
-
-    return [headerClipViewSubviews count] ? headerClipViewSubviews[0] : nil;
+    return [_headerClipView documentView];
 }
 
 - (CGRect)_cornerViewFrame
@@ -670,15 +668,32 @@
 */
 - (void)scrollWheel:(CPEvent)anEvent
 {
-   var documentFrame = [[self documentView] frame],
-       contentBounds = [_contentView bounds];
+    [self _respondToScrollWheelEventWithDeltaX:[anEvent deltaX] * _horizontalLineScroll 
+                                        deltaY:[anEvent deltaY] * _verticalLineScroll];
+}
+
+- (void)_respondToScrollWheelEventWithDeltaX:(float)deltaX deltaY:(float)deltaY
+{
+    var documentFrame = [[self documentView] frame],
+        contentBounds = [_contentView bounds],
+        contentFrame = [_contentView frame],
+        enclosingScrollView = [self enclosingScrollView],
+        extraX = 0,
+        extraY = 0;
 
     // We want integral bounds!
-    contentBounds.origin.x = ROUND(contentBounds.origin.x + [anEvent deltaX] * _horizontalLineScroll);
-    contentBounds.origin.y = ROUND(contentBounds.origin.y + [anEvent deltaY] * _verticalLineScroll);
+    contentBounds.origin.x = ROUND(contentBounds.origin.x + deltaX);
+    contentBounds.origin.y = ROUND(contentBounds.origin.y + deltaY);
 
-    [_contentView scrollToPoint:contentBounds.origin];
-    [_headerClipView scrollToPoint:CGPointMake(contentBounds.origin.x, 0.0)];
+    var constrainedOrigin = [_contentView constrainScrollPoint:CGPointCreateCopy(contentBounds.origin)];
+    extraX = ((contentBounds.origin.x - constrainedOrigin.x) / _horizontalLineScroll) * [enclosingScrollView horizontalLineScroll];
+    extraY = ((contentBounds.origin.y - constrainedOrigin.y) / _verticalLineScroll) * [enclosingScrollView verticalLineScroll];
+
+    [_contentView scrollToPoint:constrainedOrigin];
+    [_headerClipView scrollToPoint:CGPointMake(constrainedOrigin.x, 0.0)];
+
+    if (extraX || extraY)
+        [enclosingScrollView _respondToScrollWheelEventWithDeltaX:extraX deltaY:extraY];
 }
 
 - (void)keyDown:(CPEvent)anEvent
@@ -759,7 +774,13 @@ var CPScrollViewContentViewKey       = "CPScrollViewContentView",
         
         _contentView            = [aCoder decodeObjectForKey:CPScrollViewContentViewKey];
         _headerClipView         = [aCoder decodeObjectForKey:CPScrollViewHeaderClipViewKey];
-        
+
+        if (!_headerClipView)
+        {
+            _headerClipView = [[CPClipView alloc] init];
+            [self addSubview:_headerClipView];
+        }
+
         _verticalScroller       = [aCoder decodeObjectForKey:CPScrollViewVScrollerKey];
         _horizontalScroller     = [aCoder decodeObjectForKey:CPScrollViewHScrollerKey];
 

AppKit/CPSlider.j

@@ -396,6 +396,18 @@ CPCircularSlider    = 1;
         _sendActionOn &= ~CPLeftMouseDraggedMask;
 }
 
+- (void)takeValueFromKeyPath:(CPString)aKeyPath ofObjects:(CPArray)objects
+{
+    var count = objects.length,
+        value = [objects[0] valueForKeyPath:aKeyPath];
+
+    [self setObjectValue:value];
+
+    while (count-- > 1)
+        if (value !== ([objects[count] valueForKeyPath:aKeyPath]))
+            return [self setFloatValue:1.0];
+}
+
 @end
 
 var CPSliderMinValueKey             = "CPSliderMinValueKey",

AppKit/CPTableView.j

@@ -232,7 +232,6 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
         _allowsEmptySelection = YES;
         _allowsColumnSelection = NO;
         _disableAutomaticResizing = NO;
-        _tableViewFlags = 0;
 
         //Setting Display Attributes
         _selectionHighlightStyle = CPTableViewSelectionHighlightStyleRegular;
@@ -245,28 +244,13 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
         _dirtyTableColumnRangeIndex = CPNotFound;
         _numberOfHiddenColumns = 0;
 
-        _objectValues = { };
-        _dataViewsForTableColumns = { };
-        _dataViews=  [];
-        _numberOfRows = 0;
-        _exposedRows = [CPIndexSet indexSet];
-        _exposedColumns = [CPIndexSet indexSet];
-        _cachedDataViews = { };
         _intercellSpacing = _CGSizeMake(0.0, 0.0);
         _rowHeight = 23.0;
 
         [self setGridColor:[CPColor colorWithHexString:@"dce0e2"]];
         [self setGridStyleMask:CPTableViewGridNone];
 
-        _headerView = [[CPTableHeaderView alloc] initWithFrame:CGRectMake(0, 0, [self bounds].size.width, _rowHeight)];
-
-        [_headerView setTableView:self];
-
-        _cornerView = [[_CPCornerView alloc] initWithFrame:CGRectMake(0, 0, [CPScroller scrollerWidth], CGRectGetHeight([_headerView frame]))];
-
         _lastSelectedRow = -1;
-        _selectedColumnIndexes = [CPIndexSet indexSet];
-        _selectedRowIndexes = [CPIndexSet indexSet];
         _currentHighlightedTableColumn = nil;
 
         _sortDescriptors = [CPArray array];
@@ -279,10 +263,6 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
         _dragOperationDefaultMask = nil;
         _destinationDragStyle = CPTableViewDraggingDestinationFeedbackStyleRegular;
 
-        _tableDrawView = [[_CPTableDrawView alloc] initWithTableView:self];
-        [_tableDrawView setBackgroundColor:[CPColor clearColor]];
-        [self addSubview:_tableDrawView];
-
         [self setBackgroundColor:[CPColor whiteColor]];
         [self _init];
     }
@@ -293,11 +273,43 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
 // FIX ME: we have a lot of redundent init stuff in initWithFrame: and initWithCoder: we should move it all into here.
 - (void)_init
 {
+        _tableViewFlags = 0;
+
+        _selectedColumnIndexes = [CPIndexSet indexSet];
+        _selectedRowIndexes = [CPIndexSet indexSet];
+
         _dropOperationFeedbackView = [[_CPDropOperationDrawingView alloc] initWithFrame:_CGRectMakeZero()];
         [_dropOperationFeedbackView setTableView:self];
 
         _lastColumnShouldSnap = NO;
 
+        if (!_alternatingRowBackgroundColors)
+            _alternatingRowBackgroundColors = [[CPColor whiteColor], [CPColor colorWithHexString:@"e4e7ff"]];
+
+        _tableColumnRanges = [];
+        _dirtyTableColumnRangeIndex = 0;
+        _numberOfHiddenColumns = 0;
+
+        _objectValues = { };
+        _dataViewsForTableColumns = { };
+        _dataViews=  [];
+        _numberOfRows = 0;
+        _exposedRows = [CPIndexSet indexSet];
+        _exposedColumns = [CPIndexSet indexSet];
+        _cachedDataViews = { };
+
+        _tableDrawView = [[_CPTableDrawView alloc] initWithTableView:self];
+        [_tableDrawView setBackgroundColor:[CPColor clearColor]];
+        [self addSubview:_tableDrawView];
+
+        if (!_headerView)
+            _headerView = [[CPTableHeaderView alloc] initWithFrame:CGRectMake(0, 0, [self bounds].size.width, _rowHeight)];
+
+        [_headerView setTableView:self];
+
+        if (!_cornerView)
+            _cornerView = [[_CPCornerView alloc] initWithFrame:CGRectMake(0, 0, [CPScroller scrollerWidth], CGRectGetHeight([_headerView frame]))];
+
         // Gradients for the source list
         _sourceListActiveGradient = CGGradientCreateWithColorComponents(CGColorSpaceCreateDeviceRGB(), [89.0/255.0, 153.0/255.0, 209.0/255.0,1.0, 33.0/255.0, 94.0/255.0, 208.0/255.0,1.0], [0,1], 2);
         _sourceListActiveTopLineColor = [CPColor colorWithCalibratedRed:(61.0/255.0) green:(123.0/255.0) blue:(218.0/255.0) alpha:1.0];
@@ -2434,10 +2446,9 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
             
             for(var c = firstExposedColumn; c < exposedColumnCount; c++)
             {
-                //console.log(columnIndexes);
                 var colRect = [self rectOfColumn:exposedColumnIndexes[c]],
                     colX = CGRectGetMaxX(colRect) + 0.5;
-                //console.log(colX);
+
                 CGContextMoveToPoint(context, colX, minY);
                 CGContextAddLineToPoint(context, colX, maxY);
             }
@@ -2561,7 +2572,10 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
 {
     // Prevent CPControl from eating the mouse events when we are in a drag session
     if (![_draggedRowIndexes count])
+    {
+        [self autoscroll:anEvent];
         [super trackMouse:anEvent];
+    }
     else
         [CPApp sendEvent:anEvent];
 }
@@ -2874,14 +2888,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
     [_dropOperationFeedbackView setFrame:rect];
     [_dropOperationFeedbackView setCurrentRow:row];
     [self addSubview:_dropOperationFeedbackView];
-    
-    // FIXME : Maybe we should do this in a timer outside this method. 
-    // Problem: we don't know when the scroll ends or when the next -draggingUpdated is called. 
-    if (row > 0 && location.y - CGRectGetMinY(exposedClipRect) < _rowHeight)
-        [self scrollRowToVisible:row - 1];
-    else if (row < numberOfRows && CGRectGetMaxY(exposedClipRect) - location.y < _rowHeight)
-        [self scrollRowToVisible:row + 1];
-        
+
     return dragOperation;
 }
 
@@ -3049,7 +3056,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
 
 - (void)keyDown:(CPEvent)anEvent
 {
-    [self interpretKeyEvents:[CPArray arrayWithObject:anEvent]];
+    [self interpretKeyEvents:[anEvent]];
 }
 
 - (void)moveDown:(id)sender
@@ -3187,34 +3194,18 @@ var CPTableViewDataSourceKey                = @"CPTableViewDataSourceKey",
         _allowsEmptySelection = [aCoder decodeBoolForKey:CPTableViewEmptySelectionKey];
         _allowsColumnSelection = [aCoder decodeBoolForKey:CPTableViewColumnSelectionKey];
 
-        _tableViewFlags = 0;
-
         //Setting Display Attributes
         _selectionHighlightStyle = CPTableViewSelectionHighlightStyleRegular;
 
-        _usesAlternatingRowBackgroundColors = [aCoder decodeBoolForKey:CPTableViewUsesAlternatingBackgroundKey];
-        [self setAlternatingRowBackgroundColors:[[CPColor whiteColor], [CPColor colorWithHexString:@"e4e7ff"]]];
-
-        _tableColumns = [aCoder decodeObjectForKey:CPTableViewTableColumnsKey];
+        _tableColumns = [aCoder decodeObjectForKey:CPTableViewTableColumnsKey] || [];
         [_tableColumns makeObjectsPerformSelector:@selector(setTableView:) withObject:self];
 
-        _tableColumnRanges = [];
-        _dirtyTableColumnRangeIndex = 0;
-        _numberOfHiddenColumns = 0;
-
-        _objectValues = { };
-        _dataViewsForTableColumns = { };
-        _dataViews=  [];
-        _numberOfRows = 0;
-        _exposedRows = [CPIndexSet indexSet];
-        _exposedColumns = [CPIndexSet indexSet];
-        _cachedDataViews = { };
-        _rowHeight = [aCoder decodeFloatForKey:CPTableViewRowHeightKey];
-        
-        if ([aCoder containsValueForKey:CPTableViewIntercellSpacingKey])
-            _intercellSpacing = [aCoder decodeSizeForKey:CPTableViewIntercellSpacingKey];
+        if ([aCoder containsValueForKey:CPTableViewRowHeightKey])
+            _rowHeight = [aCoder decodeFloatForKey:CPTableViewRowHeightKey];
         else
-            _intercellSpacing = _CGSizeMake(0.0, 0.0);
+            _rowHeight = 23.0;
+        
+        _intercellSpacing = [aCoder decodeSizeForKey:CPTableViewIntercellSpacingKey] || _CGSizeMake(0.0, 0.0);
         
         _gridColor = [aCoder decodeObjectForKey:CPTableViewGridColorKey] || [CPColor grayColor];
         _gridStyleMask = [aCoder decodeIntForKey:CPTableViewGridStyleMaskKey] || CPTableViewGridNone;
@@ -3225,15 +3216,9 @@ var CPTableViewDataSourceKey                = @"CPTableViewDataSourceKey",
         _headerView = [aCoder decodeObjectForKey:CPTableViewHeaderViewKey];
         _cornerView = [aCoder decodeObjectForKey:CPTableViewCornerViewKey];
 
-        _selectedColumnIndexes = [CPIndexSet indexSet];
-        _selectedRowIndexes = [CPIndexSet indexSet];
-
         _dataSource = [aCoder decodeObjectForKey:CPTableViewDataSourceKey];
         _delegate = [aCoder decodeObjectForKey:CPTableViewDelegateKey];
 
-        _tableDrawView = [[_CPTableDrawView alloc] initWithTableView:self];
-        [_tableDrawView setBackgroundColor:[CPColor clearColor]];
-        [self addSubview:_tableDrawView];
         [self _init];
 
         [self viewWillMoveToSuperview:[self superview]];

AppKit/CPTextField.j

@@ -997,7 +997,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     return bounds;
 }
 
-- (CGRect)bezelRectForBounds:(CFRect)bounds
+- (CGRect)bezelRectForBounds:(CGRect)bounds
 {
     var bezelInset = [self currentValueForThemeAttribute:@"bezel-inset"];
 
@@ -1087,6 +1087,22 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     }
 }
 
+- (void)takeValueFromKeyPath:(CPString)aKeyPath ofObjects:(CPArray)objects
+{
+    var count = objects.length,
+        value = [objects[0] valueForKeyPath:aKeyPath];
+
+    [self setStringValue:value];
+    [self setPlaceholderString:@""];
+
+    while (count-- > 1)
+        if (value !== [objects[count] valueForKeyPath:aKeyPath])
+        {
+            [self setPlaceholderString:@"Multiple Values"];
+            [self setStringValue:@""];
+        }
+}
+
 @end
 
 var secureStringForString = function(aString)

AppKit/CPToolbarItem.j

@@ -449,6 +449,9 @@ CPToolbarItemVisibilityPriorityUser
 
 - (void)validate
 {
+    var action = [self action],
+        target = [self target];
+
     // View items do not do any target-action analysis.
     if (_view)
     {
@@ -458,13 +461,9 @@ CPToolbarItemVisibilityPriorityUser
         return;
     }
 
-    var action = [self action];
-
     if (!action)
         return [self setEnabled:NO];
 
-    var target = [self target];
-
     if (target && ![target respondsToSelector:action])
         return [self setEnabled:NO];
 

AppKit/CPView.j

@@ -94,7 +94,8 @@ var DOMElementPrototype         = nil,
     BackgroundTrivialColor              = 0,
     BackgroundVerticalThreePartImage    = 1,
     BackgroundHorizontalThreePartImage  = 2,
-    BackgroundNinePartImage             = 3;
+    BackgroundNinePartImage             = 3,
+    BackgroundTransparentColor          = 4;
 #endif
 
 var CPViewFlags                     = { },
@@ -139,6 +140,7 @@ var CPViewFlags                     = { },
     
     BOOL                _isHidden;
     BOOL                _hitTests;
+    BOOL                _clipsToBounds;
     
     BOOL                _postsFrameChangedNotifications;
     BOOL                _postsBoundsChangedNotifications;
@@ -277,6 +279,7 @@ var CPViewFlags                     = { },
 
         _autoresizingMask = CPViewNotSizable;
         _autoresizesSubviews = YES;
+        _clipsToBounds = YES;
     
         _opacity = 1.0;
         _isHidden = NO;
@@ -835,28 +838,33 @@ var CPViewFlags                     = { },
 
     if (_backgroundType !== BackgroundTrivialColor)
     {
-        var images = [[_backgroundColor patternImage] imageSlices];
-
-        if (_backgroundType === BackgroundVerticalThreePartImage)
+        if (_backgroundType === BackgroundTransparentColor)
         {
-            CPDOMDisplayServerSetStyleSize(_DOMImageParts[1], size.width, size.height - _DOMImageSizes[0].height - _DOMImageSizes[2].height);
+            CPDOMDisplayServerSetStyleSize(_DOMImageParts[0], size.width, size.height);
         }
-
-        else if (_backgroundType === BackgroundHorizontalThreePartImage)
+        else
         {
-            CPDOMDisplayServerSetStyleSize(_DOMImageParts[1], size.width - _DOMImageSizes[0].width - _DOMImageSizes[2].width, size.height);
-        }
+            var images = [[_backgroundColor patternImage] imageSlices];
 
-        else if (_backgroundType === BackgroundNinePartImage)
-        {
-            var width = size.width - _DOMImageSizes[0].width - _DOMImageSizes[2].width,
-                height = size.height - _DOMImageSizes[0].height - _DOMImageSizes[6].height;
+            if (_backgroundType === BackgroundVerticalThreePartImage)
+            {
+                CPDOMDisplayServerSetStyleSize(_DOMImageParts[1], size.width, size.height - _DOMImageSizes[0].height - _DOMImageSizes[2].height);
+            }
+            else if (_backgroundType === BackgroundHorizontalThreePartImage)
+            {
+                CPDOMDisplayServerSetStyleSize(_DOMImageParts[1], size.width - _DOMImageSizes[0].width - _DOMImageSizes[2].width, size.height);
+            }
+            else if (_backgroundType === BackgroundNinePartImage)
+            {
+                var width = size.width - _DOMImageSizes[0].width - _DOMImageSizes[2].width,
+                    height = size.height - _DOMImageSizes[0].height - _DOMImageSizes[6].height;
 
-            CPDOMDisplayServerSetStyleSize(_DOMImageParts[1], width, _DOMImageSizes[0].height);
-            CPDOMDisplayServerSetStyleSize(_DOMImageParts[3], _DOMImageSizes[3].width, height);
-            CPDOMDisplayServerSetStyleSize(_DOMImageParts[4], width, height);
-            CPDOMDisplayServerSetStyleSize(_DOMImageParts[5], _DOMImageSizes[5].width, height);
-            CPDOMDisplayServerSetStyleSize(_DOMImageParts[7], width, _DOMImageSizes[7].height);
+                CPDOMDisplayServerSetStyleSize(_DOMImageParts[1], width, _DOMImageSizes[0].height);
+                CPDOMDisplayServerSetStyleSize(_DOMImageParts[3], _DOMImageSizes[3].width, height);
+                CPDOMDisplayServerSetStyleSize(_DOMImageParts[4], width, height);
+                CPDOMDisplayServerSetStyleSize(_DOMImageParts[5], _DOMImageSizes[5].width, height);
+                CPDOMDisplayServerSetStyleSize(_DOMImageParts[7], width, _DOMImageSizes[7].height);
+            }
         }
     }
 #endif
@@ -1188,6 +1196,23 @@ var CPViewFlags                     = { },
     return _isHidden;
 }
 
+- (void)setClipsToBounds:(BOOL)shouldClip
+{
+    if (_clipsToBounds === shouldClip)
+        return;
+
+    _clipsToBounds = shouldClip;
+
+#if PLATFORM(DOM)
+    _DOMElement.style.overflow = _clipsToBounds ? "hidden" :  "visible";
+#endif
+}
+
+- (BOOL)clipsToBounds
+{
+    return _clipsToBounds;
+}
+
 /*!
     Sets the opacity of the receiver. The value must be in the range of 0.0 to 1.0, where 0.0 is 
     completely transparent and 1.0 is completely opaque.
@@ -1361,7 +1386,7 @@ var CPViewFlags                     = { },
     }
     else
     {
-        _backgroundType = BackgroundTrivialColor;
+        _backgroundType = colorNeedsDOMElement ? BackgroundTransparentColor : BackgroundTrivialColor;
         amount = (colorNeedsDOMElement ? 1 : 0) - _DOMImageParts.length;
     }
 
@@ -1384,7 +1409,7 @@ var CPViewFlags                     = { },
             _DOMElement.removeChild(_DOMImageParts.pop());
     }
 
-    if (_backgroundType === BackgroundTrivialColor)
+    if (_backgroundType === BackgroundTrivialColor || _backgroundType === BackgroundTransparentColor)
     {
         var colorCSS = colorExists ? [_backgroundColor cssString] : "";
 

AppKit/CPWindow/CPWindow.j

@@ -372,6 +372,15 @@ CPTexturedBackgroundWindowMask
             [self setPlatformWindow:[CPPlatformWindow primaryPlatformWindow]];
         else
         {
+            // give zero sized borderless bridge windows a default size if we're not in the browser so they show up in NativeHost.
+            if ((aStyleMask & CPBorderlessBridgeWindowMask) && aContentRect.size.width === 0 && aContentRect.size.height === 0)
+            {
+                var visibleFrame = [[[CPScreen alloc] init] visibleFrame];
+                _frame.size.height = MIN(768.0, visibleFrame.size.height);
+                _frame.size.width = MIN(1024.0, visibleFrame.size.width);
+                _frame.origin.x = (visibleFrame.size.width - _frame.size.width) / 2;
+                _frame.origin.y = (visibleFrame.size.height - _frame.size.height) / 2;
+            }
             [self setPlatformWindow:[[CPPlatformWindow alloc] initWithContentRect:_frame]];
             [self platformWindow]._only = self;
         }
@@ -883,6 +892,23 @@ CPTexturedBackgroundWindowMask
     return _contentView;
 }
 
+/*!
+    Applies an alpha value to the window.
+    @param aValue the alpha value to apply
+*/
+- (void)setAlphaValue:(float)aValue
+{
+    [_windowView setAlphaValue:aValue];
+}
+
+/*!
+    Returns the alpha value of the window.
+*/
+- (float)alphaValue
+{
+    return [_windowView alphaValue];
+}
+
 /*!
     Sets the window's background color.
     @param aColor the new color for the background

AppKit/Themes/Aristo/ThemeDescriptors.j

@@ -439,7 +439,7 @@
         isVertical:NO]);
 
     [button setValue:CPLeftTextAlignment forThemeAttribute:@"alignment" inState:CPThemeStateBordered];
-    [button setValue:[CPFont boldSystemFontOfSize:12.0] forThemeAttribute:@"font" inState:CPThemeStateBordered];
+    [button setValue:[CPFont systemFontOfSize:12.0] forThemeAttribute:@"font" inState:CPThemeStateBordered];
     [button setValue:CGInsetMake(0.0, 0.0, 0.0, 20.0) forThemeAttribute:@"content-inset" inState:CPThemeStateBordered];
     [button setValue:bezelColor forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered];    
     [button setValue:bezelColorSelected forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateSelected];
@@ -493,7 +493,7 @@
         isVertical:NO]);
     
     [button setValue:CPLeftTextAlignment forThemeAttribute:@"alignment" inState:CPThemeStateBordered];
-    [button setValue:[CPFont boldSystemFontOfSize:12.0] forThemeAttribute:@"font" inState:CPThemeStateBordered];
+    [button setValue:[CPFont systemFontOfSize:12.0] forThemeAttribute:@"font" inState:CPThemeStateBordered];
     [button setValue:CGInsetMake(0.0, 0.0, 0.0, 20.0) forThemeAttribute:@"content-inset" inState:CPThemeStateBordered];
     [button setValue:bezelColor forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered];    
     [button setValue:bezelColorSelected forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateSelected];
@@ -721,7 +721,7 @@
 
 + (CPButtonBar)themedButtonBar
 {
-    var buttonBar = [[CPButtonBar alloc] initWithFrame:CGRectMake(0.0, 0.0, 140.0, 26.0)],
+    var buttonBar = [[CPButtonBar alloc] initWithFrame:CGRectMake(0.0, 0.0, 147.0, 26.0)],
         color = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"buttonbar-bezel.png" size:CGSizeMake(1.0, 26.0)]];
 
     [buttonBar setHasResizeControl:YES];
@@ -761,8 +761,13 @@
     [buttonBar setValue:buttonBezelColor forThemeAttribute:@"button-bezel-color"];
     [buttonBar setValue:buttonBezelHighlightedColor forThemeAttribute:@"button-bezel-color" inState:CPThemeStateHighlighted];
     [buttonBar setValue:buttonBezelDisabledColor forThemeAttribute:@"button-bezel-color" inState:CPThemeStateDisabled];
+    [buttonBar setValue:[CPColor blackColor] forThemeAttribute:@"button-text-color"];
 
-    [buttonBar setButtons:[[CPButtonBar plusButton], [CPButtonBar minusButton], [self themedPullDownMenu]]];
+    var popup = [CPButtonBar actionPopupButton];
+    [popup addItemWithTitle:"Item 1"];
+    [popup addItemWithTitle:"Item 2"];
+
+    [buttonBar setButtons:[[CPButtonBar plusButton], [CPButtonBar minusButton], popup]];
 
     return buttonBar;
 }

CommonJS/bin/flatten

@@ -10,6 +10,8 @@ var FILE = require("file");
 var OS = require("os");
 var UTIL = require("util");
 
+var CACHEMANIFEST = require("objective-j/cache-manifest");
+
 var stream = require("term").stream;
 var parser = new (require("args").Parser)();
 
@@ -49,6 +51,10 @@ parser.option("-c", "--compressor", "compressor")
     .set()
     .help("Select a compressor to use (closure-compiler, yuicompressor, shrinksafe), or \"none\" (default: shrinksafe)");
 
+parser.option("--manifest", "manifest")
+    .set(true)
+    .help("Generate HTML5 cache manifest.");
+
 parser.option("-v", "--verbose", "verbose")
    .def(false)
    .set(true)
@@ -126,6 +132,13 @@ function main(args)
     });
 
     rewriteMainHTML(outputPath.join(options.index));
+
+    if (options.manifest) {
+        CACHEMANIFEST.generateManifest(outputPath, {
+            index : outputPath.join(options.index),
+            exclude : Object.keys(flattener.filesToCache).map(function(path) { return outputPath.join(path).toString(); })
+        });
+    }
 }
 
 // ObjectiveJFlattener inherits from ObjectiveJRuntimeAnalyzer

CommonJS/bin/press

@@ -10,6 +10,8 @@ require("narwhal").ensureEngine("rhino");
 var FILE = require("file");
 var OS = require("os");
 
+var CACHEMANIFEST = require("objective-j/cache-manifest");
+
 var stream = require("term").stream;
 var parser = new (require("args").Parser)();
 
@@ -31,11 +33,20 @@ parser.option("-f", "--force", "force")
    .set(true)
    .help("Force overwriting OUTPUT_PROJECT if it exists");
 
+parser.option("--index", "index")
+   .def("index.html")
+   .set()
+   .help("The root HTML file to modify (default: index.html) (NOTE: currently only used by '--manifest' option)");
+
 parser.option("-p", "--pngcrush", "png")
     .def(false)
     .set(true)
     .help("Run pngcrush on all PNGs (pngcrush must be installed!)");
 
+parser.option("--manifest", "manifest")
+    .set(true)
+    .help("Generate HTML5 cache manifest.");
+
 parser.option("-v", "--verbose", "verbose")
     .def(false)
     .set(true)
@@ -146,6 +157,12 @@ function press(rootPath, outputPath, options) {
     if (options.png) {
         pngcrushDirectory(outputPath);
     }
+
+    if (options.manifest) {
+        CACHEMANIFEST.generateManifest(outputPath, {
+            index : outputPath.join(options.index)
+        });
+    }
 }
 
 function pressEnvironment(rootPath, outputFiles, environment, options) {

CommonJS/lib/cappuccino/nativehost.js

@@ -0,0 +1,70 @@
+var FILE = require("file");
+var OS = require("os");
+
+var NATIVEHOST_SOURCE = FILE.path(module.path).dirname().dirname().dirname().join("support", "NativeHost.app");
+
+exports.buildNativeHost = function(rootPath, buildNative, options) {
+    options = options || {};
+    options.index = options.index || "index.html";
+
+    rootPath = FILE.path(rootPath);
+    buildNative = FILE.path(buildNative);
+
+    if (buildNative.exists())
+        buildNative.rmtree();
+
+    buildNative.dirname().mkdirs();
+    // FIXME: Narwhal doesn't preserve permissions
+    // FILE.copyTree(NATIVEHOST_SOURCE, buildNative);
+    OS.system(["cp", "-r", NATIVEHOST_SOURCE, buildNative]);
+    FILE.chmod(buildNative.join("Contents", "MacOS", "NativeHost"), 0755);
+
+    var rootBaseName = rootPath.basename();
+    var buildClientDirectory = buildNative.join("Contents", "Resources", rootBaseName);
+
+    FILE.mkdirs(FILE.dirname(buildClientDirectory));
+    // FILE.copyTree(rootPath, buildClientDirectory);
+    OS.system(["cp", "-r", rootPath, buildClientDirectory]);
+
+    var defaultBundleName = buildNative.basename().match(/^(.*)(\.app)?$/)[1];
+
+    function mergePlist(plist, path) {
+        var otherPlist = CFPropertyList.readPropertyListFromFile(String(path));
+
+        otherPlist.keys().forEach(function(key) {
+            var value = otherPlist.valueForKey(key);
+            plist.setValueForKey(key, value);
+
+            if (key === "CPBundleName")
+                plist.setValueForKey("CFBundleName", value);
+
+            if (key === "CFBundleIconFile") {
+                var iconPath = rootPath.join("Resources", value);
+                if (iconPath.isFile())
+                    iconPath.copy(buildNative.join("Contents", "Resources", value));
+                else
+                    print("Warning: CFBundleIconFile references " + value + " but does not exist in the resources directory.");
+            }
+
+            if (key === "CFBundleExecutable") {
+                buildNative.join("Contents", "MacOS", "NativeHost").rename(value);
+                // FIXME:
+                FILE.chmod(buildNative.join("Contents", "MacOS", value), 0755);
+            }
+        });
+    }
+
+    CFPropertyList.modifyPlist(buildNative.join("Contents", "Info.plist"), function(plist) {
+
+        plist.setValueForKey("CFBundleName", defaultBundleName);
+        plist.setValueForKey("NHInitialResource", FILE.join(rootBaseName, options.index));
+
+        // merge Cappuccino plist
+        var cappPlistPath = rootPath.join("Info.plist");
+        if (cappPlistPath.isFile())
+            mergePlist(plist, cappPlistPath);
+
+        if (options.extraPlistPath)
+            mergePlist(plist, options.extraPlistPath);
+    });
+}

Foundation/CPArray.j

@@ -37,7 +37,7 @@
 - (id)initWithArray:(CPArray)anArray
 {
     self = [super init];
-    
+
     if (self)
     {
         _array = anArray;
@@ -67,13 +67,13 @@
 - (id)initWithArray:(CPArray)anArray
 {
     self = [super init];
-    
+
     if (self)
     {
         _array = anArray;
         _index = [_array count];
     }
-    
+
     return self;
 }
 
@@ -87,7 +87,7 @@
 
 @end
 
-/*! 
+/*!
     @class CPArray
     @brief A mutable array backed by a JavaScript Array.
     @ingroup foundation
@@ -145,10 +145,10 @@
 {
     var i = 2,
         array = [[self alloc] init],
-        argument;
+        count = arguments.length;
 
-    for(; i < arguments.length && (argument = arguments[i]) != nil; ++i)
-        array.push(argument);
+    for (; i < count; ++i)
+        array.push(arguments[i]);
 
     return array;
 }
@@ -182,10 +182,10 @@
 - (id)initWithArray:(CPArray)anArray
 {
     self = [super init];
-    
+
     if (self)
         [self setArray:anArray];
-    
+
     return self;
 }
 
@@ -203,22 +203,22 @@
         return [self initWithArray:anArray];
 
     self = [super init];
-    
+
     if (self)
     {
         var index = 0,
             count = [anArray count];
-            
-        for(; index < count; ++index)
+
+        for (; index < count; ++index)
         {
             if (anArray[index].isa)
                 self[index] = [anArray[index] copy];
             // Do a deep/shallow copy?
             else
-                self[index] = anArray;
+                self[index] = anArray[index];
         }
     }
-    
+
     return self;
 }
 
@@ -229,12 +229,12 @@
 {
     // The arguments array contains self and _cmd, so the first object is at position 2.
     var i = 2,
-        argument;
-    
-    for(; i < arguments.length && (argument = arguments[i]) != nil; ++i)
-        push(argument);
+        count = arguments.length;
 
-    return self; 
+    for (; i < count; ++i)
+        push(arguments[i]);
+
+    return self;
 }
 
 /*!
@@ -246,12 +246,12 @@
 - (id)initWithObjects:(id)objects count:(unsigned)aCount
 {
     self = [super init];
-    
+
     if (self)
     {
         var index = 0;
-    
-        for(; index < aCount; ++index)
+
+        for (; index < aCount; ++index)
             push(objects[index]);
     }
 
@@ -278,97 +278,88 @@
 
 /*!
     Returns the index of \c anObject in this array.
-    If the object is \c nil or not in the array,
+    If the object is not in the array,
     returns \c CPNotFound. It first attempts to find
-    a match using \c -isEqual:, then \c ==.
+    a match using \c -isEqual:, then \c ===.
     @param anObject the object to search for
 */
 - (int)indexOfObject:(id)anObject
 {
-    if (anObject === nil)
-        return CPNotFound;
-    
-    var i = 0, 
+    var i = 0,
         count = length;
 
     // Only use -isEqual: if our object is a CPObject.
-    if (anObject.isa)
+    if (anObject && anObject.isa)
     {
-        for(; i < count; ++i)
-            if([self[i] isEqual:anObject])
+        for (; i < count; ++i)
+            if ([self[i] isEqual:anObject])
                 return i;
     }
-    // If indexOf exists, use it since it's probably 
+    // If indexOf exists, use it since it's probably
     // faster than anything we can implement.
     else if (self.indexOf)
         return indexOf(anObject);
     // Last resort, do a straight forward linear O(N) search.
     else
-        for(; i < count; ++i)
-            if(self[i] == anObject)
+        for (; i < count; ++i)
+            if (self[i] === anObject)
                 return i;
-    
+
     return CPNotFound;
 }
 
 /*!
     Returns the index of \c anObject in the array
     within \c aRange. It first attempts to find
-    a match using \c -isEqual:, then \c ==.
+    a match using \c -isEqual:, then \c ===.
     @param anObject the object to search for
     @param aRange the range to search within
     @return the index of the object, or \c CPNotFound if it was not found.
 */
 - (int)indexOfObject:(id)anObject inRange:(CPRange)aRange
 {
-    if (anObject === nil)
-        return CPNotFound;
-    
-    var i = aRange.location, 
+    var i = aRange.location,
         count = MIN(CPMaxRange(aRange), length);
-    
+
     // Only use isEqual: if our object is a CPObject.
-    if (anObject.isa)
+    if (anObject && anObject.isa)
     {
-        for(; i < count; ++i)
-            if([self[i] isEqual:anObject])
+        for (; i < count; ++i)
+            if ([self[i] isEqual:anObject])
                 return i;
     }
     // Last resort, do a straight forward linear O(N) search.
     else
-        for(; i < count; ++i)
-            if(self[i] == anObject)
+        for (; i < count; ++i)
+            if (self[i] === anObject)
                 return i;
-    
+
     return CPNotFound;
 }
 
 /*!
-    Returns the index of \c anObject in the array. The test for equality is done using only \c ==.
+    Returns the index of \c anObject in the array. The test for equality is done using only \c ===.
     @param anObject the object to search for
     @return the index of the object in the array. \c CPNotFound if the object is not in the array.
 */
 - (int)indexOfObjectIdenticalTo:(id)anObject
 {
-    if (anObject === nil)
-        return CPNotFound;
-    
-    // If indexOf exists, use it since it's probably 
+    // If indexOf exists, use it since it's probably
     // faster than anything we can implement.
     if (self.indexOf)
         return indexOf(anObject);
-    
+
     // Last resort, do a straight forward linear O(N) search.
     else
     {
-        var index = 0, 
+        var index = 0,
             count = length;
-        
-        for(; index < count; ++index)
-            if(self[index] === anObject)
+
+        for (; index < count; ++index)
+            if (self[index] === anObject)
                 return index;
     }
-    
+
     return CPNotFound;
 }
 
@@ -382,36 +373,33 @@
 */
 - (int)indexOfObjectIdenticalTo:(id)anObject inRange:(CPRange)aRange
 {
-    if (anObject === nil)
-        return CPNotFound;
-    
-    // If indexOf exists, use it since it's probably 
+    // If indexOf exists, use it since it's probably
     // faster than anything we can implement.
     if (self.indexOf)
     {
         var index = indexOf(anObject, aRange.location);
-        
+
         if (CPLocationInRange(index, aRange))
             return index;
     }
-    
+
     // Last resort, do a straight forward linear O(N) search.
     else
     {
-        var index = aRange.location, 
+        var index = aRange.location,
             count = MIN(CPMaxRange(aRange), length);
-        
-        for(; index < count; ++index)
-            if(self[index] == anObject)
+
+        for (; index < count; ++index)
+            if (self[index] == anObject)
                 return index;
     }
-    
+
     return CPNotFound;
 }
 
 /*!
     Returns the index of \c anObject in the array, which must be sorted in the same order as
-    calling sortUsingSelector: with the selector passed to this method would result in. 
+    calling sortUsingSelector: with the selector passed to this method would result in.
     @param anObject the object to search for
     @param aSelector the comparison selector to call on each item in the list, the same
     selector should have been used to sort the array (or to maintain its sorted order).
@@ -419,12 +407,12 @@
 */
 - (unsigned)indexOfObject:(id)anObject sortedBySelector:(SEL)aSelector
 {
-    return [self indexOfObject:anObject sortedByFunction: function(lhs, rhs) { objj_msgSend(lhs, aSelector, rhs); }];
+    return [self indexOfObject:anObject sortedByFunction:function(lhs, rhs) { objj_msgSend(lhs, aSelector, rhs); }];
 }
 
 /*!
     Returns the index of \c anObject in the array, which must be sorted in the same order as
-    calling sortUsingFunction: with the selector passed to this method would result in. 
+    calling sortUsingFunction: with the selector passed to this method would result in.
     The function will be called like so:
     <pre>
     aFunction(anObject, currentObjectInArrayForComparison)
@@ -441,7 +429,7 @@
 
 /*!
     Returns the index of \c anObject in the array, which must be sorted in the same order as
-    calling sortUsingFunction: with the selector passed to this method would result in. 
+    calling sortUsingFunction: with the selector passed to this method would result in.
     The function will be called like so:
     <pre>
     aFunction(anObject, currentObjectInArrayForComparison, context)
@@ -460,13 +448,17 @@
 
 - (unsigned)_indexOfObject:(id)anObject sortedByFunction:(Function)aFunction context:(id)aContext
 {
-    if (!aFunction || anObject === undefined)
+    if (!aFunction)
         return CPNotFound;
 
     if (length === 0)
         return -1;
 
-    var mid, c, first = 0, last = length - 1;
+    var mid,
+        c,
+        first = 0,
+        last = length - 1;
+
     while (first <= last)
     {
         mid = FLOOR((first + last) / 2);
@@ -485,12 +477,12 @@
         }
     }
 
-    return -first-1;
+    return -first - 1;
 }
 
 /*!
     Returns the index of \c anObject in the array, which must be sorted in the same order as
-    calling sortUsingDescriptors: with the descriptors passed to this method would result in. 
+    calling sortUsingDescriptors: with the descriptors passed to this method would result in.
     @param anObject the object to search for
     @param descriptors the array of descriptors to use to compare each item in the array that we search. the same
     descriptors should have been used to sort the array (or to maintain its sorted order).
@@ -505,7 +497,7 @@
             result = CPOrderedSame;
 
         while (i < count)
-            if((result = [descriptors[i++] compareObject:lhs withObject:rhs]) != CPOrderedSame)
+            if ((result = [descriptors[i++] compareObject:lhs withObject:rhs]) != CPOrderedSame)
                 return result;
 
         return result;
@@ -518,9 +510,10 @@
 - (id)lastObject
 {
     var count = [self count];
-    
-    if (!count) return nil;
-    
+
+    if (!count)
+        return nil;
+
     return self[count - 1];
 }
 
@@ -546,7 +539,7 @@
     var index = CPNotFound,
         objects = [];
 
-    while((index = [indexes indexGreaterThanIndex:index]) !== CPNotFound)
+    while ((index = [indexes indexGreaterThanIndex:index]) !== CPNotFound)
         [objects addObject:[self objectAtIndex:index]];
 
     return objects;
@@ -582,11 +575,11 @@
 {
     if (!aSelector)
         [CPException raise:CPInvalidArgumentException reason:"makeObjectsPerformSelector: 'aSelector' can't be nil"];
-    
-    var index = 0, 
+
+    var index = 0,
         count = length;
-        
-    for(; index < count; ++index)
+
+    for (; index < count; ++index)
         objj_msgSend(self[index], aSelector);
 }
 
@@ -601,10 +594,10 @@
     if (!aSelector)
         [CPException raise:CPInvalidArgumentException reason:"makeObjectsPerformSelector:withObject 'aSelector' can't be nil"];
 
-    var index = 0, 
+    var index = 0,
         count = length;
-        
-    for(; index < count; ++index) 
+
+    for (; index < count; ++index)
         objj_msgSend(self[index], aSelector, anObject);
 }
 
@@ -617,7 +610,7 @@
         count = length,
         argumentsArray = [nil, aSelector].concat(objects || []);
 
-    for(; index < count; ++index)
+    for (; index < count; ++index)
     {
         argumentsArray[0] = self[index];
         objj_msgSend.apply(this, argumentsArray);
@@ -635,12 +628,12 @@
 {
     if (![anArray count] || ![self count])
         return nil;
-    
+
     var i = 0,
         count = [self count];
 
-    for(; i < count; ++i)
-        if([anArray containsObject:self[i]])
+    for (; i < count; ++i)
+        if ([anArray containsObject:self[i]])
             return self[i];
 
     return nil;
@@ -656,20 +649,20 @@
 
     if (anArray === nil || length !== anArray.length)
         return NO;
-    
+
     var index = 0,
         count = [self count];
-    
-    for(; index < count; ++index)
+
+    for (; index < count; ++index)
     {
         var lhs = self[index],
             rhs = anArray[index];
-        
+
         // If they're not equal, and either doesn't have an isa, or they're !isEqual (not isEqual)
         if (lhs !== rhs && (lhs && !lhs.isa || rhs && !rhs.isa || ![lhs isEqual:rhs]))
             return NO;
     }
-        
+
     return YES;
 }
 
@@ -677,8 +670,8 @@
 {
     if (self === anObject)
         return YES;
-    
-    if(![anObject isKindOfClass:[CPArray class]])
+
+    if (![anObject isKindOfClass:[CPArray class]])
         return NO;
 
     return [self isEqualToArray:anObject];
@@ -693,14 +686,9 @@
 */
 - (CPArray)arrayByAddingObject:(id)anObject
 {
-    if (anObject === nil || anObject === undefined)
-        [CPException raise:CPInvalidArgumentException
-                    reason:"arrayByAddingObject: object can't be nil"];
-
     var array = [self copy];
-    
     array.push(anObject);
-    
+
     return array;
 }
 
@@ -713,17 +701,17 @@
     return slice(0).concat(anArray);
 }
 
-/*  
+/*
 - (CPArray)filteredArrayUsingPredicate:(CPPredicate)aPredicate
 {
-    var i= 0, 
+    var i= 0,
         count = [self count],
         array = [CPArray array];
-    
-    for(; i<count; ++i)
-        if(aPredicate.evaluateWithObject(self[i]))
+
+    for (; i<count; ++i)
+        if (aPredicate.evaluateWithObject(self[i]))
             array.push(self[i]);
-    
+
     return array;
 }
 */
@@ -748,9 +736,9 @@
 - (CPArray)sortedArrayUsingDescriptors:(CPArray)descriptors
 {
     var sorted = [self copy];
-    
+
     [sorted sortUsingDescriptors:descriptors];
-    
+
     return sorted;
 }
 
@@ -773,9 +761,9 @@
 - (CPArray)sortedArrayUsingFunction:(Function)aFunction context:(id)aContext
 {
     var sorted = [self copy];
-    
+
     [sorted sortUsingFunction:aFunction context:aContext];
-    
+
     return sorted;
 }
 
@@ -786,7 +774,7 @@
 - (CPArray)sortedArrayUsingSelector:(SEL)aSelector
 {
     var sorted = [self copy]
-    
+
     [sorted sortUsingSelector:aSelector];
 
     return sorted;
@@ -820,7 +808,7 @@
         count = [self count],
         description = '(';
 
-    for(; index < count; ++index)
+    for (; index < count; ++index)
     {
         if (index === 0)
             description += '\n';
@@ -852,11 +840,11 @@
     var index = 0,
         count = [self count],
         array = [];
-    
-    for(; index < count; ++index)
+
+    for (; index < count; ++index)
         if (self[index].isa && [self[index] isKindOfClass:[CPString class]] && [filterTypes containsObject:[self[index] pathExtension]])
             array.push(self[index]);
-    
+
     return array;
 }
 
@@ -870,8 +858,8 @@
 {
     var i = 0,
         count = [self count];
-    
-    for(; i < count; ++i)
+
+    for (; i < count; ++i)
         [self[i] setValue:aValue forKey:aKey];
 }
 
@@ -885,10 +873,10 @@
     var i = 0,
         count = [self count],
         array = [];
-    
-    for(; i < count; ++i)
+
+    for (; i < count; ++i)
         array.push([self[i] valueForKey:aKey]);
-    
+
     return array;
 }
 
@@ -902,7 +890,7 @@
 {
     return slice(0);
 }
-    
+
 @end
 
 @implementation CPArray(CPMutableArray)
@@ -965,18 +953,18 @@
 {
     var indexesCount = [indexes count],
         objectsCount = [objects count];
-    
-    if(indexesCount !== objectsCount)
+
+    if (indexesCount !== objectsCount)
         [CPException raise:CPRangeException reason:"the counts of the passed-in array (" + objectsCount + ") and index set (" + indexesCount + ") must be identical."];
-    
+
     var lastIndex = [indexes lastIndex];
-    
-    if(lastIndex >= [self count] + indexesCount)
-        [CPException raise:CPRangeException reason:"the last index (" + lastIndex + ") must be less than the sum of the original count (" + [self count] + ") and the insertion count (" + indexesCount + ")."];    
-    
+
+    if (lastIndex >= [self count] + indexesCount)
+        [CPException raise:CPRangeException reason:"the last index (" + lastIndex + ") must be less than the sum of the original count (" + [self count] + ") and the insertion count (" + indexesCount + ")."];
+
     var index = 0,
         currentIndex = [indexes firstIndex];
- 
+
     for (; index < objectsCount; ++index, currentIndex = [indexes indexGreaterThanIndex:currentIndex])
         [self insertObject:objects[index] atIndex:currentIndex];
 }
@@ -990,14 +978,14 @@
             result = CPOrderedSame;
 
         while (i < count)
-            if((result = [descriptors[i++] compareObject:lhs withObject:rhs]) != CPOrderedSame)
+            if ((result = [descriptors[i++] compareObject:lhs withObject:rhs]) != CPOrderedSame)
                 return result;
 
         return result;
     } context:nil];
 
     if (index < 0)
-        index = -index-1;
+        index = -index - 1;
 
     [self insertObject:anObject atIndex:index];
     return index;
@@ -1021,10 +1009,10 @@
 */
 - (void)replaceObjectsAtIndexes:(CPIndexSet)anIndexSet withObjects:(CPArray)objects
 {
-    var i = 0, 
+    var i = 0,
         index = [anIndexSet firstIndex];
-   
-    while(index != CPNotFound)
+
+    while (index != CPNotFound)
     {
         [self replaceObjectAtIndex:index withObject:objects[i++]];
         index = [anIndexSet indexGreaterThanIndex:index];
@@ -1065,8 +1053,9 @@
 */
 - (void)setArray:(CPArray)anArray
 {
-    if(self == anArray) return;
-    
+    if (self == anArray)
+        return;
+
     splice.apply(self, [0, length].concat(anArray));
 }
 
@@ -1104,7 +1093,7 @@
 - (void)removeObject:(id)anObject inRange:(CPRange)aRange
 {
     var index;
-    
+
     while ((index = [self indexOfObject:anObject inRange:aRange]) != CPNotFound)
     {
         [self removeObjectAtIndex:index];
@@ -1128,7 +1117,7 @@
 - (void)removeObjectsAtIndexes:(CPIndexSet)anIndexSet
 {
     var index = [anIndexSet lastIndex];
-   
+
     while (index != CPNotFound)
     {
         [self removeObjectAtIndex:index];
@@ -1157,7 +1146,7 @@
 {
     var index,
         count = [self count];
-    
+
     while ((index = [self indexOfObjectIdenticalTo:anObject inRange:aRange]) !== CPNotFound)
     {
         [self removeObjectAtIndex:index];
@@ -1173,7 +1162,7 @@
 {
     var index = 0,
         count = [anArray count];
-        
+
     for (; index < count; ++index)
         [self removeObject:anArray[index]];
 }
@@ -1207,11 +1196,11 @@
         var i = 0,
             count = [descriptors count],
             result = CPOrderedSame;
-        
-        while(i < count)
-            if((result = [descriptors[i++] compareObject:lhs withObject:rhs]) != CPOrderedSame)
+
+        while (i < count)
+            if ((result = [descriptors[i++] compareObject:lhs withObject:rhs]) != CPOrderedSame)
                 return result;
-        
+
         return result;
     });
 }

Foundation/CPJSONPConnection.j

@@ -56,7 +56,7 @@ CPJSONPCallbackReplacementString = @"${JSONP_CALLBACK}";
 
 + (CPJSONPConnection)connectionWithRequest:(CPURLRequest)aRequest callback:(CPString)callbackParameter delegate:(id)aDelegate
 {
-    return [[[self class] alloc] initWithRequest:aRequest callback:callbackParameter delegate:aDelegate startImmediately:YES];;
+    return [[[self class] alloc] initWithRequest:aRequest callback:callbackParameter delegate:aDelegate startImmediately:YES];
 }
 
 - (id)initWithRequest:(CPURLRequest)aRequest callback:(CPString)aString delegate:(id)aDelegate 
@@ -88,7 +88,12 @@ CPJSONPCallbackReplacementString = @"${JSONP_CALLBACK}";
     {
         CPJSONPConnectionCallbacks["callback"+[self UID]] = function(data)
         {
-            [_delegate connection:self didReceiveData:data];
+            if ([_delegate respondsToSelector:@selector(connection:didReceiveData:)])
+                [_delegate connection:self didReceiveData:data];
+
+            if ([_delegate respondsToSelector:@selector(connectionDidFinishLoading:)])
+                    [_delegate connectionDidFinishLoading:self];
+    
             [self removeScriptTag];
     
             [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
@@ -118,7 +123,9 @@ CPJSONPCallbackReplacementString = @"${JSONP_CALLBACK}";
     }
     catch (exception)
     {
-        [_delegate connection: self didFailWithError: exception];
+        if ([_delegate respondsToSelector:@selector(connection:didFailWithError:)])
+            [_delegate connection: self didFailWithError: exception];
+
         [self removeScriptTag];
     }
 }

Foundation/CPNull.j

@@ -25,7 +25,7 @@
 
 var CPNullSharedNull = nil;
 
-/*! 
+/*!
     @class CPNull
     @ingroup foundation
     @brief An object representation of \c nil.
@@ -41,7 +41,7 @@ var CPNullSharedNull = nil;
 {
     if (CPNullSharedNull)
         return CPNullSharedNull;
-        
+
     return [super alloc];
 }*/
 /*!
@@ -53,8 +53,27 @@ var CPNullSharedNull = nil;
 {
     if (!CPNullSharedNull)
         CPNullSharedNull = [[CPNull alloc] init];
-        
+
     return CPNullSharedNull;
 }
 
+/*!
+    Returns CPNull null.
+    @param aCoder the coder from which to do nothing
+    @return [CPNull null]
+*/
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    return [CPNull null];
+}
+
+/*!
+    Writes out nothing to the specified coder.
+    @param aCoder the coder to which nothing will
+    be written
+*/
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+}
+
 @end

Foundation/CPSet.j

@@ -23,7 +23,7 @@
  *
  * TODO: Needs to implement CPCoding, CPCopying.
  */
- 
+
 @import "CPObject.j"
 @import "CPArray.j"
 @import "CPNumber.j"
@@ -79,7 +79,7 @@
 /*
     Creates and returns a set containing the objects in a given argument list.
     @param anObject The first object to add to the new set.
-    @param ... A comma-separated list of objects, ending with nil, to add to the new set. If the same object appears more than once objects, it is added only once to the returned set. 
+    @param ... A comma-separated list of objects, ending with nil, to add to the new set. If the same object appears more than once objects, it is added only once to the returned set.
 */
 + (id)setWithObjects:(id)anObject, ...
 {
@@ -89,7 +89,7 @@
 
     for(; i < argLength && ((argument = arguments[i]) !== nil); ++i)
         [set addObject:argument];
-    
+
     return set;
 }
 
@@ -112,7 +112,7 @@
         _count = 0;
         _contents = {};
     }
-    
+
     return self;
 }
 
@@ -121,21 +121,21 @@
     @param array An array of objects to add to the new set. If the same object appears more than once in array, it is represented only once in the returned set.
 */
 - (id)initWithArray:(CPArray)anArray
-{    
+{
     if (self = [self init])
     {
         var count = anArray.length;
-        
+
         while (count--)
             [self addObject:anArray[count]];
     }
-    
+
     return self;
 }
 
 /*
     Initializes a newly allocated set with members taken from the specified list of objects.
-    @param objects A array of objects to add to the new set. If the same object appears more than once objects, it is added only once to the returned set. 
+    @param objects A array of objects to add to the new set. If the same object appears more than once objects, it is added only once to the returned set.
     @param count The number of objects from objects to add to the new set.
 */
 - (id)initWithObjects:(id)objects count:(unsigned)count
@@ -158,7 +158,7 @@
         for(; i < argLength && (argument = arguments[i]) != nil; ++i)
             [self addObject:argument];
     }
-    
+
     return self;
 }
 
@@ -179,9 +179,9 @@
 
     if (!aSet)
         return self;
-            
+
     var contents = aSet._contents;
-    
+
     for (var property in contents)
     {
         if (contents.hasOwnProperty(property))
@@ -192,7 +192,7 @@
                 [self addObject:contents[property]];
         }
     }
-    
+
     return self;
 }
 
@@ -202,13 +202,13 @@
 - (CPArray)allObjects
 {
     var array = [];
-    
+
     for (var property in _contents)
     {
         if (_contents.hasOwnProperty(property))
             array.push(_contents[property]);
     }
-    
+
     return array;
 }
 
@@ -222,7 +222,7 @@
         if (_contents.hasOwnProperty(property))
             return _contents[property];
     }
-    
+
     return nil;
 }
 
@@ -236,7 +236,7 @@
 
     if (obj !== undefined && [obj isEqual:anObject])
         return YES;
-    
+
     return NO;
 }
 
@@ -277,7 +277,7 @@
     @param set The set with which to compare the receiver.
 */
 - (BOOL)isEqualToSet:(CPSet)set
-{    
+{
     // If both are subsets of each other, they are equal
     return self === set || ([self count] === [set count] && [set isSubsetOfSet:self]);
 }
@@ -295,7 +295,7 @@
         if (![set containsObject:items[i]])
             return NO;
     }
-    
+
     return YES;
 }
 
@@ -330,7 +330,7 @@
 {
     if ([self containsObject:object])
         return object;
-    
+
     return nil;
 }
 
@@ -467,6 +467,11 @@
     }
 }
 
+- (CPString)description
+{
+    return @"{(" + [self allObjects].join(", ") + ")}";
+}
+
 @end
 
 @implementation CPSet (CPCopying)

Objective-J/CFPropertyList.js

@@ -91,6 +91,16 @@ CFPropertyList.writePropertyListToFile = function(/*CFPropertyList*/ aPropertyLi
 {
     return FILE.write(aFilePath, CFPropertyList.stringFromPropertyList(aPropertyList, aFormat), { charset:"UTF-8" });
 }
+CFPropertyList.modifyPlist = function(/*String*/ aFilePath, /*Function*/ aCallback, /*String*/ aFormat)
+{
+    var string = FILE.read(aFilePath, { charset:"UTF-8" });
+    var format = CFPropertyList.sniffedFormatOfString(string);
+    var plist = CFPropertyList.propertyListFromString(string, format);
+
+    aCallback(plist);
+
+    CFPropertyList.writePropertyListToFile(plist, aFilePath, aFormat || format);
+}
 #endif
 
 function serializePropertyList(/*CFPropertyList*/ aPropertyList, /*Object*/ serializers)

Objective-J/CommonJS/lib/objective-j.js

@@ -182,5 +182,11 @@ exports.fullVersionString = function() {
     );
 }
 
+global.ObjectiveJ = {};
+
+for (key in exports)
+    if (Object.prototype.hasOwnProperty.call(exports, key))
+        global.ObjectiveJ[key] = exports[key];
+
 if (require.main == module.id)
     exports.run(system.args);

Objective-J/CommonJS/lib/objective-j/cache-manifest.js

@@ -2,12 +2,14 @@
 var FILE = require("file");
 var MD5 = require("md5");
 
-var FileList = require("jake").FileList,
+var FileList = require("jake").FileList;
 var BundleTask = require("objective-j/jake/bundletask").BundleTask;
 
-exports.generateManifest = function(productPath, indexFilePath)
+exports.generateManifest = function(productPath, options)
 {
-    indexFilePath = indexFilePath || FILE.join(productPath, "index.html");
+    options = options || {};
+
+    indexFilePath = options.index || FILE.join(productPath, "index.html");
 
     if (!FILE.isFile(indexFilePath)) {
         print("Warning: Skipping cache manifest generation, no index file at "+indexFilePath);
@@ -33,21 +35,28 @@ exports.generateManifest = function(productPath, indexFilePath)
     list.exclude("**/LICENSE");
     list.exclude("**/MHTML*");
     list.exclude("**/CommonJS.environment/*");
+    list.exclude("**/*.cur"); // FIXME: sprite these?
 
     // FIXME: bleh. heuristic for whether index file includes debug frameworks
     if (index.indexOf('"Frameworks/Debug"') < 0)
         list.exclude("**/Frameworks/Debug/*");
 
+    if (options.exclude)
+        options.exclude.forEach(list.exclude.bind(list));
+
     list.forEach(function(path) {
         if (FILE.isFile(path)) {
+            var relative = FILE.relative(productPath, path);
+
             // FIXME: check the actual sprited images file
-            if (BundleTask.isSpritable(path))
+            // check index for references to file (for spinner.gif, etc)
+            if (BundleTask.isSpritable(path) && index.indexOf(relative) < 0)
                 return;
 
             // include hash of each file in comments to expire when any file changes
             var hash = MD5.hash(FILE.read(path, "b")).decodeToString("base16");
             manifestOut.print("# " + hash);
-            manifestOut.print(FILE.relative(productPath, path));
+            manifestOut.print(relative);
         }
     });
 

Objective-J/CommonJS/lib/objective-j/jake/applicationtask.js

@@ -130,7 +130,7 @@ ApplicationTask.prototype.defineCacheManifestTask = function()
     // TODO: can we conditionally generate based on outdated files?
     var manifestPath = FILE.join(productPath, "app.manifest");
     Jake.task(manifestPath, function() {
-        require("../cache-manifest").generateManifest(productPath, indexFilePath);
+        require("../cache-manifest").generateManifest(productPath, { index : indexFilePath });
     });
 
     this.enhance([manifestPath]);

Tests/Foundation/CPArrayTest.j

@@ -21,8 +21,8 @@
 
 - (void)testsInsertObjectsAtIndexes
 {
-    var array = [CPMutableArray arrayWithObjects:@"one", @"two", @"three", @"four", nil],
-        newAdditions = [CPArray arrayWithObjects:@"a", @"b", nil],
+    var array = [CPMutableArray arrayWithObjects:@"one", @"two", @"three", @"four"],
+        newAdditions = [CPArray arrayWithObjects:@"a", @"b"],
         indexes = [CPMutableIndexSet indexSetWithIndex:1];
 
     [indexes addIndex:3];
@@ -31,8 +31,8 @@
 
     [self assert:array equals:[@"one", @"a", @"two", @"b", @"three", @"four"]];
 
-    var array = [CPMutableArray arrayWithObjects:@"one", @"two", @"three", @"four", nil],
-        newAdditions = [CPArray arrayWithObjects:@"a", @"b", nil],
+    var array = [CPMutableArray arrayWithObjects:@"one", @"two", @"three", @"four"],
+        newAdditions = [CPArray arrayWithObjects:@"a", @"b"],
         indexes = [CPMutableIndexSet indexSetWithIndex:5];
     
     [indexes addIndex:4];
@@ -41,8 +41,8 @@
 
     [self assert:array equals:[@"one", @"two", @"three", @"four", @"a", @"b"]];
     
-    var array = [CPMutableArray arrayWithObjects: @"one", @"two", @"three", @"four", nil],
-        newAdditions = [CPArray arrayWithObjects: @"a", @"b", @"c", nil],
+    var array = [CPMutableArray arrayWithObjects: @"one", @"two", @"three", @"four"],
+        newAdditions = [CPArray arrayWithObjects: @"a", @"b", @"c"],
         indexes = [CPMutableIndexSet indexSetWithIndex:1];
 
     [indexes addIndex:2];
@@ -53,8 +53,8 @@
     [self assert:array equals:[@"one", @"a", @"b", @"two", @"c", @"three", @"four"]];
 
 
-    var array = [CPMutableArray arrayWithObjects: @"one", @"two", @"three", @"four", nil],
-        newAdditions = [CPArray arrayWithObjects: @"a", @"b", @"c", nil],
+    var array = [CPMutableArray arrayWithObjects: @"one", @"two", @"three", @"four"],
+        newAdditions = [CPArray arrayWithObjects: @"a", @"b", @"c"],
         indexes = [CPMutableIndexSet indexSetWithIndex:1];
 
     [indexes addIndex:2];
@@ -64,10 +64,9 @@
     
     [self assert:array equals:[@"one", @"a", @"b", @"two", @"three", @"four", @"c"]];
 
-    //
-    
-    var array = [CPMutableArray arrayWithObjects:@"one", @"two", @"three", @"four", nil],
-        newAdditions = [CPArray arrayWithObjects:@"a", @"b", nil],
+
+    var array = [CPMutableArray arrayWithObjects:@"one", @"two", @"three", @"four"],
+        newAdditions = [CPArray arrayWithObjects:@"a", @"b"],
         indexes = [CPMutableIndexSet indexSetWithIndex:5];
     
     [indexes addIndex:6];
@@ -88,10 +87,10 @@
 {
 	var array = [CPMutableArray arrayWithObjects:@"one", @"two", @"three", @"four", nil],
 			indexes = [CPMutableIndexSet indexSetWithIndex: 2];
-			
+
 	[array removeObjectsAtIndexes: indexes];
-	
-	[self assert:array equals:[@"one", @"two", @"four"]];
+
+	[self assert:array equals:[@"one", @"two", @"four", nil]];
 }
 
 - (void)testIndexOfObjectSortedByFunction
@@ -212,10 +211,15 @@
 
 - (void)testInitWithArrayCopyItems
 {
-    var a = [[CopyableObject new], 2, 3];
+    var a = [[CopyableObject new], 2, 3, {empty:true}];
     var b = [[CPArray alloc] initWithArray:a copyItems:YES];
 
     [self assert:a notEqual:b];
+
+    [self assert:a[0] notEqual:b[0]];
+    [self assert:a[1] equals:b[1]];
+    [self assert:a[2] equals:b[2]];
+    [self assertTrue:a[3] === b[3]];
 }
 
 - (void)testIsEqualToArray

Tests/Foundation/CPNullTest.j

@@ -0,0 +1,12 @@
+@import <Foundation/CPNull.j>
+@import <Foundation/CPKeyedArchiver.j>
+@import <Foundation/CPKeyedUnarchiver.j>
+
+@implementation CPNullTest : OJTestCase
+
+- (void)testArchiving
+{
+    [self assert:[CPKeyedUnarchiver unarchiveObjectWithData:[CPKeyedArchiver archivedDataWithRootObject:[CPNull null]]] equals:[CPNull null]];
+}
+
+@end

Tests/Foundation/CPSetTest.j

@@ -56,4 +56,17 @@
     [self assertFalse:[set containsObject:nil]];
 }
 
+- (void)testDescription
+{
+    [self assert:@"{()}" equals:[set description]];
+    [set addObject:"horizon"];
+    [set addObject:"surfer"];
+    [set addObject:"7"];
+    var desc = [set description];
+    // Ordering may not be guaranteed.
+    [self assertTrue:desc.match(new RegExp("{\(.*horizon.*\)}"))];
+    [self assertTrue:desc.match(new RegExp("{\(.*surfer.*\)}"))];
+    [self assertTrue:desc.match(new RegExp("{\(.*7.*\)}"))];
+}
+
 @end

Tests/Manual/CPBrowserTest/AppController.j

@@ -29,6 +29,16 @@
 - (CPArray)children
 {
     return [[Node withValue:1],
+            [Node withValue:2],
+            [Node withValue:3],
+            [Node withValue:2],
+            [Node withValue:3],
+            [Node withValue:2],
+            [Node withValue:3],
+            [Node withValue:2],
+            [Node withValue:3],
+            [Node withValue:2],
+            [Node withValue:3],
             [Node withValue:2],
             [Node withValue:3],
             [Node withValue:4]];

Tests/Manual/CPBrowserTest/CPBrowser.j

@@ -1 +0,0 @@
-../../../AppKit/CPBrowser.j

Tools/Jakefile

@@ -2,4 +2,4 @@
 require("../common.jake");
 
 // nib2cib has to come before capp since capp uses nib2cib
-subtasks(["nib2cib", "capp"], ["build"/*, "clean", "clobber"*/]);
+subtasks(["nib2cib", "capp", "NativeHost"], ["build"/*, "clean", "clobber"*/]);

Tools/NativeHost/.gitignore

@@ -0,0 +1,5 @@
+.DS_Store
+*.mode1v3
+*.pbxuser
+*.perspectivev3
+build

Tools/NativeHost/AppController+MainMenu.m

@@ -0,0 +1,33 @@
+//
+//  AppController+MainMenu.m
+//  NativeHost
+//
+//  Created by Francisco Tolmasky on 9/2/09.
+//  Copyright 2009 280 North, Inc.. All rights reserved.
+//
+
+#import <WebKit/WebKit.h>
+
+#import "MenuBridge.h"
+#import "AppController.h"
+
+
+@interface NSApplication (MenuMethods)
+
+- (void)setAppleMenu:(NSMenu *)aMenu;
+
+@end
+
+@implementation AppController (MainMenu)
+
+- (void)setMainMenuObject:(WebScriptObject *)aMenuObject
+{
+    NSMenu * mainMenu = [[MenuBridge alloc] initWithMenuObject:aMenuObject];
+
+    [NSApp setAppleMenu:[[mainMenu itemArray] objectAtIndex:0]];
+    [NSApp setMainMenu:mainMenu];
+
+    [mainMenu release];
+}
+
+@end

Tools/NativeHost/AppController+WebFrameLoadDelegate.m

@@ -0,0 +1,26 @@
+
+
+//
+//  AppController+WebFrameLoadDelegate.m
+//  NativeHost
+//
+//  Created by Francisco Tolmasky on 7/28/09.
+//  Copyright 2009 280 North, Inc.. All rights reserved.
+//
+
+#import "AppController.h"
+
+#import "BridgedMethods.h"
+
+
+@implementation AppController (WebFrameLoadDelegate)
+
+- (void)webView:(WebView *)aWebView didClearWindowObject:(WebScriptObject *)aWindowObject forFrame:(WebFrame *)aFrame
+{
+    if (aWebView == webView)
+        [GlobalMethods enhanceWindowObject:aWindowObject ofWebView:aWebView];
+    else
+        [WindowMethods enhanceWindowObject:aWindowObject ofWebView:aWebView];
+}
+
+@end

Tools/NativeHost/AppController+WebResourceLoadDelegate.m

@@ -0,0 +1,32 @@
+//
+//  AppController+WebResourceLoadDelegate.m
+//  NativeHost
+//
+//  Created by Francisco Tolmasky on 7/28/09.
+//  Copyright 2009 280 North, Inc.. All rights reserved.
+//
+
+#import "AppController.h"
+#import "SSCrypto.h"
+
+NSString *authHeader = nil;
+
+@implementation AppController (WebResourceLoadDelegate)
+
+- (NSURLRequest *)webView:(WebView *)aSender resource:(id)anIdentifier willSendRequest:(NSURLRequest *)aRequest redirectResponse:(NSURLResponse *)aRedirectResponse fromDataSource:(WebDataSource *)aDataSource
+{
+    aRequest = [[aRequest mutableCopy] autorelease];
+
+    if (!authHeader)
+    {
+        NSString *plaintext = [NSString stringWithFormat:@"%@:%@", SERVER_USER, SERVER_PASSWORD];
+        NSData *data = [plaintext dataUsingEncoding:NSASCIIStringEncoding];
+        authHeader = [[NSString alloc] initWithFormat:@"Basic %@", [data encodeBase64WithNewlines:NO]];
+    }
+
+    [(NSMutableURLRequest *)aRequest setValue:authHeader forHTTPHeaderField:@"Authorization"];
+
+    return aRequest;
+}
+
+@end

Tools/NativeHost/AppController+WebUIDelegate.m

@@ -0,0 +1,71 @@
+//
+//  AppController+WebUIDelegate.m
+//  NativeHost
+//
+//  Created by Francisco Tolmasky on 7/28/09.
+//  Copyright 2009 280 North, Inc.. All rights reserved.
+//
+
+#import "AppController.h"
+#import "WebWindow.h"
+
+
+@implementation AppController (WebUIDelegate)
+
+- (void)webView:(WebView *)aWebView setFrame:(NSRect)aFrame
+{
+    [[aWebView window] setFrame:aFrame display:YES];
+}
+
+- (NSRect)webViewFrame:(WebView *)aWebView
+{
+    return [[aWebView window] frame];
+}
+
+- (WebView *)webView:(WebView *)aWebView createWebViewWithRequest:(NSURLRequest *)aRequest
+{
+    return [[WebWindow webWindow] webView];
+}
+
+- (void)webViewClose:(WebView *)aWebView
+{
+    // Important to call close and not:
+    // -performClose:, which beeps without the presence of a close button.
+    // -orderOut:, which doesn't release the window.
+    [[aWebView window] close];
+    //[[aWebView window] orderOut:self];
+}
+
+- (void)webViewShow:(WebView *)aWebView
+{
+    [[aWebView window] makeKeyAndOrderFront:self];
+}
+
+- (NSAttributedString *)loggedOutput;
+{
+    return loggedOutput;
+}
+
+- (void)webView:(WebView *)aWebView addMessageToConsole:(NSDictionary *)aDictionary
+{
+    NSString * message = [aDictionary objectForKey:@"message"];
+    NSAttributedString * attributedString = [[NSAttributedString alloc] initWithString:[NSString stringWithFormat:@"%@\n", message, nil]];
+    
+    [loggedOutput appendAttributedString:attributedString];
+
+    [attributedString release];
+    NHLog(@"CONSOLE", message);
+}
+
+- (void)webView:(WebView *)aSender runJavaScriptAlertPanelWithMessage:(NSString *)aMessage initiatedByFrame:(WebFrame *)aFrame
+{
+    WebDataSource * dataSource = [aFrame dataSource];
+    NSString * title = [dataSource pageTitle];
+    
+    if (![title length])
+        title = [[[dataSource request] URL] absoluteString];
+    
+    [[NSAlert alertWithMessageText:title defaultButton:@"OK" alternateButton:nil otherButton:nil informativeTextWithFormat:@"%@", aMessage, nil] runModal];
+}
+
+@end

Tools/NativeHost/AppController.h

@@ -0,0 +1,49 @@
+//
+//  AppController.h
+//  NativeHost
+//
+//  Created by Francisco Tolmasky on 6/4/09.
+//  Copyright 2009 280 North, Inc. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+extern int SERVER_PORT;
+extern NSString *SERVER_PASSWORD;
+extern NSString *SERVER_USER;
+
+@class Server;
+@class WebScriptObject;
+
+@interface AppController : NSObject
+{
+    NSWindow                        * webViewWindow;
+    WebView                         * webView;
+
+    NSMutableArray                  * openingFilenames;
+    NSMutableArray                  * openingURLStrings;
+
+    Server                          * server;
+    NSFileHandle                    * stdinFileHandle;
+
+    NSMutableAttributedString       * loggedOutput;
+}
+
+- (void)startServer;
+- (void)startCappuccinoApplication;
+
+- (NSArray *)openingURLStrings;
+
+- (NSView *)keyView;
+- (WebView *)webView;
+- (WebScriptObject *)windowScriptObject;
+
+@end
+
+@interface AppController (MainMenu)
+
+- (void)setMainMenuObject:(WebScriptObject *)aMenuObject;
+
+@end
+
+void NHLog(NSString *type, NSString *message);

Tools/NativeHost/AppController.m

@@ -0,0 +1,194 @@
+//
+//  AppController.m
+//  NativeHost
+//
+//  Created by Francisco Tolmasky on 6/4/09.
+//  Copyright 2009 280 North, Inc. All rights reserved.
+//
+
+#import "Console.h"
+#import "Server.h"
+#import "AppController.h"
+#import "NSURL+Additions.h"
+#import "BridgedMethods.h"
+#import "WebWindow.h"
+#import "WebScripObject+Objective-J.h"
+
+extern int interactive;
+
+int SERVER_PORT = 9191;
+NSString *SERVER_PASSWORD = nil;
+NSString *SERVER_USER = nil;
+
+@implementation AppController
+
+- (id)init
+{
+    self = [super init];
+
+    if (self)
+        openingURLStrings = [NSMutableArray new];
+
+    return self;
+}
+
+- (void)dealloc
+{
+    [webView release];
+    [webViewWindow release];
+
+    [openingURLStrings release];
+
+    [super dealloc];
+}
+
+- (BOOL)application:(NSApplication *)anApplication openFile:(NSString *)aFilename
+{
+    id canOpenFilesImmediately = [[webView windowScriptObject] evaluateWebScript:@"CPApp && CPApp._finishedLaunching"];
+
+    NSString *path = [[[NSURL fileURLWithPath:aFilename] HTTPFileSystemURL] absoluteString];
+    if ([canOpenFilesImmediately isKindOfClass:[NSNumber class]] && [canOpenFilesImmediately boolValue])
+        [[webView windowScriptObject] evaluateObjectiveJ:[NSString stringWithFormat:@"[CPApp _openURL:[CPURL URLWithString:\"%@\"]]", path]];
+    else
+        [openingURLStrings addObject:path];
+
+    return NO;
+}
+
+- (void)applicationWillFinishLaunching:(NSNotification *)aNotification
+{
+    NSUserDefaults  * defaults = [NSUserDefaults standardUserDefaults];
+
+    [defaults registerDefaults:[NSDictionary dictionaryWithObject:[NSNumber numberWithBool:YES] forKey:@"WebKitDeveloperExtras"]];
+
+    [self startServer];
+}
+
+- (void)applicationDidFinishLaunching:(NSNotification *)notification
+{
+    [self startCappuccinoApplication];
+}
+
+- (void)applicationDidResignActive:(NSNotification *)aNotification
+{
+    // FIXME: handle this better.
+    [[self windowScriptObject] evaluateObjectiveJ:@"[CPApp _willResignActive];"];
+    [[self windowScriptObject] evaluateObjectiveJ:@"CPApp._isActive = NO;"];
+    [[self windowScriptObject] evaluateObjectiveJ:@"[CPApp _didResignActive];"];
+}
+
+- (void)applicationDidBecomeActive:(NSNotification *)aNotification
+{
+    // FIXME: handle this better.
+    [[self windowScriptObject] evaluateObjectiveJ:@"[CPApp _willBecomeActive];"];
+    [[self windowScriptObject] evaluateObjectiveJ:@"CPApp._isActive = YES;"];
+    [[self windowScriptObject] evaluateObjectiveJ:@"[CPApp _didBecomeActive];"];
+}
+
+- (NSArray *)openingURLStrings
+{
+    return openingURLStrings;
+}
+
+- (NSView *)keyView
+{
+    return [[[webView mainFrame] frameView] documentView];
+}
+
+- (WebView *)webView
+{
+    return webView;
+}
+
+- (WebScriptObject *)windowScriptObject
+{
+    return [webView windowScriptObject];
+}
+
+- (void)startServer
+{
+    server = [[Server alloc] init];
+
+    if (![server start])
+        exit(0);
+
+	if (interactive)
+	{
+        stdinFileHandle = [[NSFileHandle fileHandleWithStandardInput] retain];
+        [[NSNotificationCenter defaultCenter]
+         addObserver:self
+         selector:@selector(didReadStdin:)
+         name:NSFileHandleReadCompletionNotification
+         object:stdinFileHandle];
+
+        fprintf(stdout, "objj> ");
+        fflush(stdout);
+        [stdinFileHandle readInBackgroundAndNotify];
+    }
+}
+
+- (void)didReadStdin:(NSNotification *)aNotification
+{
+    NSString *string = [[NSString alloc] initWithData:[[aNotification userInfo] objectForKey:NSFileHandleNotificationDataItem] encoding:NSASCIIStringEncoding];
+    NSString *result = [[self windowScriptObject] evaluateObjectiveJReturningString:string];
+    [string release];
+    if ([result respondsToSelector:@selector(UTF8String)])
+        fprintf(stdout, "%s\n", [result UTF8String]);
+    fprintf(stdout, "objj> ");
+    fflush(stdout);
+    [stdinFileHandle readInBackgroundAndNotify];
+}
+
+- (void)startCappuccinoApplication
+{
+    NSString *initialURL = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"NHInitialURL"];
+    BOOL prependServer = [[[NSBundle mainBundle] objectForInfoDictionaryKey:@"NHInitialURLPrependServer"] boolValue];
+
+    if (!initialURL)
+    {
+        NSString *initialResource = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"NHInitialResource"];
+        
+        if (!initialResource)
+            initialResource = @"Application/index.html";
+
+        initialURL = [[NSString stringWithFormat:@"file://%@/%@", [[NSBundle mainBundle] resourcePath], initialResource] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+    }
+    else if (prependServer)
+    {
+        initialURL = [NSString stringWithFormat:@"http://127.0.0.1:%d/%@", SERVER_PORT, initialURL];
+    }
+
+	NHLog(@"STARTUP", [initialURL description]);
+	
+    [[webView mainFrame] loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:initialURL]]];
+}
+
+- (void)applicationWillTerminate:(NSNotification *)aNotification
+{
+    [server stop];
+}
+
+- (void)awakeFromNib
+{
+    webView = [[WebView alloc] init];
+
+    [webView setUIDelegate:self];
+    [webView setFrameLoadDelegate:self];
+    [webView setResourceLoadDelegate:self];
+
+    webViewWindow = [[NSWindow alloc] init];
+
+    [webViewWindow setContentView:webView];
+}
+
+@end
+
+void NHLog(NSString *type, NSString *message)
+{
+    NSArray *lines = [message componentsSeparatedByString:@"\n"];
+    for (NSString *line in lines)
+    {
+        if ([line length] > 0)
+            NSLog(@"%10@: %@", type, line);
+    }
+}

Tools/NativeHost/Application.h

@@ -0,0 +1,18 @@
+//
+//  Application.h
+//  NativeHost
+//
+//  Created by Francisco Tolmasky on 10/8/09.
+//  Copyright 2009 280 North, Inc.. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+
+@interface Application : NSApplication
+{
+}
+
+- (void)_reallyTerminate:(id)sender;
+
+@end

Tools/NativeHost/Application.m

@@ -0,0 +1,47 @@
+//
+//  Application.m
+//  NativeHost
+//
+//  Created by Francisco Tolmasky on 10/8/09.
+//  Copyright 2009 280 North, Inc.. All rights reserved.
+//
+
+#import "Application.h"
+#import "AppController.h"
+#import "WebScripObject+Objective-J.h"
+#import "WebWindow.h"
+
+@implementation Application
+
+- (void)sendEvent:(NSEvent *)anEvent
+{
+    NSWindow * window = [anEvent window];
+
+    if (!window || [window isKindOfClass:[WebWindow class]])
+    {
+        NSResponder * firstResponder = window ? [window firstResponder] : [(AppController *)[self delegate] keyView];
+
+        switch ([anEvent type])
+        {
+            case NSKeyDown: return [firstResponder keyDown:anEvent];
+            case NSKeyUp:   return [firstResponder keyUp:anEvent];
+        }
+    }
+
+    [super sendEvent:anEvent];
+}
+
+- (void)terminate:(id)sender
+{
+    if ([[[self delegate] windowScriptObject] evaluateObjectiveJ:@"(CPApp)"] == [WebUndefined undefined])
+        [self _reallyTerminate:sender];
+    else
+        [[(AppController *)[self delegate] windowScriptObject] evaluateObjectiveJ:@"[CPApp terminate:nil]"];
+}
+
+- (void)_reallyTerminate:(id)sender
+{
+    [super terminate:sender];
+}
+
+@end

Tools/NativeHost/BridgedMethods.h

@@ -0,0 +1,65 @@
+//
+//  BridgedMethods.h
+//  NativeHost
+//
+//  Created by Francisco Tolmasky on 10/16/09.
+//  Copyright 2009 280 North, Inc.. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+
+@interface BridgedMethods : NSObject
+{
+    WebView * webView;
+}
++ (NSMutableArray *)arrayFromWebScriptObject:(WebScriptObject *)incomingObject;
++ (void)enhanceWindowObject:(WebScriptObject *)aWindowObject ofWebView:(WebView *)aWebView;
+@end
+
+@interface GlobalMethods : BridgedMethods
+{
+}
+- (id)isDesktop;
+
+- (id)openingURLStrings;
+
+- (id)setMainMenu:(id)arguments;
+
+- (id)terminate;
+- (id)activateIgnoringOtherApps:(NSArray *)arguments;
+- (id)deactivate;
+- (id)hide;
+- (id)hideOtherApplications;
+
+- (id)savePanel:(NSArray *)arguments; // FIXME: This should be implemented in Cappuccino.
+- (id)openPanel; // FIXME: This should be implemented in Cappuccino.
+
+- (id)clearRecentDocuments;
+- (id)noteNewRecentDocumentPath:(NSArray *)aURL;
+- (id)recentDocumentURLs;
+
+- (id)pasteboardWithName:(NSArray *)arguments;
+
+@end
+
+@interface WindowMethods : BridgedMethods
+{
+}
+- (id)miniaturize;
+- (id)deminiaturize;
+
+- (id)level;
+- (id)setLevel:(NSArray *)arguments;
+
+- (id)hasShadow;
+- (id)setHasShadow:(NSArray *)arguments;
+
+- (id)shadowStyle;
+- (id)setShadowStyle:(NSArray *)arguments;
+
+- (id)frame;
+- (id)setFrame:(NSArray *)arguments;
+
+@end
+

Tools/NativeHost/BridgedMethods.m

@@ -0,0 +1,345 @@
+//
+//  BridgedMethods.m
+//  NativeHost
+//
+//  Created by Francisco Tolmasky on 10/16/09.
+//  Copyright 2009 280 North, Inc.. All rights reserved.
+//
+
+
+#import <objc/runtime.h>
+#import "Application.h"
+#import "AppController.h"
+#import "BridgedMethods.h"
+#import "NSObject+WebAdditions.h"
+#import "NSURL+Additions.h"
+#import "WebWindow.h"
+#import "WebPasteboardProxy.h"
+
+static NSMutableDictionary * MethodClasses;
+
+@implementation GlobalMethods
+
+- (id)isDesktop
+{
+    return [NSNumber numberWithBool:YES];
+}
+
+- (id)openingURLStrings
+{
+    return [(AppController *)[NSApp delegate] openingURLStrings];
+}
+
+- (id)setMainMenu:(id)arguments
+{
+    [[NSApp delegate] setMainMenuObject:[arguments objectAtIndex:0]];
+
+    return [WebUndefined undefined];
+}
+
+- (id)terminate
+{
+    [(Application *)NSApp _reallyTerminate:self];
+
+    return [WebUndefined undefined];
+}
+
+- (id)activateIgnoringOtherApps:(NSArray *)arguments
+{
+    id argument = [arguments objectAtIndex:0];
+
+    [(NSApplication *)NSApp activateIgnoringOtherApps:[argument isKindOfClass:[NSNumber class]] && [(NSNumber *)argument boolValue]];
+
+    return [WebUndefined undefined];
+}
+
+- (id)deactivate
+{
+    [(NSApplication *)NSApp deactivate];
+    return [WebUndefined undefined];
+}
+
+- (id)hide
+{
+    [NSApp hide:self];
+    return [WebUndefined undefined];
+}
+
+- (id)hideOtherApplications
+{
+    [NSApp hideOtherApplications:self];
+    return [WebUndefined undefined];
+}
+
+- (id)openPanel
+{
+    NSOpenPanel * openPanel = [NSOpenPanel openPanel];
+
+    NSInteger result = [openPanel runModal];
+
+    NSMutableString * resultObject = [NSMutableString stringWithFormat:@"({ button:%d, URLs:", result];
+
+    NSMutableArray * fileSystemURLs = [NSMutableArray array];
+
+    for (NSURL * URL in [openPanel URLs])
+        [fileSystemURLs addObject:[URL HTTPFileSystemURL]];
+
+    if (result == NSFileHandlingPanelOKButton)
+        [resultObject appendString:[NSString stringWithFormat:@"[\"%@\"] })", [fileSystemURLs componentsJoinedByString:@"\", \""]]];
+
+    else
+        [resultObject appendString:@"[] })"];
+
+    return [[webView windowScriptObject] evaluateWebScript:resultObject];
+}
+
+- (id)savePanel:(NSArray *)arguments
+{
+    NSSavePanel * savePanel = [NSSavePanel savePanel];
+    WebScriptObject *args = [arguments objectAtIndex:0];
+
+    [savePanel setAllowedFileTypes:[BridgedMethods arrayFromWebScriptObject:[args valueForKey:@"allowedFileTypes"]]];
+
+    id allowsOtherFileTypes = [args valueForKey:@"allowsOtherFileTypes"];
+
+    [savePanel setAllowsOtherFileTypes:allowsOtherFileTypes && [allowsOtherFileTypes webBoolValue]];
+
+    id isExtensionHidden = [args valueForKey:@"isExtensionHidden"];
+
+    [savePanel setExtensionHidden:isExtensionHidden && [isExtensionHidden webBoolValue]];
+
+    id canSelectHiddenExtension = [args valueForKey:@"canSelectHiddenExtension"];
+
+    [savePanel setCanSelectHiddenExtension:canSelectHiddenExtension && canSelectHiddenExtension];
+
+    id canCreateDirectories = [args valueForKey:@"canCreateDirectories"];
+
+    [savePanel setCanCreateDirectories:canCreateDirectories && [canCreateDirectories webBoolValue]];
+
+    NSInteger result = [savePanel runModal];
+
+    return [[webView windowScriptObject] evaluateWebScript:[NSString stringWithFormat:@"({ button:%d, URL:\"%@\" })", result, [[[savePanel URL] HTTPFileSystemURL] absoluteString]]];
+}
+
+- (id)clearRecentDocuments
+{
+    [[NSDocumentController sharedDocumentController] clearRecentDocuments:self];
+    return [WebUndefined undefined];
+}
+
+- (id)noteNewRecentDocumentPath:(NSArray *)arguments
+{
+    if (![arguments count])
+        return [WebUndefined undefined];
+
+    NSString *aURL = [arguments objectAtIndex:0];
+    NSURL *fileURL = [NSURL fileSystemURLFromHTTPFileSystemString:aURL];
+
+    [[NSDocumentController sharedDocumentController] noteNewRecentDocumentURL:fileURL];
+
+    return [WebUndefined undefined];
+}
+
+- (id)recentDocumentURLs
+{
+    NSArray *existingURLs = [[NSDocumentController sharedDocumentController] recentDocumentURLs];
+    NSMutableArray *urlsAsStrings = [NSMutableArray array];
+
+    for (int i=0, count = [existingURLs count]; i < count; i++)
+        [urlsAsStrings addObject:[[existingURLs objectAtIndex:i] absoluteString]];
+
+    return urlsAsStrings;
+}
+
+- (id)pasteboardWithName:(NSArray *)arguments
+{
+    if (![arguments count])
+        return [WebUndefined undefined];
+
+    return [WebPasteboardProxy pasteboardWithName:[arguments objectAtIndex:0]];
+}
+
+@end
+
+@implementation WindowMethods
+
+- (id)miniaturize
+{
+    [[webView window] miniaturize:nil];
+	return [WebUndefined undefined];
+}
+
+- (id)deminiaturize
+{
+    [[webView window] deminiaturize:nil];
+	return [WebUndefined undefined];
+}
+
+- (id)level
+{
+    return [NSNumber numberWithInt:[[webView window] level]];
+}
+
+- (id)setLevel:(NSArray *)arguments
+{
+    [[webView window] setLevel:[[arguments objectAtIndex:0] intValue]];
+
+    return [WebUndefined undefined];
+}
+
+- (id)hasShadow
+{
+    return [NSNumber numberWithBool:[[webView window] hasShadow]];
+}
+
+- (id)setHasShadow:(NSArray *)arguments
+{
+    [[webView window] setHasShadow:[[arguments objectAtIndex:0] boolValue]];
+
+    return [WebUndefined undefined];
+}
+
+- (id)frame
+{
+    NSRect frame = [[webView window] frame];
+
+    return [[webView windowScriptObject] evaluateWebScript:[NSString stringWithFormat:@"({ origin:{%f, %f}, size:{%f, %f}})", NSMinX(frame), NSMinY(frame), NSWidth(frame), NSHeight(frame)]];
+}
+
+- (id)setFrame:(NSArray *)arguments
+{
+    id  origin = [[arguments objectAtIndex:0] valueForKey:@"origin"],
+    size = [[arguments objectAtIndex:0] valueForKey:@"size"];
+
+    NSWindow * window = [webView window];
+    NSScreen * screen = [window screen];
+
+    if (!screen)
+    screen = [NSScreen mainScreen]; // Is this correct?
+
+    float height = [[size valueForKey:@"height"] floatValue];
+
+    [[webView window] setFrame:NSMakeRect([[origin valueForKey:@"x"] floatValue], NSMaxY([screen frame]) - [[origin valueForKey:@"y"] floatValue] - height, [[size valueForKey:@"width"] floatValue], height) display:YES];
+    /*
+     NSLog([webView description]);
+     NSLog(@"%@ %@", [window screen], NSStringFromRect([window frame]));
+     NSLog(@"%f - %f - %f = %f", NSMaxY([[window screen] frame]), [[origin valueForKey:@"y"] floatValue], height, NSMaxY([[window screen] frame]) - [[origin valueForKey:@"y"] floatValue] - height);
+     NSLog(@"FROM: %@", NSStringFromRect(NSMakeRect([[origin valueForKey:@"x"] floatValue], [[origin valueForKey:@"y"] floatValue], [[size valueForKey:@"width"] floatValue], height)));
+     NSLog(@"  TO: %@", NSStringFromRect([[webView window] frame]));
+     */
+
+    return [WebUndefined undefined];
+}
+
+- (id)shadowStyle
+{
+    WebWindow * window = (WebWindow *)[webView window];
+
+    return [NSNumber numberWithInt:[window shadowStyle]];
+}
+
+- (id)setShadowStyle:(id)arguments
+{
+    int type = [[arguments objectAtIndex:0] intValue];
+
+    WebWindow * window = (WebWindow *)[webView window];
+
+    [window setShadowStyle:type];
+
+    return [WebUndefined undefined];
+}
+
+@end
+
+
+@interface WindowScriptObjectMethod : NSObject
+{
+    WebView * webView;
+}
+
+- (id)initWithWebView:(WebView *)aWebView;
+
+@end
+
+@implementation WindowScriptObjectMethod
+
+- (id)initWithWebView:(WebView *)aWebView
+{
+    self = [super init];
+
+	if (self)
+        webView = aWebView;
+
+    return self;
+}
+
+@end
+
+@implementation BridgedMethods
+
++ (NSMutableArray *)arrayFromWebScriptObject:(WebScriptObject *)incomingObject
+{
+    if (!incomingObject)
+        return nil;
+
+    NSMutableArray * newItems = [[NSMutableArray alloc] init];
+
+    for (int i=0; [incomingObject webScriptValueAtIndex:i]!=[WebUndefined undefined]; i++)
+    {
+        id oneItem =[incomingObject webScriptValueAtIndex:i];
+        [newItems addObject:oneItem];
+    }
+
+    return [newItems autorelease];
+}
+
++ (void)enhanceWindowObject:(WebScriptObject *)aWindowObject ofWebView:(WebView *)aWebView
+{
+    NSDictionary * classMethods = [MethodClasses objectForKey:[self className]];
+    NSString * key = nil;
+    NSEnumerator * keyEnumerator = [classMethods keyEnumerator];
+
+    while (key = [keyEnumerator nextObject])
+        [aWindowObject setValue:[(WindowScriptObjectMethod *)[[[classMethods objectForKey:key] alloc] initWithWebView:aWebView] autorelease] forKey:key];
+}
+
++ (void)bridgeMethod:(Method)aMethod dictionary:(NSMutableDictionary *)aDictionary
+{
+    NSString    * methodName = NSStringFromSelector(method_getName(aMethod)),
+                * publicMethodName = [NSString stringWithFormat:@"cp%@", [[NSString stringWithFormat:@"%@%@", [[methodName substringToIndex:1] uppercaseString], [methodName substringFromIndex:1]] stringByTrimmingCharactersInSet:[NSCharacterSet characterSetWithCharactersInString:@":"]]];
+
+    Class methodClass = objc_allocateClassPair([WindowScriptObjectMethod class], [[NSString stringWithFormat:@"WebScriptObjectMethod_%@", publicMethodName] cString], 0);
+
+    class_addMethod(methodClass, @selector(invokeDefaultMethodWithArguments:), method_getImplementation(aMethod), "@@:@");
+
+    objc_registerClassPair(methodClass);
+
+    [aDictionary setObject:methodClass forKey:publicMethodName];
+}
+
++ (void)initialize
+{
+    if (!MethodClasses)
+        MethodClasses = [[NSMutableDictionary alloc] init];
+
+    NSMutableDictionary * dictionary = [[NSMutableDictionary alloc] init];
+
+    [MethodClasses setObject:dictionary forKey:[self className]];
+    [dictionary release];
+
+    unsigned int methodCount = 0;
+    Method * methods = class_copyMethodList(self, &methodCount);
+
+    if (!methods)
+        return;
+
+    int index = 0;
+
+    for (; index < methodCount; ++index)
+        [self bridgeMethod:methods[index] dictionary:dictionary];
+
+    free(methods);
+    methods = NULL;
+}
+
+@end

Tools/NativeHost/Console.h

@@ -0,0 +1,21 @@
+//
+//  Console.h
+//  NativeHost
+//
+//  Created by Francisco Tolmasky on 6/16/09.
+//  Copyright 2009 280 North, Inc.. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+
+@interface Console : NSObject
+{
+    NSMutableAttributedString * contents;
+}
+
++ (id)sharedConsole;
+
+- (NSAttributedString *)contents;
+
+@end

Tools/NativeHost/Console.m

@@ -0,0 +1,69 @@
+//
+//  Console.m
+//  NativeHost
+//
+//  Created by Francisco Tolmasky on 6/16/09.
+//  Copyright 2009 280 North, Inc.. All rights reserved.
+//
+
+#import "Console.h"
+
+#import "AppController.h"
+
+
+@implementation Console
+
++ (id)sharedConsole
+{
+    static Console * console = nil;
+
+    if (!console)
+        console = [[Console alloc] init];
+
+    return console;
+}
+
+- (id)init
+{
+    self = [super init];
+
+    if (self)
+        contents = [[NSMutableAttributedString alloc] init];
+
+    return self;
+}
+
+- (void)dealloc
+{
+    [contents release];
+    [super dealloc];
+}
+
+- (NSAttributedString *)contents
+{
+    return contents;
+}
+
+- (void)webView:(WebView *)aWebView addMessageToConsole:(NSDictionary *)aDictionary
+{
+    NSString * message = [aDictionary objectForKey:@"message"];
+
+    NSAttributedString *attrString = [[NSAttributedString alloc] initWithString:[NSString stringWithFormat:@"%@\n", message, nil]];
+    [contents appendAttributedString:attrString];
+    [attrString release];
+
+    NHLog(@"CONSOLE", message);
+}
+
+- (void)webView:(WebView *)aSender runJavaScriptAlertPanelWithMessage:(NSString *)aMessage initiatedByFrame:(WebFrame *)aFrame
+{
+    WebDataSource * dataSource = [aFrame dataSource];
+    NSString * title = [dataSource pageTitle];
+
+    if (![title length])
+        title = [[[dataSource request] URL] absoluteString];
+
+    [[NSAlert alertWithMessageText:title defaultButton:@"OK" alternateButton:nil otherButton:nil informativeTextWithFormat:aMessage, nil] runModal];
+}
+
+@end

Tools/NativeHost/English.lproj/MainMenu.xib

@@ -0,0 +1,548 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
+	<data>
+		<int key="IBDocument.SystemTarget">1050</int>
+		<string key="IBDocument.SystemVersion">10C540</string>
+		<string key="IBDocument.InterfaceBuilderVersion">732</string>
+		<string key="IBDocument.AppKitVersion">1038.25</string>
+		<string key="IBDocument.HIToolboxVersion">458.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">732</string>
+		</object>
+		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+		</object>
+		<object class="NSArray" key="IBDocument.PluginDependencies">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</object>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<object class="NSArray" key="dict.sortedKeys" id="0">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+			</object>
+			<object class="NSMutableArray" key="dict.values">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+			</object>
+		</object>
+		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1048">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<object class="NSCustomObject" id="1021">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSCustomObject" id="1014">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="1050">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSCustomObject" id="755631768">
+				<string key="NSClassName">NSFontManager</string>
+			</object>
+			<object class="NSCustomObject" id="810129115">
+				<string key="NSClassName">AppController</string>
+			</object>
+		</object>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<object class="NSMutableArray" key="connectionRecords">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="1050"/>
+						<reference key="destination" ref="810129115"/>
+					</object>
+					<int key="connectionID">519</int>
+				</object>
+			</object>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<object class="NSArray" key="orderedObjects">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<reference key="object" ref="0"/>
+						<reference key="children" ref="1048"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="1021"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="1014"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="1050"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Application</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">420</int>
+						<reference key="object" ref="755631768"/>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">487</int>
+						<reference key="object" ref="810129115"/>
+						<reference key="parent" ref="0"/>
+					</object>
+				</object>
+			</object>
+			<object class="NSMutableDictionary" key="flattenedProperties">
+				<string key="NS.key.0">-3.IBPluginDependency</string>
+				<string key="NS.object.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			</object>
+			<object class="NSMutableDictionary" key="unlocalizedProperties">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<reference key="dict.sortedKeys" ref="0"/>
+				<object class="NSMutableArray" key="dict.values">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+				</object>
+			</object>
+			<nil key="activeLocalization"/>
+			<object class="NSMutableDictionary" key="localizations">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<reference key="dict.sortedKeys" ref="0"/>
+				<object class="NSMutableArray" key="dict.values">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+				</object>
+			</object>
+			<nil key="sourceID"/>
+			<int key="maxID">677</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBPartialClassDescription">
+					<string key="className">AppController</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">AppController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">NSObject+WebAdditions.h</string>
+					</object>
+				</object>
+			</object>
+			<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSApplication</string>
+					<string key="superclassName">NSResponder</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="462640452">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSApplication.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSApplication</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="559217937">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSApplicationScripting.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSApplication</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="185909934">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSColorPanel.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSApplication</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSHelpManager.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSApplication</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSPageLayout.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSApplication</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSUserInterfaceItemSearching.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSFontManager</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="536952554">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSFontManager.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSMenu</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="810670176">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSMenu.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSAccessibility.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<reference key="sourceIdentifier" ref="462640452"/>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<reference key="sourceIdentifier" ref="559217937"/>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<reference key="sourceIdentifier" ref="185909934"/>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSControl.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSDictionaryController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSDragging.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<reference key="sourceIdentifier" ref="536952554"/>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSFontPanel.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSKeyValueBinding.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<reference key="sourceIdentifier" ref="810670176"/>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSNibLoading.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSOutlineView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSPasteboard.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSSavePanel.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSTableView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSToolbarItem.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSArchiver.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSClassDescription.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSError.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSObjectScripting.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSPortCoder.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSScriptClassDescription.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSScriptKeyValueCoding.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSScriptObjectSpecifiers.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSScriptWhoseTests.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSURLDownload.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">WebKit.framework/Headers/WebDownload.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">WebKit.framework/Headers/WebEditingDelegate.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">WebKit.framework/Headers/WebFrameLoadDelegate.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">WebKit.framework/Headers/WebJavaPlugIn.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">WebKit.framework/Headers/WebPlugin.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">WebKit.framework/Headers/WebPluginContainer.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">WebKit.framework/Headers/WebPolicyDelegate.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">WebKit.framework/Headers/WebResourceLoadDelegate.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">WebKit.framework/Headers/WebScriptObject.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">WebKit.framework/Headers/WebUIDelegate.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSResponder</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSInterfaceStyle.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSResponder</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSResponder.h</string>
+					</object>
+				</object>
+			</object>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<integer value="1050" key="NS.object.0"/>
+		</object>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<integer value="1050" key="NS.object.0"/>
+		</object>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
+			<integer value="3000" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<string key="IBDocument.LastKnownRelativeProjectPath">../NativeHost.xcodeproj</string>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+	</data>
+</archive>

Tools/NativeHost/Info.plist

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIconFile</key>
+	<string>icon</string>
+    <key>CFBundleShortVersionString</key>
+    <string>0.9</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.280north.${PRODUCT_NAME:identifier}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>NativeHost</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>

Tools/NativeHost/Jakefile

@@ -0,0 +1,36 @@
+
+require("../../common.jake");
+
+var OS = require("os");
+var task = require("jake").task
+
+task ("build", function()
+{
+    if (executableExists("xcodebuild"))
+    {
+        if (OS.system("xcodebuild -alltargets -configuration Release"))
+            OS.exit(1);
+        
+        rm_rf(FILE.join($BUILD_CJS_CAPPUCCINO, "support", "NativeHost.app"));
+        FILE.mkdirs(FILE.join($BUILD_CJS_CAPPUCCINO, "support"))
+        cp_r(FILE.join("build", "Release", "NativeHost.app"), FILE.join($BUILD_CJS_CAPPUCCINO, "support", "NativeHost.app"));
+    }
+    else
+    {
+        print("Building NativeHost requires Xcode.");
+    }
+});
+
+task ("clean", function()
+{
+    if (OS.system("xcodebuild clean"))
+        OS.exit(1);
+});
+
+task ("clobber", function()
+{
+    if (OS.system("xcodebuild clean"))
+        OS.exit(1);
+});
+
+task ("default", ["build"]);

Tools/NativeHost/MenuBridge.h

@@ -0,0 +1,22 @@
+//
+//  MenuBridge.h
+//  NativeHost
+//
+//  Created by Francisco Tolmasky on 9/2/09.
+//  Copyright 2009 280 North, Inc.. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+
+@class WebScriptObject;
+
+@interface MenuBridge : NSMenu
+{
+    WebScriptObject * menuObject;
+}
+
++ (id)menuBridgeWithMenuObject:(WebScriptObject *)aMenuObject;
+- (id)initWithMenuObject:(WebScriptObject *)aMenuObject;
+
+@end

Tools/NativeHost/MenuBridge.m

@@ -0,0 +1,63 @@
+//
+//  MenuBridge.m
+//  NativeHost
+//
+//  Created by Francisco Tolmasky on 9/2/09.
+//  Copyright 2009 280 North, Inc.. All rights reserved.
+//
+
+#import "WebScripObject+Objective-J.h"
+#import "MenuItemBridge.h"
+#import "MenuBridge.h"
+
+
+@implementation MenuBridge
+
++ (id)menuBridgeWithMenuObject:(WebScriptObject *)aMenuObject
+{
+    if (!aMenuObject)
+        return nil;
+
+    static NSMapTable * cache = nil;
+
+    if (!cache)
+        cache = [[NSMapTable mapTableWithStrongToStrongObjects] retain];
+
+    MenuBridge * menuBridge = [cache objectForKey:aMenuObject];
+
+    if (!menuBridge)
+    {
+        menuBridge = [MenuBridge alloc];
+
+        [cache setObject:menuBridge forKey:aMenuObject];
+
+        [[menuBridge initWithMenuObject:aMenuObject] autorelease];
+    }
+
+    return menuBridge;
+}
+
+- (id)initWithMenuObject:(WebScriptObject *)aMenuObject
+{
+    self = [super initWithTitle:[aMenuObject bridgeSelector:@selector(title)]];
+
+    if (self)
+    {
+        menuObject = aMenuObject;
+
+        NSInteger   index = 0,
+                    count = [[aMenuObject bridgeSelector:@selector(numberOfItems)] intValue];
+
+        for (; index < count; ++index)
+            [self addItem:[[[MenuItemBridge alloc] initWithMenuItemObject:[aMenuObject bridgeSelector:@selector(itemAtIndex:) withObject:[NSNumber numberWithInt:index]]] autorelease]];
+    }
+
+    return self;
+}
+
+- (void)performActionForItemAtIndex:(NSInteger)anIndex
+{
+    [menuObject bridgeSelector:@selector(performActionForItemAtIndex:) withObject:[NSNumber numberWithInt:anIndex]];
+}
+
+@end

Tools/NativeHost/MenuItemBridge.h

@@ -0,0 +1,24 @@
+//
+//  ReflectMenuItem.h
+//  NativeHost
+//
+//  Created by Francisco Tolmasky on 9/2/09.
+//  Copyright 2009 280 North, Inc.. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+
+@class WebScriptObject;
+
+@interface MenuItemBridge : NSMenuItem
+{
+    WebScriptObject * menuItemObject;
+}
+
++ (id)menuItemBridgeWithMenuItemObject:(WebScriptObject *)aMenuItemObject;
+- (id)initWithMenuItemObject:(WebScriptObject *)aMenuItemObject;
+
+- (void)updateFromMenuItemObject;
+
+@end

Tools/NativeHost/MenuItemBridge.m

@@ -0,0 +1,77 @@
+//
+//  ReflectMenuItem.m
+//  NativeHost
+//
+//  Created by Francisco Tolmasky on 9/2/09.
+//  Copyright 2009 280 North, Inc.. All rights reserved.
+//
+
+#import "WebScripObject+Objective-J.h"
+#import "MenuBridge.h"
+#import "MenuItemBridge.h"
+
+
+@implementation MenuItemBridge
+
++ (id)menuItemBridgeWithMenuItemObject:(WebScriptObject *)aMenuItemObject
+{
+    if (!aMenuItemObject)
+        return nil;
+    
+    static NSMapTable * cache = nil;
+    
+    if (!cache)
+        cache = [[NSMapTable mapTableWithStrongToStrongObjects] retain];
+    
+    MenuItemBridge * menuItemBridge = [cache objectForKey:aMenuItemObject];
+    
+    if (!menuItemBridge)
+    {
+        menuItemBridge = [MenuBridge alloc];
+
+        [cache setObject:menuItemBridge forKey:aMenuItemObject];
+
+        [[menuItemBridge initWithMenuItemObject:aMenuItemObject] autorelease];
+    }
+    
+    return menuItemBridge;
+}
+
+- (id)initWithMenuItemObject:(WebScriptObject *)aMenuItemObject
+{
+    if ([[aMenuItemObject bridgeSelector:@selector(isSeparatorItem)] boolValue])
+        return [[NSMenuItem separatorItem] retain];
+
+    self = [super init];
+
+    if (self)
+    {
+        menuItemObject = aMenuItemObject;
+
+        [self updateFromMenuItemObject];
+    }
+
+    return self;
+}
+/*
+- (BOOL)isSeparatorItem
+{
+    return [[menuItemObject bridgeSelector:@selector(isSeparatorItem)] boolValue];
+}
+*/
+- (void)updateFromMenuItemObject
+{
+    [self setTitle:[menuItemObject bridgeSelector:@selector(title)]];
+    [self setSubmenu:[MenuBridge menuBridgeWithMenuObject:[menuItemObject bridgeSelector:@selector(submenu)]]];
+    [self setKeyEquivalent:[menuItemObject bridgeSelector:@selector(keyEquivalent)]];
+    [self setKeyEquivalentModifierMask:[[menuItemObject evaluateObjectiveJ:[NSString stringWithFormat:@"(function() { var mask = %u; return (((mask & CPAlphaShiftKeyMask) ? %u : 0) | ((mask & CPShiftKeyMask) ? %u : 0) | ((mask & CPControlKeyMask) ? %u : 0) | ((mask & CPAlternateKeyMask) ? %u : 0) | ((mask & CPCommandKeyMask) ? %u : 0) | ((mask & CPNumericPadKeyMask) ? %u : 0) | ((mask & CPHelpKeyMask) ? %u : 0) | ((mask & CPFunctionKeyMask) ? %u : 0)) }())", [[menuItemObject bridgeSelector:@selector(keyEquivalentModifierMask)] unsignedIntegerValue], NSAlphaShiftKeyMask, NSShiftKeyMask, NSControlKeyMask, NSAlternateKeyMask, NSCommandKeyMask, NSNumericPadKeyMask, NSHelpKeyMask, NSFunctionKeyMask, NSDeviceIndependentModifierFlagsMask]] unsignedIntegerValue]];[self setAction:@selector(bridgeAction:)];
+    [self setTarget:self];
+    [self setAction:@selector(bridgeAction:)];
+}
+
+// This exists so that the menu items are enabled.
+- (void)bridgeAction:(id)aSender
+{
+}
+
+@end

Tools/NativeHost/NSObject+WebAdditions.h

@@ -0,0 +1,16 @@
+//
+//  NSObject+WebAdditions.h
+//  NativeHost
+//
+//  Created by Francisco Tolmasky on 11/16/09.
+//  Copyright 2009 280 North, Inc.. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+
+@interface NSObject (WebAdditions)
+
+- (BOOL)webBoolValue;
+
+@end

Tools/NativeHost/NSObject+WebAdditions.m

@@ -0,0 +1,19 @@
+//
+//  NSObject+WebAdditions.m
+//  NativeHost
+//
+//  Created by Francisco Tolmasky on 11/16/09.
+//  Copyright 2009 280 North, Inc.. All rights reserved.
+//
+
+#import "NSObject+WebAdditions.h"
+
+
+@implementation NSObject (WebAdditions)
+
+- (BOOL)webBoolValue
+{
+    return [self isKindOfClass:[NSNumber class]] && [(NSNumber *)self boolValue];
+}
+
+@end

Tools/NativeHost/NSURL+Additions.h

@@ -0,0 +1,17 @@
+//
+//  NSURL+Additions.h
+//  NativeHost
+//
+//  Created by Francisco Tolmasky on 6/3/09.
+//  Copyright 2009 280 North, Inc. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+
+@interface NSURL (Additions)
+
+- (NSURL *)HTTPFileSystemURL;
++ (NSURL *)fileSystemURLFromHTTPFileSystemString:(NSString *)aString;
+
+@end

Tools/NativeHost/NSURL+Additions.m

@@ -0,0 +1,36 @@
+//
+//  NSURL+Additions.m
+//  NativeHost
+//
+//  Created by Francisco Tolmasky on 6/3/09.
+//  Copyright 2009 280 North, Inc. All rights reserved.
+//
+
+#import "NSURL+Additions.h"
+#import "AppController.h"
+
+@implementation NSURL (Additions)
+
+- (NSURL *)HTTPFileSystemURL
+{
+    if ([[self scheme] caseInsensitiveCompare:@"file"] == NSOrderedSame)
+        return [[[NSURL alloc] initWithScheme:@"http"
+										 host:[NSString stringWithFormat:@"127.0.0.1:%d", SERVER_PORT] 
+										 path:[@"/filesystem/" stringByAppendingString:[self path]]] autorelease];
+
+    return [[self copy] autorelease];
+}
+
++ (NSURL *)fileSystemURLFromHTTPFileSystemString:(NSString *)aString
+{
+    NSURL *httpURL = [NSURL URLWithString:aString];
+    NSString *path = [httpURL path];
+    NSRange range = [path rangeOfString:@"/filesystem"];
+
+    if (range.location == 0 && NSMaxRange(range) < [path length])
+        path = [path substringFromIndex:[@"/filesystem" length]];
+
+    return [[[NSURL alloc] initFileURLWithPath:path] autorelease];
+}
+
+@end

Tools/NativeHost/NativeHost.xcodeproj/project.pbxproj

@@ -0,0 +1,412 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 45;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD58140DA1D0A300B32029 /* MainMenu.xib */; };
+		4D55A7941180F1E000B5187D /* icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4D55A7931180F1BE00B5187D /* icon.icns */; };
+		8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
+		8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
+		8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
+		9E2E533A103B33CB00DF2D13 /* Server.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E2E5339103B33CB00DF2D13 /* Server.m */; };
+		9E43AC84104DB51400263989 /* WebScripObject+Objective-J.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E43AC83104DB51400263989 /* WebScripObject+Objective-J.m */; };
+		9E44CA9D0FD798FE00860A54 /* NSURL+Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E44CA9C0FD798FE00860A54 /* NSURL+Additions.m */; };
+		9E4EBB4210892BDE0091C8E9 /* BridgedMethods.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E4EBB4110892BDE0091C8E9 /* BridgedMethods.m */; };
+		9E535D05104F6F4900C119FA /* AppController+MainMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E535D04104F6F4900C119FA /* AppController+MainMenu.m */; };
+		9E535D32104F73FB00C119FA /* MenuBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E535D31104F73FB00C119FA /* MenuBridge.m */; };
+		9E535D37104F761F00C119FA /* MenuItemBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E535D36104F761F00C119FA /* MenuItemBridge.m */; };
+		9E55CFE50FE8750C007D1D64 /* Console.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E55CFE40FE8750C007D1D64 /* Console.m */; };
+		9E5D4F0D1090FB6E00E76B38 /* WebWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E5D4F0C1090FB6E00E76B38 /* WebWindow.m */; };
+		9E9DD6C00FC93C7A0001EF2E /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9E9DD6BF0FC93C7A0001EF2E /* WebKit.framework */; };
+		9EA1BEF7107E7EE500CDE684 /* Application.m in Sources */ = {isa = PBXBuildFile; fileRef = 9EA1BEF6107E7EE500CDE684 /* Application.m */; };
+		9EB99C960FD8968100AA94A2 /* AppController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9EB99C950FD8968100AA94A2 /* AppController.m */; };
+		9EBC421E10B1D07100C2AE33 /* NSObject+WebAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 9EBC421D10B1D07100C2AE33 /* NSObject+WebAdditions.m */; };
+		9ED96C8A1020072300D24B9C /* AppController+WebUIDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 9ED96C871020072300D24B9C /* AppController+WebUIDelegate.m */; };
+		9ED96C8B1020072300D24B9C /* AppController+WebFrameLoadDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 9ED96C881020072300D24B9C /* AppController+WebFrameLoadDelegate.m */; };
+		9ED96C8C1020072300D24B9C /* AppController+WebResourceLoadDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 9ED96C891020072300D24B9C /* AppController+WebResourceLoadDelegate.m */; };
+		AD8D31C6108F98B00008F7C4 /* SSCrypto.m in Sources */ = {isa = PBXBuildFile; fileRef = AD8D31C5108F98B00008F7C4 /* SSCrypto.m */; };
+		AD8D31C9108F98E40008F7C4 /* libssl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = AD8D31C8108F98E40008F7C4 /* libssl.dylib */; };
+		AD8D31CB108F98EF0008F7C4 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = AD8D31CA108F98EF0008F7C4 /* libcrypto.dylib */; };
+		AD8D350F109040300008F7C4 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD8D350E109040300008F7C4 /* IOKit.framework */; };
+		ADCCEF6810D43C970055BDFD /* WebPasteboardProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = ADCCEF3310D4370F0055BDFD /* WebPasteboardProxy.m */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
+		13E42FB307B3F0F600E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
+		1DDD58150DA1D0A300B32029 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = "<group>"; };
+		29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+		29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
+		29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
+		32CA4F630368D1EE00C91783 /* NativeHost_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeHost_Prefix.pch; sourceTree = "<group>"; };
+		4D55A7931180F1BE00B5187D /* icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = icon.icns; sourceTree = "<group>"; };
+		8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		8D1107320486CEB800E47090 /* NativeHost.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = NativeHost.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		9E2E5338103B33CB00DF2D13 /* Server.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Server.h; sourceTree = "<group>"; };
+		9E2E5339103B33CB00DF2D13 /* Server.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Server.m; sourceTree = "<group>"; };
+		9E43AC82104DB51400263989 /* WebScripObject+Objective-J.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "WebScripObject+Objective-J.h"; sourceTree = "<group>"; };
+		9E43AC83104DB51400263989 /* WebScripObject+Objective-J.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "WebScripObject+Objective-J.m"; sourceTree = "<group>"; };
+		9E44CA9B0FD798FE00860A54 /* NSURL+Additions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSURL+Additions.h"; sourceTree = "<group>"; };
+		9E44CA9C0FD798FE00860A54 /* NSURL+Additions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSURL+Additions.m"; sourceTree = "<group>"; };
+		9E4EBB4010892BDE0091C8E9 /* BridgedMethods.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BridgedMethods.h; sourceTree = "<group>"; };
+		9E4EBB4110892BDE0091C8E9 /* BridgedMethods.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BridgedMethods.m; sourceTree = "<group>"; };
+		9E535D04104F6F4900C119FA /* AppController+MainMenu.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "AppController+MainMenu.m"; sourceTree = "<group>"; };
+		9E535D30104F73FB00C119FA /* MenuBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MenuBridge.h; sourceTree = "<group>"; };
+		9E535D31104F73FB00C119FA /* MenuBridge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MenuBridge.m; sourceTree = "<group>"; };
+		9E535D35104F761F00C119FA /* MenuItemBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MenuItemBridge.h; sourceTree = "<group>"; };
+		9E535D36104F761F00C119FA /* MenuItemBridge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MenuItemBridge.m; sourceTree = "<group>"; };
+		9E55CFE30FE8750C007D1D64 /* Console.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Console.h; sourceTree = "<group>"; };
+		9E55CFE40FE8750C007D1D64 /* Console.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Console.m; sourceTree = "<group>"; };
+		9E5D4F0B1090FB6E00E76B38 /* WebWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebWindow.h; sourceTree = "<group>"; };
+		9E5D4F0C1090FB6E00E76B38 /* WebWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebWindow.m; sourceTree = "<group>"; };
+		9E9DD6BF0FC93C7A0001EF2E /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
+		9EA1BEF5107E7EE500CDE684 /* Application.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Application.h; sourceTree = "<group>"; };
+		9EA1BEF6107E7EE500CDE684 /* Application.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Application.m; sourceTree = "<group>"; };
+		9EB99C940FD8968100AA94A2 /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppController.h; sourceTree = "<group>"; };
+		9EB99C950FD8968100AA94A2 /* AppController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppController.m; sourceTree = "<group>"; };
+		9EBC421C10B1D07100C2AE33 /* NSObject+WebAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+WebAdditions.h"; sourceTree = "<group>"; };
+		9EBC421D10B1D07100C2AE33 /* NSObject+WebAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSObject+WebAdditions.m"; sourceTree = "<group>"; };
+		9ED96C871020072300D24B9C /* AppController+WebUIDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "AppController+WebUIDelegate.m"; sourceTree = "<group>"; };
+		9ED96C881020072300D24B9C /* AppController+WebFrameLoadDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "AppController+WebFrameLoadDelegate.m"; sourceTree = "<group>"; };
+		9ED96C891020072300D24B9C /* AppController+WebResourceLoadDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "AppController+WebResourceLoadDelegate.m"; sourceTree = "<group>"; };
+		AD8D31C4108F98B00008F7C4 /* SSCrypto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SSCrypto.h; sourceTree = "<group>"; };
+		AD8D31C5108F98B00008F7C4 /* SSCrypto.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SSCrypto.m; sourceTree = "<group>"; };
+		AD8D31C8108F98E40008F7C4 /* libssl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libssl.dylib; path = /usr/lib/libssl.dylib; sourceTree = "<absolute>"; };
+		AD8D31CA108F98EF0008F7C4 /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = /usr/lib/libcrypto.dylib; sourceTree = "<absolute>"; };
+		AD8D350E109040300008F7C4 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
+		ADCCEF3210D4370F0055BDFD /* WebPasteboardProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPasteboardProxy.h; sourceTree = "<group>"; };
+		ADCCEF3310D4370F0055BDFD /* WebPasteboardProxy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebPasteboardProxy.m; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		8D11072E0486CEB800E47090 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
+				9E9DD6C00FC93C7A0001EF2E /* WebKit.framework in Frameworks */,
+				AD8D31C9108F98E40008F7C4 /* libssl.dylib in Frameworks */,
+				AD8D31CB108F98EF0008F7C4 /* libcrypto.dylib in Frameworks */,
+				AD8D350F109040300008F7C4 /* IOKit.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		080E96DDFE201D6D7F000001 /* Classes */ = {
+			isa = PBXGroup;
+			children = (
+				9E535D04104F6F4900C119FA /* AppController+MainMenu.m */,
+				9ED96C881020072300D24B9C /* AppController+WebFrameLoadDelegate.m */,
+				9ED96C891020072300D24B9C /* AppController+WebResourceLoadDelegate.m */,
+				9ED96C871020072300D24B9C /* AppController+WebUIDelegate.m */,
+				9EB99C940FD8968100AA94A2 /* AppController.h */,
+				9EB99C950FD8968100AA94A2 /* AppController.m */,
+				9EA1BEF5107E7EE500CDE684 /* Application.h */,
+				9EA1BEF6107E7EE500CDE684 /* Application.m */,
+				9E55CFE30FE8750C007D1D64 /* Console.h */,
+				9E55CFE40FE8750C007D1D64 /* Console.m */,
+				9E2E5338103B33CB00DF2D13 /* Server.h */,
+				9E2E5339103B33CB00DF2D13 /* Server.m */,
+				AD8D31C4108F98B00008F7C4 /* SSCrypto.h */,
+				AD8D31C5108F98B00008F7C4 /* SSCrypto.m */,
+				9E5D4F0B1090FB6E00E76B38 /* WebWindow.h */,
+				9E5D4F0C1090FB6E00E76B38 /* WebWindow.m */,
+				9E1E34190FCC82A5007F8CA0 /* Bridge */,
+			);
+			name = Classes;
+			sourceTree = "<group>";
+		};
+		1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				AD8D31CA108F98EF0008F7C4 /* libcrypto.dylib */,
+				AD8D31C8108F98E40008F7C4 /* libssl.dylib */,
+				1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
+				AD8D350E109040300008F7C4 /* IOKit.framework */,
+			);
+			name = "Linked Frameworks";
+			sourceTree = "<group>";
+		};
+		1058C7A2FEA54F0111CA2CBB /* Other Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				29B97324FDCFA39411CA2CEA /* AppKit.framework */,
+				13E42FB307B3F0F600E4EEF1 /* CoreData.framework */,
+				29B97325FDCFA39411CA2CEA /* Foundation.framework */,
+				9E9DD6BF0FC93C7A0001EF2E /* WebKit.framework */,
+			);
+			name = "Other Frameworks";
+			sourceTree = "<group>";
+		};
+		19C28FACFE9D520D11CA2CBB /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				8D1107320486CEB800E47090 /* NativeHost.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		29B97314FDCFA39411CA2CEA /* NativeHost */ = {
+			isa = PBXGroup;
+			children = (
+				080E96DDFE201D6D7F000001 /* Classes */,
+				29B97315FDCFA39411CA2CEA /* Other Sources */,
+				29B97317FDCFA39411CA2CEA /* Resources */,
+				29B97323FDCFA39411CA2CEA /* Frameworks */,
+				19C28FACFE9D520D11CA2CBB /* Products */,
+			);
+			name = NativeHost;
+			sourceTree = "<group>";
+		};
+		29B97315FDCFA39411CA2CEA /* Other Sources */ = {
+			isa = PBXGroup;
+			children = (
+				29B97316FDCFA39411CA2CEA /* main.m */,
+				32CA4F630368D1EE00C91783 /* NativeHost_Prefix.pch */,
+			);
+			name = "Other Sources";
+			sourceTree = "<group>";
+		};
+		29B97317FDCFA39411CA2CEA /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				4D55A7931180F1BE00B5187D /* icon.icns */,
+				8D1107310486CEB800E47090 /* Info.plist */,
+				089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
+				1DDD58140DA1D0A300B32029 /* MainMenu.xib */,
+			);
+			name = Resources;
+			sourceTree = "<group>";
+		};
+		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */,
+				1058C7A2FEA54F0111CA2CBB /* Other Frameworks */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		9E1E34190FCC82A5007F8CA0 /* Bridge */ = {
+			isa = PBXGroup;
+			children = (
+				9E535DB7104F923E00C119FA /* Menus */,
+				9E4EBB4010892BDE0091C8E9 /* BridgedMethods.h */,
+				9E4EBB4110892BDE0091C8E9 /* BridgedMethods.m */,
+				9EBC421C10B1D07100C2AE33 /* NSObject+WebAdditions.h */,
+				9EBC421D10B1D07100C2AE33 /* NSObject+WebAdditions.m */,
+				9E44CA9B0FD798FE00860A54 /* NSURL+Additions.h */,
+				9E44CA9C0FD798FE00860A54 /* NSURL+Additions.m */,
+				ADCCEF3210D4370F0055BDFD /* WebPasteboardProxy.h */,
+				ADCCEF3310D4370F0055BDFD /* WebPasteboardProxy.m */,
+				9E43AC82104DB51400263989 /* WebScripObject+Objective-J.h */,
+				9E43AC83104DB51400263989 /* WebScripObject+Objective-J.m */,
+			);
+			name = Bridge;
+			sourceTree = "<group>";
+		};
+		9E535DB7104F923E00C119FA /* Menus */ = {
+			isa = PBXGroup;
+			children = (
+				9E535D30104F73FB00C119FA /* MenuBridge.h */,
+				9E535D31104F73FB00C119FA /* MenuBridge.m */,
+				9E535D35104F761F00C119FA /* MenuItemBridge.h */,
+				9E535D36104F761F00C119FA /* MenuItemBridge.m */,
+			);
+			name = Menus;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		8D1107260486CEB800E47090 /* NativeHost */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "NativeHost" */;
+			buildPhases = (
+				8D1107290486CEB800E47090 /* Resources */,
+				8D11072C0486CEB800E47090 /* Sources */,
+				8D11072E0486CEB800E47090 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = NativeHost;
+			productInstallPath = "$(HOME)/Applications";
+			productName = NativeHost;
+			productReference = 8D1107320486CEB800E47090 /* NativeHost.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		29B97313FDCFA39411CA2CEA /* Project object */ = {
+			isa = PBXProject;
+			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "NativeHost" */;
+			compatibilityVersion = "Xcode 3.1";
+			hasScannedForEncodings = 1;
+			mainGroup = 29B97314FDCFA39411CA2CEA /* NativeHost */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				8D1107260486CEB800E47090 /* NativeHost */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		8D1107290486CEB800E47090 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
+				1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */,
+				4D55A7941180F1E000B5187D /* icon.icns in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		8D11072C0486CEB800E47090 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				9E535D05104F6F4900C119FA /* AppController+MainMenu.m in Sources */,
+				9ED96C8B1020072300D24B9C /* AppController+WebFrameLoadDelegate.m in Sources */,
+				9ED96C8C1020072300D24B9C /* AppController+WebResourceLoadDelegate.m in Sources */,
+				9ED96C8A1020072300D24B9C /* AppController+WebUIDelegate.m in Sources */,
+				9EB99C960FD8968100AA94A2 /* AppController.m in Sources */,
+				9EA1BEF7107E7EE500CDE684 /* Application.m in Sources */,
+				9E4EBB4210892BDE0091C8E9 /* BridgedMethods.m in Sources */,
+				9E55CFE50FE8750C007D1D64 /* Console.m in Sources */,
+				8D11072D0486CEB800E47090 /* main.m in Sources */,
+				9E535D32104F73FB00C119FA /* MenuBridge.m in Sources */,
+				9E535D37104F761F00C119FA /* MenuItemBridge.m in Sources */,
+				9EBC421E10B1D07100C2AE33 /* NSObject+WebAdditions.m in Sources */,
+				9E44CA9D0FD798FE00860A54 /* NSURL+Additions.m in Sources */,
+				9E2E533A103B33CB00DF2D13 /* Server.m in Sources */,
+				AD8D31C6108F98B00008F7C4 /* SSCrypto.m in Sources */,
+				ADCCEF6810D43C970055BDFD /* WebPasteboardProxy.m in Sources */,
+				9E43AC84104DB51400263989 /* WebScripObject+Objective-J.m in Sources */,
+				9E5D4F0D1090FB6E00E76B38 /* WebWindow.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXVariantGroup section */
+		089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				089C165DFE840E0CC02AAC07 /* English */,
+			);
+			name = InfoPlist.strings;
+			sourceTree = "<group>";
+		};
+		1DDD58140DA1D0A300B32029 /* MainMenu.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				1DDD58150DA1D0A300B32029 /* English */,
+			);
+			name = MainMenu.xib;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+		C01FCF4B08A954540054247B /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = NativeHost_Prefix.pch;
+				GCC_PREPROCESSOR_DEFINITIONS = "ACTIVATION=0";
+				INFOPLIST_FILE = Info.plist;
+				INFOPLIST_PREPROCESS = YES;
+				INFOPLIST_PREPROCESSOR_DEFINITIONS = "ACTIVATION=0";
+				INSTALL_PATH = "$(HOME)/Applications";
+				PRODUCT_NAME = NativeHost;
+			};
+			name = Debug;
+		};
+		C01FCF4C08A954540054247B /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_MODEL_TUNING = G5;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = NativeHost_Prefix.pch;
+				INFOPLIST_FILE = Info.plist;
+				INFOPLIST_PREPROCESS = YES;
+				INFOPLIST_PREPROCESSOR_DEFINITIONS = "ACTIVATION=0";
+				INSTALL_PATH = "$(HOME)/Applications";
+				PRODUCT_NAME = NativeHost;
+			};
+			name = Release;
+		};
+		C01FCF4F08A954540054247B /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				GCC_C_LANGUAGE_STANDARD = c99;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_VERSION = 4.2;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				PREBINDING = NO;
+				SDKROOT = macosx10.5;
+			};
+			name = Debug;
+		};
+		C01FCF5008A954540054247B /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				GCC_C_LANGUAGE_STANDARD = c99;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				PREBINDING = NO;
+				SDKROOT = macosx10.5;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "NativeHost" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				C01FCF4B08A954540054247B /* Debug */,
+				C01FCF4C08A954540054247B /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "NativeHost" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				C01FCF4F08A954540054247B /* Debug */,
+				C01FCF5008A954540054247B /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
+}

Tools/NativeHost/NativeHost_Prefix.pch

@@ -0,0 +1,8 @@
+//
+// Prefix header for all source files of the 'NativeHost' target in the 'NativeHost' project
+//
+
+#ifdef __OBJC__
+    #import <Cocoa/Cocoa.h>
+    #import <WebKit/WebKit.h>
+#endif

Tools/NativeHost/SSCrypto.h

@@ -0,0 +1,116 @@
+/*
+ Copyright (c) 2003-2006, Septicus Software All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ 
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer. 
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution. 
+ * Neither the name of Septicus Software nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+ 
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+//
+//  SSCrypto.h
+//
+//  Created by Ed Silva on Sat May 31 2003.
+//  Copyright (c) 2003-2006 Septicus Software. All rights reserved.
+//
+
+
+#import <Foundation/Foundation.h>
+#import <openssl/evp.h>
+#import <openssl/rand.h>
+#import <openssl/rsa.h>
+#import <openssl/engine.h>
+#import <openssl/sha.h>
+#import <openssl/pem.h>
+#import <openssl/bio.h>
+#import <openssl/err.h>
+#import <openssl/ssl.h>
+#import <openssl/md5.h>
+
+@interface NSData (HexDump)
+- (NSString *)encodeBase64;
+- (NSString *)encodeBase64WithNewlines:(BOOL)encodeWithNewlines;
+- (NSData *)decodeBase64;
+- (NSData *)decodeBase64WithNewLines:(BOOL)decodeWithNewLines;
+- (NSString *)hexval;
+- (NSString *)hexdump;
+@end
+
+@interface SSCrypto : NSObject
+{
+    NSData *symmetricKey;
+    NSData *cipherText;
+    NSData *clearText;
+	NSData *publicKey;
+	NSData *privateKey;
+	
+	BOOL isSymmetric;
+}
+
+- (id)init;
+- (id)initWithSymmetricKey:(NSData *)k;
+- (id)initWithPublicKey:(NSData *)pub;
+- (id)initWithPrivateKey:(NSData *)priv;
+- (id)initWithPublicKey:(NSData *)pub privateKey:(NSData *)priv;
+
+- (BOOL)isSymmetric;
+- (void)setIsSymmetric:(BOOL)flag;
+
+- (NSData *)symmetricKey;
+- (void)setSymmetricKey:(NSData *)k;
+
+- (NSData *)publicKey;
+- (void)setPublicKey:(NSData *)k;
+
+- (NSData *)privateKey;
+- (void)setPrivateKey:(NSData *)k;
+
+- (NSData *)clearTextAsData;
+- (NSString *)clearTextAsString;
+- (void)setClearTextWithData:(NSData *)c;
+- (void)setClearTextWithString:(NSString *)c;
+
+- (NSData *)cipherTextAsData;
+- (NSString *)cipherTextAsString;
+- (void)setCipherText:(NSData *)c;
+
+- (NSData *)decrypt;
+- (NSData *)decrypt:(NSString *)cipherName;
+
+- (NSData *)verify;
+
+- (NSData *)encrypt;
+- (NSData *)encrypt:(NSString *)cipherName;
+
+- (NSData *)sign;
+
+- (NSData *)digest:(NSString *)digestName;
+
++ (NSData *)generateRSAPrivateKeyWithLength:(int)length;
++ (NSData *)generateRSAPublicKeyFromPrivateKey:(NSData *)privateKey;
++ (NSData *)getKeyDataWithLength:(int)length;
++ (NSData *)getKeyDataWithLength:(int)length fromPassword:(NSString *)pass withSalt:(NSString *)salt;
++ (NSData *)getKeyDataWithLength:(int)length fromPassword:(NSString *)pass withSalt:(NSString *)salt withIterations:(int)count;
++ (NSData *)getSHA1ForData:(NSData *)d;
++ (NSData *)getMD5ForData:(NSData *)d;
+
+@end

Tools/NativeHost/Server.h

@@ -0,0 +1,21 @@
+//
+//  Server.h
+//  NativeHost
+//
+//  Created by Francisco Tolmasky on 8/18/09.
+//  Copyright 2009 280 North, Inc.. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+@interface Server : NSObject
+{
+    NSFileHandle    * outputFile;
+    NSFileHandle    * errorFile;
+    NSTask          * process;
+}
+
+- (BOOL)start;
+- (void)stop;
+
+@end

Tools/NativeHost/Server.m

@@ -0,0 +1,193 @@
+//
+//  Server.m
+//  NativeHost
+//
+//  Created by Francisco Tolmasky on 8/18/09.
+//  Copyright 2009 280 North, Inc.. All rights reserved.
+//
+
+#import "Server.h"
+#import "AppController.h"
+
+#import <sys/socket.h>
+#import <netinet/in.h>
+
+@implementation Server
+
+- (BOOL)start
+{
+    NSBundle *mainBundle = [NSBundle mainBundle];
+    NSString *serverPath = [mainBundle pathForResource:@"NativeHostServer" ofType:@"" inDirectory:@"Server"];
+
+    if (!serverPath)
+    {
+        return YES;
+    }
+
+    // find an available port
+    struct sockaddr_in addr;
+    int sockfd;
+	int attempts = 0;
+
+	while (SERVER_PORT == 9191 && attempts++ < 5)
+	{
+		// Create a socket
+		sockfd = socket( AF_INET, SOCK_STREAM, 0 );
+
+		// Setup its address structure
+		bzero( &addr, sizeof(struct sockaddr_in));
+		addr.sin_family = AF_INET;
+		addr.sin_addr.s_addr = htonl( INADDR_ANY );
+		addr.sin_port = htons( 0 );
+
+		// Bind it to an address and port
+		bind( sockfd, (struct sockaddr *)&addr, sizeof(struct sockaddr));
+
+		// Set it listening for connections
+		listen( sockfd, 5 );
+
+		// Find out what port the socket was bound to
+		socklen_t namelen = sizeof(struct sockaddr_in);
+		getsockname( sockfd, (struct sockaddr *)&addr, &namelen );
+
+		if (addr.sin_port <= 1024)
+			addr.sin_port = 9191;
+		else
+		    SERVER_PORT = addr.sin_port;
+
+		shutdown(sockfd, 2);
+	}
+    
+    if (SERVER_PASSWORD == nil)
+    {
+        CFUUIDRef uuidObj = CFUUIDCreate(nil);
+        SERVER_PASSWORD = (NSString*)CFUUIDCreateString(nil, uuidObj);
+        CFRelease(uuidObj);
+    }
+
+    if (SERVER_USER == nil)
+    {
+        CFUUIDRef uuidObj = CFUUIDCreate(nil);
+        SERVER_USER = (NSString*)CFUUIDCreateString(nil, uuidObj);
+        CFRelease(uuidObj);
+        // usernames can't have "-" in them
+        SERVER_USER = [[SERVER_USER autorelease] stringByReplacingOccurrencesOfString:@"-" withString:@""];
+    }
+
+    // setup environment variables
+    NSDictionary *env = [[[NSProcessInfo processInfo] environment] mutableCopy];
+    [env setValue:[mainBundle resourcePath] forKey:@"NATIVEHOST_RESOURCES"];
+    [env setValue:[[NSNumber numberWithInt:SERVER_PORT] stringValue] forKey:@"NATIVEHOST_SERVER_PORT"];
+    [env setValue:SERVER_USER forKey:@"NATIVEHOST_SERVER_USER"];
+    [env setValue:SERVER_PASSWORD forKey:@"NATIVEHOST_SERVER_PASSWORD"];
+
+    // create pipes for stdout and stderr
+    NSPipe  * outputPipe = [NSPipe pipe];
+    outputFile = [outputPipe fileHandleForReading];
+    NSPipe  * errorPipe = [NSPipe pipe];
+    errorFile = [errorPipe fileHandleForReading];
+
+    // setup the process
+    process = [[NSTask alloc] init];
+    [process setLaunchPath:serverPath];
+    [process setStandardOutput:outputPipe];
+    [process setStandardError:errorPipe];
+    [process setEnvironment:env];
+    [env release];
+
+    [[NSNotificationCenter defaultCenter] addObserver:self 
+                                             selector:@selector(serverDidTerminate:) 
+                                                 name:NSTaskDidTerminateNotification 
+                                               object:process];
+
+    [process launch];
+
+    BOOL didStartup = NO;
+    NSData * data = nil;
+
+    while (!didStartup && (data = [outputFile availableData]) && [data length])
+    {
+        NSString * string = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
+        if (string)
+        {
+            NHLog(@"SERVER-OUT", string);
+
+            didStartup = [string rangeOfString:@"Jack is starting up"].location != NSNotFound;
+
+            [string release];
+        }
+    }
+    NSLog(@"Server has started.");
+
+    [[NSNotificationCenter defaultCenter]
+        addObserver:self
+          selector:@selector(didReadStdOut:)
+              name:NSFileHandleReadCompletionNotification
+            object:outputFile];
+
+    [[NSNotificationCenter defaultCenter]
+        addObserver:self
+          selector:@selector(didReadStdErr:)
+              name:NSFileHandleReadCompletionNotification
+            object:errorFile];
+
+    [outputFile readInBackgroundAndNotify];
+    [errorFile readInBackgroundAndNotify];
+
+    return didStartup;
+}
+
+- (void)stop
+{
+    [process terminate];
+}
+
+- (void)didReadStdOut:(NSNotification *)aNotification
+{
+    NSString * string = [[NSString alloc] initWithData:[[aNotification userInfo] objectForKey:NSFileHandleNotificationDataItem]
+                                              encoding:NSASCIIStringEncoding];
+    NHLog(@"SERVER-OUT", string);
+    [string release];
+    [outputFile readInBackgroundAndNotify];
+}
+
+- (void)didReadStdErr:(NSNotification *)aNotification
+{
+    NSString * string = [[NSString alloc] initWithData:[[aNotification userInfo] objectForKey:NSFileHandleNotificationDataItem]
+                                              encoding:NSASCIIStringEncoding];
+    NHLog(@"SERVER-ERR", string);
+    [string release];
+    [errorFile readInBackgroundAndNotify];
+}
+
+- (void)serverDidTerminate:(NSNotification *)note
+{
+    if ([process terminationStatus] != 0)
+    {
+        NSString *appName = [[[NSBundle mainBundle] localizedInfoDictionary] objectForKey:@"CFBundleDisplayName"];
+        if (appName == nil)
+            appName = [[NSProcessInfo processInfo] processName];
+
+        if (SERVER_PORT != 9191 && [self start])
+        {
+            NSRunAlertPanel(@"Unexpected Error",
+                [NSString stringWithFormat:@"%@ was not able to complete the last action you performed. Try again, and report the problem if it continues to occur.", appName],
+                @"OK", nil, nil);
+        }
+        else
+        {
+            NSRunAlertPanel(@"Unexpected Error",
+                [NSString stringWithFormat:@"A fatal error occurred. %@ could not recover and must terminate.", appName],
+                @"Terminate", nil, nil);
+            exit(1);
+        }
+    }
+}
+
+- (void)dealloc
+{
+    [process release];
+    [super dealloc];
+}
+
+@end

Tools/NativeHost/WebPasteboardProxy.h

@@ -0,0 +1,19 @@
+//
+//  WebPasteboardProxy.h
+//  NativeHost
+//
+//  Created by Ross Boucher on 12/12/09.
+//  Copyright 2009 280 North. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+
+@interface WebPasteboardProxy : NSObject 
+{
+    NSPasteboard *pasteboard;
+}
+
++ (id)pasteboardWithName:(NSString *)aName;
+
+@end

Tools/NativeHost/WebPasteboardProxy.m

@@ -0,0 +1,95 @@
+//
+//  WebPasteboardProxy.m
+//  NativeHost
+//
+//  Created by Ross Boucher on 12/12/09.
+//  Copyright 2009 280 North. All rights reserved.
+//
+
+#import "WebPasteboardProxy.h"
+#import "WebScripObject+Objective-J.h"
+#import "BridgedMethods.h"
+
+NSMutableDictionary *WebPasteboardDictionary = nil;
+
+@implementation WebPasteboardProxy
+
++ (void)initialize
+{
+    WebPasteboardDictionary = [[NSMutableDictionary dictionary] retain];
+}
+
++ (BOOL)isSelectorExcludedFromWebScript:(SEL)aSelector
+{
+    return NO;
+}
+
++ (id)pasteboardWithName:(NSString *)aName
+{
+    if ([aName isEqual:@"CPGeneralPboard"])
+        return [self pasteboardWithName:NSGeneralPboard];
+
+    id proxy = [WebPasteboardDictionary objectForKey:aName];
+    if (!proxy)
+    {
+        proxy = [[self alloc] initWithPasteboard:[NSPasteboard pasteboardWithName:aName]];
+        [WebPasteboardDictionary setObject:proxy forKey:aName];
+        [proxy release];
+    }
+
+    return proxy;
+}
+
+- (id)initWithPasteboard:(NSPasteboard *)aPasteboard
+{
+    if (self = [super init])
+    {
+        pasteboard = [aPasteboard retain];
+    }
+
+    return self;
+}
+
+- (void)dealloc
+{
+    [pasteboard release];
+    [super dealloc];
+}
+
+- (int)changeCount
+{
+    return [pasteboard changeCount];
+}
+
+- (void)declareTypes:(WebScriptObject *)args
+{
+    [pasteboard declareTypes:[BridgedMethods arrayFromWebScriptObject:args] owner:self];
+}
+
+- (void)addTypes:(WebScriptObject *)args
+{
+    [pasteboard addTypes:[BridgedMethods arrayFromWebScriptObject:args ] owner:self];
+}
+
+- (NSArray *)types
+{
+    return [pasteboard types];
+}
+
+- (NSString *)stringForType:(NSString *)aType
+{
+    return [pasteboard stringForType:aType];
+}
+
+- (void)pasteboard:(NSPasteboard *)aPasteboard provideDataForType:(NSString *)aType
+{
+    NSString *name = aPasteboard == [NSPasteboard generalPasteboard] ? @"CPGeneralPboard" : [aPasteboard name];
+
+    NSString *data = [[[NSApp delegate] windowScriptObject] evaluateObjectiveJReturningString:
+     [NSString stringWithFormat:@"[[CPPasteboard pasteboardWithName:'%@'] stringForType:'%@']", name, aType]
+    ];
+
+    [aPasteboard setString:data forType:aType];
+}
+
+@end

Tools/NativeHost/WebScripObject+Objective-J.h

@@ -0,0 +1,22 @@
+//
+//  WebScripObject+Objective-J.h
+//  NativeHost
+//
+//  Created by Francisco Tolmasky on 9/1/09.
+//  Copyright 2009 280 North, Inc.. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+#import <WebKit/WebKit.h>
+
+
+@interface WebScriptObject (ObjectiveJ)
+
+- (id)evaluateObjectiveJ:(NSString *)aString;
+- (NSString *)evaluateObjectiveJReturningString:(NSString *)aString;
+
+- (id)bridgeSelector:(SEL)aSelector;
+- (id)bridgeSelector:(SEL)aSelector withObject:(id)anObject;
+- (id)bridgeSelector:(SEL)aSelector withObjects:(NSArray *)array;
+
+@end

Tools/NativeHost/WebScripObject+Objective-J.m

@@ -0,0 +1,46 @@
+//
+//  WebScripObject+Objective-J.m
+//  NativeHost
+//
+//  Created by Francisco Tolmasky on 9/1/09.
+//  Copyright 2009 280 North, Inc.. All rights reserved.
+//
+
+#import "WebScripObject+Objective-J.h"
+
+
+@implementation WebScriptObject (ObjectiveJ)
+
+- (id)evaluateObjectiveJ:(NSString *)aString
+{
+    return [self evaluateWebScript:[NSString stringWithFormat:@"(ObjectiveJ.eval(decodeURIComponent(\"%@\")))", [aString stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding], nil]];
+}
+
+- (NSString *)evaluateObjectiveJReturningString:(NSString *)aString
+{
+    return [self evaluateWebScript:[NSString stringWithFormat:@"String(ObjectiveJ.eval(decodeURIComponent(\"%@\")))", [aString stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding], nil]];
+}
+
+- (id)bridgeSelector:(SEL)aSelector
+{
+    return [self bridgeSelector:aSelector withObjects:nil];
+}
+
+- (id)bridgeSelector:(SEL)aSelector withObject:(id)anObject
+{
+    return [self bridgeSelector:aSelector withObjects:[NSArray arrayWithObject:anObject]];
+}
+
+- (id)bridgeSelector:(SEL)aSelector withObjects:(NSArray *)objects
+{
+    [self evaluateWebScript:@"objj_object.prototype.__objj_msgSend = function() { return objj_msgSend.apply(null, arguments); }"];
+
+    NSArray * arguments = [NSArray arrayWithObjects:self, NSStringFromSelector(aSelector), nil];
+
+    if (objects)
+        arguments = [arguments arrayByAddingObjectsFromArray:objects];
+
+    return [self callWebScriptMethod:@"__objj_msgSend" withArguments:arguments];
+}
+
+@end

Tools/NativeHost/WebWindow.h

@@ -0,0 +1,44 @@
+//
+//  WebWindow.h
+//  NativeHost
+//
+//  Created by Francisco Tolmasky on 10/18/09.
+//  Copyright 2009 280 North, Inc.. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+
+typedef enum _CPWindowShadowStyle
+{
+    CPStandardWindowShadowStyle = 0,
+    CPMenuWindowShadowStyle     = 1,
+    CPPanelWindowShadowStyle    = 2,
+    CPCustomWindowShadowStyle   = 3
+} CPWindowShadowStyle;
+
+@interface WebWindow : NSWindow
+{
+    NSView              * leftMouseDownView;
+    NSView              * rightMouseDownView;
+
+    WebView             * webView;
+    NSView              * shadowView;
+
+    BOOL                hasShadow;
+    CPWindowShadowStyle shadowStyle;
+}
+
++ (WebWindow *)webWindow;
+
+- (WebView *)webView;
+
+- (BOOL)hitTest:(NSPoint)aPoint;
+
+- (BOOL)hasShadow;
+- (void)setHasShadow:(BOOL)shouldHaveShadow;
+
+- (void)setShadowStyle:(CPWindowShadowStyle)aStyle;
+- (CPWindowShadowStyle)shadowStyle;
+
+@end

Tools/NativeHost/WebWindow.m

@@ -0,0 +1,509 @@
+//
+//  WebWindow.m
+//  NativeHost
+//
+//  Created by Francisco Tolmasky on 10/18/09.
+//  Copyright 2009 280 North, Inc.. All rights reserved.
+//
+
+#import "WebWindow.h"
+
+
+static NSMutableArray * DisabledWindows;
+
+CFMachPortRef tap_port;
+
+CGEventRef headTapCallback(CGEventTapProxy proxy, CGEventType type, CGEventRef event, void *refcon)
+{
+    // It's dangerous to fail in this code: could disable mousedown system-wide. So just try catch it all.
+    @try
+    {
+        [DisabledWindows makeObjectsPerformSelector:@selector(stopIgnoringMouseEvents)];
+        [DisabledWindows removeAllObjects];
+
+        if (type == kCGEventLeftMouseDown)
+        {
+            CGPoint location = CGEventGetLocation(event);
+            NSPoint NSLocation = NSMakePoint(location.x, location.y);
+
+            for (NSWindow * window in [NSApp windows])
+            {
+                if ([window isKindOfClass:[WebWindow class]] && ![(WebWindow *)window hitTest:NSLocation])
+                {
+                    [window setIgnoresMouseEvents:YES];
+
+                    [DisabledWindows addObject:window];
+                }
+            }
+        }
+        else if (type == kCGEventTapDisabledByTimeout)
+            CGEventTapEnable(tap_port, YES);
+
+    }
+    @catch (NSException * anException)
+    {
+    }
+
+    return event;
+}
+
+
+@interface WebWindowContentView : NSView
+{
+}
+@end
+
+@implementation WebWindow
+
++ (void)initialize
+{
+    if (self != [WebWindow class])
+        return;
+
+    DisabledWindows = [[NSMutableArray alloc] init];
+
+    //| CGEventMaskBit(kCGEventTapDisabledByTimeout)
+    tap_port = CGEventTapCreate(kCGSessionEventTap, kCGHeadInsertEventTap,
+                                kCGEventTapOptionDefault,
+                                CGEventMaskBit(kCGEventLeftMouseDown),
+                                headTapCallback, NULL);
+
+    if (NULL == tap_port)
+    {
+        fprintf(stderr, "Error creating event tap\n");
+        return;
+    }
+
+    /* Create a run loop source from the tap port, add it to my run loop
+     * and start executing the loop
+     */
+    CFRunLoopSourceRef tap_source = CFMachPortCreateRunLoopSource(kCFAllocatorDefault, tap_port, 0);
+
+    if (NULL == tap_source)
+    {
+        fprintf(stderr, "Error converting port to run loop source\n");
+
+        if (tap_port != NULL)
+            CFRelease(tap_port);
+
+        return;
+    }
+
+    CFRunLoopAddSource(CFRunLoopGetCurrent(), tap_source, kCFRunLoopCommonModes);
+}
+
+- (id)initWithContentRect:(NSRect)aContentRect styleMask:(NSUInteger)windowStyle backing:(NSBackingStoreType)aBufferingType defer:(BOOL)shouldDeferCreation
+{
+    self = [super initWithContentRect:aContentRect styleMask:NSBorderlessWindowMask backing:aBufferingType defer:shouldDeferCreation];
+
+    if (self)
+    {
+        id delegate = [NSApp delegate];
+
+        shadowView = [[WebWindowContentView alloc] init];
+
+        [self setContentView:shadowView];
+
+        webView = [[WebView alloc] initWithFrame:NSZeroRect];
+
+        [webView setDrawsBackground:NO];
+        [webView setUIDelegate:delegate];
+        [webView setFrameLoadDelegate:delegate];
+        [webView setResourceLoadDelegate:delegate];
+        [webView setShouldCloseWithWindow:YES];
+
+        [shadowView addSubview:webView];
+
+        [self setBackgroundColor:[NSColor clearColor]];
+        [self setOpaque:NO];
+        [self setReleasedWhenClosed:YES];
+		[super setHasShadow:NO];
+    }
+
+    return self;
+}
+
+- (void)setFrame:(NSRect)aFrame display:(BOOL)shouldDisplay
+{
+    [webView setFrame:NSMakeRect(33.0, 33.0, NSWidth(aFrame), NSHeight(aFrame))];
+    [super setFrame:NSInsetRect(aFrame, -33.0, -33.0) display:YES];
+}
+
+- (void)dealloc
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:NSWindowDidResizeNotification object:self];
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:NSWindowDidBecomeKeyNotification object:self];
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:NSWindowDidResignKeyNotification object:self];
+
+    [shadowView release];
+    [webView release];
+    [super dealloc];
+}
+
+- (BOOL)canBecomeKeyWindow
+{
+    // Necessary since this apparently returns NO for borderless windows.
+    return YES;
+}
+
+- (NSView *)webHitTest:(NSPoint)aPoint
+{
+    NSPoint locationInWebView = [[self contentView] convertPoint:aPoint fromView:nil];
+
+    return [(NSView *)[self contentView] hitTest:locationInWebView];
+}
+
+- (void)sendEvent:(NSEvent *)anEvent
+{
+    NSInteger type = [anEvent type];
+
+    if (type == NSLeftMouseDown)
+    {
+        NSView * view = [self webHitTest:[anEvent locationInWindow]];
+
+        leftMouseDownView = view;
+
+        [view mouseDown:anEvent];
+    }
+
+    else if (type == NSLeftMouseDragged)
+        [leftMouseDownView mouseDragged:anEvent];
+
+    else if (type == NSLeftMouseUp)
+        [leftMouseDownView mouseUp:anEvent];
+
+    else if (type == NSRightMouseDown)
+    {
+        NSView * view = [self webHitTest:[anEvent locationInWindow]];
+
+        rightMouseDownView = view;
+
+        [view rightMouseDown:anEvent];
+    }
+    else if (type == NSRightMouseDragged)
+        [rightMouseDownView rightMouseDragged:anEvent];
+
+    else if (type == NSRightMouseUp)
+        [rightMouseDownView rightMouseUp:anEvent];
+
+    else
+        [super sendEvent:anEvent];
+
+    // FIXME: other
+}
+
+// Override this to avoid the beep from unhandled events.
+- (void)keyDown:(NSEvent *)anEvent
+{
+}
+
++ (WebWindow *)webWindow
+{
+    return [[WebWindow alloc] initWithContentRect:NSZeroRect styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:YES];
+}
+
+- (WebView *)webView
+{
+    return webView;
+}
+
+- (void)updateShadow
+{
+    [super setHasShadow:hasShadow && shadowStyle == CPCustomWindowShadowStyle];
+    [shadowView setNeedsDisplay:YES];
+}
+
+- (BOOL)hasShadow
+{
+    return hasShadow;
+}
+
+- (void)setHasShadow:(BOOL)shouldHaveShadow
+{
+    if (hasShadow == shouldHaveShadow)
+        return;
+
+    hasShadow = shouldHaveShadow;
+
+    [self updateShadow];
+}
+
+- (CPWindowShadowStyle)shadowStyle
+{
+    return shadowStyle;
+}
+
+- (void)setShadowStyle:(CPWindowShadowStyle)aStyle
+{
+    if (shadowStyle == aStyle)
+        return;
+
+    shadowStyle = aStyle;
+
+    [self updateShadow];
+}
+
+- (BOOL)hitTest:(NSPoint)aPoint
+{
+    NSInteger windowNumber = [[[webView windowScriptObject] valueForKey:@"cpWindowNumber"] intValue];
+
+#if LOGGING
+    WebScriptObject * frame = [[[NSApp delegate] windowScriptObject] evaluateWebScript:[NSString stringWithFormat:@"(objj_msgSend(objj_msgSend(CPApp, \"windowWithWindowNumber:\", %d), \"frame\"))", windowNumber]],
+                    * origin = [frame valueForKey:@"origin"],
+                    * size = [frame valueForKey:@"size"];
+
+    NSLog(@"(%f, %f) in { %f, %f, %f, %f }", aPoint.x, aPoint.y, [[origin valueForKey:@"x"] floatValue], [[origin valueForKey:@"y"] floatValue], [[size valueForKey:@"width"] floatValue], [[size valueForKey:@"height"] floatValue]);
+#endif
+
+    return [[[[NSApp delegate] windowScriptObject] evaluateWebScript:[NSString stringWithFormat:@"(CGRectContainsPoint(objj_msgSend(objj_msgSend(CPApp, \"windowWithWindowNumber:\", %d), \"frame\"), CGPointMake(%f, %f)))", windowNumber, aPoint.x, aPoint.y]] boolValue];
+}
+
+- (void)stopIgnoringMouseEvents
+{
+    [self setIgnoresMouseEvents:NO];
+}
+
+- (void)becomeKeyWindow
+{
+    [super becomeKeyWindow];
+
+    [self updateShadow];
+}
+
+- (void)resignKeyWindow
+{
+    [super resignKeyWindow];
+
+    [self updateShadow];
+}
+
+@end
+
+@interface NSImage (Additions)
+
+- (void)drawInRect:(NSRect)aRect slices:(CGFloat [])slices;
+
+@end
+
+@implementation NSImage (Additions)
+
+- (void)drawInRect:(NSRect)aRect slices:(CGFloat [])slices
+{
+    NSRect imageBounds = NSMakeRect(0.0, 0.0, [self size].width, [self size].height);
+
+    [self drawInRect:NSMakeRect(0.0, 0.0, slices[0], slices[1])
+            fromRect:NSMakeRect(0.0, 0.0, slices[0], slices[1])
+           operation:NSCompositeSourceOver
+            fraction:1.0];
+
+    [self drawInRect:NSMakeRect(NSMaxX(aRect) - slices[2], 0.0, slices[2], slices[1])
+            fromRect:NSMakeRect(NSMaxX(imageBounds) - slices[2], 0.0, slices[2], slices[1])
+           operation:NSCompositeSourceOver
+            fraction:1.0];
+
+    [self drawInRect:NSMakeRect(0.0, NSMaxY(aRect) - slices[3], slices[0], slices[3])
+            fromRect:NSMakeRect(0.0, NSMaxY(imageBounds) - slices[3], slices[0], slices[3])
+           operation:NSCompositeSourceOver
+            fraction:1.0];
+
+    [self drawInRect:NSMakeRect(NSMaxX(aRect) - slices[2], NSMaxY(aRect) - slices[3], slices[2], slices[3])
+            fromRect:NSMakeRect(NSMaxX(imageBounds) - slices[2], NSMaxY(imageBounds) - slices[3], slices[2], slices[3])
+           operation:NSCompositeSourceOver
+            fraction:1.0];
+
+    [self drawInRect:NSMakeRect(slices[0], 0.0, NSWidth(aRect) - slices[0] - slices[2], slices[1])
+            fromRect:NSMakeRect(slices[0], 0.0, 1.0, slices[1])
+           operation:NSCompositeSourceOver
+            fraction:1.0];
+
+    [self drawInRect:NSMakeRect(0.0, slices[1], slices[0], NSHeight(aRect) - slices[1] - slices[3])
+            fromRect:NSMakeRect(0.0, slices[1], slices[0], 1.0)
+           operation:NSCompositeSourceOver
+            fraction:1.0];
+
+    [self drawInRect:NSMakeRect(NSMaxX(aRect) - slices[2], slices[1], slices[2], NSHeight(aRect) - slices[1] - slices[3])
+            fromRect:NSMakeRect(NSMaxX(imageBounds) - slices[2], slices[1], slices[2], 1.0)
+           operation:NSCompositeSourceOver
+            fraction:1.0];
+
+    [self drawInRect:NSMakeRect(slices[0], NSMaxY(aRect) - slices[3], NSWidth(aRect) - slices[0] - slices[2], slices[3])
+            fromRect:NSMakeRect(slices[0], NSMaxY(imageBounds) - slices[3], 1.0, slices[3])
+           operation:NSCompositeSourceOver
+            fraction:1.0];
+}
+
+@end
+
+@implementation WebWindowContentView : NSView
+{
+}
+
+static float OUTlINE_HORIZONTAL_INSET   = 33.0;
+static float OUTlINE_VERTICAL_INSET     = 33.0;
+
+- (void)drawStandardActiveShadowInRect:(NSRect)aRect
+{
+    CGContextRef context = [[NSGraphicsContext currentContext] graphicsPort];
+
+    CGRect bounds = CGRectInset(*(CGRect *)&aRect, OUTlINE_HORIZONTAL_INSET - 0.5, OUTlINE_VERTICAL_INSET - 0.5);
+
+    CGColorRef shadowColor = CGColorCreateGenericGray(0.0, 0.8);
+    CGContextSetShadowWithColor (context, CGSizeMake(0.0, -10.0), 100.0, shadowColor);
+    CGColorRelease(shadowColor);
+
+    CGColorRef fillColor = CGColorCreateGenericGray(1.0, 1.0);
+    CGColorRef strokeColor = CGColorCreateGenericGray(0.0, 0.2);
+
+    CGContextSetFillColorWithColor(context, fillColor);
+    CGContextSetStrokeColorWithColor(context, strokeColor);
+
+    CGColorRelease(fillColor);
+    CGColorRelease(strokeColor);
+
+    CGContextBeginPath(context);
+
+    CGContextAddArc(context, CGRectGetMinX(bounds) + 5.0, CGRectGetMaxY(bounds) - 5.0, 5.0, M_PI, M_PI_2, YES);
+    CGContextAddArc(context, CGRectGetMaxX(bounds) - 5.0, CGRectGetMaxY(bounds) - 5.0, 5.0, M_PI_2, 0, YES);
+    CGContextAddLineToPoint(context, CGRectGetMaxX(bounds), CGRectGetMinY(bounds));
+    CGContextAddLineToPoint(context, CGRectGetMinX(bounds), CGRectGetMinY(bounds));
+
+    CGContextClosePath(context);
+
+    CGContextDrawPath(context, kCGPathFillStroke);
+}
+
+- (void)drawStandardInactiveShadowInRect:(NSRect)aRect
+{
+    CGContextRef context = [[NSGraphicsContext currentContext] graphicsPort];
+
+    CGRect bounds = CGRectInset(*(CGRect *)&aRect, OUTlINE_HORIZONTAL_INSET - 0.5, OUTlINE_VERTICAL_INSET - 0.5);
+
+    CGColorRef shadowColor = CGColorCreateGenericGray(0.0, 0.5);
+    CGContextSetShadowWithColor (context, CGSizeMake(0.0, -10.0), 40.0, shadowColor);
+    CGColorRelease(shadowColor);
+
+    CGColorRef fillColor = CGColorCreateGenericGray(1.0, 1.0);
+    CGColorRef strokeColor = CGColorCreateGenericGray(0.0, 0.2);
+
+    CGContextSetFillColorWithColor(context, fillColor);
+    CGContextSetStrokeColorWithColor(context, strokeColor);
+
+    CGColorRelease(fillColor);
+    CGColorRelease(strokeColor);
+
+    CGContextBeginPath(context);
+
+    CGContextAddArc(context, CGRectGetMinX(bounds) + 5.0, CGRectGetMaxY(bounds) - 5.0, 5.0, M_PI, M_PI_2, YES);
+    CGContextAddArc(context, CGRectGetMaxX(bounds) - 5.0, CGRectGetMaxY(bounds) - 5.0, 5.0, M_PI_2, 0, YES);
+    CGContextAddLineToPoint(context, CGRectGetMaxX(bounds), CGRectGetMinY(bounds));
+    CGContextAddLineToPoint(context, CGRectGetMinX(bounds), CGRectGetMinY(bounds));
+
+    CGContextClosePath(context);
+
+    CGContextDrawPath(context, kCGPathFillStroke);
+}
+
+- (void)drawMenuShadowInRect:(NSRect)aRect
+{
+    CGContextRef context = [[NSGraphicsContext currentContext] graphicsPort];
+
+    CGRect bounds = CGRectInset(*(CGRect *)&aRect, OUTlINE_HORIZONTAL_INSET - 0.5, OUTlINE_VERTICAL_INSET - 0.5);
+
+    CGColorRef shadowColor = CGColorCreateGenericGray(0.0, 0.5);
+    CGContextSetShadowWithColor (context, CGSizeMake(0.0, -10.0), 30.0, shadowColor);
+    CGColorRelease(shadowColor);
+
+    CGColorRef fillColor = CGColorCreateGenericGray(1.0, 1.0);
+    CGColorRef strokeColor = CGColorCreateGenericGray(0.0, 0.2);
+
+    CGContextSetFillColorWithColor(context, fillColor);
+    CGContextSetStrokeColorWithColor(context, strokeColor);
+
+    CGColorRelease(fillColor);
+    CGColorRelease(strokeColor);
+
+    CGContextBeginPath(context);
+
+    CGContextAddArc(context, CGRectGetMinX(bounds) + 3.0, CGRectGetMaxY(bounds) - 3.0, 2.0, M_PI, M_PI_2, YES);
+    CGContextAddArc(context, CGRectGetMaxX(bounds) - 3.0, CGRectGetMaxY(bounds) - 3.0, 2.0, M_PI_2, 0, YES);
+    CGContextAddArc(context, CGRectGetMaxX(bounds) - 3.0, CGRectGetMinY(bounds) + 3.0, 2.0, 0, 3 * M_PI_2, YES);
+    CGContextAddArc(context, CGRectGetMinX(bounds) + 3.0, CGRectGetMinY(bounds) + 3.0, 2.0, 3 * M_PI_2, M_PI, YES);
+
+    CGContextClosePath(context);
+
+    CGContextDrawPath(context, kCGPathFill);//Stroke);
+
+/*
+    CGContextBeginPath(context);
+
+    CGContextAddArc(context, CGRectGetMinX(bounds) + 3.0, CGRectGetMaxY(bounds) - 3.0, 2.0, M_PI, M_PI_2, YES);
+    CGContextAddArc(context, CGRectGetMaxX(bounds) - 3.0, CGRectGetMaxY(bounds) - 3.0, 2.0, M_PI_2, 0, YES);
+    CGContextAddArc(context, CGRectGetMaxX(bounds) - 3.0, CGRectGetMinY(bounds) + 3.0, 2.0, 0, 3 * M_PI_2, YES);
+    CGContextAddArc(context, CGRectGetMinX(bounds) + 3.0, CGRectGetMinY(bounds) + 3.0, 2.0, 3 * M_PI_2, M_PI, YES);
+
+    CGContextClosePath(context);
+
+    CGContextSetFillColorWithColor(context, CGColorGetConstantColor(kCGColorClear));
+
+    CGContextSetBlendMode(context, kCGBlendModeCopy);
+    CGContextDrawPath(context, kCGPathFill);
+*/
+}
+
+- (NSImage *)shadowImageWithSelector:(SEL)aSelector
+{
+    static NSMutableDictionary * images = nil;
+
+    if (!images)
+        images = [[NSMutableDictionary alloc] init];
+
+    NSString * name = NSStringFromSelector(aSelector);
+    NSImage * image = [images objectForKey:name];
+
+    if (!image)
+    {
+        image = [[NSImage alloc] initWithSize:NSMakeSize(100.0, 100.0)];
+
+        [image lockFocus];
+        objc_msgSend(self, aSelector, NSMakeRect(0.0, 0.0, 100.0, 100.0));
+        [image unlockFocus];
+
+        [images setObject:image forKey:name];
+
+        [image release];
+    }
+
+    return image;
+}
+
+- (void)drawShadowWithSelector:(SEL)aSelector inRect:(NSRect)aRect
+{
+    CGFloat slices[] = { 40.0, 49.0, 40.0, 49.0 };
+
+    if (NSWidth(aRect) > 100.0 || NSHeight(aRect) > 100.0)
+        [[self shadowImageWithSelector:aSelector] drawInRect:aRect slices:slices];
+    else
+        objc_msgSend(self, aSelector, aRect);
+}
+
+- (void)drawRect:(NSRect)aRect
+{
+    WebWindow * window = (WebWindow *)[self window];
+    NSRect bounds = [self bounds];
+
+    if (![window hasShadow])
+        return;
+
+    if ([window shadowStyle] == CPStandardWindowShadowStyle)
+        if ([window isKeyWindow])
+            return [self drawShadowWithSelector:@selector(drawStandardActiveShadowInRect:) inRect:bounds];
+        else
+            return [self drawShadowWithSelector:@selector(drawStandardInactiveShadowInRect:) inRect:bounds];
+
+
+    if ([window shadowStyle] == CPMenuWindowShadowStyle)
+        return [self drawShadowWithSelector:@selector(drawMenuShadowInRect:) inRect:bounds];
+}
+
+@end
+

Tools/NativeHost/main.m

@@ -0,0 +1,23 @@
+//
+//  main.m
+//  NativeHost
+//
+//  Created by Francisco Tolmasky on 5/24/09.
+//  Copyright 280 North, Inc. 2009. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+#import "Application.h"
+
+int interactive = 0;
+
+int main(int argc, char *argv[])
+{
+    if (argc > 1 && strcmp(argv[1], "-i") == 0) {
+        interactive = 1;
+    }
+
+    [Application sharedApplication];
+
+    return NSApplicationMain(argc,  (const char **) argv);
+}

Tools/capp/Resources/Templates/Application/Jakefile

@@ -37,13 +37,6 @@ app ("__project.nameasidentifier__", function(task)
         task.setCompilerFlags("-O");
 });
 
-function printResults(configuration)
-{
-    print("----------------------------");
-    print(configuration+" app built at path: "+FILE.join("Build", configuration, "__project.nameasidentifier__"));
-    print("----------------------------");
-}
-
 task ("default", ["__project.nameasidentifier__"], function()
 {
     printResults(configuration);
@@ -79,3 +72,22 @@ task ("deploy", ["release"], function()
     OS.system(["press", "-f", FILE.join("Build", "Release", "__project.nameasidentifier__"), FILE.join("Build", "Deployment", "__project.nameasidentifier__")]);
     printResults("Deployment")
 });
+
+task ("desktop", ["release"], function()
+{
+    FILE.mkdirs(FILE.join("Build", "Desktop", "__project.nameasidentifier__"));
+    require("cappuccino/nativehost").buildNativeHost(FILE.join("Build", "Release", "__project.nameasidentifier__"), FILE.join("Build", "Desktop", "__project.nameasidentifier__", "__project.nameasidentifier__.app"));
+    printResults("Desktop")
+});
+
+task ("run-desktop", ["desktop"], function()
+{
+    OS.system([FILE.join("Build", "Desktop", "__project.nameasidentifier__", "__project.nameasidentifier__.app", "Contents", "MacOS", "NativeHost"), "-i"]);
+});
+
+function printResults(configuration)
+{
+    print("----------------------------");
+    print(configuration+" app built at path: "+FILE.join("Build", configuration, "__project.nameasidentifier__"));
+    print("----------------------------");
+}

Tools/capp/Resources/Templates/NibApplication/Jakefile

@@ -38,13 +38,6 @@ app ("__project.nameasidentifier__", function(task)
         task.setCompilerFlags("-O");
 });
 
-function printResults(configuration)
-{
-    print("----------------------------");
-    print(configuration+" app built at path: "+FILE.join("Build", configuration, "__project.nameasidentifier__"));
-    print("----------------------------");
-}
-
 task ("default", ["__project.nameasidentifier__"], function()
 {
     printResults(configuration);
@@ -80,3 +73,22 @@ task ("deploy", ["release"], function()
     OS.system(["press", "-f", FILE.join("Build", "Release", "__project.nameasidentifier__"), FILE.join("Build", "Deployment", "__project.nameasidentifier__")]);
     printResults("Deployment")
 });
+
+task ("desktop", ["release"], function()
+{
+    FILE.mkdirs(FILE.join("Build", "Desktop", "__project.nameasidentifier__"));
+    require("cappuccino/nativehost").buildNativeHost(FILE.join("Build", "Release", "__project.nameasidentifier__"), FILE.join("Build", "Desktop", "__project.nameasidentifier__", "__project.nameasidentifier__.app"));
+    printResults("Desktop")
+});
+
+task ("run-desktop", ["desktop"], function()
+{
+    OS.system([FILE.join("Build", "Desktop", "__project.nameasidentifier__", "__project.nameasidentifier__.app", "Contents", "MacOS", "NativeHost"), "-i"]);
+});
+
+function printResults(configuration)
+{
+    print("----------------------------");
+    print(configuration+" app built at path: "+FILE.join("Build", configuration, "__project.nameasidentifier__"));
+    print("----------------------------");
+}

Tools/capp/Resources/Templates/ThemeDescriptor/Jakefile

@@ -42,3 +42,22 @@ task ("release", function()
     ENV["CONFIGURATION"] = "Release";
     JAKE.subjake(["."], "build", ENV);
 });
+
+task ("desktop", ["release"], function()
+{
+    FILE.mkdirs(FILE.join("Build", "Desktop", "__project.nameasidentifier__"));
+    require("cappuccino/nativehost").buildNativeHost(FILE.join("Build", "Release", "__project.nameasidentifier__"), FILE.join("Build", "Desktop", "__project.nameasidentifier__", "__project.nameasidentifier__.app"));
+    printResults("Desktop")
+});
+
+task ("run-desktop", ["desktop"], function()
+{
+    OS.system([FILE.join("Build", "Desktop", "__project.nameasidentifier__", "__project.nameasidentifier__.app", "Contents", "MacOS", "NativeHost"), "-i"]);
+});
+
+function printResults(configuration)
+{
+    print("----------------------------");
+    print(configuration+" app built at path: "+FILE.join("Build", configuration, "__project.nameasidentifier__"));
+    print("----------------------------");
+}

Tools/nib2cib/NSFont.j

@@ -33,8 +33,8 @@
 
     if ((fontName === "LucidaGrande" || fontName === "LucidaGrande-Bold") && size === 13)
     {
-        CPLog.debug("Converting default IB font: <"+fontName+", "+size+"> to default Aristo font: <Arial, 12>");
-        return [CPFont boldSystemFontOfSize:12.0];
+        CPLog.debug("Removing default IB font: <"+fontName+", "+size+"> for theme default font.");
+        return nil;
     }
 
     // FIXME: Is this alwasy true?