Auto run all LoadTimeTests

Reviewed by me.

.gitignore

@@ -4,3 +4,4 @@ Build
 Demos
 ./Aristo
 WebSite
+.push-package

AppKit/AppKit.j

@@ -26,6 +26,7 @@
 @import "CPApplication.j"
 @import "CPBezierPath.j"
 @import "CPBox.j"
+@import "CPBrowser.j"
 @import "CPButton.j"
 @import "CPButtonBar.j"
 @import "CPCheckBox.j"
@@ -57,6 +58,7 @@
 @import "CPMenu.j"
 @import "CPMenuItem.j"
 @import "CPOpenPanel.j"
+@import "CPOutlineView.j"
 @import "CPPanel.j"
 @import "CPPasteboard.j"
 @import "CPPopUpButton.j"
@@ -77,7 +79,9 @@
 @import "CPTextField.j"
 @import "CPToolbar.j"
 @import "CPToolbarItem.j"
+@import "CPTreeNode.j"
 @import "CPView.j"
+@import "CPViewAnimation.j"
 @import "CPViewController.j"
 @import "CPWebView.j"
 @import "CPWindow.j"

AppKit/CPAccordionView.j

@@ -96,12 +96,12 @@
     return _items;
 }
 
-- (void)addItem:(CPAccordionItem)anItem
+- (void)addItem:(CPAccordionViewItem)anItem
 {
     [self insertItem:anItem atIndex:_items.length];
 }
 
-- (void)insertItem:(CPAccordionItem)anItem atIndex:(CPInteger)anIndex
+- (void)insertItem:(CPAccordionViewItem)anItem atIndex:(CPInteger)anIndex
 {
     // FIXME: SHIFT ITEMS RIGHT
     [_expandedItemIndexes addIndex:anIndex];
@@ -122,7 +122,7 @@
     [self setNeedsLayout];
 }
 
-- (void)removeItem:(CPAccordionItem)anItem
+- (void)removeItem:(CPAccordionViewItem)anItem
 {
     [self removeItemAtIndex:[_items indexOfObjectIdenticalTo:anItem]];
 }

AppKit/CPAlert.j

@@ -148,7 +148,8 @@ var CPAlertWarningImage,
         var button = _buttons[i];
         
         [button setFrameSize:CGSizeMake([button frame].size.width, (styleMask == CPHUDBackgroundWindowMask) ? 20.0 : 24.0)];
-        [button setTheme:[CPTheme themeNamed: _windowStyle === CPHUDBackgroundWindowMask ? "Aristo-HUD" : "Aristo"]];
+        
+        [button setTheme:(_windowStyle === CPHUDBackgroundWindowMask) ? [CPTheme themeNamed:"Aristo-HUD"] : [CPTheme defaultTheme]];
 
         [[_alertPanel contentView] addSubview:button];
     }
@@ -263,8 +264,8 @@ var CPAlertWarningImage,
     [button setTag:_buttonCount];
     [button setAction:@selector(_notifyDelegate:)];
     
-    [button setTheme:[CPTheme themeNamed: _windowStyle === CPHUDBackgroundWindowMask ? "Aristo-HUD" : "Aristo"]];
-    [button setAutoresizingMask:CPViewMinXMargin|CPViewMinYMargin];
+    [button setTheme:(_windowStyle === CPHUDBackgroundWindowMask) ? [CPTheme themeNamed:"Aristo-HUD"] : [CPTheme defaultTheme]];
+    [button setAutoresizingMask:CPViewMinXMargin | CPViewMinYMargin];
 
     [[_alertPanel contentView] addSubview:button];
     

AppKit/CPApplication.j

@@ -31,6 +31,7 @@
 @import "CPCibLoading.j"
 @import "CPPlatform.j"
 
+#include "Platform/Platform.h"
 
 var CPMainCibFile               = @"CPMainCibFile",
     CPMainCibFileHumanFriendly  = @"Main cib file base name";
@@ -40,6 +41,10 @@ CPApp = nil;
 CPApplicationWillFinishLaunchingNotification    = @"CPApplicationWillFinishLaunchingNotification";
 CPApplicationDidFinishLaunchingNotification     = @"CPApplicationDidFinishLaunchingNotification";
 CPApplicationWillTerminateNotification          = @"CPApplicationWillTerminateNotification";
+CPApplicationWillBecomeActiveNotification       = @"CPApplicationWillBecomeActiveNotification";
+CPApplicationDidBecomeActiveNotification        = @"CPApplicationDidBecomeActiveNotification";
+CPApplicationWillResignActiveNotification       = @"CPApplicationWillResignActiveNotification";
+CPApplicationDidResignActiveNotification        = @"CPApplicationDidResignActiveNotification";
 
 CPTerminateNow      = YES;
 CPTerminateCancel   = NO;
@@ -49,7 +54,7 @@ CPRunStoppedResponse    = -1000;
 CPRunAbortedResponse    = -1001;
 CPRunContinuesResponse  = -1002;
 
-/*! 
+/*!
     @ingroup appkit
     @class CPApplication
 
@@ -57,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)
     {
@@ -77,22 +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;
@@ -111,7 +119,7 @@ CPRunContinuesResponse  = -1002;
 {
     if (!CPApp)
         CPApp = [[CPApplication alloc] init];
-    
+
     return CPApp;
 }
 
@@ -123,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;
 }
 
@@ -205,37 +158,46 @@ CPRunContinuesResponse  = -1002;
 {
     if (_delegate == aDelegate)
         return;
-    
-    var defaultCenter = [CPNotificationCenter defaultCenter];
-    
+
+    var defaultCenter = [CPNotificationCenter defaultCenter],
+        delegateNotifications =
+        [
+            CPApplicationWillFinishLaunchingNotification, @selector(applicationWillFinishLaunching:),
+            CPApplicationDidFinishLaunchingNotification, @selector(applicationDidFinishLaunching:),
+            CPApplicationWillBecomeActiveNotification, @selector(applicationWillBecomeActive:),
+            CPApplicationDidBecomeActiveNotification, @selector(applicationDidBecomeActive:),
+            CPApplicationWillResignActiveNotification, @selector(applicationWillResignActive:),
+            CPApplicationDidResignActiveNotification, @selector(applicationDidResignActive:),
+            CPApplicationWillTerminateNotification, @selector(applicationWillTerminate:)
+        ],
+        count = [delegateNotifications count];
+
     if (_delegate)
     {
-        [defaultCenter
-            removeObserver:_delegate
-                      name:CPApplicationWillFinishLaunchingNotification
-                    object:self];
+        var index = 0;
 
-        [defaultCenter
-            removeObserver:_delegate
-                      name:CPApplicationDidFinishLaunchingNotification
-                    object:self];
+        for (; index < count; index += 2)
+        {
+            var notificationName = delegateNotifications[index],
+                selector = delegateNotifications[index + 1];
+
+            if ([_delegate respondsToSelector:selector])
+                [defaultCenter removeObserver:_delegate name:notificationName object:self];
+        }
     }
-    
+
     _delegate = aDelegate;
-    
-    if ([_delegate respondsToSelector:@selector(applicationWillFinishLaunching:)])
-        [defaultCenter
-            addObserver:_delegate
-               selector:@selector(applicationWillFinishLaunching:)
-                   name:CPApplicationWillFinishLaunchingNotification
-                 object:self];
-    
-    if ([_delegate respondsToSelector:@selector(applicationDidFinishLaunching:)])
-        [defaultCenter
-            addObserver:_delegate
-               selector:@selector(applicationDidFinishLaunching:)
-                   name:CPApplicationDidFinishLaunchingNotification
-                 object:self];
+
+    var index = 0;
+
+    for (; index < count; index += 2)
+    {
+        var notificationName = delegateNotifications[index],
+            selector = delegateNotifications[index + 1];
+
+        if ([_delegate respondsToSelector:selector])
+            [defaultCenter addObserver:_delegate selector:selector name:notificationName object:self];
+    }
 }
 
 /*!
@@ -261,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];
@@ -314,6 +276,10 @@ CPRunContinuesResponse  = -1002;
 
 - (void)terminate:(id)aSender
 {
+    [[CPNotificationCenter defaultCenter]
+        postNotificationName:CPApplicationWillTerminateNotification
+                      object:self];
+
     if (![CPPlatform isBrowser])
     {
         [[CPDocumentController sharedDocumentController] closeAllDocumentsWithDelegate:self
@@ -367,22 +333,22 @@ 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 || ""];
 
-        if (version && applicationVersion)
-            [versionLabel setStringValue:sprintf(@"Version %@ (%@)", applicationVersion, version)];
+        if (applicationVersion && version)
+            [versionLabel setStringValue:@"Version " + applicationVersion + " (" + version + ")"];
         else if (applicationVersion || version)
-            [versionLabel setStringValue:sprintf(@"Version %@", applicationVersion || version)];
+            [versionLabel setStringValue:@"Version " + (applicationVersion || version)];
         else
             [versionLabel setStringValue:@""];
 
@@ -419,7 +385,27 @@ CPRunContinuesResponse  = -1002;
 
 - (void)activateIgnoringOtherApps:(BOOL)shouldIgnoreOtherApps
 {
+    [self _willBecomeActive];
+
     [CPPlatform activateIgnoringOtherApps:shouldIgnoreOtherApps];
+    _isActive = YES;
+
+    [self _willResignActive];
+}
+
+- (void)deactivate
+{
+    [self _willResignActive];
+
+    [CPPlatform deactivate];
+    _isActive = NO;
+
+    [self _didResignActive];
+}
+
+- (void)isActive
+{
+    return _isActive;
 }
 
 - (void)hideOtherApplications:(id)aSender
@@ -458,10 +444,10 @@ CPRunContinuesResponse  = -1002;
         return;
         // raise exception;
     }
-    
+
     _currentSession._state = aCode;
     _currentSession = _currentSession._previous;
-    
+
 //    if (aCode == CPRunAbortedResponse)
         [self _removeRunModalLoop];
 }
@@ -470,12 +456,12 @@ CPRunContinuesResponse  = -1002;
 - (void)_removeRunModalLoop
 {
     var count = _eventListeners.length;
-    
+
     while (count--)
         if (_eventListeners[count]._callback === _CPRunModalLoop)
         {
             _eventListeners.splice(count, 1);
-            
+
             return;
         }
 }
@@ -513,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];
@@ -532,7 +518,7 @@ CPRunContinuesResponse  = -1002;
 {
     if (!_currentSession)
         return nil;
-    
+
     return _currentSession._window;
 }
 
@@ -577,7 +563,7 @@ CPRunContinuesResponse  = -1002;
     {
         if (_eventListeners[_eventListeners.length - 1]._mask & (1 << [anEvent type]))
             _eventListeners.pop()._callback(anEvent);
-        
+
         return;
     }
 
@@ -624,6 +610,14 @@ CPRunContinuesResponse  = -1002;
     return _windows;
 }
 
+/*!
+    Returns an array of visible CPWindow objects, ordered by their front to back order on the screen.
+*/
+- (CPArray)orderedWindows
+{
+    return CPWindowObjectList();
+}
+
 - (void)hide:(id)aSender
 {
     [CPPlatform hide:self];
@@ -680,11 +674,11 @@ CPRunContinuesResponse  = -1002;
 
     if ([super tryToPerform:anAction with:anObject])
         return YES;
-    
+
     if([_delegate respondsToSelector:anAction])
     {
         [_delegate performSelector:anAction withObject:anObject];
-        
+
         return YES;
     }
 
@@ -704,9 +698,9 @@ CPRunContinuesResponse  = -1002;
 
     if (!target)
         return NO;
-    
+
     [target performSelector:anAction withObject:aSender];
-    
+
     return YES;
 }
 
@@ -725,10 +719,10 @@ CPRunContinuesResponse  = -1002;
 {
     if (!anAction)
         return nil;
-        
+
     if (aTarget)
         return aTarget;
-        
+
     return [self targetForAction:anAction];
 }
 
@@ -753,36 +747,35 @@ 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;
-    
+
     var theDocument = [windowController document];
-    
-    if (theDocument != delegate && [theDocument respondsToSelector:anAction])
+    if (theDocument !== delegate && [theDocument respondsToSelector:anAction])
         return theDocument;
-    
+
     return nil;
 }
 
@@ -791,7 +784,7 @@ CPRunContinuesResponse  = -1002;
     Checks for a target in the following order:
     <ol>
         <li>a responder from the key window</li>
-        <li>a responder frmo the main window</li>
+        <li>a responder from the main window</li>
         <li>the CPApplication instance</li>
         <li>the application delegate</li>
         <li>the document controller</li>
@@ -804,34 +797,32 @@ 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;
 }
 
 - (void)setCallback:(Function)aCallback forNextEventMatchingMask:(unsigned int)aMask untilDate:(CPDate)anExpiration inMode:(CPString)aMode dequeue:(BOOL)shouldDequeue
 {
     _eventListeners.push(_CPEventListenerMake(aMask, aCallback));
-    
-    if (_eventListeners.length == 3) objj_debug_print_backtrace();
 }
 
 - (CPEvent)setTarget:(id)aTarget selector:(SEL)aSelector forNextEventMatchingMask:(unsigned int)aMask untilDate:(CPDate)anExpiration inMode:(CPString)aMode dequeue:(BOOL)shouldDequeue
@@ -855,29 +846,30 @@ 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];
 }
 
 - (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;
         }
@@ -889,12 +881,11 @@ CPRunContinuesResponse  = -1002;
    [self endSheet:sheet returnCode:0];
 }
 
-
 - (CPArray)arguments
 {
-    if(_fullArgsString != window.location.hash)
+    if(_fullArgsString !== window.location.hash)
         [self _reloadArguments];
-    
+
     return _args;
 }
 
@@ -904,33 +895,39 @@ 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;
-    var args = _fullArgsString.replace("#", "").split("/").slice(0);
-    
-    for(var i=0, count = args.length; i<count; i++) 
-        args[i] = decodeURIComponent(args[i]);
-    
-    _args = args;
+
+    if (_fullArgsString.length)
+    {
+        var args = _fullArgsString.substring(1).split("/");
+
+        for (var i = 0, count = args.length; i < count; i++)
+            args[i] = decodeURIComponent(args[i]);
+
+        _args = args;
+    }
+    else
+        _args = [];
 }
 
 - (CPDictionary)namedArguments
@@ -952,10 +949,71 @@ CPRunContinuesResponse  = -1002;
     return !![_documentController openDocumentWithContentsOfURL:aURL display:YES error:NULL];
 }
 
+- (void)_willBecomeActive
+{
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPApplicationWillBecomeActiveNotification
+                                                        object:self
+                                                      userInfo:nil];
+}
+
+- (void)_didBecomeActive
+{
+    if (![self keyWindow] && _previousKeyWindow &&
+        [[self windows] indexOfObjectIdenticalTo:_previousKeyWindow] !== CPNotFound)
+        [_previousKeyWindow makeKeyWindow];
+
+    if (![self mainWindow] && _previousMainWindow &&
+        [[self windows] indexOfObjectIdenticalTo:_previousMainWindow] !== CPNotFound)
+        [_previousMainWindow makeMainWindow];
+
+    if ([self keyWindow])
+        [[self keyWindow] orderFront:self];
+    else if ([self mainWindow])
+        [[self mainWindow] makeKeyAndOrderFront:self];
+    else
+        [[self mainMenu]._menuWindow makeKeyWindow]; //FIXME this may not actually work
+
+    _previousKeyWindow = nil;
+    _previousMainWindow = nil;
+
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPApplicationDidBecomeActiveNotification
+                                                        object:self
+                                                      userInfo:nil];
+}
+
+- (void)_willResignActive
+{
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPApplicationWillResignActiveNotification
+                                                        object:self
+                                                      userInfo:nil];
+}
+
 - (void)_didResignActive
 {
     if (self._activeMenu)
         [self._activeMenu cancelTracking];
+
+    if ([self keyWindow])
+    {
+        _previousKeyWindow = [self keyWindow];
+        [_previousKeyWindow resignKeyWindow];
+    }
+
+    if ([self mainWindow])
+    {
+        _previousMainWindow = [self mainWindow];
+        [_previousMainWindow resignMainWindow];
+    }
+
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPApplicationDidResignActiveNotification
+                                                        object:self
+                                                      userInfo:nil];
+}
+
++ (CPString)defaultThemeName
+{
+    // FIXME: don't hardcode
+    return ([[CPBundle mainBundle] objectForInfoDictionaryKey:"CPDefaultTheme"] || @"Aristo");
 }
 
 @end
@@ -976,7 +1034,7 @@ var _CPRunModalLoop = function(anEvent)
 
     var theWindow = [anEvent window],
         modalSession = CPApp._currentSession;
-    
+
     if (theWindow == modalSession._window || [theWindow worksWhenModal])
         [theWindow sendEvent:anEvent];
 }
@@ -990,6 +1048,13 @@ var _CPRunModalLoop = function(anEvent)
 
 function CPApplicationMain(args, namedArgs)
 {
+
+#if PLATFORM(DOM)
+    // hook to allow recorder, etc to manipulate things before starting AppKit
+    if (window.parent !== window && typeof window.parent._childAppIsStarting === "function")
+        window.parent._childAppIsStarting(window);
+#endif
+
     var mainBundle = [CPBundle mainBundle],
         principalClass = [mainBundle principalClass];
 
@@ -998,29 +1063,8 @@ function CPApplicationMain(args, namedArgs)
 
     [principalClass sharedApplication];
 
-    //FIXME?
-    if (!args)
-    {
-        var args = [CPApp arguments];
-
-        if([args containsObject:"debug"])
-            CPLogRegister(CPLogPopup);
-    }
-
-    if (!namedArgs)
-    {
-        var searchParams = window.location.search.substring(1).split("&");
-            namedArgs = [CPDictionary dictionary];
-
-        for(var i=0; i<searchParams.length; i++)
-        {
-            var index = searchParams[i].indexOf('=');
-            if(index == -1)
-                [namedArgs setObject: "" forKey:searchParams[i]];
-            else
-                [namedArgs setObject: searchParams[i].substring(index+1) forKey: searchParams[i].substring(0, index)];
-        }
-    }
+    if ([args containsObject:"debug"])
+        CPLogRegister(CPLogPopup);
 
     CPApp._args = args;
     CPApp._namedArgs = namedArgs;
@@ -1034,7 +1078,7 @@ var _CPAppBootstrapperActions = nil;
 {
 }
 
-+ (void)actions
++ (CPArray)actions
 {
     return [@selector(bootstrapPlatform), @selector(loadDefaultTheme), @selector(loadMainCibFile)];
 }
@@ -1062,16 +1106,16 @@ var _CPAppBootstrapperActions = nil;
 
 + (BOOL)loadDefaultTheme
 {
-    var blend = [[CPThemeBlend alloc] initWithContentsOfURL:[[CPBundle bundleForClass:[CPApplication class]] pathForResource:@"Aristo.blend"]];
+    var blend = [[CPThemeBlend alloc] initWithContentsOfURL:[[CPBundle bundleForClass:[CPApplication class]] pathForResource:[CPApplication defaultThemeName] + ".blend"]];
 
     [blend loadWithDelegate:self];
 
     return YES;
 }
 
-+ (void)blendDidFinishLoading:(CPBundle)aBundle
++ (void)blendDidFinishLoading:(CPThemeBlend)aThemeBlend
 {
-    [CPTheme setDefaultTheme:[CPTheme themeNamed:@"Aristo"]];
+    [CPTheme setDefaultTheme:[CPTheme themeNamed:[CPApplication defaultThemeName]]];
 
     [self performActions];
 }
@@ -1089,15 +1133,83 @@ 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];
 }
 
++ (void)cibDidFailToLoad:(CPCib)aCib
+{
+    throw new Error("Could not load main cib file (Did you forget to nib2cib it?).");
+}
+
 + (void)reset
 {
 	_CPAppBootstrapperActions = nil;

AppKit/CPBrowser.j

@@ -0,0 +1,952 @@
+/*
+ * CPBrowser.j
+ * AppKit
+ *
+ * Created by Ross Boucher.
+ * Copyright 2010, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import "CPControl.j"
+@import "CPImage.j"
+@import "CPTableView.j"
+@import "CPScrollView.j"
+
+/*! 
+    @ingroup appkit
+    @class CPBrowser    
+*/
+
+@implementation CPBrowser : CPControl
+{
+    id              _delegate;
+    CPString        _pathSeparator;
+
+    CPView          _contentView;
+    CPScrollView    _horizontalScrollView;
+    CPView          _prototypeView;
+
+    CPArray         _tableViews;
+    CPArray         _tableDelegates;
+
+    id              _rootItem;
+
+    BOOL            _delegateSupportsImages;
+
+    SEL             _doubleAction @accessors(property=doubleAction);
+
+    BOOL            _allowsMultipleSelection;
+    BOOL            _allowsEmptySelection;
+
+    Class           _tableViewClass @accessors(property=tableViewClass);
+
+    float           _rowHeight;
+    float           _imageWidth;
+    float           _leafWidth;
+    float           _minColumnWidth;
+    float           _defaultColumnWidth @accessors(property=defaultColumnWidth);
+
+    CPArray         _columnWidths;
+}
+
++ (CPImage)branchImage
+{
+    return [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPBrowser class]] 
+                                                    pathForResource:"browser-leaf.png"]
+                                              size:CGSizeMake(9,9)];
+}
+
++ (CPImage)highlightedBranchImage
+{
+    return [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPBrowser class]] 
+                                                    pathForResource:"browser-leaf-highlighted.png"]
+                                              size:CGSizeMake(9,9)];
+}
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    if (self = [super initWithFrame:aFrame])
+    {
+        _rowHeight = 23.0;
+        _defaultColumnWidth = 140.0;
+        _minColumnWidth = 80.0;
+        _imageWidth = 23.0;
+        _leafWidth = 13.0;
+        _columnWidths = [];
+
+        _pathSeparator = "/";
+        _tableViews = [];
+        _tableDelegates = [];
+        _allowsMultipleSelection = YES;
+        _allowsEmptySelection = YES;
+        _tableViewClass = [_CPBrowserTableView class];
+
+        _prototypeView = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
+        [_prototypeView setVerticalAlignment:CPCenterVerticalTextAlignment];
+        [_prototypeView setValue:[CPColor whiteColor] forThemeAttribute:"text-color" inState:CPThemeStateSelected];
+        [_prototypeView setLineBreakMode:CPLineBreakByTruncatingTail];
+
+        _horizontalScrollView = [[CPScrollView alloc] initWithFrame:[self bounds]];
+
+        [_horizontalScrollView setHasVerticalScroller:NO];
+        [_horizontalScrollView setAutohidesScrollers:YES];
+        [_horizontalScrollView setAutoresizingMask:CPViewWidthSizable|CPViewHeightSizable];
+        
+        _contentView = [[CPView alloc] initWithFrame:CGRectMake(0, 0, 0, CGRectGetHeight([self bounds]))];
+        [_contentView setAutoresizingMask:CPViewHeightSizable];
+        
+        [_horizontalScrollView setDocumentView:_contentView];
+
+        [self addSubview:_horizontalScrollView];
+    }
+
+    return self;
+}
+
+- (void)setPrototypeView:(CPView)aPrototypeView
+{
+    _prototypeView = [CPKeyedUnarchiver unarchiveObjectWithData:
+                        [CPKeyedArchiver archivedDataWithRootObject:aPrototypeView]];
+}
+
+- (CPView)prototypeView
+{
+    return [CPKeyedUnarchiver unarchiveObjectWithData:
+            [CPKeyedArchiver archivedDataWithRootObject:_prototypeView]];
+}
+
+- (void)setDelegate:(id)anObject
+{    
+    _delegate = anObject;
+    _delegateSupportsImages = [_delegate respondsToSelector:@selector(browser:imageValueForItem:)];
+
+    [self loadColumnZero];
+}
+
+- (id)delegate
+{
+    return _delegate;
+}
+
+- (CPTableView)tableViewInColumn:(unsigned)index
+{
+    return _tableViews[index];
+}
+
+- (unsigned)columnOfTableView:(CPTableView)aTableView
+{
+    return [_tableViews indexOfObject:aTableView];
+}
+
+- (void)loadColumnZero
+{
+    if ([_delegate respondsToSelector:@selector(rootItemForBrowser:)])
+        _rootItem = [_delegate rootItemForBrowser:self];
+    else
+        _rootItem = nil;
+
+    [self setLastColumn:-1];
+    [self addColumn];
+}
+
+- (void)setLastColumn:(int)columnIndex
+{
+    if (columnIndex >= _tableViews.length)
+        return;
+
+    var oldValue = _tableViews.length - 1;
+
+    // unloads all later columns.
+    var indexPlusOne = columnIndex + 1;
+
+    [[_tableViews.slice(indexPlusOne) valueForKey:"enclosingScrollView"] 
+      makeObjectsPerformSelector:@selector(removeFromSuperview)];
+
+    _tableViews = _tableViews.slice(0, indexPlusOne);
+    _tableDelegates = _tableDelegates.slice(0, indexPlusOne);
+
+    if ([_delegate respondsToSelector:@selector(browser:didChangeLastColumn:toColumn:)])
+        [_delegate browser:self didChangeLastColumn:oldValue toColumn:columnIndex];
+
+    [self tile];
+}
+
+- (int)lastColumn
+{
+    return _tableViews.length - 1;
+}
+
+- (void)addColumn
+{
+    var lastIndex = [self lastColumn],
+        lastColumn = _tableViews[lastIndex],
+        selectionIndexes = [lastColumn selectedRowIndexes];
+
+    if (lastIndex >= 0 && [selectionIndexes count] > 1)
+        [CPException raise:CPInvalidArgumentException 
+                    reason:"Can't add column, column "+lastIndex+" has invalid selection."];
+
+    var index = lastIndex+1,
+        item = index === 0 ? _rootItem : [_tableDelegates[lastIndex] childAtIndex:[selectionIndexes firstIndex]];
+
+    if (index > 0 && item && [self isLeafItem:item])
+        return;
+
+    var table = [[_tableViewClass alloc] initWithFrame:CGRectMakeZero() browser:self];
+
+    [table setHeaderView:nil];
+    [table setCornerView:nil];
+    [table setAllowsMultipleSelection:_allowsMultipleSelection];
+    [table setAllowsEmptySelection:_allowsEmptySelection];
+    [table registerForDraggedTypes:[self registeredDraggedTypes]];
+
+    [self _addTableColumnsToTableView:table forColumnIndex:index];
+
+    var delegate = [[_CPBrowserTableDelegate alloc] init];
+
+    [delegate _setDelegate:_delegate];
+    [delegate _setBrowser:self];
+    [delegate _setIndex:index];
+    [delegate _setItem:item];
+
+    _tableViews[index] = table;
+    _tableDelegates[index] = delegate;
+
+    [table setDelegate:delegate];
+    [table setDataSource:delegate];
+    [table setTarget:delegate];
+    [table setAction:@selector(_tableViewClicked:)];
+    [table setDoubleAction:@selector(_tableViewDoubleClicked:)];
+    [table setDraggingDestinationFeedbackStyle:CPTableViewDraggingDestinationFeedbackStyleRegular];
+    
+    var scrollView = [[_CPBrowserScrollView alloc] initWithFrame:CGRectMakeZero()];
+    [scrollView _setBrowser:self];
+    [scrollView setDocumentView:table];
+    [scrollView setHasHorizontalScroller:NO];
+    [scrollView setAutoresizingMask:CPViewHeightSizable];
+
+    [_contentView addSubview:scrollView];
+
+    [self tile];
+
+    [self scrollColumnToVisible:index];
+}
+
+- (void)_addTableColumnsToTableView:(CPTableView)aTableView forColumnIndex:(unsigned)index
+{
+    if (_delegateSupportsImages)
+    {
+        var column = [[CPTableColumn alloc] initWithIdentifier:@"Image"],
+            view = [[CPImageView alloc] initWithFrame:CGRectMakeZero()];
+
+        [view setImageScaling:CPScaleProportionally];
+
+        [column setDataView:view];
+        [column setResizingMask:CPTableColumnNoResizing];
+
+        [aTableView addTableColumn:column];
+    }
+
+    var column = [[CPTableColumn alloc] initWithIdentifier:@"Content"];
+
+    [column setDataView:_prototypeView];
+    [column setResizingMask:CPTableColumnNoResizing];
+
+    [aTableView addTableColumn:column];
+
+    var column = [[CPTableColumn alloc] initWithIdentifier:@"Leaf"],
+        view = [[_CPBrowserLeafView alloc] initWithFrame:CGRectMakeZero()];
+
+    [view setBranchImage:[[self class] branchImage]];
+    [view setHighlightedBranchImage:[[self class] highlightedBranchImage]];
+    
+    [column setDataView:view];
+    [column setResizingMask:CPTableColumnNoResizing];
+    
+    [aTableView addTableColumn:column];
+}
+
+- (void)reloadColumn:(int)column
+{
+    [[self tableViewInColumn:column] reloadData];
+}
+
+- (void)tile
+{
+    var xOrigin = 0,
+        scrollerWidth = [CPScroller scrollerWidth],
+        height = CGRectGetHeight([_contentView bounds]);
+
+    for (var i = 0, count = _tableViews.length; i < count; i++)
+    {
+        var tableView = _tableViews[i],
+            scrollView = [tableView enclosingScrollView],
+            width = [self widthOfColumn:i],
+            tableHeight = CGRectGetHeight([tableView bounds]);
+
+        [[tableView tableColumnWithIdentifier:"Image"] setWidth:_imageWidth];
+        [[tableView tableColumnWithIdentifier:"Content"] setWidth:width - (_leafWidth + _delegateSupportsImages ? _imageWidth : 0) - scrollerWidth - scrollerWidth];
+        [[tableView tableColumnWithIdentifier:"Leaf"] setWidth:_leafWidth];
+
+        [tableView setRowHeight:_rowHeight];
+        [tableView setFrameSize:CGSizeMake(width - scrollerWidth, tableHeight)];
+        [scrollView setFrameOrigin:CGPointMake(xOrigin, 0)];
+        [scrollView setFrameSize:CGSizeMake(width, height)];
+
+        xOrigin += width;
+    }
+
+    [_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
+{
+    return [_tableDelegates[column] childAtIndex:row];
+}
+
+- (BOOL)isLeafItem:(id)item
+{
+    return [_delegate respondsToSelector:@selector(browser:isLeafItem:)] && [_delegate browser:self isLeafItem:item];
+}
+
+- (id)parentForItemsInColumn:(int)column
+{
+    return [_tableDelegates[column] _item];
+}
+
+- (CPSet)selectedItems
+{
+    var selectedColumn = [self selectedColumn],
+        selectedIndexes = [self selectedRowIndexesInColumn:selectedColumn],
+        set = [CPSet set],
+        index = [selectedIndexes firstIndex];
+
+    while (index !== CPNotFound)
+    {
+        [set addObject:[self itemAtRow:index inColumn:selectedColumn]];
+        index = [selectedIndexes indexGreaterThanIndex:index];
+    }
+
+    return set;
+}
+
+- (id)selectedItem
+{
+    var selectedColumn = [self selectedColumn],
+        selectedRow = [self selectedRowInColumn:selectedColumn];
+
+    return [self itemAtRow:selectedRow inColumn:selectedColumn];
+}
+
+// CLICK EVENTS
+
+- (void)trackMouse:(CPEvent)anEvent
+{
+}
+
+- (void)_column:(unsigned)columnIndex clickedRow:(unsigned)rowIndex
+{
+    [self setLastColumn:columnIndex];
+
+    if (rowIndex >= 0)
+        [self addColumn];
+
+    [self doClick:self];
+}
+
+- (void)sendAction
+{
+    [self sendAction:_action to:_target];
+}
+
+- (void)doClick:(id)sender
+{
+    [self sendAction:_action to:_target];
+}
+
+- (void)doDoubleClick:(id)sender
+{
+    [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
+{
+    return aWidth - (_leafWidth + _delegateSupportsImages ? _imageWidth : 0) - [CPScroller scrollerWidth];
+}
+
+- (float)columnWidthForColumnContentWidth:(float)aWidth
+{
+    return aWidth + (_leafWidth + _delegateSupportsImages ? _imageWidth : 0) + [CPScroller scrollerWidth];
+}
+
+- (void)setImageWidth:(float)aWidth
+{
+    _imageWidth = aWidth;
+    [self tile];
+}
+
+- (float)imageWidth
+{
+    return _imageWidth;
+}
+
+- (void)setMinColumnWidth:(float)minWidth
+{
+    _minColumnWidth = minWidth;
+    [self tile];
+}
+
+- (float)minColumnWidth
+{
+    return _minColumnWidth;
+}
+
+- (void)setWidth:(float)aWidth ofColumn:(unsigned)column
+{
+    _columnWidths[column] = aWidth;
+
+    if ([_delegate respondsToSelector:@selector(browser:didResizeColumn:)])
+        [_delegate browser:self didResizeColumn:column];
+
+    [self tile];
+}
+
+- (float)widthOfColumn:(unsigned)column
+{
+    var width = _columnWidths[column];
+
+    if (width == null)
+        width = _defaultColumnWidth;
+
+    return MAX([CPScroller scrollerWidth], MAX(_minColumnWidth, width));
+}
+
+- (void)setRowHeight:(float)aHeight
+{
+    _rowHeight = aHeight;
+}
+
+- (float)rowHeight
+{
+    return _rowHeight;
+}
+
+// SCROLLERS
+
+- (void)scrollColumnToVisible:(unsigned)columnIndex
+{
+    [_contentView scrollRectToVisible:[[[self tableViewInColumn:columnIndex] enclosingScrollView] frame]];
+}
+
+– (void)scrollRowToVisible:(unsigned)rowIndex inColumn:(unsigned)columnIndex
+{
+    [self scrollColumnToVisible:columnIndex];
+    [[self tableViewInColumn:columnIndex] scrollRowToVisible:rowIndex];
+}
+
+- (BOOL)autohidesScroller
+{
+    return [_horizontalScrollView autohidesScrollers];
+}
+
+- (void)setAutohidesScroller:(BOOL)shouldHide
+{
+    [_horizontalScrollView setAutohidesScrollers:shouldHide];
+}
+
+// SELECTION
+
+- (unsigned)selectedRowInColumn:(unsigned)columnIndex
+{
+    if (columnIndex > [self lastColumn] || columnIndex < 0)
+        return -1;
+
+    return [_tableViews[columnIndex] selectedRow];
+}
+
+- (unsigned)selectedColumn
+{
+    var column = [self lastColumn],
+        row = [self selectedRowInColumn:column];
+
+    if (row >= 0)
+        return column;
+    else
+        return column - 1;
+}
+
+- (void)selectRow:(unsigned)row inColumn:(unsigned)column
+{
+    var selectedIndexes = row === -1 ? [CPIndexSet indexSet] : [CPIndexSet indexSetWithIndex:row];
+    [self selectRowIndexes:selectedIndexes inColumn:column];
+}
+
+- (BOOL)allowsMultipleSelection
+{
+    return _allowsMultipleSelection;
+}
+
+- (void)setAllowsMultipleSelection:(BOOL)shouldAllow
+{
+    if (_allowsMultipleSelection === shouldAllow)
+        return;
+
+    _allowsMultipleSelection = shouldAllow;
+    [_tableViews makeObjectsPerformSelector:@selector(setAllowsMultipleSelection:) withObject:shouldAllow];
+}
+
+- (BOOL)allowsEmptySelection
+{
+    return _allowsEmptySelection;
+}
+
+- (void)setAllowsEmptySelection:(BOOL)shouldAllow
+{
+    if (_allowsEmptySelection === shouldAllow)
+        return;
+
+    _allowsEmptySelection = shouldAllow;
+    [_tableViews makeObjectsPerformSelector:@selector(setAllowsEmptySelection:) withObject:shouldAllow];
+}
+
+- (CPIndexSet)selectedRowIndexesInColumn:(unsigned)column
+{
+    if (column < 0 || column > [self lastColumn] +1)
+        return [CPIndexSet indexSet];
+
+    return [[self tableViewInColumn:column] selectedRowIndexes];
+}
+
+- (void)selectRowIndexes:(CPIndexSet)indexSet inColumn:(unsigned)column
+{
+    if (column < 0 || column > [self lastColumn] + 1)
+        return;
+
+    if ([_delegate respondsToSelector:@selector(browser:selectionIndexesForProposedSelection:inColumn:)])
+        indexSet = [_delegate browser:self selectionIndexesForProposedSelection:indexSet inColumn:column];
+
+    if ([_delegate respondsToSelector:@selector(browser:shouldSelectRowIndexes:inColumn:)] && 
+       ![_delegate browser:self shouldSelectRowIndexes:indexSet inColumn:column])
+        return;
+
+    if ([_delegate respondsToSelector:@selector(browserSelectionIsChanging:)])
+        [_delegate browserSelectionIsChanging:self];
+
+    if (column > [self lastColumn])
+        [self addColumn];
+
+    [self setLastColumn:column];
+
+    [[self tableViewInColumn:column] selectRowIndexes:indexSet byExtendingSelection:NO];
+
+    [self scrollColumnToVisible:column];
+
+    if ([_delegate respondsToSelector:@selector(browserSelectionDidChange:)])
+        [_delegate browserSelectionDidChange:self];
+}
+
+- (void)setBackgroundColor:(CPColor)aColor
+{
+    [super setBackgroundColor:aColor];
+    [_contentView setBackgroundColor:aColor];
+}
+
+- (BOOL)acceptsFirstResponder
+{
+    return YES;
+}
+
+// DRAG AND DROP
+
+- (void)registerForDraggedTypes:(CPArray)types
+{
+    [super registerForDraggedTypes:types];
+    [_tableViews makeObjectsPerformSelector:@selector(registerForDraggedTypes:) withObject:types];
+}
+
+- (BOOL)canDragRowsWithIndexes:(CPIndexSet)rowIndexes inColumn:(int)columnIndex withEvent:(CPEvent)dragEvent
+{
+    if ([_delegate respondsToSelector:@selector(browser:canDragRowsWithIndexes:inColumn:withEvent:)])
+        return [_delegate browser:self canDragRowsWithIndexes:rowIndexes inColumn:columnIndex withEvent:dragEvent];
+
+    return YES;
+}
+
+- (CPImage)draggingImageForRowsWithIndexes:(CPIndexSet)rowIndexes inColumn:(int)columnIndex withEvent:(CPEvent)dragEvent offset:(CGPoint)dragImageOffset
+{
+    if ([_delegate respondsToSelector:@selector(browser:draggingImageForRowsWithIndexes:inColumn:withEvent:offset:)])
+        return [_delegate browser:self draggingImageForRowsWithIndexes:rowIndexes inColumn:columnIndex withEvent:dragEvent offset:dragImageOffset];
+
+    return nil;
+}
+
+- (CPView)draggingViewForRowsWithIndexes:(CPIndexSet)rowIndexes inColumn:(int)columnIndex withEvent:(CPEvent)dragEvent offset:(CGPoint)dragImageOffset
+{
+    if ([_delegate respondsToSelector:@selector(browser:draggingViewForRowsWithIndexes:inColumn:withEvent:offset:)])
+        return [_delegate browser:self draggingViewForRowsWithIndexes:rowIndexes inColumn:columnIndex withEvent:dragEvent offset:dragImageOffset];
+
+    return nil;
+}
+
+@end
+
+var _CPBrowserResizeControlBackgroundImage = nil;
+
+@implementation _CPBrowserResizeControl : CPView
+{
+    CGPoint     _mouseDownX;
+    CPBrowser   _browser;
+    unsigned    _index;
+    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;
+    _browser = [[self superview] _browser];
+    _index = [_browser columnOfTableView:[[self superview] documentView]];
+    _width = [_browser widthOfColumn:_index];
+}
+
+- (void)mouseDragged:(CPEvent)anEvent
+{
+    var deltaX = [anEvent locationInWindow].x - _mouseDownX;
+    [_browser setWidth:_width + deltaX ofColumn:_index];
+}
+
+- (void)mouseUp:(CPEvent)anEvent
+{
+}
+
+@end
+
+@implementation _CPBrowserScrollView : CPScrollView
+{
+    _CPBrowserResizeControl  _resizeControl;
+    CPBrowser                _browser @accessors;
+}
+
+- (void)initWithFrame:(CGRect)aFrame
+{
+    if (self = [super initWithFrame:aFrame])
+    {
+        _resizeControl = [[_CPBrowserResizeControl alloc] initWithFrame:CGRectMakeZero()];
+        [self addSubview:_resizeControl];
+    }
+
+    return self;
+}
+
+- (void)reflectScrolledClipView:(CPClipView)aClipView
+{
+    [super reflectScrolledClipView:aClipView];
+
+    var frame = [_verticalScroller frame];
+    frame.size.height = CGRectGetHeight([self bounds]) - 14.0 - frame.origin.y;
+    [_verticalScroller setFrameSize:frame.size];
+
+    var resizeFrame = CGRectMake(CGRectGetMinX(frame), CGRectGetMaxY(frame), [CPScroller scrollerWidth], 14.0);
+    [_resizeControl setFrame:resizeFrame];
+}
+
+@end
+
+@implementation _CPBrowserTableView : CPTableView
+{
+    CPBrowser   _browser;
+}
+
+- (id)initWithFrame:(CGRect)aFrame browser:(CPBrowser)aBrowser
+{
+    if (self = [super initWithFrame:aFrame])
+        _browser = aBrowser;
+
+    return self;
+}
+
+- (BOOL)acceptsFirstResponder
+{
+    return NO;
+}
+
+- (void)mouseDown:(CPEvent)anEvent
+{
+    [super mouseDown:anEvent];
+    [[self window] makeFirstResponder:_browser];
+}
+
+- (CPView)browserView
+{
+    return _browser;
+}
+
+- (BOOL)canDragRowsWithIndexes:(CPIndexSet)rowIndexes atPoint:(CGPoint)mouseDownPoint
+{
+    return [_browser canDragRowsWithIndexes:rowIndexes inColumn:[_browser columnOfTableView:self] withEvent:[CPApp currentEvent]];
+}
+
+- (CPImage)dragImageForRowsWithIndexes:(CPIndexSet)dragRows tableColumns:(CPArray)theTableColumns event:(CPEvent)dragEvent offset:(CPPointPointer)dragImageOffset
+{
+    return [_browser draggingImageForRowsWithIndexes:dragRows inColumn:[_browser columnOfTableView:self] withEvent:dragEvent offset:dragImageOffset] ||
+           [super dragImageForRowsWithIndexes:dragRows tableColumns:theTableColumns event:dragEvent offset:dragImageOffset];
+}
+
+- (CPView)dragViewForRowsWithIndexes:(CPIndexSet)dragRows tableColumns:(CPArray)theTableColumns event:(CPEvent)dragEvent offset:(CPPoint)dragViewOffset
+{
+    var count = theTableColumns.length;
+    while (count--)
+    {
+        if ([theTableColumns[count] identifier] === "Leaf")
+            [theTableColumns removeObject:theTableColumns[count]];
+    }
+
+    return [_browser draggingViewForRowsWithIndexes:dragRows inColumn:[_browser columnOfTableView:self] withEvent:dragEvent offset:dragViewOffset] ||
+           [super dragViewForRowsWithIndexes:dragRows tableColumns:theTableColumns event:dragEvent offset:dragViewOffset];
+}
+
+- (void)moveUp:(id)sender
+{
+    [super moveUp:sender];
+    [_browser selectRow:[self selectedRow] inColumn:[_browser selectedColumn]];
+}
+
+- (void)moveDown:(id)sender
+{
+    [super moveDown:sender];
+    [_browser selectRow:[self selectedRow] inColumn:[_browser selectedColumn]];
+}
+
+- (void)moveLeft:(id)sender
+{    
+    var previousColumn = [_browser selectedColumn] - 1,
+        selectedRow = [_browser selectedRowInColumn:previousColumn];
+
+    [_browser selectRow:selectedRow inColumn:previousColumn];
+}
+
+- (void)moveRight:(id)sender
+{    
+    [_browser selectRow:0 inColumn:[_browser selectedColumn] + 1];
+}
+
+@end
+
+@implementation _CPBrowserTableDelegate : CPObject
+{
+    CPBrowser   _browser @accessors;
+    unsigned    _index @accessors;
+    id          _delegate @accessors;
+    id          _item @accessors;
+}
+
+- (unsigned)numberOfRowsInTableView:(CPTableView)aTableView
+{
+    return [_delegate browser:_browser numberOfChildrenOfItem:_item];
+}
+
+- (void)tableView:(CPTableView)aTableView objectValueForTableColumn:(CPTableColumn)column row:(unsigned)row
+{
+    if ([column identifier] === "Image")
+        return [_delegate browser:_browser imageValueForItem:[self childAtIndex:row]];
+    else if ([column identifier] === "Leaf")
+        return ![_browser isLeafItem:[self childAtIndex:row]];
+    else
+        return [_delegate browser:_browser objectValueForItem:[self childAtIndex:row]];
+}
+
+- (void)_tableViewDoubleClicked:(CPTableView)aTableView
+{
+    [_browser doDoubleClick:self];
+}
+
+- (void)_tableViewClicked:(CPTableView)aTableView
+{
+    var selectedIndexes = [aTableView selectedRowIndexes];
+    [_browser _column:_index clickedRow:[selectedIndexes count] === 1 ? [selectedIndexes firstIndex] : -1];
+}
+
+- (id)childAtIndex:(unsigned)index
+{
+    return [_delegate browser:_browser child:index ofItem:_item];
+}
+
+- (BOOL)tableView:(CPTableView)aTableView acceptDrop:(id)info row:(int)row dropOperation:(CPTableViewDropOperation)operation
+{
+    if ([_delegate respondsToSelector:@selector(browser:acceptDrop:atRow:column:dropOperation:)])
+        return [_delegate browser:_browser acceptDrop:info atRow:row column:_index dropOperation:operation];
+    else
+        return NO;
+}
+
+- (CPDragOperation)tableView:(CPTableView)aTableView validateDrop:(id)info proposedRow:(int)row proposedDropOperation:(CPTableViewDropOperation)operation
+{
+    if ([_delegate respondsToSelector:@selector(browser:validateDrop:proposedRow:column:dropOperation:)])
+        [_delegate browser:_browser validateDrop:info proposedRow:row column:_index dropOperation:operation];
+    else
+        return CPDragOperationNone;
+}
+
+- (BOOL)tableView:(CPTableView)aTableView writeRowsWithIndexes:(CPIndexSet)rowIndexes toPasteboard:(CPPasteboard)pboard
+{
+    if ([_delegate respondsToSelector:@selector(browser:writeRowsWithIndexes:inColumn:toPasteboard:)])
+        return [_delegate browser:_browser writeRowsWithIndexes:rowIndexes inColumn:_index toPasteboard:pboard];
+    else
+        return NO;
+}
+
+- (BOOL)respondsToSelector:(SEL)aSelector
+{
+    if (aSelector === @selector(browser:writeRowsWithIndexes:inColumn:toPasteboard:))
+        return [_delegate respondsToSelector:@selector(browser:writeRowsWithIndexes:inColumn:toPasteboard:)];
+    else
+        return [super respondsToSelector:aSelector];
+}
+
+@end
+
+@implementation _CPBrowserLeafView : CPView
+{
+    BOOL        _isLeaf @accessors(readonly, property=isLeaf);
+    CPImage     _branchImage @accessors(property=branchImage);
+    CPImage     _highlightedBranchImage @accessors(property=highlightedBranchImage);
+}
+
+- (BOOL)objectValue
+{
+    return _isLeaf;
+}
+
+- (void)setObjectValue:(id)aValue
+{
+    _isLeaf = !!aValue;
+    [self setNeedsLayout];
+}
+
+- (CGRect)rectForEphemeralSubviewNamed:(CPString)aName
+{
+    if (aName === "image-view")
+        return CGRectInset([self bounds], 1, 1);
+
+    return [super rectForEphemeralSubviewNamed:aName];
+}
+
+- (CPView)createEphemeralSubviewNamed:(CPString)aName
+{
+    if (aName === "image-view")
+        return [[CPImageView alloc] initWithFrame:CGRectMakeZero()];
+
+    return [super createEphemeralSubviewNamed:aName];
+}
+
+- (void)layoutSubviews
+{
+    var imageView = [self layoutEphemeralSubviewNamed:@"image-view"
+                                           positioned:CPWindowAbove
+                      relativeToEphemeralSubviewNamed:nil];
+
+    var isHighlighted = [self themeState] & CPThemeStateSelected;
+    [imageView setImage: _isLeaf ? (isHighlighted ? _highlightedBranchImage : _branchImage) : nil];
+    [imageView setImageScaling:CPScaleNone];
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [super encodeWithCoder:aCoder];
+
+    [aCoder encodeBool:_isLeaf forKey:"_CPBrowserLeafViewIsLeafKey"];
+    [aCoder encodeObject:_branchImage forKey:"_CPBrowserLeafViewBranchImageKey"];
+    [aCoder encodeObject:_highlightedBranchImage forKey:"_CPBrowserLeafViewHighlightedBranchImageKey"];
+}
+
+- (void)initWithCoder:(CPCoder)aCoder
+{
+    if (self = [super initWithCoder:aCoder])
+    {
+        _isLeaf = [aCoder decodeBoolForKey:"_CPBrowserLeafViewIsLeafKey"];
+        _branchImage = [aCoder decodeObjectForKey:"_CPBrowserLeafViewBranchImageKey"];
+        _highlightedBranchImage = [aCoder decodeObjectForKey:"_CPBrowserLeafViewHighlightedBranchImageKey"];
+    }
+
+    return self;
+}
+
+@end

AppKit/CPButton.j

@@ -24,32 +24,11 @@
 @import "CGGeometry.j"
 
 @import "CPControl.j"
+@import "CPStringDrawing.j"
 
 #include "CoreGraphics/CGGeometry.h"
 
 
-CPScaleProportionally   = 0;
-CPScaleToFit            = 1;
-CPScaleNone             = 2;
-
-
-/* @group CPCellImagePosition */
-
-CPNoImage       = 0;
-CPImageOnly     = 1;
-CPImageLeft     = 2;
-CPImageRight    = 3;
-CPImageBelow    = 4;
-CPImageAbove    = 5;
-CPImageOverlaps = 6;
-
-
-/*  @group CPButtonState */
-
-CPOnState                       = 1;
-CPOffState                      = 0;
-CPMixedState                    = -1;
-
 /* @group CPBezelStyle */
 
 CPRoundedBezelStyle             = 1;
@@ -145,7 +124,7 @@ CPButtonStateMixed  = CPThemeState("mixed");
 
 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[_CGInsetMakeZero(), _CGInsetMakeZero(), nil]
+    return [CPDictionary dictionaryWithObjects:[_CGInsetMakeZero(), _CGInsetMakeZero(), [CPNull null]]
                                        forKeys:[@"bezel-inset", @"content-inset", @"bezel-color"]];
 }
 
@@ -460,7 +439,7 @@ CPButtonStateMixed  = CPThemeState("mixed");
     return bounds;
 }
 
-- (CGRect)bezelRectForBounds:(CFRect)bounds
+- (CGRect)bezelRectForBounds:(CGRect)bounds
 {
     if (![self isBordered])
         return _CGRectMakeZero();
@@ -523,8 +502,6 @@ CPButtonStateMixed  = CPThemeState("mixed");
     }
     else
         return [[_CPImageAndTextView alloc] initWithFrame:_CGRectMakeZero()];
-
-    return [super createEphemeralSubviewNamed:aName];
 }
 
 - (void)layoutSubviews
@@ -532,9 +509,8 @@ CPButtonStateMixed  = CPThemeState("mixed");
     var bezelView = [self layoutEphemeralSubviewNamed:@"bezel-view"
                                            positioned:CPWindowBelow
                       relativeToEphemeralSubviewNamed:@"content-view"];
-      
-    if (bezelView)
-        [bezelView setBackgroundColor:[self currentValueForThemeAttribute:@"bezel-color"]];
+
+    [bezelView setBackgroundColor:[self currentValueForThemeAttribute:@"bezel-color"]];
 
     var contentView = [self layoutEphemeralSubviewNamed:@"content-view"
                                              positioned:CPWindowAbove
@@ -554,6 +530,7 @@ CPButtonStateMixed  = CPThemeState("mixed");
         [contentView setTextShadowOffset:[self currentValueForThemeAttribute:@"text-shadow-offset"]];
         [contentView setImagePosition:[self currentValueForThemeAttribute:@"image-position"]];
         [contentView setImageScaling:[self currentValueForThemeAttribute:@"image-scaling"]];
+        [contentView setDimsImage:[self hasThemeState:CPThemeStateDisabled] && _imageDimsWhenDisabled];
     }
 }
 

AppKit/CPButtonBar.j

@@ -4,8 +4,50 @@
 #include "CoreGraphics/CGGeometry.h"
 
 
-@implementation CPButtonBar : CPControl
+@implementation CPButtonBar : CPView
 {
+    BOOL    _hasResizeControl;
+    BOOL    _resizeControlIsLeftAligned;
+    CPArray _buttons;
+}
+
++ (id)plusButton
+{
+    var button = [[CPButton alloc] initWithFrame:CGRectMake(0, 0, 35, 25)],
+        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];
+
+    return button;
+}
+
++ (id)minusButton
+{
+    var button = [[CPButton alloc] initWithFrame:CGRectMake(0, 0, 35, 25)],
+        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
@@ -15,47 +57,223 @@
 
 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[nil]
-                                       forKeys:[@"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
+{
+    self = [super initWithFrame:aFrame];
+
+    if (self)
+    {
+        _buttons = [];
+        [self setNeedsLayout];
+    }
+
+    return self;
+}
+
+- (void)awakeFromCib
+{
+    var view = [self superview],
+        subview = self;
+
+    while (view)
+    {
+        if ([view isKindOfClass:[CPSplitView class]])
+        {
+            var viewIndex = [[view subviews] indexOfObject:subview];
+            [view setButtonBar:self forDividerAtIndex:viewIndex];
+
+            break;
+        }
+
+        subview = view;
+        view = [view superview];
+    }
+}
+
+- (void)setButtons:(CPArray)buttons
+{
+    _buttons = [CPArray arrayWithArray:buttons];
+
+    for (var i = 0, count = [_buttons count]; i < count; i++)
+        [_buttons[i] setBordered:YES];
+
+    [self setNeedsLayout];
+}
+
+- (CPArray)buttons
+{
+    return [CPArray arrayWithArray:_buttons];
+}
+
+- (void)setHasResizeControl:(BOOL)shouldHaveResizeControl
+{
+    if (_hasResizeControl === shouldHaveResizeControl)
+        return;
+
+    _hasResizeControl = !!shouldHaveResizeControl;
+    [self setNeedsLayout];
+}
+
+- (BOOL)hasResizeControl
+{
+    return _hasResizeControl;
+}
+
+- (void)setResizeControlIsLeftAligned:(BOOL)shouldBeLeftAligned
+{
+    if (_resizeControlIsLeftAligned === shouldBeLeftAligned)
+        return;
+
+    _resizeControlIsLeftAligned = !!shouldBeLeftAligned;
+    [self setNeedsLayout];
+}
+
+- (BOOL)resizeControlIsLeftAligned
+{
+    return _resizeControlIsLeftAligned;
+}
+
+- (CGRect)resizeControlFrame
+{
+    var inset = [self currentValueForThemeAttribute:@"resize-control-inset"],
+        size = [self currentValueForThemeAttribute:@"resize-control-size"],
+        currentSize = [self bounds],
+        leftOrigin = _resizeControlIsLeftAligned ? 0 : currentSize.size.width - size.width - inset.right - inset.left;
+
+    return CGRectMake(leftOrigin, 0, size.width + inset.left + inset.right, size.height + inset.top + inset.bottom);
 }
 
 - (CGRect)rectForEphemeralSubviewNamed:(CPString)aName
 {
-    if (aName === "bezel-view")
-        return [self bounds];
-    
+    if (aName === "resize-control-view")
+    {
+        var inset = [self currentValueForThemeAttribute:@"resize-control-inset"],
+            size = [self currentValueForThemeAttribute:@"resize-control-size"],
+            currentSize = [self bounds];
+
+        if (_resizeControlIsLeftAligned)
+            return CGRectMake(inset.left, inset.top, size.width, size.height);
+        else
+            return CGRectMake(currentSize.size.width - size.width - inset.right, inset.top, size.width, size.height);
+    }
+
     return [super rectForEphemeralSubviewNamed:aName];
 }
 
 - (CPView)createEphemeralSubviewNamed:(CPString)aName
 {
-    if (aName === "bezel-view")
-    {
-        var view = [[CPView alloc] initWithFrame:_CGRectMakeZero()];
+    if (aName === "resize-control-view")
+        return [[CPView alloc] initWithFrame:CGRectMakeZero()];
 
-        [view setHitTests:NO];
-        
-        return view;
-    }
-    
     return [super createEphemeralSubviewNamed:aName];
 }
 
 - (void)layoutSubviews
 {
-    var bezelView = [self layoutEphemeralSubviewNamed:@"bezel-view"
-                                           positioned:CPWindowBelow
-                      relativeToEphemeralSubviewNamed:@""];
-      
-    if (bezelView)
-        [bezelView setBackgroundColor:[self currentValueForThemeAttribute:@"bezel-color"]];
+    [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];
+
+    while (count--)
+        if ([buttonsNotHidden[count] isHidden])
+            [buttonsNotHidden removeObject:buttonsNotHidden[count]];
+
+    var currentButtonOffset = _resizeControlIsLeftAligned ? CGRectGetMaxX([self bounds]) + 1 : -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)];
+            currentButtonOffset -= width - 1;
+        }
+        else
+        {
+            [button setFrame:CGRectMake(currentButtonOffset, 1, width, height)];
+            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];
+    }
+
+    if (_hasResizeControl)
+    {
+        var resizeControlView = [self layoutEphemeralSubviewNamed:@"resize-control-view"
+                                                       positioned:CPWindowAbove
+                                  relativeToEphemeralSubviewNamed:nil];
+
+        [resizeControlView setAutoresizingMask: _resizeControlIsLeftAligned ? CPViewMaxXMargin : CPViewMinXMargin];
+        [resizeControlView setBackgroundColor:[self currentValueForThemeAttribute:@"resize-control-color"]];
+    }
 }
 
-- (void)addSubview:(CPView)aSubview
+- (void)setFrameSize:(CGSize)aSize
 {
-    [super addSubview:aSubview];
-
-    [aSubview setAutoresizingMask:CPViewMinXMargin];
+    [super setFrameSize:aSize];
+    [self setNeedsLayout];
+}
+
+@end
+
+var CPButtonBarHasResizeControlKey = @"CPButtonBarHasResizeControlKey",
+    CPButtonBarResizeControlIsLeftAlignedKey = @"CPButtonBarResizeControlIsLeftAlignedKey",
+    CPButtonBarButtonsKey = @"CPButtonBarButtonsKey";
+
+@implementation CPButtonBar (CPCoding)
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [super encodeWithCoder:aCoder];
+
+    [aCoder encodeBool:_hasResizeControl forKey:CPButtonBarHasResizeControlKey];
+    [aCoder encodeBool:_resizeControlIsLeftAligned forKey:CPButtonBarResizeControlIsLeftAlignedKey];
+    [aCoder encodeObject:_buttons forKey:CPButtonBarButtonsKey];
+}
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    if (self = [super initWithCoder:aCoder])
+    {
+        _buttons = [aCoder decodeObjectForKey:CPButtonBarButtonsKey] || [];
+        _hasResizeControl = [aCoder decodeBoolForKey:CPButtonBarHasResizeControlKey];
+        _resizeControlIsLeftAligned = [aCoder decodeBoolForKey:CPButtonBarResizeControlIsLeftAlignedKey];
+    }
+
+    return self;
 }
 
 @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

@@ -120,9 +120,13 @@
         
     [super setBoundsOrigin:aPoint];
 
-    var superview = [self superview];
-    
-    if([superview isKindOfClass:[CPScrollView class]])
+    var superview = [self superview],
+
+        // This is hack to avoid having to import CPScrollView.
+        // FIXME: Should CPScrollView be finding out about this on its own somehow?
+        scrollViewClass = objj_getClass("CPScrollView");
+
+    if([superview isKindOfClass:scrollViewClass])
         [superview reflectScrolledClipView:self];
 }
 
@@ -173,26 +177,52 @@
         return;
 
     // ... and we're in a scroll view of course.
-    var superview = [self superview];
-        
-    if ([superview isKindOfClass:[CPScrollView class]])
+    var superview = [self superview],
+
+        // This is hack to avoid having to import CPScrollView.
+        // FIXME: Should CPScrollView be finding out about this on its own somehow?
+        scrollViewClass = objj_getClass("CPScrollView");
+
+    if ([superview isKindOfClass:scrollViewClass])
         [superview reflectScrolledClipView:self];
 }
 
 - (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,16 +326,18 @@
 
 /* @ignore */
 - (void)reloadContent
-{   
+{
     // Remove current views
     var count = _items.length;
-    
+
     while (count--)
     {
         [[_items[count] view] removeFromSuperview];
+        [_items[count] setSelected:NO];
+
         _cachedItems.push(_items[count]);
     }
-    
+
     _items = [];
 
     if (!_itemPrototype || !_content)
@@ -348,10 +350,14 @@
     for (; index < count; ++index)
     {
         _items.push([self newItemForRepresentedObject:_content[index]]);
-    
+
         [self addSubview:[_items[index] view]];
     }
-    
+
+    index = CPNotFound;
+    while ((index = [_selectionIndexes indexGreaterThanIndex:index]) != CPNotFound)
+        [_items[index] setSelected:YES];
+
     [self tile];
 }
 
@@ -359,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)
@@ -409,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;
 }
 
@@ -439,9 +454,9 @@
 {
     if (_maxNumberOfRows == aMaxNumberOfRows)
         return;
-    
+
     _maxNumberOfRows = aMaxNumberOfRows;
-    
+
     [self tile];
 }
 
@@ -461,9 +476,9 @@
 {
     if (_maxNumberOfColumns == aMaxNumberOfColumns)
         return;
-    
+
     _maxNumberOfColumns = aMaxNumberOfColumns;
-    
+
     [self tile];
 }
 
@@ -500,9 +515,9 @@
 {
     if (CGSizeEqualToSize(_minItemSize, aSize))
         return;
-    
+
     _minItemSize = CGSizeMakeCopy(aSize);
-    
+
     [self tile];
 }
 
@@ -522,9 +537,9 @@
 {
     if (CGSizeEqualToSize(_maxItemSize, aSize))
         return;
-    
+
     _maxItemSize = CGSizeMakeCopy(aSize);
-    
+
     [self tile];
 }
 
@@ -584,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;
 
@@ -591,6 +614,10 @@
     if (![_selectionIndexes count])
         return;
 
+    if ([_delegate respondsToSelector:@selector(collectionView:canDragItemsAtIndexes:withEvent:)] &&
+        ![_delegate collectionView:self canDragItemsAtIndexes:_selectionIndexes withEvent:_mouseDownEvent])
+        return;
+
     // Set up the pasteboard
     var dragTypes = [_delegate collectionView:self dragTypesForItemsAtIndexes:_selectionIndexes];
 
@@ -638,9 +665,9 @@
 {
     if (_verticalMargin == aVerticalMargin)
         return;
-    
+
     _verticalMargin = aVerticalMargin;
-    
+
     [self tile];
 }
 
@@ -670,6 +697,124 @@
     return _delegate;
 }
 
+- (CPCollectionViewItem)itemAtIndex:(unsigned)anIndex
+{
+    return [_items objectAtIndex:anIndex];
+}
+
+- (CGRect)frameForItemAtIndex:(unsigned)anIndex
+{
+    return [[[self itemAtIndex:anIndex] view] frame];
+}
+
+- (CGRect)frameForItemsAtIndexes:(CPIndexSet)anIndexSet
+{
+    var indexArray = [],
+        frame = CGRectNull;
+
+    [anIndexSet getIndexes:indexArray maxCount:-1 inIndexRange:nil];
+
+    var index = 0,
+        count = [indexArray count];
+
+    for (; index < count; ++index)
+        frame = CGRectUnion(frame, [self frameForItemAtIndex:indexArray[index]]);
+
+    return frame;
+}
+
+@end
+
+@implementation CPCollectionView (KeyboardInteraction)
+
+- (void)_scrollToSelection
+{
+    var frame = [self frameForItemsAtIndexes:[self selectionIndexes]];
+
+    if (!CGRectIsNull(frame))
+        [self scrollRectToVisible:frame];
+}
+
+- (void)moveLeft:(id)sender
+{
+    var index = [[self selectionIndexes] firstIndex];
+    if (index === CPNotFound)
+        index = [[self items] count];
+
+    index = MAX(index - 1, 0);
+
+    [self setSelectionIndexes:[CPIndexSet indexSetWithIndex:index]];
+    [self _scrollToSelection];
+}
+
+- (void)moveRight:(id)sender
+{
+    var index = MIN([[self selectionIndexes] firstIndex] + 1, [[self items] count]-1);
+
+    [self setSelectionIndexes:[CPIndexSet indexSetWithIndex:index]];
+    [self _scrollToSelection];
+}
+
+- (void)moveDown:(id)sender
+{
+    var index = MIN([[self selectionIndexes] firstIndex] + [self numberOfColumns], [[self items] count]-1);
+
+    [self setSelectionIndexes:[CPIndexSet indexSetWithIndex:index]];
+    [self _scrollToSelection];
+}
+
+- (void)moveUp:(id)sender
+{
+    var index = [[self selectionIndexes] firstIndex];
+    if (index == CPNotFound)
+        index = [[self items] count];
+
+    index = MAX(0, index - [self numberOfColumns]);
+
+    [self setSelectionIndexes:[CPIndexSet indexSetWithIndex:index]];
+    [self _scrollToSelection];
+}
+
+- (void)deleteBackward:(id)sender
+{
+    if ([[self delegate] respondsToSelector:@selector(collectionView:shouldDeleteItemsAtIndexes:)])
+    {
+        [[self delegate] collectionView:self shouldDeleteItemsAtIndexes:[self selectionIndexes]];
+
+        var index = [[self selectionIndexes] firstIndex];
+        if (index > [[self content] count]-1)
+            [self setSelectionIndexes:[CPIndexSet indexSetWithIndex:[[self content] count]-1]];
+
+        [self _scrollToSelection];
+        [self setNeedsDisplay:YES];
+    }
+}
+
+- (void)keyDown:(CPEvent)anEvent
+{
+    [self interpretKeyEvents:[anEvent]];
+}
+
+@end
+
+@implementation CPCollectionView (Deprecated)
+
+- (CGRect)rectForItemAtIndex:(int)anIndex
+{
+    _CPReportLenientDeprecation([self class], _cmd, @selector(frameForItemAtIndex:));
+
+    // Don't re-compute anything just grab the current frame
+    // This allows subclasses to override tile without messing this up.
+    return [self frameForItemAtIndex:anIndex];
+}
+
+- (CGRect)rectForItemsAtIndexes:(CPIndexSet)anIndexSet
+{
+    _CPReportLenientDeprecation([self class], _cmd, @selector(frameForItemsAtIndexes:));
+
+    return [self frameForItemsAtIndexes:anIndexSet];
+}
+
 @end
 
 var CPCollectionViewMinItemSizeKey      = @"CPCollectionViewMinItemSizeKey",
@@ -693,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;
     }
 
@@ -719,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/CPColor.j

@@ -437,51 +437,16 @@ var cachedBlackColor,
     if (self)
     {
         _components = components;
-        
-		if (!CPFeatureIsCompatible(CPCSSRGBAFeature) && _components[3] != 1.0 && window.Base64 && window.CRC32)
-		{
-			var bytes = [0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x1,0x8,0x3,0x0,0x0,0x0,0x28,0xcb,0x34,0xbb,0x0,0x0,0x3,0x0,0x50,0x4c,0x54,0x45,0xff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x17,0x89,0x99,0x55,0x0,0x0,0x0,0x1,0x74,0x52,0x4e,0x53,0x0,0x40,0xe6,0xd8,0x66,0x0,0x0,0x0,0x10,0x49,0x44,0x41,0x54,0x78,0xda,0x62,0x60,0x0,0x0,0x0,0x0,0xff,0xff,0x3,0x0,0x0,0x2,0x0,0x1,0x24,0x7f,0x24,0xf1,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,0xff];
-			var r_off = 41;
-			var g_off = 42;
-			var b_off = 43;
-			var a_off = 821;
-			var plte_crc_off = 809;
-			var trns_crc_off = 822;
-			var plte_type_off = 37;
-			var trns_type_off = 817;
-			
-			bytes[r_off] = Math.round(_components[0]*255);
-			bytes[g_off] = Math.round(_components[1]*255);
-			bytes[b_off] = Math.round(_components[2]*255);
-			bytes[a_off] = Math.round(_components[3]*255);
-            
-			// calculate new CRCs
-			var new_plte_crc = integerToBytes(CRC32.getCRC(bytes, plte_type_off, 4+768), 4);
-			var new_trns_crc = integerToBytes(CRC32.getCRC(bytes, trns_type_off, 4+1), 4);
-            
-			// overwrite old CRCs with new ones
-			for (var i = 0; i < 4; i++)
-			{
-				bytes[plte_crc_off+i] = new_plte_crc[i];
-				bytes[trns_crc_off+i] = new_trns_crc[i];
-			}
-            
-			// Base64 encode, strip whitespace and build data URL
-			var base64image = Base64.encode(bytes); //.replace(/[\s]/g, "");
-			
-			_cssString = "url(\"data:image/png;base64," + base64image + "\")";
-		}
-		else
-		{
-        	var hasAlpha = CPFeatureIsCompatible(CPCSSRGBAFeature) && _components[3] != 1.0;
-        		
-        	_cssString = (hasAlpha ? "rgba(" : "rgb(") + 
-        	    parseInt(_components[0] * 255.0) + ", " + 
-        	    parseInt(_components[1] * 255.0) + ", " + 
-        	    parseInt(_components[2] * 255.0) + 
-        	    (hasAlpha ?  (", " + _components[3]) : "") + ")";
-		}
+
+        var hasAlpha = CPFeatureIsCompatible(CPCSSRGBAFeature) && _components[3] != 1.0;
+
+        _cssString = (hasAlpha ? "rgba(" : "rgb(") +
+            parseInt(_components[0] * 255.0) + ", " +
+            parseInt(_components[1] * 255.0) + ", " +
+            parseInt(_components[2] * 255.0) +
+            (hasAlpha ?  (", " + _components[3]) : "") + ")";
     }
+
     return self;
 }
 
@@ -494,6 +459,7 @@ var cachedBlackColor,
     {
         _patternImage = anImage;
         _cssString = "url(\"" + [_patternImage filename] + "\")";
+        _components = [0.0, 0.0, 0.0, 1.0];
     }
        
     return self;
@@ -735,6 +701,9 @@ var CPColorComponentsKey    = @"CPColorComponentsKey",
 
 var hexCharacters = "0123456789ABCDEF";
 
+// HACK: prevent these from becoming globals. workaround for obj-j "function foo(){}" behavior
+var hexToRGB, rgbToHex, byteToHex;
+
 /*!
     Used for the CPColor \c +colorWithHexString: implementation
     @ignore
@@ -761,18 +730,6 @@ function hexToRGB(hex)
     return [red, green, blue, 1.0];
 }
 
-function integerToBytes(integer, length) {
-	if (!length)
-		length = (integer == 0) ? 1 : Math.round((Math.log(integer)/Math.log(2))/8+0.5);
-		
-	var bytes = new Array(length);
-	for (var i = length-1; i >= 0; i--) {
-		bytes[i] = integer & 255;
-		integer = integer >> 8
-	}
-	return bytes;
-}
-
 function rgbToHex(r,g,b) {
     return byteToHex(r) + byteToHex(g) + byteToHex(b);
 }

AppKit/CPColorPicker.j

@@ -23,6 +23,8 @@
 @import <Foundation/CPObject.j>
 @import "CPColorPanel.j"
 
+#include "Platform/Platform.h"
+
 /*! 
     @ingroup appkit
     @class CPColorPicker
@@ -239,8 +241,10 @@
     _blackWheelImage.style.filter = "alpha(opacity=0)"
     _blackWheelImage.style.position = "absolute";
 
+#if PLATFORM(DOM)
     _DOMElement.appendChild(_wheelImage);
     _DOMElement.appendChild(_blackWheelImage);
+#endif
 
     [self setWheelSize:aFrame.size];
 

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/CPCompatibility.j

@@ -65,8 +65,6 @@ CPInputTypeCanBeChangedFeature          = 1 << 25;
 CPHTML5DragAndDropSourceYOffBy1         = 1 << 26;
 
 
-
-
 var USER_AGENT                          = "",
     PLATFORM_ENGINE                     = CPUnknownBrowserEngine,
     PLATFORM_FEATURES                   = 0;
@@ -75,7 +73,7 @@ var USER_AGENT                          = "",
 
 PLATFORM_FEATURES |= CPInputTypeCanBeChangedFeature;
 
-if (typeof window != "undfined" && typeof window.navigator != "undefined")
+if (typeof window !== "undefined" && typeof window.navigator !== "undefined")
     USER_AGENT = window.navigator.userAgent;
 
 // Opera
@@ -109,7 +107,10 @@ else if (USER_AGENT.indexOf("AppleWebKit/") != -1)
     // Features we can only be sure of with WebKit (no known independent tests)
     PLATFORM_FEATURES |= CPCSSRGBAFeature;
     PLATFORM_FEATURES |= CPHTMLContentEditableFeature;
-    PLATFORM_FEATURES |= CPHTMLDragAndDropFeature;
+
+    if (USER_AGENT.indexOf("Chrome") === -1)
+        PLATFORM_FEATURES |= CPHTMLDragAndDropFeature;
+
     PLATFORM_FEATURES |= CPJavascriptClipboardEventsFeature;
     PLATFORM_FEATURES |= CPJavascriptClipboardAccessFeature;
     PLATFORM_FEATURES |= CPJavaScriptShadowFeature;
@@ -204,11 +205,11 @@ if (USER_AGENT.indexOf("Mac") !== -1)
 
     CPPlatformActionKeyMask = CPCommandKeyMask;
 
-    CPUndoKeyEquivalent = @"Z";
+    CPUndoKeyEquivalent = @"z";
     CPRedoKeyEquivalent = @"Z";
 
     CPUndoKeyEquivalentModifierMask = CPCommandKeyMask;
-    CPRedoKeyEquivalentModifierMask = CPCommandKeyMask | CPShiftKeyMask;
+    CPRedoKeyEquivalentModifierMask = CPCommandKeyMask;
 }
 else
 {
@@ -217,8 +218,8 @@ else
 
     CPPlatformActionKeyMask = CPControlKeyMask;
 
-    CPUndoKeyEquivalent = @"Z";
-    CPRedoKeyEquivalent = @"Y";
+    CPUndoKeyEquivalent = @"z";
+    CPRedoKeyEquivalent = @"y";
 
     CPUndoKeyEquivalentModifierMask = CPControlKeyMask;
     CPRedoKeyEquivalentModifierMask = CPControlKeyMask;

AppKit/CPControl.j

@@ -27,47 +27,42 @@
 #include "CoreGraphics/CGGeometry.h"
 #include "Platform/Platform.h"
 
-/*
-    @global
-    @group CPTextAlignment
-*/
-CPLeftTextAlignment         = 0;
-/*
-    @global
-    @group CPTextAlignment
-*/
-CPRightTextAlignment        = 1;
-/*
-    @global
-    @group CPTextAlignment
-*/
-CPCenterTextAlignment       = 2;
-/*
-    @global
-    @group CPTextAlignment
-*/
-CPJustifiedTextAlignment    = 3;
-/*
-    @global
-    @group CPTextAlignment
-*/
-CPNaturalTextAlignment      = 4;
+CPLeftTextAlignment             = 0;
+CPRightTextAlignment            = 1;
+CPCenterTextAlignment           = 2;
+CPJustifiedTextAlignment        = 3;
+CPNaturalTextAlignment          = 4;
 
-/*
-    @global
-    @group CPControlSize
-*/
-CPRegularControlSize        = 0;
-/*
-    @global
-    @group CPControlSize
-*/
-CPSmallControlSize          = 1;
-/*
-    @global
-    @group CPControlSize
-*/
-CPMiniControlSize           = 2;
+CPRegularControlSize            = 0;
+CPSmallControlSize              = 1;
+CPMiniControlSize               = 2;
+
+CPLineBreakByWordWrapping       = 0;
+CPLineBreakByCharWrapping       = 1;
+CPLineBreakByClipping           = 2;
+CPLineBreakByTruncatingHead     = 3;
+CPLineBreakByTruncatingTail     = 4;
+CPLineBreakByTruncatingMiddle   = 5;
+
+CPTopVerticalTextAlignment      = 1,
+CPCenterVerticalTextAlignment   = 2,
+CPBottomVerticalTextAlignment   = 3;
+
+CPScaleProportionally   = 0;
+CPScaleToFit            = 1;
+CPScaleNone             = 2;
+
+CPNoImage       = 0;
+CPImageOnly     = 1;
+CPImageLeft     = 2;
+CPImageRight    = 3;
+CPImageBelow    = 4;
+CPImageAbove    = 5;
+CPImageOverlaps = 6;
+
+CPOnState                       = 1;
+CPOffState                      = 0;
+CPMixedState                    = -1;
 
 CPControlNormalBackgroundColor      = "CPControlNormalBackgroundColor";
 CPControlSelectedBackgroundColor    = "CPControlSelectedBackgroundColor";
@@ -112,7 +107,7 @@ var CPControlBlackColor     = [CPColor blackColor];
                                                 CPLineBreakByClipping,
                                                 [CPColor blackColor],
                                                 [CPFont systemFontOfSize:12.0],
-                                                nil,
+                                                [CPNull null],
                                                 _CGSizeMakeZero(),
                                                 CPImageLeft,
                                                 CPScaleToFit,
@@ -308,6 +303,12 @@ var CPControlBlackColor     = [CPColor blackColor];
     [self highlight:YES];
     [self setState:[self nextState]];
     [self sendAction:[self action] to:[self target]];
+    
+    [CPTimer scheduledTimerWithTimeInterval:0.1 target:self selector:@selector(unhighlightButtonTimerDidFinish:) userInfo:nil repeats:NO];
+}
+
+- (void)unhighlightButtonTimerDidFinish:(id)sender
+{
     [self highlight:NO];
 }
 

AppKit/CPCursor.j

@@ -12,6 +12,8 @@ Implemented class methods:
     Opera       : All except resizeLeftRightCursor resizeUpDownCursor operationNotAllowedCursor dragCopyCursor dragLinkCursor contextualMenuCursor openHandCursor closedHandCursor disappearingItemCursor // Opera does not support url cursors so these won't work with images
 */
 
+#include "Platform/Platform.h"
+
 var currentCursor = nil,
     cursorStack = [],
     cursors = {},
@@ -186,12 +188,12 @@ var currentCursor = nil,
 
 + (void)hide
 {
-    document.body.style.cursor = 'none'; // Not supported in IE
+    [self _setCursorCSS:"none"]; // Not supported in IE
 }
 
 + (void)unhide
 {
-    document.body.style.cursor = [currentCursor _cssString];
+    [self _setCursorCSS:[currentCursor _cssString]]
 }
 
 + (void)setHiddenUntilMouseMoves:(BOOL)flag
@@ -217,17 +219,23 @@ var currentCursor = nil,
 
 - (void)set
 {
-    document.body.style.cursor = _cssString;
     currentCursor = self; 
 
 #if PLATFORM(DOM)
-    var platformWindows = [[CPPlatformWindow visiblePlatformWindows] allObjects];
-    for (var i = 0, count = [platformWindows count]; i < count; i++)
-        platformWindows[i]._DOMWindow.document.body.style.cursor = _cssString;
+    [[self class] _setCursorCSS:_cssString];
 #endif
 
 }
 
++ (void)_setCursorCSS:(CPString)aString
+{
+#if PLATFORM(DOM)
+    var platformWindows = [[CPPlatformWindow visiblePlatformWindows] allObjects];
+    for (var i = 0, count = [platformWindows count]; i < count; i++)
+        platformWindows[i]._DOMBodyElement.style.cursor = aString;
+#endif
+}
+
 - (void)push
 {
     currentCursor = cursorStack.push(self);

AppKit/CPDocument.j

@@ -484,14 +484,14 @@ var CPDocumentUntitledCount = 0;
     else
         [_writeRequest setHTTPMethod:@"PUT"];
 
-    [_writeRequest setHTTPBody:[data string]];
+    [_writeRequest setHTTPBody:[data rawString]];
 
     [_writeRequest setValue:@"close" forHTTPHeaderField:@"Connection"];
 
-    if (aSaveOperation == CPSaveOperation)
+    if (aSaveOperation === CPSaveOperation)
         [_writeRequest setValue:@"true" forHTTPHeaderField:@"x-cappuccino-overwrite"];
 
-    if (aSaveOperation != CPSaveToOperation)
+    if (aSaveOperation !== CPSaveToOperation)
         [self updateChangeCount:CPChangeCleared];
 
     // FIXME: Oh man is this every looking for trouble, we need to handle login at the Cappuccino level, with HTTP Errors.
@@ -567,7 +567,7 @@ var CPDocumentUntitledCount = 0;
     // READ
     if (aConnection == _readConnection)
     {
-        [self readFromData:[CPData dataWithString:aData] ofType:session.fileType error:nil];
+        [self readFromData:[CPData dataWithRawString:aData] ofType:session.fileType error:nil];
 
         objj_msgSend(session.delegate, session.didReadSelector, self, YES, session.contextInfo);
     }
@@ -888,8 +888,7 @@ var CPDocumentUntitledCount = 0;
     [_canCloseAlert setDelegate:self];
     [_canCloseAlert setAlertStyle:CPWarningAlertStyle];
     [_canCloseAlert setTitle:@"Unsaved Document"];
-    [_canCloseAlert setMessageText:sprintf(@"Do you want to save the changes you've made to the document \"%@\"?", 
-                                        [self displayName] || [self fileName])];
+    [_canCloseAlert setMessageText:@"Do you want to save the changes you've made to the document \"" + ([self displayName] || [self fileName]) + "\"?"];
 
     [_canCloseAlert addButtonWithTitle:@"Save"];
     [_canCloseAlert addButtonWithTitle:@"Cancel"];

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;
@@ -127,7 +108,7 @@ var CPDragServerDraggingInfo       = nil;
 @end
 
 var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
-    CPDraggingSource_draggedImage_endAt_operation_  = 1 << 1,
+    CPDraggingSource_draggedImage_endedAt_operation_  = 1 << 1,
     CPDraggingSource_draggedView_movedTo_           = 1 << 2,
     CPDraggingSource_draggedView_endedAt_operation_ = 1 << 3;
 
@@ -150,6 +131,13 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
 
     CGPoint         _draggingLocation;
     id              _draggingDestination;
+    BOOL            _draggingDestinationWantsPeriodicUpdates;
+
+    CGPoint         _startDragLocation;
+    BOOL            _shouldSlideBack;
+    unsigned        _dragOperation;
+
+    CPTimer         _draggingUpdateTimer;
 }
 
 /*
@@ -189,6 +177,11 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
     return self;
 }
 
+- (id)draggingDestination
+{
+    return _draggingDestination;
+}
+
 - (CGPoint)draggingLocation
 {
     return _draggingLocation
@@ -225,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]];
@@ -234,33 +230,96 @@ 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])
         [_draggedWindow orderOut:self];
 
-    if (_implementedDraggingSourceMethods & CPDraggingSource_draggedImage_endAt_operation_)
+    if (_implementedDraggingSourceMethods & CPDraggingSource_draggedImage_endedAt_operation_)
         [_draggingSource draggedImage:[_draggedView image] endedAt:aLocation operation:anOperation];
-
     else if (_implementedDraggingSourceMethods & CPDraggingSource_draggedView_endedAt_operation_)
         [_draggingSource draggedView:_draggedView endedAt:aLocation operation:anOperation];
 
@@ -296,6 +355,7 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
     _draggingPasteboard = aPasteboard || [CPPasteboard pasteboardWithName:CPDragPboard];
     _draggingSource = aSourceObject;
     _draggingDestination = nil;
+    _shouldSlideBack = slideBack;
 
     // The offset is based on the distance from where we want the view to be initially from where the mouse is initially
     // Hence the use of mouseDownEvent's location and view's location in global coordinates.
@@ -320,7 +380,8 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
     var mouseLocation = [CPEvent mouseLocation];
 
     // Place it where the mouse pointer is.
-    [_draggedWindow setFrameOrigin:_CGPointMake(mouseLocation.x - _draggingOffset.width, mouseLocation.y - _draggingOffset.height)];
+    _startDragLocation = _CGPointMake(mouseLocation.x - _draggingOffset.width, mouseLocation.y - _draggingOffset.height);
+    [_draggedWindow setFrameOrigin:_startDragLocation];
     [_draggedWindow setFrameSize:[aView frame].size];
 
     [[_draggedWindow contentView] addSubview:aView];
@@ -332,8 +393,8 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
         if ([_draggingSource respondsToSelector:@selector(draggedImage:movedTo:)])
             _implementedDraggingSourceMethods |= CPDraggingSource_draggedImage_movedTo_;
 
-        if ([_draggingSource respondsToSelector:@selector(draggedImage:endAt:operation:)])
-            _implementedDraggingSourceMethods |= CPDraggingSource_draggedImage_endAt_operation_;
+        if ([_draggingSource respondsToSelector:@selector(draggedImage:endedAt:operation:)])
+            _implementedDraggingSourceMethods |= CPDraggingSource_draggedImage_endedAt_operation_;
     }
     else
     {
@@ -385,19 +446,34 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
 
     if (type === CPLeftMouseUp)
     {
-        [self performDragOperationInPlatformWindow:platformWindow];
-        [self draggingEndedInPlatformWindow:platformWindow globalLocation:platformWindowLocation operation:CPDragOperationNone];
+        // Make sure we do not finalize (cancel) the drag if the last drag update was disallowed
+        if (_dragOperation !== CPDragOperationNone)
+            [self performDragOperationInPlatformWindow:platformWindow];
+
+        [self draggingEndedInPlatformWindow:platformWindow globalLocation:platformWindowLocation operation:_dragOperation];
 
         // Stop tracking events.
         return;
     }
-
-    [self draggingSourceUpdatedWithGlobalLocation:platformWindowLocation];
-    [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/CPEvent.j

@@ -128,7 +128,7 @@ var _CPEventPeriodicEventPeriod         = 0,
     BOOL                _isARepeat;
     unsigned            _keyCode;
     DOMEvent            _DOMEvent;
-    
+
     float               _deltaX;
     float               _deltaY;
     float               _deltaZ;
@@ -345,7 +345,10 @@ var _CPEventPeriodicEventPeriod         = 0,
 */
 - (int)buttonNumber
 {
-    return _buttonNumber;
+    if (_type === CPRightMouseDown || _type === CPRightMouseUp || _type === CPRightMouseDragged)
+        return 1;
+
+    return 0;
 }
 
 /*!

AppKit/CPFlashMovie.j

@@ -30,7 +30,7 @@
 */
 @implementation CPFlashMovie : CPObject
 {
-    CPString _fileName;
+    CPString        _filename;
 }
 
 /*!
@@ -38,9 +38,9 @@
     @param aFilename the swf to load
     @return the initialized CPFlashMovie
 */
-+ (id)flashMovieWithFile:(CPString)aFileName
++ (id)flashMovieWithFile:(CPString)aFilename
 {
-    return [[self alloc] initWithFile:aFileName];
+    return [[self alloc] initWithFile:aFilename];
 }
 
 /*!
@@ -48,14 +48,37 @@
     @param aFilename the swf to load
     @return the initialized CPFlashMovie
 */
-- (id)initWithFile:(CPString)aFileName
+- (id)initWithFile:(CPString)aFilename
 {
     self = [super init];
     
     if (self)
-        _fileName = aFileName;
+        _filename = aFilename;
     
     return self;
 }
 
+- (CPString)filename
+{
+    return _filename;
+}
+
+@end
+
+var CPFlashMovieFilenameKey = "CPFlashMovieFilenameKey";
+
+@implementation CPFlashMovie (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    _filename = [aCoder decodeObjectForKey:CPFlashMovieFilenameKey];
+
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [aCoder encodeObject:_filename forKey:CPFlashMovieFilenameKey];
+}
+
 @end

AppKit/CPFlashView.j

@@ -23,6 +23,9 @@
 @import "CPFlashMovie.j"
 @import "CPView.j"
 
+#include "Platform/Platform.h"
+
+var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
 
 /*!
     @ingroup appkit
@@ -31,9 +34,13 @@
 {
     CPFlashMovie    _flashMovie;
     
-    DOMElement      _DOMEmbedElement;
-    DOMElement      _DOMMParamElement;
+    CPDictionary    _params;
+    CPDictionary    _paramElements;
+#if PLATFORM(DOM)    
+    DOMElement      _DOMParamElement;
     DOMElement      _DOMObjectElement;
+    DOMElement      _DOMInnerObjectElement;
+#endif
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -42,35 +49,32 @@
     
     if (self)
     {
-        _DOMObjectElement = document.createElement("object");
-        _DOMObjectElement.width = "100%";
-        _DOMObjectElement.height = "100%";
-        _DOMObjectElement.style.top = "0px";
-        _DOMObjectElement.style.left = "0px";
-        
-        _DOMParamElement = document.createElement("param");
-        _DOMParamElement.name = "movie";
-        
-        _DOMObjectElement.appendChild(_DOMParamElement);
-        
-        var param = document.createElement("param");
-        
-        param.name = "wmode";
-        param.value = "transparent";
-        
-        _DOMObjectElement.appendChild(param);
-        
-        _DOMEmbedElement = document.createElement("embed");
-
-        _DOMEmbedElement.type = "application/x-shockwave-flash";
-        _DOMEmbedElement.setAttribute("wmode", "transparent");
-        _DOMEmbedElement.width = "100%";
-        _DOMEmbedElement.height = "100%";
-
-        // IE requires this thing to be in the _DOMElement and not the _DOMObjectElement.
-        _DOMElement.appendChild(_DOMEmbedElement);
-                
-        _DOMElement.appendChild(_DOMObjectElement);
+#if PLATFORM(DOM)
+        if (!CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
+        {
+            _DOMObjectElement = document.createElement(@"object");
+            _DOMObjectElement.width = @"100%";
+            _DOMObjectElement.height = @"100%";
+            _DOMObjectElement.style.top = @"0px";
+            _DOMObjectElement.style.left = @"0px";
+            _DOMObjectElement.type = @"application/x-shockwave-flash";
+            _DOMObjectElement.setAttribute(@"classid", IEFlashCLSID);
+            
+            _DOMParamElement = document.createElement(@"param");
+            _DOMParamElement.name = @"movie";
+            
+            _DOMInnerObjectElement = document.createElement(@"object");
+            _DOMInnerObjectElement.width = @"100%";
+            _DOMInnerObjectElement.height = @"100%";
+            
+            _DOMObjectElement.appendChild(_DOMParamElement);
+            _DOMObjectElement.appendChild(_DOMInnerObjectElement);
+            
+            _DOMElement.appendChild(_DOMObjectElement);
+        }
+        else
+            [self _rebuildIEObjects];
+#endif
     }
     
     return self;
@@ -82,11 +86,15 @@
         return;
         
     _flashMovie = aFlashMovie;
-    
-    _DOMParamElement.value = aFlashMovie._fileName;
-    
-    if (_DOMEmbedElement)
-       _DOMEmbedElement.src = aFlashMovie._fileName;
+#if PLATFORM(DOM)
+    if (!CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
+    {
+        _DOMParamElement.value = [aFlashMovie filename];
+        _DOMInnerObjectElement.data = [aFlashMovie filename];
+    }
+    else
+        [self _rebuildIEObjects];
+#endif
 }
 
 - (CPFlashMovie)flashMovie
@@ -94,6 +102,90 @@
     return _flashMovie;
 }
 
+- (void)setFlashVars:(CPDictionary)aDictionary
+{
+    var varString = @"",
+        enumerator = [aDictionary keyEnumerator];
+    
+    var key;
+    while (key = [enumerator nextObject])
+        varString = [varString stringByAppendingFormat:@"&%@=%@", key, [aDictionary objectForKey:key]];
+    
+    if (!_params)
+        _params = [CPDictionary dictionary];
+    
+    [_params setObject:varString forKey:@"flashvars"];
+    [self setParameters:_params];
+}
+
+- (CPDictionary)flashVars
+{
+    return [_params objectForKey:@"flashvars"];
+}
+
+- (void)setParameters:(CPDictionary)aDictionary
+{
+#if PLATFORM(DOM)
+    if (_paramElements && !CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
+    {
+        var elements = [_paramElements allValues],
+            count = [elements count];
+        
+        for (var i = 0; i < count; i++)
+            _DOMObjectElement.removeChild([elements objectAtIndex:i]);
+    }
+#endif
+    _params = aDictionary;
+#if PLATFORM(DOM)
+    if (!CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
+    {
+        _paramElements = [CPDictionary dictionary];
+        
+        var enumerator = [_params keyEnumerator],
+            key;
+        
+        while (key = [enumerator nextObject] && _DOMObjectElement)
+        {
+            var param = document.createElement(@"param");
+            param.name = key;
+            param.value = [_params objectForKey:key];
+            
+            _DOMObjectElement.appendChild(param);
+            
+            [_paramElements setObject:param forKey:key];
+        }
+    }
+    else
+        [self _rebuildIEObjects];
+#endif
+}
+
+- (CPDictionary)parameters
+{
+    return _params;
+}
+
+#if PLATFORM(DOM)
+- (void)_rebuildIEObjects
+{
+    _DOMElement.innerHTML = @"";
+    if (![_flashMovie filename])
+        return;
+    
+    var paramString = [CPString stringWithFormat:@"<param name='movie' value='%@' />", [_flashMovie filename]],
+        paramEnumerator = [_params keyEnumerator],
+        key;
+    
+    while (key = [paramEnumerator nextObject])
+        paramString = [paramString stringByAppendingFormat:@"<param name='%@' value='%@' />", key, [_params objectForKey:key]];
+    
+    _DOMObjectElement = document.createElement(@"object");
+    _DOMElement.appendChild(_DOMObjectElement);
+    
+    _DOMObjectElement.outerHTML = [CPString stringWithFormat:@"<object classid=%@ width=%@ height=%@>%@</object>", IEFlashCLSID, CGRectGetWidth([self bounds]), CGRectGetHeight([self bounds]), paramString];
+}
+#endif
+
 - (void)mouseDragged:(CPEvent)anEvent
 {
     [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];

AppKit/CPFont.j

@@ -20,10 +20,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-var _CPFonts                = {};
-    _CPFontSystemFontFace   = @"Arial";
+var _CPFonts                = {},
+    _CPFontSystemFontFace   = @"Arial, sans-serif",
+    _CPWrapRegExp           = new RegExp("\\s*,\\s*", "g");
 
-#define _CPCachedFont(aName, aSize, isBold) _CPFonts[(isBold ? @"bold " : @"") + ROUND(aSize) + @"px '" + aName + @"'"]
+
+#define _CPCreateCSSString(aName, aSize, isBold) (isBold ? @"bold " : @"") + ROUND(aSize) + @"px " + ((aName === _CPFontSystemFontFace) ? aName : (@"\"" + aName.replace(_CPWrapRegExp, '", "') + @"\", " + _CPFontSystemFontFace))
+#define _CPCachedFont(aName, aSize, isBold) _CPFonts[_CPCreateCSSString(aName, aSize, isBold)]
 
 /*! 
     @ingroup appkit
@@ -95,7 +98,7 @@ var _CPFonts                = {};
         _size = aSize;
         _isBold = isBold;
         
-        _cssString = (_isBold ? @"bold " : @"") + ROUND(aSize) + @"px '" + aName + @"'";
+        _cssString = _CPCreateCSSString(_name, _size, _isBold);
         
         _CPFonts[_cssString] = self;
     }
@@ -127,6 +130,16 @@ var _CPFonts                = {};
     return _name;
 }
 
+- (BOOL)isEqual:(id)anObject
+{
+    return [anObject isKindOfClass:[CPFont class]] && [anObject cssString] === [self cssString];
+}
+
+- (CPString)description
+{
+    return [CPString stringWithFormat:@"%@ %@ %f pt.", [super description], [self familyName], [self size]];
+}
+
 @end
 
 var CPFontNameKey   = @"CPFontNameKey",

AppKit/CPFontManager.j

@@ -51,7 +51,7 @@ var CPSharedFontManager     = nil,
 
 // Changing the Default Font Conversion Classes
 /*!
-    Sets the class that will be used to create the applcation's
+    Sets the class that will be used to create the application's
     font manager.
 */
 + (void)setFontManagerFactory:(Class)aClass

AppKit/CPImage.j

@@ -19,7 +19,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
- 
+
 @import <Foundation/CPBundle.j>
 @import <Foundation/CPNotificationCenter.j>
 @import <Foundation/CPObject.j>
@@ -28,6 +28,9 @@
 
 @import "CPGeometry.j"
 
+#include "Platform/Platform.h"
+
+
 CPImageLoadStatusInitialized    = 0;
 CPImageLoadStatusLoading        = 1;
 CPImageLoadStatusCompleted      = 2;
@@ -38,17 +41,32 @@ CPImageLoadStatusReadError      = 6;
 
 CPImageDidLoadNotification      = @"CPImageDidLoadNotification";
 
+// Image Names
+CPImageNameColorPanel               = @"CPImageNameColorPanel";
+CPImageNameColorPanelHighlighted    = @"CPImageNameColorPanelHighlighted";
+
+var imagesForNames = { },
+    AppKitImageForNames = { };
+
+AppKitImageForNames[CPImageNameColorPanel]              = CGSizeMake(26.0, 29.0);
+AppKitImageForNames[CPImageNameColorPanelHighlighted]   = CGSizeMake(26.0, 29.0);
+
 function CPImageInBundle(aFilename, aSize, aBundle)
 {
     if (!aBundle)
         aBundle = [CPBundle mainBundle];
-    
+
     if (aSize)
         return [[CPImage alloc] initWithContentsOfFile:[aBundle pathForResource:aFilename] size:aSize];
-    
+
     return [[CPImage alloc] initWithContentsOfFile:[aBundle pathForResource:aFilename]];
 }
 
+function CPAppKitImage(aFilename, aSize)
+{
+    return CPImageInBundle(aFilename, aSize, [CPBundle bundleForClass:[CPView class]]);
+}
+
 /*! 
     @ingroup appkit
     @class CPImage
@@ -74,10 +92,11 @@ function CPImageInBundle(aFilename, aSize, aBundle)
 {
     CGSize      _size;
     CPString    _filename;
-    
+    CPString    _name;
+
     id          _delegate;
     unsigned    _loadStatus;
-    
+
     Image       _image;
 }
 
@@ -97,14 +116,14 @@ function CPImageInBundle(aFilename, aSize, aBundle)
 - (id)initByReferencingFile:(CPString)aFilename size:(CGSize)aSize
 {
     self = [super init];
-    
+
     if (self)
     {
         _size = CPSizeCreateCopy(aSize);
         _filename = aFilename;
         _loadStatus = CPImageLoadStatusInitialized;
     }
-    
+
     return self;
 }
 
@@ -117,10 +136,10 @@ function CPImageInBundle(aFilename, aSize, aBundle)
 - (id)initWithContentsOfFile:(CPString)aFilename size:(CGSize)aSize
 {
     self = [self initByReferencingFile:aFilename size:aSize];
-    
+
     if (self)
         [self load];
-    
+
     return self;
 }
 
@@ -133,10 +152,10 @@ function CPImageInBundle(aFilename, aSize, aBundle)
 - (id)initWithContentsOfFile:(CPString)aFilename
 {
     self = [self initByReferencingFile:aFilename size:CGSizeMake(-1, -1)];
-    
+
     if (self)
         [self load];
-    
+
     return self;
 }
 
@@ -165,6 +184,45 @@ function CPImageInBundle(aFilename, aSize, aBundle)
     return _size;
 }
 
++ (id)imageNamed:(CPString)aName
+{
+    var image = imagesForNames[aName];
+
+    if (image)
+        return image;
+
+    var imageOrSize = AppKitImageForNames[aName];
+
+    if (!imageOrSize.isa)
+    {
+        imageOrSize = CPAppKitImage("CPImage/" + aName + ".png", imageOrSize);
+
+        [imageOrSize setName:aName];
+
+        AppKitImageForNames[aName] = imageOrSize;
+    }
+
+    return imageOrSize;
+}
+
+- (void)setName:(CPString)aName
+{
+    if (_name === aName)
+        return;
+
+    if (imagesForNames[aName] === self)
+        imagesForNames[aName] = nil;
+
+    _name = aName;
+
+    imagesForNames[aName] = self;
+}
+
+- (CPString)name
+{
+    return _name;
+}
+
 /*!
     Sets the receiver's delegate.
     @param the delegate
@@ -200,9 +258,10 @@ function CPImageInBundle(aFilename, aSize, aBundle)
 {
     if (_loadStatus == CPImageLoadStatusLoading || _loadStatus == CPImageLoadStatusCompleted)
         return;
-        
+
     _loadStatus = CPImageLoadStatusLoading;
 
+#if PLATFORM(DOM)
     _image = new Image();
 
     var isSynchronous = YES;
@@ -219,7 +278,7 @@ function CPImageInBundle(aFilename, aSize, aBundle)
             }
             [self _derefFromImage];
         }
-    
+
     _image.onerror = function ()
         {
             if (isSynchronous)
@@ -231,7 +290,7 @@ function CPImageInBundle(aFilename, aSize, aBundle)
             }
             [self _derefFromImage];
         }
-    
+
     _image.onabort = function ()
         {
             if (isSynchronous)
@@ -243,10 +302,13 @@ function CPImageInBundle(aFilename, aSize, aBundle)
             }
             [self _derefFromImage];
         }
-        
+
     _image.src = _filename;
-    
-    isSynchronous = NO;
+
+    // onload and friends may fire after this point but BEFORE the end of the run loop,
+    // crazy, I know. So don't set isSynchronous here, rather wait a bit longer.
+    window.setTimeout(function() { isSynchronous = NO; }, 0);
+#endif
 }
 
 - (BOOL)isThreePartImage
@@ -279,7 +341,7 @@ function CPImageInBundle(aFilename, aSize, aBundle)
     [[CPNotificationCenter defaultCenter]
         postNotificationName:CPImageDidLoadNotification
         object:self];
-        
+
     if ([_delegate respondsToSelector:@selector(imageDidLoad:)])
         [_delegate imageDidLoad:self];
 }
@@ -288,7 +350,7 @@ function CPImageInBundle(aFilename, aSize, aBundle)
 - (void)_imageDidError
 {
     _loadStatus = CPImageLoadStatusReadError;
-    
+
     if ([_delegate respondsToSelector:@selector(imageDidError:)])
         [_delegate imageDidError:self];
 }
@@ -297,7 +359,7 @@ function CPImageInBundle(aFilename, aSize, aBundle)
 - (void)_imageDidAbort
 {
     _loadStatus = CPImageLoadStatusCancelled;
-    
+
     if ([_delegate respondsToSelector:@selector(imageDidAbort:)])
         [_delegate imageDidAbort:self];
 }
@@ -337,7 +399,7 @@ function CPImageInBundle(aFilename, aSize, aBundle)
 - (id)initWithImageSlices:(CPArray)imageSlices isVertical:(BOOL)isVertical
 {
     self = [super init];
-    
+
     if (self)
     {
         _imageSlices = imageSlices;
@@ -382,13 +444,13 @@ var CPThreePartImageImageSlicesKey  = @"CPThreePartImageImageSlicesKey",
 - (id)initWithCoder:(CPCoder)aCoder
 {
     self = [super init];
-    
+
     if (self)
     {
         _imageSlices = [aCoder decodeObjectForKey:CPThreePartImageImageSlicesKey];
         _isVertical = [aCoder decodeBoolForKey:CPThreePartImageIsVerticalKey];
     }
-    
+
     return self;
 }
 
@@ -409,10 +471,10 @@ var CPThreePartImageImageSlicesKey  = @"CPThreePartImageImageSlicesKey",
 - (id)initWithImageSlices:(CPArray)imageSlices
 {
     self = [super init];
-    
+
     if (self)
         _imageSlices = imageSlices;
-    
+
     return self;
 }
 
@@ -445,10 +507,10 @@ var CPNinePartImageImageSlicesKey   = @"CPNinePartImageImageSlicesKey";
 - (id)initWithCoder:(CPCoder)aCoder
 {
     self = [super init];
-    
+
     if (self)
         _imageSlices = [aCoder decodeObjectForKey:CPNinePartImageImageSlicesKey];
-    
+
     return self;
 }
 

AppKit/CPImageView.j

@@ -31,24 +31,10 @@
 
 #include "CoreGraphics/CGGeometry.h"
 
-
-/*
-    @global
-    @group CPImageScaling
-*/
 CPScaleProportionally   = 0;
-/*
-    @global
-    @group CPImageScaling
-*/
 CPScaleToFit            = 1;
-/*
-    @global
-    @group CPImageScaling
-*/
 CPScaleNone             = 2;
 
-
 var CPImageViewShadowBackgroundColor = nil;
     
 var LEFT_SHADOW_INSET       = 3.0,
@@ -225,6 +211,11 @@ var LEFT_SHADOW_INSET       = 3.0,
     [self setNeedsDisplay:YES];
 }
 
+- (unsigned)imageScaling
+{
+    return [self currentValueForThemeAttribute:@"image-scaling"];
+}
+
 /*!
     Toggles the display of the image view.
 */
@@ -374,12 +365,17 @@ var LEFT_SHADOW_INSET       = 3.0,
     return _isEditable;
 }
 
-- (void)performDragOperation:(CPDraggingInfo)aSender
+- (BOOL)performDragOperation:(CPDraggingInfo)aSender
 {
     var images = [CPKeyedUnarchiver unarchiveObjectWithData:[[aSender draggingPasteboard] dataForType:CPImagesPboardType]];
 
     if ([images count])
+    {
         [self setImage:images[0]];
+        [self sendAction:[self action] to:[self target]];
+    }
+    
+    return YES;
 }
 
 @end

AppKit/CPMenu/CPMenu.j

@@ -93,7 +93,7 @@ var _CPMenuBarVisible               = NO,
 
 + (void)setMenuBarVisible:(BOOL)menuBarShouldBeVisible
 {
-    if (_CPMenuBarVisible == menuBarShouldBeVisible)
+    if (_CPMenuBarVisible === menuBarShouldBeVisible)
         return;
     
     _CPMenuBarVisible = menuBarShouldBeVisible;
@@ -747,6 +747,9 @@ var _CPMenuBarVisible               = NO,
     }
 
     // Show it.
+    if ([CPPlatform isBrowser])
+        [menuWindow setPlatformWindow:[[aView window] platformWindow]];
+
     [menuWindow orderFront:self];
 
     // Track it.
@@ -816,6 +819,9 @@ var _CPMenuBarVisible               = NO,
         [menuWindow setFrameOrigin:CGRectIntersection(unconstrainedFrame, constraintRect).origin];
     }
 
+    if ([CPPlatform isBrowser])
+        [menuWindow setPlatformWindow:[[aView window] platformWindow]];
+
     [menuWindow orderFront:self];
 
     [[_CPMenuManager sharedMenuManager]
@@ -886,6 +892,13 @@ var _CPMenuBarVisible               = NO,
                    subtype:0
                      data1:0
                      data2:0]];
+
+    // FIXME: We need to do this because this happens in a limitDateForMode:, thus
+    // the second limitDateForMode: won't take effect and the perform selector that
+    // actually draws also won't go into effect. In Safari this works because it sends
+    // an additional mouse move after all this, but not in other browsers.
+    // This will be fixed correctly with the coming run loop changes.
+    [_CPDisplayServer run];
 }
 
 /* @ignore */
@@ -980,13 +993,14 @@ var _CPMenuBarVisible               = NO,
 */
 - (void)_highlightItemAtIndex:(int)anIndex
 {
-    var previousHighlightedIndex = _highlightedIndex;
-    
+    if (_highlightedIndex === anIndex)
+        return;
+
+    if (_highlightedIndex !== CPNotFound)
+        [[_items[_highlightedIndex] _menuItemView] highlight:NO];
+
     _highlightedIndex = anIndex;
-    
-    if (previousHighlightedIndex !== CPNotFound)
-        [[_items[previousHighlightedIndex] _menuItemView] highlight:NO];
-    
+
     if (_highlightedIndex !== CPNotFound)
         [[_items[_highlightedIndex] _menuItemView] highlight:YES];
 }

AppKit/CPMenu/_CPMenuBarWindow.j

@@ -1,5 +1,6 @@
 
 #include "../CoreGraphics/CGGeometry.h"
+#include "../Platform/Platform.h"
 
 @import "_CPMenuWindow.j"
 
@@ -60,8 +61,7 @@ var _CPMenuBarWindowBackgroundColor = nil,
 
     if (self)
     {
-        // FIXME: http://280north.lighthouseapp.com/projects/13294-cappuccino/tickets/39-dont-allow-windows-to-go-above-menubar
-        [self setLevel:-1];//CPTornOffMenuWindowLevel];
+        [self setLevel:CPMainMenuWindowLevel];
         [self setAutoresizingMask:CPWindowWidthSizable];
      
         var contentView = [self contentView];

AppKit/CPMenu/_CPMenuManager.j

@@ -57,14 +57,34 @@ var SharedMenuManager = nil;
        constraintRect:(CGRect)aRect
              callback:(Function)aCallback
 {
-    CPApp._activeMenu = [aMenuContainer menu];
+    var menu = [aMenuContainer menu];
+
+    CPApp._activeMenu = menu;
 
     _startTime = [anEvent timestamp];//new Date();
     _scrollingState = _CPMenuManagerScrollingStateNone;
 
     _constraintRect = aRect;
-    _trackingCallback = aCallback;
     _menuContainerStack = [aMenuContainer];
+    _trackingCallback = aCallback;
+
+    if (menu === [CPApp mainMenu])
+    {
+        var globalLocation = [anEvent globalLocation];
+
+        // Find which menu window the mouse is currently on top of
+        var menuLocation = [aMenuContainer convertGlobalToBase:globalLocation];
+
+        // Find out the item the mouse is currently on top of
+        var activeItemIndex = [aMenuContainer itemIndexAtPoint:menuLocation],
+            activeItem = activeItemIndex !== CPNotFound ? [menu itemAtIndex:activeItemIndex] : nil;
+
+        _menuBarButtonItemIndex = activeItemIndex;
+        _menuBarButtonMenuContainer = aMenuContainer;
+
+        if ([activeItem _isMenuBarButton])
+            return [self trackMenuBarButtonEvent:anEvent];
+    }
 
     [self trackEvent:anEvent];
 }
@@ -76,32 +96,7 @@ var SharedMenuManager = nil;
 
     // Close Menu Event.
     if (type === CPAppKitDefined)
-    {
-        // Stop all periodic events at this point.
-        [CPEvent stopPeriodicEvents];
-
-        // Get the highlighted item from the original menu.
-        var highlightedItem = [trackingMenu highlightedItem];
-
-        // Hide all submenus.
-        [self showMenu:nil fromMenu:trackingMenu atPoint:nil];
-
-        var delegate = [trackingMenu delegate];
-
-        if ([delegate respondsToSelector:@selector(menuDidClose:)])
-            [delegate menuDidClose:trackingMenu];
-
-        if (_trackingCallback)
-            _trackingCallback([self trackingMenuContainer], trackingMenu);
-
-        [[CPNotificationCenter defaultCenter]
-            postNotificationName:CPMenuDidEndTrackingNotification
-                          object:trackingMenu];
-
-        CPApp._activeMenu = nil;
-
-        return;
-    }
+        return [self completeTracking]
 
     [CPApp setTarget:self selector:@selector(trackEvent:) forNextEventMatchingMask:CPPeriodicMask | CPMouseMovedMask | CPLeftMouseDraggedMask | CPLeftMouseUpMask | CPAppKitDefinedMask untilDate:nil inMode:nil dequeue:YES];
 
@@ -121,7 +116,7 @@ var SharedMenuManager = nil;
         activeItem = activeItemIndex !== CPNotFound ? [activeMenu itemAtIndex:activeItemIndex] : nil;
 
     // If the item isn't enabled its as if we clicked on nothing.
-    if (![activeItem isEnabled])
+    if (![activeItem isEnabled] || [activeItem _isMenuBarButton])
     {
         activeItemIndex = CPNotFound;
         activeItem = nil;
@@ -217,6 +212,59 @@ var SharedMenuManager = nil;
         [self showMenu:nil fromMenu:activeMenu atPoint:CGPointMakeZero()];
 }
 
+- (void)trackMenuBarButtonEvent:(CPEvent)anEvent
+{
+    var type = [anEvent type];
+
+    if (type === CPAppKitDefined)
+        return [self completeTracking];
+
+    var globalLocation = [anEvent globalLocation];
+
+    // Find which menu window the mouse is currently on top of
+    var menu = [self trackingMenu],
+        trackingMenuContainer = [self trackingMenuContainer],
+        menuLocation = [trackingMenuContainer convertGlobalToBase:globalLocation];
+
+    if ([trackingMenuContainer itemIndexAtPoint:menuLocation] === _menuBarButtonItemIndex)
+        [menu _highlightItemAtIndex:_menuBarButtonItemIndex];
+
+    else
+        [menu _highlightItemAtIndex:CPNotFound];
+
+    [CPApp setTarget:self selector:@selector(trackMenuBarButtonEvent:) forNextEventMatchingMask:CPPeriodicMask | CPMouseMovedMask | CPLeftMouseDraggedMask | CPLeftMouseUpMask | CPAppKitDefinedMask untilDate:nil inMode:nil dequeue:YES];
+
+    if (type === CPLeftMouseUp)
+        [menu cancelTracking];
+}
+
+- (void)completeTracking
+{
+    var trackingMenu = [self trackingMenu];
+
+    // Stop all periodic events at this point.
+    [CPEvent stopPeriodicEvents];
+
+    // Get the highlighted item from the original menu.
+    var highlightedItem = [trackingMenu highlightedItem];
+
+    // Hide all submenus.
+    [self showMenu:nil fromMenu:trackingMenu atPoint:nil];
+
+    var delegate = [trackingMenu delegate];
+
+    if ([delegate respondsToSelector:@selector(menuDidClose:)])
+        [delegate menuDidClose:trackingMenu];
+
+    if (_trackingCallback)
+        _trackingCallback([self trackingMenuContainer], trackingMenu);
+
+    [[CPNotificationCenter defaultCenter]
+        postNotificationName:CPMenuDidEndTrackingNotification
+                      object:trackingMenu];
+
+    CPApp._activeMenu = nil;
+}
 
 - (id)menuContainerForPoint:(float)aGlobalLocation
 {

AppKit/CPMenuItem/CPMenuItem.j

@@ -799,6 +799,11 @@ CPControlKeyMask
     return ![self submenu] || [self action] !== @selector(submenuAction:) || [self target] !== [self menu];
 }
 
+- (BOOL)_isMenuBarButton
+{
+    return ![self submenu] && [self menu] === [CPApp mainMenu];
+}
+
 @end
 
 var CPMenuItemIsSeparatorKey                = @"CPMenuItemIsSeparatorKey",

AppKit/CPMenuItem/_CPMenuItemMenuBarView.j

@@ -155,12 +155,14 @@ var SelectionColor                              = nil,
 {
     // FIXME: This should probably be even throw.
     if (![_menuItem isEnabled])
-        return; 
+        shouldHighlight = NO;
 
     if (shouldHighlight)
     {
-        [self setBackgroundColor:SelectionColor];
+        if (![_menuItem _isMenuBarButton])
+            [self setBackgroundColor:SelectionColor];
 
+        [_imageAndTextView setImage:[_menuItem alternateImage] || [_menuItem image]];
         [_imageAndTextView setTextColor:[CPColor whiteColor]];
         [_imageAndTextView setTextShadowColor:_CPMenuItemTextShadowColor];
 
@@ -171,6 +173,7 @@ var SelectionColor                              = nil,
     {
         [self setBackgroundColor:nil];
 
+        [_imageAndTextView setImage:[_menuItem image]];
         [_imageAndTextView setTextColor:[self textColor]];
         [_imageAndTextView setTextShadowColor:[self textShadowColor]];
 
@@ -224,8 +227,8 @@ var SelectionColor                              = nil,
     
     CGContextClosePath(context);
     
-    CGContextSetShadowWithColor(context, CGSizeMake(0.0, 1.0), 1.1, _shadowColor);
-    CGContextSetFillColor(context, _color);
+    CGContextSetShadowWithColor(context, CGSizeMake(0.0, 1.0), 1.1, _shadowColor || [CPColor whiteColor]);
+    CGContextSetFillColor(context, _color || [CPColor blackColor]);
     CGContextFillPath(context);
 }
 

AppKit/CPMenuItem/_CPMenuItemStandardView.j

@@ -236,6 +236,7 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
     {
         [self setBackgroundColor:_CPMenuItemSelectionColor];
 
+        [_imageAndTextView setImage:[_menuItem alternateImage] || [_menuItem image]];
         [_imageAndTextView setTextColor:[CPColor whiteColor]];
         [_keyEquivalentView setTextColor:[CPColor whiteColor]];
         [_submenuIndicatorView setColor:[CPColor whiteColor]];
@@ -246,7 +247,8 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
     else
     {
         [self setBackgroundColor:nil];
-        
+
+        [_imageAndTextView setImage:[_menuItem image]];
         [_imageAndTextView setTextColor:[self textColor]];
         [_keyEquivalentView setTextColor:[self textColor]];
         [_submenuIndicatorView setColor:SUBMENU_INDICATOR_COLOR];

AppKit/CPMenuItem/_CPMenuItemView.j

@@ -155,24 +155,6 @@ var _CPMenuItemSelectionColor                   = nil,
         [_view highlight:shouldHighlight];
 }
 
-- (void)activate:(BOOL)shouldActivate
-{
-    [_imageAndTextView setImage:[_menuItem image]];
-    
-    if (shouldActivate)
-    {
-        [_imageAndTextView setTextColor:[self activateColor] || [CPColor whiteColor]];
-        [_imageAndTextView setTextShadowColor:[self activateShadowColor] || [CPColor blackColor]];
-        [_submenuView setColor:[self activateColor] || [CPColor whiteColor]];
-    }
-    else
-    {
-        [_imageAndTextView setTextColor:[self textColor]];
-        [_imageAndTextView setTextShadowColor:[self textShadowColor]];
-        [_submenuView setColor:[self textColor]];
-    }
-}
-
 - (BOOL)eventOnSubmenu:(CPEvent)anEvent
 {
     if (![_menuItem hasSubmenu])

AppKit/CPOutlineView.j

@@ -50,6 +50,15 @@ var CPOutlineViewDataSource_outlineView_setObjectValue_forTableColumn_byItem_
 
     CPOutlineViewDataSource_outlineView_sortDescriptorsDidChange_                                   = 1 << 10;
 
+
+var CPOutlineViewDelegate_outlineView_dataViewForTableColumn_item_                                  = 1 << 1,
+    CPOutlineViewDelegate_outlineView_shouldSelectItem_                                             = 1 << 2,
+    CPOutlineViewDelegate_outlineView_heightOfRowByItem_                                            = 1 << 3,
+    CPOutlineViewDelegate_outlineView_willDisplayView_forTableColumn_item_                          = 1 << 4,
+    CPOutlineViewDelegate_outlineView_isGroupItem_                                                  = 1 << 5;
+
+CPOutlineViewDropOnItemIndex = -1;
+
 @implementation CPOutlineView : CPTableView
 {
     id              _outlineViewDataSource;
@@ -60,6 +69,7 @@ var CPOutlineViewDataSource_outlineView_setObjectValue_forTableColumn_byItem_
     BOOL            _indentationMarkerFollowsDataView;
 
     CPInteger       _implementedOutlineViewDataSourceMethods;
+    CPInteger       _implementedOutlineViewDelegateMethods;
 
     Object          _rootItemInfo;
     CPMutableArray  _itemsForRows;
@@ -69,6 +79,14 @@ var CPOutlineViewDataSource_outlineView_setObjectValue_forTableColumn_byItem_
     CPArray         _disclosureControlsForRows;
     CPData          _disclosureControlData;
     CPArray         _disclosureControlQueue;
+    
+    BOOL            _shouldRetargetItem;
+    id              _retargetedItem;
+    
+    BOOL            _shouldRetargetChildIndex;
+    CPInteger       _retargedChildIndex;
+    CPTimer         _dragHoverTimer;
+    id              _dropItem;
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -77,6 +95,9 @@ var CPOutlineViewDataSource_outlineView_setObjectValue_forTableColumn_byItem_
 
     if (self)
     {
+
+        _selectionHighlightStyle = CPTableViewSelectionHighlightStyleSourceList;
+
         // The root item has weight "0", thus represents the weight solely of its descendants.
         _rootItemInfo = { isExpanded:YES, isExpandable:NO, level:-1, row:-1, children:[], weight:0 };
 
@@ -84,10 +105,18 @@ var CPOutlineViewDataSource_outlineView_setObjectValue_forTableColumn_byItem_
         _itemInfosForItems = { };
         _disclosureControlsForRows = [];
 
+        _retargetedItem = nil;
+        _shouldRetargetItem = NO;
+        
+        _retargedChildIndex = nil;
+        _shouldRetargetChildIndex = NO;
+        _startHoverTime = nil;
+
         [self setIndentationPerLevel:16.0];
         [self setIndentationMarkerFollowsDataView:YES];
 
         [super setDataSource:[[_CPOutlineViewTableViewDataSource alloc] initWithOutlineView:self]];
+        [super setDelegate:[[_CPOutlineViewTableViewDelegate alloc] initWithOutlineView:self]];
 
         [self setDisclosureControlPrototype:[[CPDisclosureButton alloc] initWithFrame:CGRectMake(0.0, 0.0, 10.0, 10.0)]];
     }
@@ -181,20 +210,32 @@ var CPOutlineViewDataSource_outlineView_setObjectValue_forTableColumn_byItem_
 
 - (void)expandItem:(id)anItem
 {
-    if (!anItem)
-        return;
+    [self expandItem:anItem expandChildren:NO];
+}
 
-    var itemInfo = _itemInfosForItems[[anItem UID]];
+- (void)expandItem:(id)anItem expandChildren:(BOOL)shouldExpandChildren
+{
+    var itemInfo = null;
+    
+    if (!anItem)
+        itemInfo = _rootItemInfo;
+    else
+        itemInfo = _itemInfosForItems[[anItem UID]];
 
     if (!itemInfo)
         return;
-
-    if (itemInfo.isExpanded)
-        return;
-
+    
     itemInfo.isExpanded = YES;
-
     [self reloadItem:anItem reloadChildren:YES];
+    
+    if (shouldExpandChildren)
+    {
+        var children = itemInfo.children,
+            childIndex = children.length;
+        
+        while (childIndex--)
+            [self expandItem:children[childIndex] expandChildren:YES];
+    }
 }
 
 - (void)collapseItem:(id)anItem
@@ -324,7 +365,13 @@ var CPOutlineViewDataSource_outlineView_setObjectValue_forTableColumn_byItem_
     if (!itemInfo)
         return nil;
 
-    return itemInfo.parent;
+    var parent = itemInfo.parent;
+    
+    // Check if the parent is the root item because we never return the actual root item
+    if (itemInfo[[parent UID]] === _rootItemInfo)
+        parent = nil;
+
+    return parent;
 }
 
 - (CGRect)frameOfOutlineDataViewAtColumn:(CPInteger)aColumn row:(CPInteger)aRow
@@ -338,6 +385,16 @@ var CPOutlineViewDataSource_outlineView_setObjectValue_forTableColumn_byItem_
     return frame;
 }
 
+- (void)_performSelection:(BOOL)select forRow:(CPInteger)rowIndex context:(id)context
+{
+    [super _performSelection:select forRow:rowIndex context:context];
+    
+    var control = _disclosureControlsForRows[rowIndex],
+        selector = select ? @"setThemeState:" : @"unsetThemeState:";
+        
+    [control performSelector:CPSelectorFromString(selector) withObject:CPThemeStateSelected];
+}
+
 - (void)setDelegate:(id)aDelegate
 {
     if (_outlineViewDelegate === aDelegate)
@@ -372,63 +429,24 @@ var CPOutlineViewDataSource_outlineView_setObjectValue_forTableColumn_byItem_
                         object:self];
     }
 
-    _outlineViewDelegate = aDelegate;/*
-    _implementedDelegateMethods = 0;
+    _outlineViewDelegate = aDelegate;
+    _implementedOutlineViewDelegateMethods = 0;
 
-    if ([_outlineViewDelegate respondsToSelector:@selector(selectionShouldChangeInTableView:)])
-        _implementedDelegateMethods |= CPTableViewDelegate_selectionShouldChangeInTableView_;
+    if ([_outlineViewDelegate respondsToSelector:@selector(outlineView:dataViewForTableColumn:item:)])
+        _implementedOutlineViewDelegateMethods |= CPOutlineViewDelegate_outlineView_dataViewForTableColumn_item_;
+        
+    if ([_outlineViewDelegate respondsToSelector:@selector(outlineView:shouldSelectItem:)])
+        _implementedOutlineViewDelegateMethods |= CPOutlineViewDelegate_outlineView_shouldSelectItem_;
+        
+    if ([_outlineViewDelegate respondsToSelector:@selector(outlineView:heightOfRowByItem:)])
+        _implementedOutlineViewDelegateMethods |= CPOutlineViewDelegate_outlineView_heightOfRowByItem_;
 
-    if ([_outlineViewDelegate respondsToSelector:@selector(tableView:dataViewForTableColumn:row:)])
-        _implementedDelegateMethods |= CPTableViewDelegate_tableView_dataViewForTableColumn_row_;
+    if ([_outlineViewDelegate respondsToSelector:@selector(outlineView:willDisplayView:forTableColumn:item:)])
+        _implementedOutlineViewDelegateMethods |= CPOutlineViewDelegate_outlineView_willDisplayView_forTableColumn_item_;
 
-    if ([_outlineViewDelegate respondsToSelector:@selector(tableView:didClickTableColumn:)])
-        _implementedDelegateMethods |= CPTableViewDelegate_tableView_didClickTableColumn_;
+    if ([_outlineViewDelegate respondsToSelector:@selector(outlineView:isGroupItem:)])
+         _implementedOutlineViewDelegateMethods |= CPOutlineViewDelegate_outlineView_isGroupItem_;
 
-    if ([_outlineViewDelegate respondsToSelector:@selector(tableView:didDragTableColumn:)])
-        _implementedDelegateMethods |= CPTableViewDelegate_tableView_didDragTableColumn_;
-
-    if ([_outlineViewDelegate respondsToSelector:@selector(tableView:heightOfRow:)])
-        _implementedDelegateMethods |= CPTableViewDelegate_tableView_heightOfRow_;
-
-    if ([_outlineViewDelegate respondsToSelector:@selector(tableView:isGroupRow:)])
-        _implementedDelegateMethods |= CPTableViewDelegate_tableView_isGroupRow_;
-
-    if ([_outlineViewDelegate respondsToSelector:@selector(tableView:mouseDownInHeaderOfTableColumn:)])
-        _implementedDelegateMethods |= CPTableViewDelegate_tableView_mouseDownInHeaderOfTableColumn_;
-
-    if ([_outlineViewDelegate respondsToSelector:@selector(tableView:nextTypeSelectMatchFromRow:toRow:forString:)])
-        _implementedDelegateMethods |= CPTableViewDelegate_tableView_nextTypeSelectMatchFromRow_toRow_forString_;
-
-    if ([_outlineViewDelegate respondsToSelector:@selector(tableView:selectionIndexesForProposedSelection:)])
-        _implementedDelegateMethods |= CPTableViewDelegate_tableView_selectionIndexesForProposedSelection_;
-
-    if ([_outlineViewDelegate respondsToSelector:@selector(tableView:shouldEditTableColumn:row:)])
-        _implementedDelegateMethods |= CPTableViewDelegate_tableView_shouldEditTableColumn_row_;
-
-    if ([_outlineViewDelegate respondsToSelector:@selector(tableView:shouldSelectRow:)])
-        _implementedDelegateMethods |= CPTableViewDelegate_tableView_shouldSelectRow_;
-
-    if ([_outlineViewDelegate respondsToSelector:@selector(tableView:shouldSelectTableColumn:)])
-        _implementedDelegateMethods |= CPTableViewDelegate_tableView_shouldSelectTableColumn_;
-
-    if ([_outlineViewDelegate respondsToSelector:@selector(tableView:shouldShowViewExpansionForTableColumn:row:)])
-        _implementedDelegateMethods |= CPTableViewDelegate_tableView_shouldShowViewExpansionForTableColumn_row_;
-
-    if ([_outlineViewDelegate respondsToSelector:@selector(tableView:shouldTrackView:forTableColumn:row:)])
-        _implementedDelegateMethods |= CPTableViewDelegate_tableView_shouldTrackView_forTableColumn_row_;
-
-    if ([_outlineViewDelegate respondsToSelector:@selector(tableView:shouldTypeSelectForEvent:withCurrentSearchString:)])
-        _implementedDelegateMethods |= CPTableViewDelegate_tableView_shouldTypeSelectForEvent_withCurrentSearchString_;
-
-    if ([_outlineViewDelegate respondsToSelector:@selector(tableView:toolTipForView:rect:tableColumn:row:mouseLocation:)])
-        _implementedDelegateMethods |= CPTableViewDelegate_tableView_toolTipForView_rect_tableColumn_row_mouseLocation_;
-
-    if ([_outlineViewDelegate respondsToSelector:@selector(tableView:typeSelectStringForTableColumn:row:)])
-        _implementedDelegateMethods |= CPTableViewDelegate_tableView_typeSelectStringForTableColumn_row_;
-
-    if ([_outlineViewDelegate respondsToSelector:@selector(tableView:willDisplayView:forTableColumn:row:)])
-        _implementedDelegateMethods |= CPTableViewDelegate_tableView_willDisplayView_forTableColumn_row_;
-*/
     if ([_outlineViewDelegate respondsToSelector:@selector(outlineViewColumnDidMove:)])
         [defaultCenter
             addObserver:_outlineViewDelegate
@@ -488,6 +506,86 @@ var CPOutlineViewDataSource_outlineView_setObjectValue_forTableColumn_byItem_
     return [super frameOfDataViewAtColumn:aColumn row:aRow];
 }
 
+- (void)setDropItem:(id)theItem dropChildIndex:(int)theIndex
+{
+    if (_dropItem !== theItem && theIndex < 0 && [self isExpandable:theItem] && ![self isItemExpanded:theItem])
+    {
+        if (_dragHoverTimer)
+            [_dragHoverTimer invalidate];
+
+        var autoExpandCallBack = function(){
+            if (_dropItem)
+            {
+                [_dropOperationFeedbackView blink];
+                [CPTimer scheduledTimerWithTimeInterval:.3 callback:objj_msgSend(self, "expandItem:", _dropItem) repeats:NO]; //[self expandItem:_dropItem];
+            }
+        }
+
+        _dragHoverTimer = [CPTimer scheduledTimerWithTimeInterval:.8 callback:autoExpandCallBack repeats:NO];
+    }
+
+    if (theIndex >= 0)
+    {
+        [_dragHoverTimer invalidate];
+        _dragHoverTimer = nil;
+    }
+
+    _dropItem = theItem;
+    _retargetedItem = theItem;
+    _shouldRetargetItem = YES;
+    
+    _retargedChildIndex = theIndex;
+    _shouldRetargetChildIndex = YES;
+}
+
+- (void)_draggingEnded
+{
+    [super _draggingEnded];
+    _dropItem = nil;
+    [_dragHoverTimer invalidate];
+    _dragHoverTimer = nil;
+}
+
+- (id)_parentItemForUpperRow:(int)theUpperRowIndex andLowerRow:(int)theLowerRowIndex atMouseOffset:(CPPoint)theOffset
+{
+    if (_shouldRetargetItem)
+        return _retargetedItem;
+    
+    var lowerLevel = [self levelForRow:theLowerRowIndex]
+        upperItem = [self itemAtRow:theUpperRowIndex];
+        upperLevel = [self levelForItem:upperItem];
+
+    // If the row above us has a higher level the item can be added to multiple parent items
+    // Determine which one by looping through all possible parents and return the first
+    // of which the indentation level is larger than the current x offset
+    while (upperLevel > lowerLevel)
+    {
+        upperLevel = [self levelForItem:upperItem];
+
+        // See if this item's indentation level matches the mouse offset
+        if (theOffset.x > (upperLevel + 1) * [self indentationPerLevel])
+            return [self parentForItem:upperItem];
+
+        // Check the next parent
+        upperItem = [self parentForItem:upperItem];
+    }
+    
+    return [self parentForItem:[self itemAtRow:theLowerRowIndex]];
+}
+
+- (CPRect)_rectForDropHighlightViewBetweenUpperRow:(int)theUpperRowIndex andLowerRow:(int)theLowerRowIndex offset:(CPPoint)theOffset
+{
+    // Call super and the update x to reflect the current indentation level
+    var rect = [super _rectForDropHighlightViewBetweenUpperRow:theUpperRowIndex andLowerRow:theLowerRowIndex offset:theOffset],
+        parentItem = [self _parentItemForUpperRow:theUpperRowIndex andLowerRow:theLowerRowIndex atMouseOffset:theOffset],
+        level = [self levelForItem:parentItem];
+    
+    rect.origin.x = (level + 1) * [self indentationPerLevel];   
+    rect.size.width -= rect.origin.x; // This assumes that the x returned by super is zero
+    
+    return rect;
+}
+
 - (void)_loadDataViewsInRows:(CPIndexSet)rows columns:(CPIndexSet)columns
 {
     [super _loadDataViewsInRows:rows columns:columns];
@@ -526,6 +624,8 @@ var CPOutlineViewDataSource_outlineView_setObjectValue_forTableColumn_byItem_
         _disclosureControlsForRows[row] = control;
 
         [control setState:[self isItemExpanded:item] ? CPOnState : CPOffState];
+        var selector = [self isRowSelected:row] ? @"setThemeState:" : @"unsetThemeState:";
+        [control performSelector:CPSelectorFromString(selector) withObject:CPThemeStateSelected];
         [control setFrame:frame];
 
         [self addSubview:control];
@@ -618,140 +718,147 @@ var CPOutlineViewDataSource_outlineView_setObjectValue_forTableColumn_byItem_
 
 @end
 
+// FIX ME: We're using with() here because Safari fails if we use anOutlineView._itemInfosForItems or whatever... 
 var _reloadItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anItem)
 {
     if (!anItem)
         return;
 
-    // Get the existing info if it exists.
-    var itemInfosForItems = anOutlineView._itemInfosForItems,
-        dataSource = anOutlineView._outlineViewDataSource,
-        itemUID = [anItem UID],
-        itemInfo = itemInfosForItems[itemUID];
-
-    // If we're not in the tree, then just bail.
-    if (!itemInfo)
-        return [];
-
-    // See if the item itself can be swapped out.
-    var parent = itemInfo.parent,
-        parentItemInfo = parent ? itemInfosForItems[[parent UID]] : anOutlineView._rootItemInfo,
-        parentChildren = parentItemInfo.children,
-        index = [parentChildren indexOfObjectIdenticalTo:anItem],
-        newItem = [dataSource outlineView:anOutlineView child:index ofItem:parent];
-
-    if (anItem !== newItem)
-    {
-        itemInfosForItems[[anItem UID]] = nil;
-        itemInfosForItems[[newItem UID]] = itemInfo;
-
-        parentChildren[index] = newItem;
-        anOutlineView._itemsForRows[itemInfo.row] = newItem;
-    }
-
-    itemInfo.isExpandable = [dataSource outlineView:anOutlineView isItemExpandable:newItem];
-    itemInfo.isExpanded = itemInfo.isExpandable && itemInfo.isExpanded;
-}
-
-var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anItem,  /*BOOL*/ isIntermediate)
-{
-    var itemInfosForItems = anOutlineView._itemInfosForItems,
-        dataSource = anOutlineView._outlineViewDataSource;
-
-    if (!anItem)
-        var itemInfo = anOutlineView._rootItemInfo;
-
-    else
+    with(anOutlineView)
     {
         // Get the existing info if it exists.
-        var itemUID = [anItem UID],
+        var itemInfosForItems = _itemInfosForItems,
+            dataSource = _outlineViewDataSource,
+            itemUID = [anItem UID],
             itemInfo = itemInfosForItems[itemUID];
-
+        
         // If we're not in the tree, then just bail.
         if (!itemInfo)
             return [];
-
-        itemInfo.isExpandable = [dataSource outlineView:anOutlineView isItemExpandable:anItem];
-
-        // If we were previously expanded, but now no longer expandable, "de-expand".
-        // NOTE: we are *not* collapsing, thus no notification is posted.
-        if (!itemInfo.isExpandable && itemInfo.isExpanded)
+        
+        // See if the item itself can be swapped out.
+        var parent = itemInfo.parent,
+            parentItemInfo = parent ? itemInfosForItems[[parent UID]] : _rootItemInfo,
+            parentChildren = parentItemInfo.children,
+            index = [parentChildren indexOfObjectIdenticalTo:anItem],
+            newItem = [dataSource outlineView:anOutlineView child:index ofItem:parent];
+        
+        if (anItem !== newItem)
         {
-            itemInfo.isExpanded = NO;
+            itemInfosForItems[[anItem UID]] = nil;
+            itemInfosForItems[[newItem UID]] = itemInfo;
+        
+            parentChildren[index] = newItem;
+            _itemsForRows[itemInfo.row] = newItem;
+        }
+        
+        itemInfo.isExpandable = [dataSource outlineView:anOutlineView isItemExpandable:newItem];
+        itemInfo.isExpanded = itemInfo.isExpandable && itemInfo.isExpanded;
+    }
+}
+
+// FIX ME: We're using with() here because Safari fails if we use anOutlineView._itemInfosForItems or whatever... 
+var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anItem,  /*BOOL*/ isIntermediate)
+{
+    with(anOutlineView)
+    {
+        var itemInfosForItems = _itemInfosForItems,
+            dataSource = _outlineViewDataSource;
+        
+        if (!anItem)
+            var itemInfo = _rootItemInfo;
+        
+        else
+        {
+            // Get the existing info if it exists.
+            var itemUID = [anItem UID],
+                itemInfo = itemInfosForItems[itemUID];
+        
+            // If we're not in the tree, then just bail.
+            if (!itemInfo)
+                return [];
+        
+            itemInfo.isExpandable = [dataSource outlineView:anOutlineView isItemExpandable:anItem];
+        
+            // If we were previously expanded, but now no longer expandable, "de-expand".
+            // NOTE: we are *not* collapsing, thus no notification is posted.
+            if (!itemInfo.isExpandable && itemInfo.isExpanded)
+            {
+                itemInfo.isExpanded = NO;
+                itemInfo.children = [];
+            }
+        }
+        
+        // The root item does not count as a descendant.
+        var weight = itemInfo.weight,
+            descendants = anItem ? [anItem] : [];
+        
+        if (itemInfo.isExpanded && (!(_implementedOutlineViewDataSourceMethods & CPOutlineViewDataSource_outlineView_shouldDeferDisplayingChildrenOfItem_) ||
+            ![dataSource outlineView:anOutlineView shouldDeferDisplayingChildrenOfItem:anItem]))
+        {
+            var index = 0,
+                count = [dataSource outlineView:anOutlineView numberOfChildrenOfItem:anItem],
+                level = itemInfo.level + 1;
+        
             itemInfo.children = [];
-        }
-    }
-
-    // The root item does not count as a descendant.
-    var weight = itemInfo.weight,
-        descendants = anItem ? [anItem] : [];
-
-    if (itemInfo.isExpanded && (!(anOutlineView._implementedOutlineViewDataSourceMethods & CPOutlineViewDataSource_outlineView_shouldDeferDisplayingChildrenOfItem_) ||
-        ![dataSource outlineView:anOutlineView shouldDeferDisplayingChildrenOfItem:anItem]))
-    {
-        var index = 0,
-            count = [dataSource outlineView:anOutlineView numberOfChildrenOfItem:anItem],
-            level = itemInfo.level + 1;
-
-        itemInfo.children = [];
-
-        for (; index < count; ++index)
-        {
-            var childItem = [dataSource outlineView:anOutlineView child:index ofItem:anItem],
-                childItemInfo = itemInfosForItems[[childItem UID]];
-
-            if (!childItemInfo)
+        
+            for (; index < count; ++index)
             {
-                childItemInfo = { isExpanded:NO, isExpandable:NO, children:[], weight:1 };
-                itemInfosForItems[[childItem UID]] = childItemInfo;
+                var childItem = [dataSource outlineView:anOutlineView child:index ofItem:anItem],
+                    childItemInfo = itemInfosForItems[[childItem UID]];
+        
+                if (!childItemInfo)
+                {
+                    childItemInfo = { isExpanded:NO, isExpandable:NO, children:[], weight:1 };
+                    itemInfosForItems[[childItem UID]] = childItemInfo;
+                }
+        
+                itemInfo.children[index] = childItem;
+        
+                var childDescendants = _loadItemInfoForItem(anOutlineView, childItem, YES);
+        
+                childItemInfo.parent = anItem;
+                childItemInfo.level = level;
+                descendants = descendants.concat(childDescendants);
             }
-
-            itemInfo.children[index] = childItem;
-
-            var childDescendants = _loadItemInfoForItem(anOutlineView, childItem, YES);
-
-            childItemInfo.parent = anItem;
-            childItemInfo.level = level;
-            descendants = descendants.concat(childDescendants);
         }
-    }
-
-    itemInfo.weight = descendants.length;
-
-    if (!isIntermediate)
-    {
-        // row = -1 is the root item, so just go to row 0 since it is ignored.
-        var index = MAX(itemInfo.row, 0),
-            itemsForRows = anOutlineView._itemsForRows;
-
-        descendants.unshift(index, weight);
-
-        itemsForRows.splice.apply(itemsForRows, descendants);
-
-        var count = itemsForRows.length;
-
-        for (; index < count; ++index)
-            itemInfosForItems[[itemsForRows[index] UID]].row = index;
-
-        var deltaWeight = itemInfo.weight - weight;
-
-        if (deltaWeight !== 0)
+        
+        itemInfo.weight = descendants.length;
+        
+        if (!isIntermediate)
         {
-            var parent = itemInfo.parent;
-
-            while (parent)
+            // row = -1 is the root item, so just go to row 0 since it is ignored.
+            var index = MAX(itemInfo.row, 0),
+                itemsForRows = _itemsForRows;
+        
+            descendants.unshift(index, weight);
+        
+            itemsForRows.splice.apply(itemsForRows, descendants);
+        
+            var count = itemsForRows.length;
+        
+            for (; index < count; ++index)
+                itemInfosForItems[[itemsForRows[index] UID]].row = index;
+        
+            var deltaWeight = itemInfo.weight - weight;
+        
+            if (deltaWeight !== 0)
             {
-                var parentItemInfo = itemInfosForItems[[parent UID]];
-
-                parentItemInfo.weight += deltaWeight;
-                parent = parentItemInfo.parent;
+                var parent = itemInfo.parent;
+        
+                while (parent)
+                {
+                    var parentItemInfo = itemInfosForItems[[parent UID]];
+        
+                    parentItemInfo.weight += deltaWeight;
+                    parent = parentItemInfo.parent;
+                }
+        
+                if (anItem)
+                    _rootItemInfo.weight += deltaWeight;
             }
-
-            if (anItem)
-                anOutlineView._rootItemInfo.weight += deltaWeight;
         }
-    }
-
+    }//end of with
     return descendants;
 }
 
@@ -780,6 +887,93 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
     return [_outlineView._outlineViewDataSource outlineView:_outlineView objectValueForTableColumn:aTableColumn byItem:_outlineView._itemsForRows[aRow]];
 }
 
+- (BOOL)tableView:(CPTableView)aTableColumn writeRowsWithIndexes:(CPIndexSet)theIndexes toPasteboard:(CPPasteboard)thePasteboard
+{
+    if (!(_outlineView._implementedOutlineViewDataSourceMethods & CPOutlineViewDataSource_outlineView_writeItems_toPasteboard_))
+        return NO;
+    
+    var rowIndexes = [];
+    [theIndexes getIndexes:rowIndexes maxCount:[theIndexes count] inIndexRange:nil];
+    
+    var rowIndex = [rowIndexes count],
+        items = [];
+        
+    while (rowIndex--)
+        [items addObject:[_outlineView itemAtRow:[rowIndexes objectAtIndex:rowIndex]]];
+        
+    return [_outlineView._outlineViewDataSource outlineView:_outlineView writeItems:items toPasteboard:thePasteboard];
+}
+
+- (int)_childIndexForDropOperation:(CPTableViewDropOperation)theDropOperation row:(int)theRow offset:(CPPoint)theOffset
+{
+    if (_outlineView._shouldRetargetChildIndex)
+        return _outlineView._retargedChildIndex;
+    
+    var childIndex = CPNotFound;
+    
+    if (theDropOperation === CPTableViewDropAbove)
+    {
+        var parentItem = [_outlineView _parentItemForUpperRow:theRow - 1 andLowerRow:theRow atMouseOffset:theOffset],
+            itemInfo = (parentItem !== nil) ? _outlineView._itemInfosForItems[[parentItem UID]] : _outlineView._rootItemInfo,
+            children = itemInfo.children;
+        
+        childIndex = [children indexOfObject:[_outlineView itemAtRow:theRow]];
+
+        if (childIndex === CPNotFound)
+            childIndex = children.length;
+    }
+    else if (theDropOperation === CPTableViewDropOn)
+        childIndex = -1;
+
+    return childIndex;
+}
+
+- (void)_parentItemForDropOperation:(CPTableViewDropOperation)theDropOperation row:(int)theRow offset:(CPPoint)theOffset
+{
+    if (theDropOperation === CPTableViewDropAbove)
+        return [_outlineView _parentItemForUpperRow:theRow - 1 andLowerRow:theRow atMouseOffset:theOffset]       
+            
+    return [_outlineView itemAtRow:theRow];
+}
+
+- (CPDragOperation)tableView:(CPTableView)aTableView validateDrop:(id < CPDraggingInfo >)theInfo 
+    proposedRow:(int)theRow proposedDropOperation:(CPTableViewDropOperation)theOperation
+{
+    if (!(_outlineView._implementedOutlineViewDataSourceMethods & CPOutlineViewDataSource_outlineView_validateDrop_proposedItem_proposedChildIndex_))
+        return CPDragOperationNone;
+
+    // Make sure the retargeted item and index are reset
+    _outlineView._retargetedItem = nil;
+    _outlineView._shouldRetargetItem = NO;
+
+    _outlineView._retargedChildIndex = nil;
+    _outlineView._shouldRetargetChildIndex = NO;
+
+    var location = [_outlineView convertPoint:[theInfo draggingLocation] fromView:nil],
+        parentItem = [self _parentItemForDropOperation:theOperation row:theRow offset:location];
+        childIndex = [self _childIndexForDropOperation:theOperation row:theRow offset:location];
+
+    return [_outlineView._outlineViewDataSource outlineView:_outlineView validateDrop:theInfo proposedItem:parentItem proposedChildIndex:childIndex];
+}
+
+- (BOOL)tableView:(CPTableView)aTableView acceptDrop:(id <CPDraggingInfo>)theInfo row:(int)theRow dropOperation:(CPTableViewDropOperation)theOperation
+{   
+    if (!(_outlineView._implementedOutlineViewDataSourceMethods & CPOutlineViewDataSource_outlineView_acceptDrop_item_childIndex_))
+        return NO;
+
+     var location = [_outlineView convertPoint:[theInfo draggingLocation] fromView:nil],
+        parentItem = [self _parentItemForDropOperation:theOperation row:theRow offset:location];
+        childIndex = [self _childIndexForDropOperation:theOperation row:theRow offset:location];
+    
+    _outlineView._retargetedItem = nil;
+    _outlineView._shouldRetargetItem = NO;
+
+    _outlineView._retargedChildIndex = nil;
+    _outlineView._shouldRetargetChildIndex = NO;
+
+    return [_outlineView._outlineViewDataSource outlineView:_outlineView acceptDrop:theInfo item:parentItem childIndex:childIndex];
+}
+
 @end
 
 @implementation _CPOutlineViewTableViewDelegate : CPObject
@@ -797,6 +991,54 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
     return self;
 }
 
+- (CPView)tableView:(CPTableView)theTableView dataViewForTableColumn:(CPTableColumn)theTableColumn row:(int)theRow
+{
+    var dataView = nil;
+    
+    if ((_outlineView._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_dataViewForTableColumn_item_))
+            dataView = [_outlineView._outlineViewDelegate outlineView:_outlineView 
+                                           dataViewForTableColumn:theTableColumn 
+                                                             item:[_outlineView itemAtRow:theRow]];
+
+    if (!dataView)
+        dataView = [theTableColumn dataViewForRow:theRow]; 
+        
+    return dataView;
+}
+
+- (BOOL)tableView:(CPTableView)theTableView shouldSelectRow:(int)theRow
+{
+    if ((_outlineView._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_shouldSelectItem_))
+        return [_outlineView._outlineViewDelegate outlineView:_outlineView shouldSelectItem:[_outlineView itemAtRow:theRow]];
+        
+    return YES;
+}
+
+- (float)tableView:(CPTableView)theTableView heightOfRow:(int)theRow
+{
+    if ((_outlineView._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_heightOfRowByItem_))
+        return [_outlineView._outlineViewDelegate outlineView:_outlineView heightOfRowByItem:[_outlineView itemAtRow:theRow]];
+
+    return [theTableView rowHeight];
+}
+
+- (void)tableView:(CPTableView)aTableView willDisplayView:(id)aView forTableColumn:(CPTableColumn)aTableColumn row:(int)aRowIndex
+{
+    if ((_outlineView._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_willDisplayView_forTableColumn_item_))
+    {
+        var item = [_outlineView itemAtRow:aRowIndex];
+        [_outlineView._outlineViewDelegate outlineView:_outlineView willDisplayView:aView forTableColumn:aTableColumn item:item];
+    }
+}
+
+- (BOOL)tableView:(CPTableView)aTableView isGroupRow:(int)row
+{
+    if ((_outlineView._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_isGroupItem_))
+        return [_outlineView._outlineViewDelegate outlineView:_outlineView isGroupItem:[_outlineView itemAtRow:theRow]];
+
+    return NO;
+}
+
 @end
 
 @implementation CPDisclosureButton : CPButton
@@ -845,8 +1087,10 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
     CGContextAddLineToPoint(context, 0.0, 0.0);
 
     CGContextClosePath(context);
-
-    CGContextSetFillColor(context, ([self themeState] & CPThemeState("highlighted")) ? [CPColor blackColor] : [CPColor grayColor]);
+    var isHighlighted = [self hasThemeState:CPThemeStateHighlighted];
+    var color = [self hasThemeState:CPThemeStateSelected] ? (isHighlighted ? [CPColor lightGrayColor] : [CPColor whiteColor]) : (isHighlighted ? [CPColor blackColor] : [CPColor grayColor]);
+    
+    CGContextSetFillColor(context, color);
     CGContextFillPath(context);
 }
 

AppKit/CPPasteboard.j

@@ -233,7 +233,7 @@ var CPPasteboards = nil,
 */
 - (BOOL)setPropertyList:(id)aPropertyList forType:(CPString)aType
 {
-    return [self setData:[CPPropertyListSerialization dataFromPropertyList:aPropertyList format:CPPropertyListXMLFormat_v1_0 errorDescription:nil] forType:aType];
+    return [self setData:[CPPropertyListSerialization dataFromPropertyList:aPropertyList format:CPPropertyList280NorthFormat_v1_0] forType:aType];
 }
 
 /*!
@@ -343,7 +343,7 @@ var CPPasteboards = nil,
     var data = [self dataForType:aType];
     
     if (data)
-        return [CPPropertyListSerialization propertyListFromData:data format:CPPropertyListXMLFormat_v1_0 errorDescription:nil];
+        return [CPPropertyListSerialization propertyListFromData:data format:CPPropertyList280NorthFormat_v1_0];
         
     return nil;
 }
@@ -415,7 +415,7 @@ var DOMDataTransferPasteboard = nil;
         if (type === CPStringPboardType)
             _dataTransfer.setData(type, [aPasteboard stringForType:type]);
         else
-            _dataTransfer.setData(type, [[aPasteboard dataForType:type] string]);
+            _dataTransfer.setData(type, [[aPasteboard dataForType:type] rawString]);
     }
 }
 
@@ -429,9 +429,9 @@ var DOMDataTransferPasteboard = nil;
     var dataString = _dataTransfer.getData(aType);
 
     if (aType === CPStringPboardType)
-        return [CPData dataFromPropertyList:dataString format:kCFPropertyList280NorthFormat_v1_0 errorDescription:0];
+        return [CPData dataFromPropertyList:dataString format:kCFPropertyList280NorthFormat_v1_0];
 
-    return [CPData dataWithString:dataString];
+    return [CPData dataWithRawString:dataString];
 }
 
 - (id)propertyListForType:(CPString)aType
@@ -439,7 +439,7 @@ var DOMDataTransferPasteboard = nil;
     if (aType === CPStringPboardType)
         return _dataTransfer.getData(aType);
 
-    return [CPPropertyListSerialization propertyListFromData:[self dataForType:aType] format:CPPropertyListUnknownFormat errorDescription:nil];
+    return [CPPropertyListSerialization propertyListFromData:[self dataForType:aType] format:CPPropertyListUnknownFormat];
 }
 
 @end

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/CPProgressIndicator.j

@@ -104,17 +104,14 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
     for (; start <= end; ++start)
     {
         CPProgressIndicatorBezelBorderViewPool[start] = [];
-    
         CPProgressIndicatorBezelBorderViewPool[start][CPMiniControlSize]    = [];
         CPProgressIndicatorBezelBorderViewPool[start][CPSmallControlSize]   = [];
         CPProgressIndicatorBezelBorderViewPool[start][CPRegularControlSize]  = [];
     }
     
     CPProgressIndicatorClassName = [self className];
-    
-    
     CPProgressIndicatorStyleIdentifiers = [];
-    
+
     CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle]        = @"Bar";
     CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorSpinningStyle]   = @"Spinny";
     CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle]     = @"HUDBar";
@@ -126,30 +123,20 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
     CPProgressIndicatorStyleSizes = [];
 
     // Bar Sttyle
-    var prefix = CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle];
+    var prefixes = [
+        CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle],
+        CPProgressIndicatorClassName + @"Bar" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle],
+        CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle],
+        CPProgressIndicatorClassName + @"Bar" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle]
+    ];
 
-    CPProgressIndicatorStyleSizes[prefix + regularIdentifier] = [_CGSizeMake(3.0, 15.0), _CGSizeMake(1.0, 15.0), _CGSizeMake(3.0, 15.0)];
-    CPProgressIndicatorStyleSizes[prefix + smallIdentifier] = [_CGSizeMake(3.0, 15.0), _CGSizeMake(1.0, 15.0), _CGSizeMake(3.0, 15.0)];
-    CPProgressIndicatorStyleSizes[prefix + miniIdentifier] = [_CGSizeMake(3.0, 15.0), _CGSizeMake(1.0, 15.0), _CGSizeMake(3.0, 15.0)];
-
-    prefix = CPProgressIndicatorClassName + @"Bar" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle];
-
-    CPProgressIndicatorStyleSizes[prefix + regularIdentifier] = _CGSizeMake(1.0, 9.0);
-    CPProgressIndicatorStyleSizes[prefix + smallIdentifier] = _CGSizeMake(1.0, 9.0);
-    CPProgressIndicatorStyleSizes[prefix + miniIdentifier] = _CGSizeMake(1.0, 9.0);
-
-    // HUD Bar Style
-    prefix = CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle];
-
-    CPProgressIndicatorStyleSizes[prefix + regularIdentifier] = [_CGSizeMake(3.0, 15.0), _CGSizeMake(1.0, 15.0), _CGSizeMake(3.0, 15.0)];
-    CPProgressIndicatorStyleSizes[prefix + smallIdentifier] = [_CGSizeMake(3.0, 15.0), _CGSizeMake(1.0, 15.0), _CGSizeMake(3.0, 15.0)];
-    CPProgressIndicatorStyleSizes[prefix + miniIdentifier] = [_CGSizeMake(3.0, 15.0), _CGSizeMake(1.0, 15.0), _CGSizeMake(3.0, 15.0)];
-
-    prefix = CPProgressIndicatorClassName + @"Bar" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle];
-
-    CPProgressIndicatorStyleSizes[prefix + regularIdentifier] = _CGSizeMake(1.0, 9.0);
-    CPProgressIndicatorStyleSizes[prefix + smallIdentifier] = _CGSizeMake(1.0, 9.0);
-    CPProgressIndicatorStyleSizes[prefix + miniIdentifier] = _CGSizeMake(1.0, 9.0);
+    for (var i = 0, count = prefixes.length; i<count; i++)
+    {
+        var prefix = prefixes[i];
+        CPProgressIndicatorStyleSizes[prefix + regularIdentifier] = [_CGSizeMake(3.0, 16.0), _CGSizeMake(1.0, 16.0), _CGSizeMake(3.0, 16.0)];
+        CPProgressIndicatorStyleSizes[prefix + smallIdentifier] = [_CGSizeMake(3.0, 16.0), _CGSizeMake(1.0, 16.0), _CGSizeMake(3.0, 16.0)];
+        CPProgressIndicatorStyleSizes[prefix + miniIdentifier] = [_CGSizeMake(3.0, 16.0), _CGSizeMake(1.0, 16.0), _CGSizeMake(3.0, 16.0)];
+    }
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -428,21 +415,25 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
     
     if (!_barView)
     {
-        _barView = [[CPView alloc] initWithFrame:CGRectMake(2.0, 2.0, 0.0, 9.0)];
-        
-        [_barView setBackgroundColor:[CPColor redColor]];
-        
+        _barView = [[CPView alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, 16.0)];        
         [self addSubview:_barView];
     }
     
-    [_barView setBackgroundColor:_CPControlColorWithPatternImage(
+    [_barView setBackgroundColor:_CPControlThreePartImagePattern(
+        NO,
         CPProgressIndicatorStyleSizes,
         CPProgressIndicatorClassName,
         @"Bar",
         CPProgressIndicatorStyleIdentifiers[_style],
         _CPControlIdentifierForControlSize(_controlSize))];
-                    
-    [_barView setFrameSize:CGSizeMake(CGRectGetWidth([self bounds]) * (_doubleValue - _minValue) / (_maxValue - _minValue) - 4.0, 9.0)];
+
+    var width = CGRectGetWidth([self bounds]),
+        barWidth = width * ((_doubleValue - _minValue) / (_maxValue - _minValue));
+
+    if (barWidth > 0.0 && barWidth < 4.0)
+        barWidth = 4.0;
+
+    [_barView setFrameSize:CGSizeMake(barWidth, 16.0)];
 }
 
 /* @ignore */

AppKit/CPResponder.j

@@ -27,6 +27,9 @@ CPDeleteKeyCode     = 8;
 CPTabKeyCode        = 9;
 CPReturnKeyCode     = 13;
 CPEscapeKeyCode     = 27;
+CPSpaceKeyCode      = 32;
+CPPageUpKeyCode     = 33;
+CPPageDownKeyCode   = 34;
 CPLeftArrowKeyCode  = 37;
 CPUpArrowKeyCode    = 38;
 CPRightArrowKeyCode = 39;
@@ -105,6 +108,10 @@ CPDownArrowKeyCode  = 40;
 
         switch([event keyCode])
         {
+            case CPPageUpKeyCode:       [self doCommandBySelector:@selector(pageUp:)];
+                                        break;
+            case CPPageDownKeyCode:     [self doCommandBySelector:@selector(pageDown:)];
+                                        break;
             case CPLeftArrowKeyCode:    [self doCommandBySelector:@selector(moveLeft:)];
                                         break;
             case CPRightArrowKeyCode:   [self doCommandBySelector:@selector(moveRight:)];
@@ -145,6 +152,15 @@ CPDownArrowKeyCode  = 40;
     [_nextResponder performSelector:_cmd withObject:anEvent];
 }
 
+/*!
+    Notifies the receiver that the user has clicked the right mouse down in its area.
+    @param anEvent contains information about the right click
+*/
+- (void)rightMouseDown:(CPEvent)anEvent
+{
+    [_nextResponder performSelector:_cmd withObject:anEvent];
+}
+
 /*!
     Notifies the receiver that the user has initiated a drag
     over it. A drag is a mouse movement while the left button is down.
@@ -164,6 +180,15 @@ CPDownArrowKeyCode  = 40;
     [_nextResponder performSelector:_cmd withObject:anEvent];
 }
 
+/*!
+    Notifies the receiver that the user has released the right mouse button.
+    @param anEvent contains information about the release
+*/
+- (void)rightMouseUp:(CPEvent)anEvent
+{
+    [_nextResponder performSelector:_cmd withObject:anEvent];
+}
+
 /*!
     Notifies the receiver that the user has moved the mouse (with no buttons down).
     @param anEvent contains information about the movement

AppKit/CPScreen.j

@@ -1,8 +1,8 @@
 
 @import <Foundation/CPObject.j>
 
-
 #import "CoreGraphics/CGGeometry.h"
+#import "Platform/Platform.h"
 
 @implementation CPScreen : CPObject
 {
@@ -10,7 +10,11 @@
 
 - (CGRect)visibleFrame
 {
+#if PLATFORM(DOM)
     return _CGRectMake(window.screen.availLeft, window.screen.availTop, window.screen.availWidth, window.screen.availHeight);
+#else
+    return _CGRectMakeZero();
+#endif
 }
 
 @end

AppKit/CPScrollView.j

@@ -315,7 +315,10 @@
     _hasHorizontalScroller = shouldHaveHorizontalScroller;
 
     if (_hasHorizontalScroller && !_horizontalScroller)
-        [self setHorizontalScroller:[[CPScroller alloc] initWithFrame:CGRectMake(0.0, 0.0, _CGRectGetWidth([self bounds]), [CPScroller scrollerWidth])]];
+    {
+        [self setHorizontalScroller:[[CPScroller alloc] initWithFrame:CGRectMake(0.0, 0.0, MAX(_CGRectGetWidth([self bounds]), [CPScroller scrollerWidth]+1), [CPScroller scrollerWidth])]];
+        [[self horizontalScroller] setFrameSize:CGSizeMake(_CGRectGetWidth([self bounds]), [CPScroller scrollerWidth])];
+    }
 
     [self reflectScrolledClipView:_contentView];
 }
@@ -373,7 +376,10 @@
     _hasVerticalScroller = shouldHaveVerticalScroller;
 
     if (_hasVerticalScroller && !_verticalScroller)
-        [self setVerticalScroller:[[CPScroller alloc] initWithFrame:_CGRectMake(0.0, 0.0, [CPScroller scrollerWidth], _CGRectGetHeight([self bounds]))]];
+    {
+        [self setVerticalScroller:[[CPScroller alloc] initWithFrame:_CGRectMake(0.0, 0.0, [CPScroller scrollerWidth], MAX(_CGRectGetHeight([self bounds]), [CPScroller scrollerWidth]+1))]];
+        [[self verticalScroller] setFrameSize:CGSizeMake([CPScroller scrollerWidth], _CGRectGetHeight([self bounds]))];
+    }
 
     [self reflectScrolledClipView:_contentView];
 }
@@ -439,9 +445,7 @@
 
 - (CPView)_headerView
 {
-    var headerClipViewSubviews = [_headerClipView subviews];
-
-    return [headerClipViewSubviews count] ? headerClipViewSubviews[0] : nil;
+    return [_headerClipView documentView];
 }
 
 - (CGRect)_cornerViewFrame
@@ -664,51 +668,78 @@
 */
 - (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
 {
-    var keyCode = [anEvent keyCode],
-        documentFrame = [[self documentView] frame],
+    [self interpretKeyEvents:[anEvent]];
+}
+
+- (void)pageUp:(id)sender
+{
+    var contentBounds = [_contentView bounds];
+    [self moveByOffset:CGSizeMake(0.0, -(_CGRectGetHeight(contentBounds) - _verticalPageScroll))];
+}
+
+- (void)pageDown:(id)sender
+{
+    var contentBounds = [_contentView bounds];
+    [self moveByOffset:CGSizeMake(0.0, _CGRectGetHeight(contentBounds) - _verticalPageScroll)];
+}
+
+- (void)moveLeft:(id)sender
+{
+    [self moveByOffset:CGSizeMake(-_horizontalLineScroll, 0.0)];
+}
+
+- (void)moveRight:(id)sender
+{
+    [self moveByOffset:CGSizeMake(_horizontalLineScroll, 0.0)];
+}
+
+- (void)moveUp:(id)sender
+{
+    [self moveByOffset:CGSizeMake(0.0, -_verticalLineScroll)];
+}
+
+- (void)moveDown:(id)sender
+{
+    [self moveByOffset:CGSizeMake(0.0, _verticalLineScroll)];
+}
+
+- (void)moveByOffset:(CGSize)aSize
+{
+    var documentFrame = [[self documentView] frame],
         contentBounds = [_contentView bounds];
-    
-    switch (keyCode)
-    {
-        case 33:    /*pageup*/
-                    contentBounds.origin.y -= _CGRectGetHeight(contentBounds) - _verticalPageScroll;
-                    break;
-                    
-        case 34:    /*pagedown*/
-                    contentBounds.origin.y += _CGRectGetHeight(contentBounds) - _verticalPageScroll;
-                    break;
-                    
-        case 38:    /*up arrow*/
-                    contentBounds.origin.y -= _verticalLineScroll;
-                    break;
 
-        case 40:    /*down arrow*/
-                    contentBounds.origin.y += _verticalLineScroll;
-                    break;
-                    
-        case 37:    /*left arrow*/
-                    contentBounds.origin.x -= _horizontalLineScroll;
-                    break;
-
-        case 49:    /*right arrow*/
-                    contentBounds.origin.x += _horizontalLineScroll;
-                    break;
-                    
-        default:    return [super keyDown:anEvent];
-    }
+    contentBounds.origin.x += aSize.width;
+    contentBounds.origin.y += aSize.height;
 
     [_contentView scrollToPoint:contentBounds.origin];
     [_headerClipView scrollToPoint:CGPointMake(contentBounds.origin, 0)];
@@ -726,7 +757,8 @@ var CPScrollViewContentViewKey       = "CPScrollViewContentView",
     CPScrollViewHasHScrollerKey      = "CPScrollViewHasHScroller",
     CPScrollViewVScrollerKey         = "CPScrollViewVScroller",
     CPScrollViewHScrollerKey         = "CPScrollViewHScroller",
-    CPScrollViewAutohidesScrollerKey = "CPScrollViewAutohidesScroller";
+    CPScrollViewAutohidesScrollerKey = "CPScrollViewAutohidesScroller",
+    CPScrollViewCornerViewKey        = "CPScrollViewCornerViewKey";
 
 @implementation CPScrollView (CPCoding)
 
@@ -742,14 +774,22 @@ 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];
 
         _hasVerticalScroller    = [aCoder decodeBoolForKey:CPScrollViewHasVScrollerKey];
         _hasHorizontalScroller  = [aCoder decodeBoolForKey:CPScrollViewHasHScrollerKey];
         _autohidesScrollers     = [aCoder decodeBoolForKey:CPScrollViewAutohidesScrollerKey];
-        
+
+        _cornerView             = [aCoder decodeObjectForKey:CPScrollViewCornerViewKey];
+
         // Do to the anything goes nature of decoding, our subviews may not exist yet, so layout at the end of the run loop when we're sure everything is in a correct state.
         [[CPRunLoop currentRunLoop] performSelector:@selector(reflectScrolledClipView:) target:self argument:_contentView order:0 modes:[CPDefaultRunLoopMode]];
     }
@@ -775,6 +815,8 @@ var CPScrollViewContentViewKey       = "CPScrollViewContentView",
     [aCoder encodeBool:_hasVerticalScroller     forKey:CPScrollViewHasVScrollerKey];
     [aCoder encodeBool:_hasHorizontalScroller   forKey:CPScrollViewHasHScrollerKey];
     [aCoder encodeBool:_autohidesScrollers      forKey:CPScrollViewAutohidesScrollerKey];
+
+    [aCoder encodeObject:_cornerView            forKey:CPScrollViewCornerViewKey];
 }
 
 @end

AppKit/CPScroller.j

@@ -79,7 +79,7 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
 
 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[    nil, nil, nil, nil,
+    return [CPDictionary dictionaryWithObjects:[    [CPNull null], [CPNull null], [CPNull null], [CPNull null],
                                                     _CGSizeMakeZero(), _CGSizeMakeZero(), _CGInsetMakeZero(), _CGInsetMakeZero(), _CGSizeMakeZero()]
                                        forKeys:[    @"knob-slot-color",
                                                     @"decrement-line-color",
@@ -242,14 +242,14 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
     {
         _usableParts = CPNoScrollerParts;
     
-        _partRects[CPScrollerDecrementPage] = _CGRectMakeZero();
-        _partRects[CPScrollerKnob]          = _CGRectMakeZero();
-        _partRects[CPScrollerIncrementPage] = _CGRectMakeZero();
-        _partRects[CPScrollerDecrementLine] = _CGRectMakeZero();
-        _partRects[CPScrollerIncrementLine] = _CGRectMakeZero();
+        _partRects[CPScrollerDecrementPage] = CGRectMakeZero();
+        _partRects[CPScrollerKnob]          = CGRectMakeZero();
+        _partRects[CPScrollerIncrementPage] = CGRectMakeZero();
+        _partRects[CPScrollerDecrementLine] = CGRectMakeZero();
+        _partRects[CPScrollerIncrementLine] = CGRectMakeZero();
 
         // In this case, the slot is the entirety of the scroller.
-        _partRects[CPScrollerKnobSlot] = _CGRectMakeCopy(bounds);
+        _partRects[CPScrollerKnobSlot] = CGRectMakeCopy(bounds);
         
         return;
     }
@@ -279,9 +279,18 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
         _partRects[CPScrollerIncrementPage] = _CGRectMake(0.0, knobLocation + knobHeight, width, height - (knobLocation + knobHeight) - effectiveIncrementLineHeight);
         _partRects[CPScrollerKnobSlot]      = _CGRectMake(trackInset.left, effectiveDecrementLineHeight, width - trackInset.left - trackInset.right, slotHeight);
         _partRects[CPScrollerDecrementLine] = _CGRectMake(0.0, 0.0, decrementLineSize.width, decrementLineSize.height);
-        _partRects[CPScrollerIncrementLine] = _CGRectMake(0.0, height - incrementLineSize.height, incrementLineSize.width, incrementLineSize.height);  
+        _partRects[CPScrollerIncrementLine] = _CGRectMake(0.0, height - incrementLineSize.height, incrementLineSize.width, incrementLineSize.height);
+        
+        if(height < knobHeight + decrementLineSize.height + incrementLineSize.height + trackInset.top + trackInset.bottom)
+            _partRects[CPScrollerKnob] = _CGRectMakeZero();
+        
+        if(height < decrementLineSize.height + incrementLineSize.height - 2)
+        {
+            _partRects[CPScrollerIncrementLine] = _CGRectMakeZero();
+            _partRects[CPScrollerDecrementLine] = _CGRectMakeZero();
+            _partRects[CPScrollerKnobSlot]      = _CGRectMake(trackInset.left, 0,  width - trackInset.left - trackInset.right, height);
+        }
     }
-
     else
     {
         var decrementLineSize = [self currentValueForThemeAttribute:"decrement-line-size"],
@@ -300,6 +309,16 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
         _partRects[CPScrollerKnobSlot]      = _CGRectMake(effectiveDecrementLineWidth, trackInset.top, slotWidth, height - trackInset.top - trackInset.bottom);
         _partRects[CPScrollerDecrementLine] = _CGRectMake(0.0, 0.0, decrementLineSize.width, decrementLineSize.height);
         _partRects[CPScrollerIncrementLine] = _CGRectMake(width - incrementLineSize.width, 0.0, incrementLineSize.width, incrementLineSize.height);
+        
+        if(width < knobWidth + decrementLineSize.width + incrementLineSize.width + trackInset.left + trackInset.right)
+            _partRects[CPScrollerKnob] = _CGRectMakeZero();
+        
+        if(width < decrementLineSize.width + incrementLineSize.width - 2)
+        {
+            _partRects[CPScrollerIncrementLine] = _CGRectMakeZero();
+            _partRects[CPScrollerDecrementLine] = _CGRectMakeZero();
+            _partRects[CPScrollerKnobSlot]      = _CGRectMake(0.0, 0.0,  width, slotHeight);
+        }
     }
 }
 

AppKit/CPSearchField.j

@@ -24,26 +24,10 @@
 
 #include "Platform/Platform.h"
 
-/*!
-    @global
-    @group Menu tags
-*/
-CPSearchFieldRecentsTitleMenuItemTag = 1000;
-/*!
-    @global
-    @group Menu tags
-*/
-CPSearchFieldRecentsMenuItemTag = 1001;
-/*!
-    @global
-    @group Menu tags
-*/
-CPSearchFieldClearRecentsMenuItemTag = 1002;
-/*!
-    @global
-    @group Menu tags
-*/
-CPSearchFieldNoRecentsMenuItemTag = 1003;
+CPSearchFieldRecentsTitleMenuItemTag    = 1000;
+CPSearchFieldRecentsMenuItemTag         = 1001;
+CPSearchFieldClearRecentsMenuItemTag    = 1002;
+CPSearchFieldNoRecentsMenuItemTag       = 1003;
 
 var CPSearchFieldSearchImage = nil,
     CPSearchFieldFindImage = nil,
@@ -79,64 +63,49 @@ var CPSearchFieldSearchImage = nil,
         return;
 
     var bundle = [CPBundle bundleForClass:self];
-    CPSearchFieldSearchImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldSearch.png"]];
-    CPSearchFieldFindImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldFind.png"]];
-    CPSearchFieldCancelImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldCancel.png"]];
-    CPSearchFieldCancelPressedImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldCancelPressed.png"]];
+    CPSearchFieldSearchImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldSearch.png"] size:CGSizeMake(25, 22)];
+    CPSearchFieldFindImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldFind.png"] size:CGSizeMake(25, 22)];
+    CPSearchFieldCancelImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldCancel.png"] size:CGSizeMake(22, 22)];
+    CPSearchFieldCancelPressedImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldCancelPressed.png"] size:CGSizeMake(22, 22)];
 }
 
-- (id)initWithFrame:(CPRect)frame
+- (id)initWithFrame:(CGRect)frame
 {
-    self = [super initWithFrame:frame];
-    if (self != nil)
+    if (self = [super initWithFrame:frame])
     {
         _recentSearches = [CPArray array];
         _maximumRecents = 10;
         _sendsWholeSearchString = NO;
         _sendsSearchStringImmediately = NO;
         _recentsAutosaveName = nil;
-         
-        [self setBezeled:YES];
-        [self setBezelStyle:CPTextFieldRoundedBezel];
-        [self setBordered:YES];
-        [self setEditable:YES];
-        [self setDelegate:self];
-        
-        _cancelButton = [[CPButton alloc] initWithFrame:CPMakeRect(frame.size.width - 27,(frame.size.height-22)/2,22,22)];
-        [self resetCancelButton];
-        [_cancelButton setHidden:YES];
-        [_cancelButton setAutoresizingMask:CPViewMinXMargin];
-        [self addSubview:_cancelButton];
-        
-        _searchButton = [[CPButton alloc] initWithFrame:CPMakeRect(5,(frame.size.height-25)/2,25,25)];
-        [self resetSearchButton];
-        [self addSubview:_searchButton];
 
+        [self _initWithFrame:frame];
 #if PLATFORM(DOM)
-    _cancelButton._DOMElement.style.cursor = "default";
-    _searchButton._DOMElement.style.cursor = "default";
-#endif
-          
+        _cancelButton._DOMElement.style.cursor = "default";
+        _searchButton._DOMElement.style.cursor = "default";
+#endif          
     }
     
     return self;
 }
 
-- (id)copy
+- (void)_initWithFrame:(CGRect)frame
 {
-    var copy = [super copy];
+    [self setBezeled:YES];
+    [self setBezelStyle:CPTextFieldRoundedBezel];
+    [self setBordered:YES];
+    [self setEditable:YES];
+    [self setDelegate:self];
     
-    [copy setCancelButton:[_cancelButton copy]];
-    [copy setSearchButton:[_searchButton copy]];
-    [copy setSendsWholeSearchString:[_sendsWholeSearchString copy]];
-    [copy setSendsSearchStringImmediately:[_sendsSearchStringImmediately copy]];
-    [copy setMaximumRecents:_maximumRecents];
-    if (_recentsAutosaveName)
-        [copy setrecentsAutosaveName:[_recentsAutosaveName copy]];
-    if (_searchMenuTemplate)
-        [copy setSearchMenutemplate:[_searchMenuTemplate copy]];
+    _cancelButton = [[CPButton alloc] initWithFrame:CGRectMake(frame.size.width - 27,(frame.size.height-22)/2,22,22)];
+    [self resetCancelButton];
+    [_cancelButton setHidden:YES];
+    [_cancelButton setAutoresizingMask:CPViewMinXMargin];
+    [self addSubview:_cancelButton];
     
-    return copy;
+    _searchButton = [[CPButton alloc] initWithFrame:CGRectMake(5,(frame.size.height-25)/2,25,25)];
+    [self resetSearchButton];
+    [self addSubview:_searchButton];
 }
 
 // Managing Buttons
@@ -695,9 +664,7 @@ var CPSearchFieldSearchImage = nil,
 
 @end
 
-var CPSearchButtonKey                   = @"CPSearchButtonKey",
-    CPCancelButtonKey                   = @"CPCancelButtonKey",
-    CPRecentsAutosaveNameKey            = @"CPRecentsAutosaveNameKey",
+var CPRecentsAutosaveNameKey            = @"CPRecentsAutosaveNameKey",
     CPSendsWholeSearchStringKey         = @"CPSendsWholeSearchStringKey",
     CPSendsSearchStringImmediatelyKey   = @"CPSendsSearchStringImmediatelyKey",
     CPMaximumRecentsKey                 = @"CPMaximumRecentsKey",
@@ -707,13 +674,20 @@ var CPSearchButtonKey                   = @"CPSearchButtonKey",
 
 - (void)encodeWithCoder:(CPCoder)coder
 {
-    [super encodeWithCoder:coder];
-    
-    [coder encodeObject:_searchButton forKey:CPSearchButtonKey];
-    [coder encodeObject:_cancelButton forKey:CPCancelButtonKey];
+    [_searchButton removeFromSuperview];
+    [_cancelButton removeFromSuperview];
+
+    [super encodeWithCoder:coder];    
+
+    if (_searchButton)
+        [self addSubview:_searchButton];
+    if (_cancelButton)
+        [self addSubview:_cancelButton];
+
     [coder encodeBool:_sendsWholeSearchString forKey:CPSendsWholeSearchStringKey];
     [coder encodeBool:_sendsSearchStringImmediately forKey:CPSendsSearchStringImmediatelyKey];
     [coder encodeInt:_maximumRecents forKey:CPMaximumRecentsKey];
+
     if (_recentsAutosaveName)
         [coder encodeObject:_recentsAutosaveName forKey:CPRecentsAutosaveNameKey];
     if (_searchMenuTemplate)
@@ -722,21 +696,23 @@ var CPSearchButtonKey                   = @"CPSearchButtonKey",
 
 - (id)initWithCoder:(CPCoder)coder
 {
-    self = [super initWithCoder:coder];
-    
-    _searchButton             = [coder decodeObjectForKey:CPSearchButtonKey];
-    _cancelButton             = [coder decodeObjectForKey:CPCancelButtonKey];
-    _recentsAutosaveName      = [coder decodeObjectForKey:CPRecentsAutosaveNameKey];
-    _sendsWholeSearchString   = [coder decodeBoolForKey:CPSendsWholeSearchStringKey];
-    _sendsSearchStringImmediately = [coder decodeBoolForKey:CPSendsSearchStringImmediatelyKey];
-    _maximumRecents           = [coder decodeIntForKey:CPMaximumRecentsKey];
-    var template              = [coder decodeObjectForKey:CPSearchMenuTemplateKey];
-    if (template)
-        [self setSearchMenuTemplate:template];
-        
-    [self setDelegate:self];
+    if (self = [super initWithCoder:coder])
+    {
+        [self _initWithFrame:[self frame]];
+
+        _recentsAutosaveName      = [coder decodeObjectForKey:CPRecentsAutosaveNameKey];
+        _sendsWholeSearchString   = [coder decodeBoolForKey:CPSendsWholeSearchStringKey];
+        _sendsSearchStringImmediately = [coder decodeBoolForKey:CPSendsSearchStringImmediatelyKey];
+        _maximumRecents           = [coder decodeIntForKey:CPMaximumRecentsKey];
+
+        var template              = [coder decodeObjectForKey:CPSearchMenuTemplateKey];
+        if (template)
+            [self setSearchMenuTemplate:template];
+            
+        [self setDelegate:self];
+    }
 
     return self;
 }
 
-@end
+@end

AppKit/CPSegmentedControl.j

@@ -26,20 +26,8 @@
 
 #include "CoreGraphics/CGGeometry.h"
 
-/*
-    @global
-    @group CPSegmentSwitchTracking
-*/
 CPSegmentSwitchTrackingSelectOne = 0;
-/*
-    @global
-    @group CPSegmentSwitchTracking
-*/
 CPSegmentSwitchTrackingSelectAny = 1;
-/*
-    @global
-    @group CPSegmentSwitchTracking
-*/
 CPSegmentSwitchTrackingMomentary = 2;
 
 /*! 
@@ -68,7 +56,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 
 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[CPCenterTextAlignment, CPCenterVerticalTextAlignment, CPImageLeft, CPScaleNone, _CGInsetMakeZero(), _CGInsetMakeZero(), nil, nil, nil, nil, 1.0, 24.0]
+    return [CPDictionary dictionaryWithObjects:[CPCenterTextAlignment, CPCenterVerticalTextAlignment, CPImageLeft, CPScaleNone, _CGInsetMakeZero(), _CGInsetMakeZero(), [CPNull null], [CPNull null], [CPNull null], [CPNull null], 1.0, 24.0]
                                        forKeys:[@"alignment", @"vertical-alignment", @"image-position", @"image-scaling", @"bezel-inset", @"content-inset", @"left-segment-bezel-color", @"right-segment-bezel-color", @"center-segment-bezel-color", @"divider-bezel-color", @"divider-thickness", @"default-height"]];
 }
 
@@ -375,7 +363,10 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (void)setEnabled:(BOOL)isEnabled forSegment:(unsigned)aSegment
 {
-    _segments[aSegment].enabled = isEnabled;
+    if (isEnabled)
+        _themeStates[aSegment] &= ~CPThemeStateDisabled;
+    else
+        _themeStates[aSegment] |= CPThemeStateDisabled;
 
     [self setNeedsLayout];
     [self setNeedsDisplay:YES];
@@ -388,7 +379,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (BOOL)isEnabledForSegment:(unsigned)aSegment
 {
-    return _segments[aSegment].enabled;
+    return !(_themeStates[aSegment] & CPThemeStateDisabled)
 }
 
 /*!
@@ -462,30 +453,28 @@ CPSegmentSwitchTrackingMomentary = 2;
     }
     else if (aName === "right-segment-bezel")
     {
-        var lastSegmentLeftOffset = [self _leftOffsetForSegment:[self _indexOfLastSegment]];
-
-        return CPRectMake(lastSegmentLeftOffset + [self widthForSegment:[self _indexOfLastSegment]] - contentInset.right,
+        return CPRectMake(CGRectGetWidth([self bounds]) - contentInset.right,
                             bezelInset.top,
                             contentInset.right,
                             height);
     }
-    else if (aName.substring(0, "segment-bezel".length) == "segment-bezel")
+    else if (aName.indexOf("segment-bezel") === 0)
     {
         var segment = parseInt(aName.substring("segment-bezel-".length), 10),
             frame = CGRectCreateCopy(_segments[segment].frame);
 
-        if (segment == 0)
+        if (segment === 0)
         {
             frame.origin.x += contentInset.left;
             frame.size.width -= contentInset.left;
         }
 
-        if (segment == _segments.length - 1)
-            frame.size.width -= contentInset.right;
+        if (segment === _segments.length - 1)
+            frame.size.width = CGRectGetWidth([self bounds]) - contentInset.right - frame.origin.x;
 
         return frame;
     }
-    else if (aName.substring(0, "divider-bezel".length) == "divider-bezel")
+    else if (aName.indexOf("divider-bezel") === 0)
     {
         var segment = parseInt(aName.substring("divider-bezel-".length), 10),
             width = [self widthForSegment:segment],
@@ -494,7 +483,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 
         return CGRectMake(left + width, bezelInset.top, thickness, height);
     }
-    else if (aName.substring(0, "segment-content".length) == "segment-content")
+    else if (aName.indexOf("segment-content") === 0)
     {
         var segment = parseInt(aName.substring("segment-content-".length), 10);
 
@@ -517,8 +506,12 @@ CPSegmentSwitchTrackingMomentary = 2;
     if (_segments.length <= 0)
         return;
 
+    var themeState = _themeStates[0];
+
+    themeState |= _themeState & CPThemeStateDisabled;
+
     var leftCapColor = [self valueForThemeAttribute:@"left-segment-bezel-color" 
-                                            inState:_themeStates[0]];
+                                            inState:themeState];
 
     var leftBezelView = [self layoutEphemeralSubviewNamed:@"left-segment-bezel"
                                                positioned:CPWindowBelow
@@ -526,8 +519,12 @@ CPSegmentSwitchTrackingMomentary = 2;
 
     [leftBezelView setBackgroundColor:leftCapColor];
 
+    var themeState = _themeStates[_themeStates.length - 1];
+
+    themeState |= _themeState & CPThemeStateDisabled;
+
     var rightCapColor = [self valueForThemeAttribute:@"right-segment-bezel-color" 
-                                             inState:_themeStates[_themeStates.length - 1]];
+                                             inState:themeState];
 
     var rightBezelView = [self layoutEphemeralSubviewNamed:@"right-segment-bezel"
                                                positioned:CPWindowBelow
@@ -703,7 +700,16 @@ CPSegmentSwitchTrackingMomentary = 2;
     while (count--)
         if (CGRectContainsPoint(_segments[count].frame, aPoint))
             return count;
-    
+
+    if (_segments.length)
+    {
+        var adjustedLastFrame = CGRectCreateCopy(_segments[_segments.length - 1].frame);
+        adjustedLastFrame.size.width = CGRectGetWidth([self bounds]) - adjustedLastFrame.origin.x;
+
+        if (CGRectContainsPoint(adjustedLastFrame, aPoint))
+            return _segments.length - 1;
+    }
+
     return -1;
 }
 
@@ -734,7 +740,7 @@ CPSegmentSwitchTrackingMomentary = 2;
         if (_trackingSegment == -1)
             return;
 
-        if (CGRectContainsPoint(_segments[_trackingSegment].frame, location))
+        if (_trackingSegment === [self testSegment:location])
         {
             if (_trackingMode == CPSegmentSwitchTrackingSelectAny)
             {
@@ -765,10 +771,13 @@ CPSegmentSwitchTrackingMomentary = 2;
     
     if (type == CPLeftMouseDown)
     {
-        _trackingHighlighted = YES;
-        _trackingSegment = [self testSegment:location];
-        
-        [self drawSegmentBezel:_trackingSegment highlight:YES];
+        var trackingSegment = [self testSegment:location];
+        if (trackingSegment > -1 && [self isEnabledForSegment:trackingSegment])
+        {
+            _trackingHighlighted = YES;
+            _trackingSegment = trackingSegment;
+            [self drawSegmentBezel:_trackingSegment highlight:YES];
+        }
     }
     
     else if (type == CPLeftMouseDragged)
@@ -776,12 +785,11 @@ CPSegmentSwitchTrackingMomentary = 2;
         if (_trackingSegment == -1)
             return;
 
-        var highlighted = CGRectContainsPoint(_segments[_trackingSegment].frame, location);
-        
+        var highlighted = [self testSegment:location] === _trackingSegment;
         if (highlighted != _trackingHighlighted)
         {
             _trackingHighlighted = highlighted;
-            
+
             [self drawSegmentBezel:_trackingSegment highlight:_trackingHighlighted];
         }
     }

AppKit/CPSlider.j

@@ -49,7 +49,7 @@ CPCircularSlider    = 1;
 
 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[nil, _CGSizeMakeZero(), 0.0, nil]
+    return [CPDictionary dictionaryWithObjects:[[CPNull null], _CGSizeMakeZero(), 0.0, [CPNull null]]
                                        forKeys:[@"knob-color", @"knob-size", @"track-width", @"track-color"]];
 }
 
@@ -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/CPSliderColorPicker.j

@@ -45,14 +45,16 @@
     CPTextField _saturationLabel;
     CPTextField _brightnessLabel;
     CPTextField _hexLabel;
-    
+
+#if PLATFORM(DOM)
     DOMElement  _redValue;
     DOMElement  _greenValue;
     DOMElement  _blueValue;
     DOMElement  _hueValue;
     DOMElement  _saturationValue;
     DOMElement  _brightnessValue;
-    DOMElement  _hexValue;    
+    DOMElement  _hexValue;
+#endif
 }
 
 - (id)initWithPickerMask:(int)mask colorPanel:(CPColorPanel)owningColorPanel 
@@ -81,7 +83,8 @@
     [_redSlider setTarget: self];
     [_redSlider setAction: @selector(sliderChanged:)];
     [_redSlider setAutoresizingMask: CPViewWidthSizable];
-    
+
+#if PLATFORM(DOM)
     var updateFunction = function(aDOMEvent) 
     { 
         if(isNaN(this.value))
@@ -147,6 +150,7 @@
     
     redValue._DOMElement.appendChild(_redValue);
     [_contentView addSubview: redValue];
+#endif
 
     _greenLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 58, 15, 20)];
     [_greenLabel setStringValue: "G"];
@@ -159,6 +163,7 @@
     [_greenSlider setAction: @selector(sliderChanged:)];
     [_greenSlider setAutoresizingMask: CPViewWidthSizable];
 
+#if PLATFORM(DOM)
     //green value input box
     var greenValue = [[CPView alloc] initWithFrame: CPRectMake(aFrame.size.width - 45, 58, 45, 20)];
     [greenValue setAutoresizingMask: CPViewMinXMargin];
@@ -168,6 +173,7 @@
     
     greenValue._DOMElement.appendChild(_greenValue);
     [_contentView addSubview: greenValue];
+#endif
 
     _blueLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 81, 15, 20)];
     [_blueLabel setStringValue: "B"];
@@ -180,6 +186,7 @@
     [_blueSlider setAction: @selector(sliderChanged:)];
     [_blueSlider setAutoresizingMask: CPViewWidthSizable];
 
+#if PLATFORM(DOM)
     //blue value input box
     var blueValue = [[CPView alloc] initWithFrame: CPRectMake(aFrame.size.width - 45, 81, 45, 20)];
     [blueValue setAutoresizingMask: CPViewMinXMargin];
@@ -189,7 +196,7 @@
 
     blueValue._DOMElement.appendChild(_blueValue);
     [_contentView addSubview: blueValue];
-
+#endif
     _hsbLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 120, 190, 20)];
     [_hsbLabel setStringValue: "Hue, Saturation, Brightness"];
     [_hsbLabel setTextColor:[CPColor blackColor]];
@@ -205,6 +212,7 @@
     [_hueSlider setAction: @selector(sliderChanged:)];
     [_hueSlider setAutoresizingMask: CPViewWidthSizable];
 
+#if PLATFORM(DOM)
     //red value input box
     var hueValue = [[CPView alloc] initWithFrame: CPRectMake(aFrame.size.width - 45, 145, 45, 20)];
     [hueValue setAutoresizingMask: CPViewMinXMargin];
@@ -214,7 +222,7 @@
 
     hueValue._DOMElement.appendChild(_hueValue);
     [_contentView addSubview: hueValue];
-    
+#endif
     _saturationLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 168, 15, 20)];
     [_saturationLabel setStringValue: "S"];
     [_saturationLabel setTextColor:[CPColor blackColor]];
@@ -226,6 +234,7 @@
     [_saturationSlider setAction: @selector(sliderChanged:)];
     [_saturationSlider setAutoresizingMask: CPViewWidthSizable];
 
+#if PLATFORM(DOM)
     //green value input box
     var saturationValue = [[CPView alloc] initWithFrame: CPRectMake(aFrame.size.width - 45, 168, 45, 20)];
     [saturationValue setAutoresizingMask: CPViewMinXMargin];
@@ -235,7 +244,7 @@
 
     saturationValue._DOMElement.appendChild(_saturationValue);
     [_contentView addSubview: saturationValue];
-
+#endif
     _brightnessLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 191, 15, 20)];
     [_brightnessLabel setStringValue: "B"];
     [_brightnessLabel setTextColor:[CPColor blackColor]];
@@ -247,6 +256,7 @@
     [_brightnessSlider setAction: @selector(sliderChanged:)];
     [_brightnessSlider setAutoresizingMask: CPViewWidthSizable];
 
+#if PLATFORM(DOM)
     //blue value input box
     var brightnessValue = [[CPView alloc] initWithFrame: CPRectMake(aFrame.size.width - 45, 191, 45, 20)];
     [brightnessValue setAutoresizingMask: CPViewMinXMargin];
@@ -256,11 +266,12 @@
 
     brightnessValue._DOMElement.appendChild(_brightnessValue);
     [_contentView addSubview: brightnessValue];
-
+#endif
     _hexLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 230, 30, 20)];
     [_hexLabel setStringValue: "Hex"];
     [_hexLabel setTextColor:[CPColor blackColor]];
-    
+
+#if PLATFORM(DOM)
     //hex input box
     _hexValue = _redValue.cloneNode(false);
     _hexValue.style.top = "228px";
@@ -289,7 +300,8 @@
     };
 
     _contentView._DOMElement.appendChild(_hexValue);
-    
+#endif
+
     [_contentView addSubview: _rgbLabel];
     [_contentView addSubview: _redLabel];
     [_contentView addSubview: _greenLabel];
@@ -380,7 +392,9 @@
 
 - (void)updateHex:(CPColor)aColor
 {
+#if PLATFORM(DOM)
     _hexValue.value = [aColor hexString];
+#endif
 }
 
 - (void)updateRGBSliders:(CPColor)aColor
@@ -394,6 +408,7 @@
 
 - (void)updateLabels
 {
+#if PLATFORM(DOM)
     _hueValue.value        = ROUND([_hueSlider floatValue]);      
     _saturationValue.value = ROUND([_saturationSlider floatValue]);
     _brightnessValue.value = ROUND([_brightnessSlider floatValue]);
@@ -401,6 +416,7 @@
     _redValue.value        = ROUND([_redSlider floatValue] * 255);
     _greenValue.value      = ROUND([_greenSlider floatValue] * 255);
     _blueValue.value       = ROUND([_blueSlider floatValue] * 255);
+#endif
 }
 
 - (CPImage)provideNewButtonImage

AppKit/CPSplitView.j

@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+@import "CPButtonBar.j"
 @import "CPImage.j"
 @import "CPView.j"
 
@@ -43,18 +44,20 @@ var CPSplitViewHorizontalImage = nil,
     id          _delegate;
     BOOL        _isVertical;
     BOOL        _isPaneSplitter;
-    
+
     int         _currentDivider;
     float       _initialOffset;
-    
+
     CPString    _originComponent;
     CPString    _sizeComponent;
-    
+
     CPArray     _DOMDividerElements;
     CPString    _dividerImagePath;
     int         _drawingDivider;
-    
+
     BOOL        _needsResizeSubviews;
+
+    CPArray     _buttonBars;
 }
 
 /*
@@ -75,12 +78,13 @@ var CPSplitViewHorizontalImage = nil,
     if (self = [super initWithFrame:aFrame])
     {
         _currentDivider = CPNotFound;
-        
+
         _DOMDividerElements = [];
-        
+        _buttonBars = [];
+
         [self _setVertical:YES];
     }
-    
+
     return self;
 }
 
@@ -98,13 +102,13 @@ var CPSplitViewHorizontalImage = nil,
 {
     if (![self _setVertical:shouldBeVertical])
         return;
-    
+
     // Just re-adjust evenly.
     var frame = [self frame],
         dividerThickness = [self dividerThickness];
-    
+
     [self _postNotificationWillResize];
-    
+
     var eachSize = ROUND((frame.size[_sizeComponent] - dividerThickness * (_subviews.length - 1)) / _subviews.length),
         index = 0,
         count = _subviews.length;
@@ -115,9 +119,9 @@ var CPSplitViewHorizontalImage = nil,
     else
         for (; index < count; ++index)
             [_subviews[index] setFrame:CGRectMake(0, ROUND((eachSize + dividerThickness) * index), frame.size.width, eachSize)];
-    
+
     [self setNeedsDisplay:YES];
-    
+
     [self _postNotificationDidResize];
 
 }
@@ -125,13 +129,13 @@ var CPSplitViewHorizontalImage = nil,
 - (BOOL)_setVertical:(BOOL)shouldBeVertical
 {
     var changed = (_isVertical != shouldBeVertical);
-    
+
     _isVertical = shouldBeVertical;
-    
+
     _originComponent = [self isVertical] ? "x" : "y";
     _sizeComponent = [self isVertical] ? "width" : "height";
     _dividerImagePath = [self isVertical] ? [CPSplitViewVerticalImage filename] : [CPSplitViewHorizontalImage filename];
-    
+
     return changed;
 }
 
@@ -144,14 +148,13 @@ var CPSplitViewHorizontalImage = nil,
 {
     if (_isPaneSplitter == shouldBePaneSplitter)
         return;
-    
+
     _isPaneSplitter = shouldBePaneSplitter;
 
-#if PLATFORM(DOM)
-    _DOMDividerElements = [];
-#endif
+    if(_DOMDividerElements[_drawingDivider])
+        [self _setupDOMDivider]
 
-    // The divider changes size when pane splitter mode is toggled, so the 
+    // The divider changes size when pane splitter mode is toggled, so the
     // subviews need to change size too.
     _needsResizeSubviews = YES;
     [self setNeedsDisplay:YES];
@@ -160,7 +163,6 @@ var CPSplitViewHorizontalImage = nil,
 - (void)didAddSubview:(CPView)aSubview
 {
     _needsResizeSubviews = YES;
-//    [self adjustSubviews];
 }
 
 - (BOOL)isSubviewCollapsed:(CPView)subview
@@ -172,9 +174,9 @@ var CPSplitViewHorizontalImage = nil,
 {
     var frame = [_subviews[aDivider] frame],
         rect = CGRectMakeZero();
-    
+
     rect.size = [self frame].size;
-    
+
     rect.size[_sizeComponent] = [self dividerThickness];
     rect.origin[_originComponent] = frame.origin[_originComponent] + frame.size[_sizeComponent];
 
@@ -184,19 +186,19 @@ var CPSplitViewHorizontalImage = nil,
 - (CGRect)effectiveRectOfDividerAtIndex:(int)aDivider
 {
     var realRect = [self rectOfDividerAtIndex:aDivider];
-    
+
     var padding = 2;
-    
+
     realRect.size[_sizeComponent] += padding * 2;
     realRect.origin[_originComponent] -= padding;
-    
+
     return realRect;
 }
 
 - (void)drawRect:(CGRect)rect
 {
     var count = [_subviews count] - 1;
-    
+
     while ((count--) > 0)
     {
         _drawingDivider = count;
@@ -210,29 +212,33 @@ var CPSplitViewHorizontalImage = nil,
     if (!_DOMDividerElements[_drawingDivider])
     {
         _DOMDividerElements[_drawingDivider] = document.createElement("div");
-        _DOMDividerElements[_drawingDivider].style.cursor = "move";
+
         _DOMDividerElements[_drawingDivider].style.position = "absolute";
         _DOMDividerElements[_drawingDivider].style.backgroundRepeat = "repeat";
 
         CPDOMDisplayServerAppendChild(_DOMElement, _DOMDividerElements[_drawingDivider]);
+    }
 
-        if (_isPaneSplitter)
-        {
-            _DOMDividerElements[_drawingDivider].style.backgroundColor = "#A5A5A5";
-            _DOMDividerElements[_drawingDivider].style.backgroundImage = "";
-        }
-        else
-        {
-            _DOMDividerElements[_drawingDivider].style.backgroundColor = "";
-            _DOMDividerElements[_drawingDivider].style.backgroundImage = "url('"+_dividerImagePath+"')";
-        }
-    }    
-
+    [self _setupDOMDivider];
     CPDOMDisplayServerSetStyleLeftTop(_DOMDividerElements[_drawingDivider], NULL, _CGRectGetMinX(aRect), _CGRectGetMinY(aRect));
     CPDOMDisplayServerSetStyleSize(_DOMDividerElements[_drawingDivider], _CGRectGetWidth(aRect), _CGRectGetHeight(aRect));
 #endif
 }
 
+- (void)_setupDOMDivider
+{
+    if (_isPaneSplitter)
+    {
+        _DOMDividerElements[_drawingDivider].style.backgroundColor = "#A5A5A5";
+        _DOMDividerElements[_drawingDivider].style.backgroundImage = "";
+    }
+    else
+    {
+        _DOMDividerElements[_drawingDivider].style.backgroundColor = "";
+        _DOMDividerElements[_drawingDivider].style.backgroundImage = "url('"+_dividerImagePath+"')";
+    }
+}
+
 - (void)viewWillDraw
 {
     [self _adjustSubviewsWithCalculatedSize];
@@ -242,13 +248,13 @@ var CPSplitViewHorizontalImage = nil,
 {
     if (!_needsResizeSubviews)
         return;
-    
+
     _needsResizeSubviews = NO;
-        
+
     var subviews = [self subviews],
         count = subviews.length,
         oldSize = CGSizeMakeZero();
-    
+
     if ([self isVertical])
     {
         oldSize.width += [self dividerThickness] * (count - 1);
@@ -259,10 +265,10 @@ var CPSplitViewHorizontalImage = nil,
         oldSize.width = CGRectGetWidth([self frame]);
         oldSize.height += [self dividerThickness] * (count - 1);
     }
-        
+
     while (count--)
         oldSize[_sizeComponent] += [subviews[count] frame].size[_sizeComponent];
-    
+
     [self resizeSubviewsWithOldSize:oldSize];
 }
 
@@ -271,31 +277,41 @@ var CPSplitViewHorizontalImage = nil,
     var frame = [_subviews[anIndex] frame],
         startPosition = frame.origin[_originComponent] + frame.size[_sizeComponent],
         effectiveRect = [self effectiveRectOfDividerAtIndex:anIndex],
+        buttonBar = _buttonBars[anIndex],
+        buttonBarRect = null,
         additionalRect = null;
-    
+
+    if (buttonBar != null)
+    {
+        buttonBarRect = [buttonBar resizeControlFrame];
+        buttonBarRect.origin = [self convertPoint:buttonBarRect.origin fromView:buttonBar];
+    }
+
     if ([_delegate respondsToSelector:@selector(splitView:effectiveRect:forDrawnRect:ofDividerAtIndex:)])
         effectiveRect = [_delegate splitView:self effectiveRect:effectiveRect forDrawnRect:effectiveRect ofDividerAtIndex:anIndex];
-    
+
     if ([_delegate respondsToSelector:@selector(splitView:additionalEffectiveRectOfDividerAtIndex:)])
         additionalRect = [_delegate splitView:self additionalEffectiveRectOfDividerAtIndex:anIndex];
 
-    return CGRectContainsPoint(effectiveRect, aPoint) || (additionalRect && CGRectContainsPoint(additionalRect, aPoint));
+    return CGRectContainsPoint(effectiveRect, aPoint) || 
+           (additionalRect && CGRectContainsPoint(additionalRect, aPoint)) ||
+           (buttonBarRect && CGRectContainsPoint(buttonBarRect, aPoint));
 }
 
 - (CPView)hitTest:(CGPoint)aPoint
 {
     if ([self isHidden] || ![self hitTests] || !CGRectContainsPoint([self frame], aPoint))
         return nil;
-    
+
     var point = [self convertPoint:aPoint fromView:[self superview]];
-    
+
     var count = [_subviews count] - 1;
     for (var i = 0; i < count; i++)
     {
         if ([self cursorAtPoint:point hitDividerAtIndex:i])
             return self;
     }
-    
+
     return [super hitTest:aPoint];
 }
 
@@ -312,12 +328,13 @@ var CPSplitViewHorizontalImage = nil,
         if (_currentDivider != CPNotFound)
         {
             _currentDivider = CPNotFound;
+            [self _updateResizeCursor:anEvent];
             [self _postNotificationDidResize];
         }
-        
+
         return;
     }
-    
+
     if (type == CPLeftMouseDown)
     {
         var point = [self convertPoint:[anEvent locationInWindow] fromView:nil];
@@ -334,7 +351,7 @@ var CPSplitViewHorizontalImage = nil,
                 if ([anEvent clickCount] == 2 &&
                     [_delegate respondsToSelector:@selector(splitView:canCollapseSubview:)] &&
                     [_delegate respondsToSelector:@selector(splitView:shouldCollapseSubview:forDoubleClickOnDividerAtIndex:)])
-                {    
+                {
                     var minPosition = [self minPossiblePositionOfDividerAtIndex:i],
                         maxPosition = [self maxPossiblePositionOfDividerAtIndex:i];
 
@@ -366,14 +383,16 @@ var CPSplitViewHorizontalImage = nil,
         if (_currentDivider === CPNotFound)
             return;
     }
-    
+
     else if (type == CPLeftMouseDragged && _currentDivider != CPNotFound)
     {
         var point = [self convertPoint:[anEvent locationInWindow] fromView:nil];
-        
+
         [self setPosition:(point[_originComponent] + _initialOffset) ofDividerAtIndex:_currentDivider];
+        // Cursor might change if we reach a resize limit.
+        [self _updateResizeCursor:anEvent];
     }
-    
+
     [CPApp setTarget:self selector:@selector(trackDivider:) forNextEventMatchingMask:CPLeftMouseDraggedMask | CPLeftMouseUpMask untilDate:nil inMode:nil dequeue:YES];
 }
 
@@ -383,13 +402,81 @@ var CPSplitViewHorizontalImage = nil,
     [self trackDivider:anEvent];
 }
 
+- (void)viewDidMoveToWindow
+{
+    // Enable split view resize cursors. Commented out pending CPTrackingArea implementation.
+    //[[self window] setAcceptsMouseMovedEvents:YES];
+}
+
+- (void)mouseEntered:(CPEvent)anEvent
+{
+    // Tracking code handles cursor by itself.
+    if (_currentDivider == CPNotFound)
+        [self _updateResizeCursor:anEvent];
+}
+
+- (void)mouseMoved:(CPEvent)anEvent
+{
+    if (_currentDivider == CPNotFound)
+        [self _updateResizeCursor:anEvent];
+}
+
+- (void)mouseExited:(CPEvent)anEvent
+{
+    if (_currentDivider == CPNotFound)
+        // FIXME: we should use CPCursor push/pop (if previous currentCursor != arrow).
+        [[CPCursor arrowCursor] set];
+}
+
+- (void)_updateResizeCursor:(CPEvent)anEvent
+{
+    var point = [self convertPoint:[anEvent locationInWindow] fromView:nil];
+
+    if ([anEvent type] === CPLeftMouseUp && ![[self window] acceptsMouseMovedEvents])
+    {
+        [[CPCursor arrowCursor] set];
+        return;
+    }
+
+    for (var i = 0, count = [_subviews count] - 1; i < count; i++)
+    {
+        // If we are currently tracking, keep the resize cursor active even outside of hit areas.
+        if (_currentDivider === i || (_currentDivider == CPNotFound && [self cursorAtPoint:point hitDividerAtIndex:i]))
+        {
+            var frame = [_subviews[i] frame],
+                startPosition = frame.origin[_originComponent] + frame.size[_sizeComponent],
+                canShrink = [self _realPositionForPosition:startPosition-1 ofDividerAtIndex:i] < startPosition,
+                canGrow = [self _realPositionForPosition:startPosition+1 ofDividerAtIndex:i] > startPosition,
+                cursor = [CPCursor arrowCursor];
+
+            if (_isVertical && canShrink && canGrow)
+                cursor = [CPCursor resizeLeftRightCursor];
+            else if (_isVertical && canShrink)
+                cursor = [CPCursor resizeLeftCursor];
+            else if (_isVertical && canGrow)
+                cursor = [CPCursor resizeRightCursor];
+            else if (canShrink && canGrow)
+                cursor = [CPCursor resizeUpDownCursor];
+            else if (canShrink)
+                cursor = [CPCursor resizeUpCursor];
+            else if (canGrow)
+                cursor = [CPCursor resizeDownCursor];
+
+            [cursor set];
+            return;
+        }
+    }
+
+    [[CPCursor arrowCursor] set];
+}
+
 - (float)maxPossiblePositionOfDividerAtIndex:(int)dividerIndex
 {
     var frame = [_subviews[dividerIndex + 1] frame];
-    
+
     if (dividerIndex + 1 < [_subviews count] - 1)
         return frame.origin[_originComponent] + frame.size[_sizeComponent] - [self dividerThickness];
-    else    
+    else
         return [self frame].size[_sizeComponent] - [self dividerThickness];
 }
 
@@ -398,17 +485,15 @@ var CPSplitViewHorizontalImage = nil,
     if (dividerIndex > 0)
     {
         var frame = [_subviews[dividerIndex - 1] frame];
-        
+
         return frame.origin[_originComponent] + frame.size[_sizeComponent] + [self dividerThickness];
     }
-    else    
+    else
         return 0;
 }
 
-- (void)setPosition:(float)position ofDividerAtIndex:(int)dividerIndex
+- (int)_realPositionForPosition:(float)position ofDividerAtIndex:(int)dividerIndex
 {
-    [self _adjustSubviewsWithCalculatedSize];
-        
     // not sure where this should override other positions?
     if ([_delegate respondsToSelector:@selector(splitView:constrainSplitPosition:ofSubviewAt:)])
         position = [_delegate splitView:self constrainSplitPosition:position ofSubviewAt:dividerIndex];
@@ -417,47 +502,56 @@ var CPSplitViewHorizontalImage = nil,
         proposedMin = [self minPossiblePositionOfDividerAtIndex:dividerIndex],
         actualMax = proposedMax,
         actualMin = proposedMin;
-        
+
     if([_delegate respondsToSelector:@selector(splitView:constrainMinCoordinate:ofSubviewAt:)])
         actualMin = [_delegate splitView:self constrainMinCoordinate:proposedMin ofSubviewAt:dividerIndex];
-        
+
     if([_delegate respondsToSelector:@selector(splitView:constrainMaxCoordinate:ofSubviewAt:)])
         actualMax = [_delegate splitView:self constrainMaxCoordinate:proposedMax ofSubviewAt:dividerIndex];
 
-    var frame = [self frame],
-        viewA = _subviews[dividerIndex],
-        frameA = [viewA frame],
-        viewB = _subviews[dividerIndex + 1],
-        frameB = [viewB frame];
+    var viewA = _subviews[dividerIndex],
+        realPosition = MAX(MIN(position, actualMax), actualMin);
 
-    var realPosition = MAX(MIN(position, actualMax), actualMin);
-    
     if (position <  proposedMin + (actualMin - proposedMin) / 2)
         if ([_delegate respondsToSelector:@selector(splitView:canCollapseSubview:)])
             if ([_delegate splitView:self canCollapseSubview:viewA])
                 realPosition = proposedMin;
-    
+
+    return realPosition;
+}
+
+- (void)setPosition:(float)position ofDividerAtIndex:(int)dividerIndex
+{
+    [self _adjustSubviewsWithCalculatedSize];
+
+    var realPosition = [self _realPositionForPosition:position ofDividerAtIndex:dividerIndex];
+
+    var viewA = _subviews[dividerIndex],
+        frameA = [viewA frame],
+        viewB = _subviews[dividerIndex + 1],
+        frameB = [viewB frame];
+
     frameA.size[_sizeComponent] = realPosition - frameA.origin[_originComponent];
     [_subviews[dividerIndex] setFrame:frameA];
-    
+
     frameB.size[_sizeComponent] = frameB.origin[_originComponent] + frameB.size[_sizeComponent] - realPosition - [self dividerThickness];
     frameB.origin[_originComponent] = realPosition + [self dividerThickness];
     [_subviews[dividerIndex + 1] setFrame:frameB];
-    
+
     [self setNeedsDisplay:YES];
 }
 
 - (void)setFrameSize:(CGSize)aSize
 {
     [self _adjustSubviewsWithCalculatedSize];
-        
+
     [super setFrameSize:aSize];
-    
+
     [self setNeedsDisplay:YES];
 }
 
 - (void)resizeSubviewsWithOldSize:(CPSize)oldSize
-{   
+{
     if ([_delegate respondsToSelector:@selector(splitView:resizeSubviewsWithOldSize:)])
     {
         [_delegate splitView:self resizeSubviewsWithOldSize:oldSize];
@@ -465,7 +559,7 @@ var CPSplitViewHorizontalImage = nil,
     }
 
     [self _postNotificationWillResize];
-    
+
     var index = 0,
         count = [_subviews count],
         bounds = [self bounds],
@@ -515,10 +609,8 @@ var CPSplitViewHorizontalImage = nil,
             }
             else if (totalSizableSpace && !isSizable)
                 viewFrame.size[_sizeComponent] = [view frame].size[_sizeComponent];
-            else
-                alert("SHOULD NEVER GET HERE");
 
-        bounds.origin[_originComponent] += viewFrame.size[_sizeComponent] + dividerThickness;        
+        bounds.origin[_originComponent] += viewFrame.size[_sizeComponent] + dividerThickness;
 
         [view setFrame:viewFrame];
     }
@@ -532,7 +624,7 @@ var CPSplitViewHorizontalImage = nil,
         [[CPNotificationCenter defaultCenter] removeObserver:_delegate name:CPSplitViewDidResizeSubviewsNotification object:self];
     if ([_delegate respondsToSelector:@selector(splitViewWillResizeSubviews:)])
         [[CPNotificationCenter defaultCenter] removeObserver:_delegate name:CPSplitViewWillResizeSubviewsNotification object:self];
-    
+
    _delegate = delegate;
 
    if ([_delegate respondsToSelector:@selector(splitViewDidResizeSubviews:)])
@@ -547,6 +639,47 @@ var CPSplitViewHorizontalImage = nil,
                                                   object:self];
 }
 
+/*!
+    Set the button bar who's resize control should act as a control for this splitview.
+    Each divider can have at most one button bar assigned to it, and that button bar must be 
+    a subview of one of the split view's subviews.
+
+    Calling this method with nil as the button bar will remove any currently assigned button bar
+    for the divider at that index. Indexes will not be adjusted as new subviews are added, so you
+    should usually call this method after adding all the desired subviews to the split view.
+
+    This method will automatically configure the hasResizeControl and resizeControlIsLeftAligned 
+    parameters of the button bar, and will override any currently set values.
+*/
+- (void)setButtonBar:(CPButtonBar)aButtonBar forDividerAtIndex:(unsigned)dividerIndex
+{
+    if (!aButtonBar)
+    {
+        _buttonBars[dividerIndex] = nil;
+        return;
+    }
+
+    var view = [aButtonBar superview],
+        subview = aButtonBar;
+
+    while (view && view !== self)
+    {
+        subview = view;
+        view = [view superview];
+    }
+
+    if (view !== self)
+        [CPException raise:CPInvalidArgumentException 
+                    reason:@"CPSplitView button bar must be a subview of the split view."];
+
+    var viewIndex = [[self subviews] indexOfObject:subview];
+
+    [aButtonBar setHasResizeControl:YES];
+    [aButtonBar setResizeControlIsLeftAligned:dividerIndex < viewIndex];
+
+    _buttonBars[dividerIndex] = aButtonBar; 
+}
+
 - (void)_postNotificationWillResize
 {
     [[CPNotificationCenter defaultCenter] postNotificationName:CPSplitViewWillResizeSubviewsNotification object:self];
@@ -561,7 +694,8 @@ var CPSplitViewHorizontalImage = nil,
 
 var CPSplitViewDelegateKey          = "CPSplitViewDelegateKey",
     CPSplitViewIsVerticalKey        = "CPSplitViewIsVerticalKey",
-    CPSplitViewIsPaneSplitterKey    = "CPSplitViewIsPaneSplitterKey";
+    CPSplitViewIsPaneSplitterKey    = "CPSplitViewIsPaneSplitterKey",
+    CPSplitViewButtonBarsKey        = "CPSplitViewButtonBarsKey";
 
 @implementation CPSplitView (CPCoding)
 
@@ -572,19 +706,21 @@ var CPSplitViewDelegateKey          = "CPSplitViewDelegateKey",
 - (id)initWithCoder:(CPCoder)aCoder
 {
     self = [super initWithCoder:aCoder];
-    
+
     if (self)
     {
         _currentDivider = CPNotFound;
-        
+
         _DOMDividerElements = [];
+
+        _buttonBars = [aCoder decodeObjectForKey:CPSplitViewButtonBarsKey] || [];
         
-        _delegate = [aCoder decodeObjectForKey:CPSplitViewDelegateKey];;
-        
+        _delegate = [aCoder decodeObjectForKey:CPSplitViewDelegateKey];
+
         _isPaneSplitter = [aCoder decodeBoolForKey:CPSplitViewIsPaneSplitterKey];
         [self _setVertical:[aCoder decodeBoolForKey:CPSplitViewIsVerticalKey]];
     }
-    
+
     return self;
 }
 
@@ -595,9 +731,12 @@ var CPSplitViewDelegateKey          = "CPSplitViewDelegateKey",
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
     [super encodeWithCoder:aCoder];
-    
+
+    //FIXME how should we handle this?
+    //[aCoder encodeObject:_buttonBars forKey:CPSplitViewButtonBarsKey];
+
     [aCoder encodeConditionalObject:_delegate forKey:CPSplitViewDelegateKey];
-    
+
     [aCoder encodeBool:_isVertical forKey:CPSplitViewIsVerticalKey];
     [aCoder encodeBool:_isPaneSplitter forKey:CPSplitViewIsPaneSplitterKey];
 }

AppKit/CPTabView.j

@@ -496,6 +496,14 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
     return contentRect;
 }
 
+/*!
+    Returns the receiver's delegate.
+*/
+- (id)delegate
+{
+    return _delegate;
+}
+
 /*!
     Sets the delegate for this tab view.
     @param aDelegate the tab view's delegate

AppKit/CPTableColumn.j

@@ -27,22 +27,11 @@
 
 @import "CPTableHeaderView.j"
 
+#include "CoreGraphics/CGGeometry.h"
 
-/*
-    @global
-    @class CPTableColumn
-*/
 CPTableColumnNoResizing         = 0;
-/*
-    @global
-    @class CPTableColumn
-*/
-CPTableColumnAutoresizingMask   = 1;
-/*
-    @global
-    @class CPTableColumn
-*/
-CPTableColumnUserResizingMask   = 2;
+CPTableColumnAutoresizingMask   = 1 << 0;
+CPTableColumnUserResizingMask   = 1 << 1;
 
 @implementation CPTableColumn : CPObject
 {
@@ -54,12 +43,15 @@ CPTableColumnUserResizingMask   = 2;
     float               _width;
     float               _minWidth;
     float               _maxWidth;
+    unsigned            _resizingMask;
 
     id                  _identifier;
     BOOL                _isEditable;
     CPSortDescriptor    _sortDescriptorPrototype;
     BOOL                _isHidden;
     CPString            _headerToolTip;
+    
+    BOOL _disableResizingPosting @accessors(property=disableResizingPosting);
 }
 
 - (id)init
@@ -78,15 +70,27 @@ CPTableColumnUserResizingMask   = 2;
         _width = 100.0;
         _minWidth = 10.0;
         _maxWidth = 1000000.0;
-
+        _resizingMask = CPTableColumnAutoresizingMask | CPTableColumnUserResizingMask;
+        _disableResizingPosting = NO;
+        
         [self setIdentifier:anIdentifier];
-        [self setHeaderView:[CPTextField new]];
-        [self setDataView:[CPTextField new]];
+
+        var header = [[_CPTableColumnHeaderView alloc] initWithFrame:CGRectMakeZero()];
+        [self setHeaderView:header];
+        
+        var textDataView = [CPTextField new];
+        [textDataView setLineBreakMode:CPLineBreakByTruncatingTail];
+        [textDataView setValue:[CPColor colorWithHexString:@"333333"] forThemeAttribute:@"text-color"];
+        [textDataView setValue:[CPColor whiteColor] forThemeAttribute:@"text-color" inState:CPThemeStateSelected];
+        [textDataView setValue:[CPFont boldSystemFontOfSize:12] forThemeAttribute:@"font" inState:CPThemeStateSelected];
+        [textDataView setValue:CPCenterVerticalTextAlignment forThemeAttribute:@"vertical-alignment"];
+        [self setDataView:textDataView];
     }
 
     return self;
 }
 
+
 - (void)setTableView:(CPTableView)aTableView
 {
     _tableView = aTableView;
@@ -117,18 +121,23 @@ CPTableColumnUserResizingMask   = 2;
 
     if (tableView)
     {
-        var index = [[tableView tableColumns] indexOfObjectIdenticalTo:self];
-
-        // FIXME: THIS IS HORRIBLE. Don't just reload everything when a table column changes, just relayout the changed widths.
-        tableView._reloadAllRows = YES;
-        tableView._dirtyTableColumnRangeIndex = tableView._dirtyTableColumnRangeIndex < 0 ? index : MIN(index,  tableView._dirtyTableColumnRangeIndex);
-
+        var index = [[tableView tableColumns] indexOfObjectIdenticalTo:self],
+            dirtyTableColumnRangeIndex = tableView._dirtyTableColumnRangeIndex;
+            
+        if (dirtyTableColumnRangeIndex < 0)
+            tableView._dirtyTableColumnRangeIndex = index;
+        else
+            tableView._dirtyTableColumnRangeIndex = MIN(index,  tableView._dirtyTableColumnRangeIndex);
+        
+        var rows = tableView._exposedRows,
+            columns = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(index, [tableView._exposedColumns lastIndex] - index + 1)];        
+        
+        // FIXME: Would be faster with some sort of -setNeedsDisplayInColumns: that updates a dirtyTableColumnForDisplay cache; then marked columns would relayout their data views at display time.
+        [tableView _layoutDataViewsInRows:rows columns:columns];
         [tableView tile];
-
-        [[CPNotificationCenter defaultCenter]
-            postNotificationName:CPTableViewColumnDidResizeNotification
-                          object:tableView
-                        userInfo:[CPDictionary dictionaryWithObjects:[self, oldWidth] forKeys:[@"CPTableColumn", "CPOldWidth"]]];
+        
+        if (!_disableResizingPosting)
+            [self _postDidResizeNotificationWithOldWidth:oldWidth];
     }
 }
 
@@ -168,7 +177,7 @@ CPTableColumnUserResizingMask   = 2;
     _maxWidth = aMaxWidth;
 
     var width = [self width],
-        newWidth = MAX(width, [self maxWidth]);
+        newWidth = MIN(width, [self maxWidth]);
 
     if (width !== newWidth)
         [self setWidth:newWidth];
@@ -184,7 +193,7 @@ CPTableColumnUserResizingMask   = 2;
     _resizingMask = aResizingMask;
 }
 
-- (float)resizingMask
+- (unsigned)resizingMask
 {
     return _resizingMask;
 }
@@ -221,6 +230,22 @@ CPTableColumnUserResizingMask   = 2;
     return _headerView;
 }
 
+/*!
+    This method set's the "prototype" view which will be used to create all table cells in this column.
+    
+    It creates a snapshot of aView, using keyed archiving, which is then copied over and over for each 
+    individual cell that is shown. As a result, changes made after calling this method won't be reflected.
+
+    Example:
+    
+        [tableColumn setDataView:someView]; // snapshot taken
+        [[tableColumn dataView] setSomething:x]; //won't work
+
+    This doesn't work because the snapshot is taken before the new property is applied. Instead, do:
+
+        [someView setSomething:x];
+        [tableColumn setDataView:someView];
+*/
 - (void)setDataView:(CPView)aView
 {
     if (_dataView === aView)
@@ -256,9 +281,9 @@ CPTableColumnUserResizingMask   = 2;
     var dataView = [self dataViewForRow:aRowIndex],
         dataViewUID = [dataView UID];
 
-var x = [self tableView]._cachedDataViews[dataViewUID];
-if (x && x.length)
-return x.pop();
+    var x = [self tableView]._cachedDataViews[dataViewUID];
+    if (x && x.length)
+    return x.pop();
 
     // if we haven't cached an archive of the data view, do it now
     if (!_dataViewData[dataViewUID])
@@ -266,7 +291,8 @@ return x.pop();
 
     // unarchive the data view cache
     var newDataView = [CPKeyedUnarchiver unarchiveObjectWithData:_dataViewData[dataViewUID]];
-newDataView.identifier = dataViewUID;
+    newDataView.identifier = dataViewUID;
+    
     return newDataView;
 }
 
@@ -322,7 +348,14 @@ newDataView.identifier = dataViewUID;
 
 - (void)setHidden:(BOOL)shouldBeHidden
 {
+    shouldBeHidden = !!shouldBeHidden
+    if (_isHidden === shouldBeHidden)
+        return;
+    
     _isHidden = shouldBeHidden;
+    
+    [[self headerView] setHidden:shouldBeHidden];
+    [[self tableView] _tableColumnVisibilityDidChange:self];
 }
 
 - (BOOL)isHidden
@@ -346,6 +379,14 @@ newDataView.identifier = dataViewUID;
     return _headerToolTip;
 }
 
+- (void)_postDidResizeNotificationWithOldWidth:(float)oldWidth
+{
+    [[CPNotificationCenter defaultCenter]
+    postNotificationName:CPTableViewColumnDidResizeNotification
+                  object:[self tableView]
+                userInfo:[CPDictionary dictionaryWithObjects:[self, oldWidth] forKeys:[@"CPTableColumn", "CPOldWidth"]]];
+}
+
 @end
 
 var CPTableColumnIdentifierKey   = @"CPTableColumnIdentifierKey",
@@ -371,14 +412,11 @@ var CPTableColumnIdentifierKey   = @"CPTableColumnIdentifierKey",
         _maxWidth = [aCoder decodeFloatForKey:CPTableColumnMaxWidthKey];
 
         [self setIdentifier:[aCoder decodeObjectForKey:CPTableColumnIdentifierKey]];
-    //    [self setHeaderView:[aCoder decodeObjectForKey:CPTableColumnHeaderViewKey]];
-    //    [self setDataView:[aCoder decodeObjectForKey:CPTableColumnDataViewKey]];
+        [self setHeaderView:[aCoder decodeObjectForKey:CPTableColumnHeaderViewKey]];
+        [self setDataView:[aCoder decodeObjectForKey:CPTableColumnDataViewKey]];
+        [self setHeaderView:[aCoder decodeObjectForKey:CPTableColumnHeaderViewKey]];
 
-        [self setHeaderView:[CPTextField new]];
-        [self setDataView:[CPTextField new]];
-
-
-    //    _resizingMask  = [aCoder decodeBoolForKey:CPTableColumnResizingMaskKey];
+        _resizingMask  = [aCoder decodeBoolForKey:CPTableColumnResizingMaskKey];
     }
 
     return self;
@@ -392,10 +430,10 @@ var CPTableColumnIdentifierKey   = @"CPTableColumnIdentifierKey",
     [aCoder encodeObject:_minWidth forKey:CPTableColumnMinWidthKey];
     [aCoder encodeObject:_maxWidth forKey:CPTableColumnMaxWidthKey];
 
-//    [aCoder encodeObject:_headerView forKey:CPTableColumnHeaderViewKey];
-//    [aCoder encodeObject:_dataView forKey:CPTableColumnDataViewKey];
+    [aCoder encodeObject:_headerView forKey:CPTableColumnHeaderViewKey];
+    [aCoder encodeObject:_dataView forKey:CPTableColumnDataViewKey];
 
-//    [aCoder encodeObject:_resizingMask forKey:CPTableColumnResizingMaskKey];
+    [aCoder encodeObject:_resizingMask forKey:CPTableColumnResizingMaskKey];
 }
 
 @end

AppKit/CPTableHeaderView.j

@@ -23,123 +23,630 @@
 @import "CPTableColumn.j"
 @import "CPTableView.j"
 @import "CPView.j"
+ 
+@implementation _CPTableColumnHeaderView : CPView
+{
+    _CPImageAndTextView     _textField;
+}
 
+- (void)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self)
+    {   
+        [self _init];
+    }
+
+    return self;
+}
+
+- (void)_init
+{
+    _textField = [[_CPImageAndTextView alloc] initWithFrame:CGRectMake(5, 1, CGRectGetWidth([self bounds]) - 10, CGRectGetHeight([self bounds]) - 1)];
+    [_textField setAutoresizingMask:CPViewWidthSizable|CPViewHeightSizable];
+
+    [_textField setLineBreakMode:CPLineBreakByTruncatingTail];
+    [_textField setTextColor: [CPColor colorWithHexString: @"333333"]];
+    [_textField setFont:[CPFont boldSystemFontOfSize:12.0]];
+    [_textField setAlignment:CPLeftTextAlignment];
+    [_textField setVerticalAlignment:CPCenterVerticalTextAlignment];
+    [_textField setTextShadowColor:[CPColor whiteColor]];
+    [_textField setTextShadowOffset:CGSizeMake(0,1)];
+
+    [self addSubview:_textField];
+}
+
+- (void)layoutSubviews
+{
+    var themeState = [self themeState];
+
+    if(themeState & CPThemeStateSelected && themeState & CPThemeStateHighlighted)
+        [self setBackgroundColor:[CPColor colorWithPatternImage:CPAppKitImage("tableview-headerview-highlighted-pressed.png", CGSizeMake(1.0, 22.0))]];
+    else if (themeState & CPThemeStateSelected)
+        [self setBackgroundColor:[CPColor colorWithPatternImage:CPAppKitImage("tableview-headerview-highlighted.png", CGSizeMake(1.0, 22.0))]];
+    else if (themeState & CPThemeStateHighlighted)
+        [self setBackgroundColor:[CPColor colorWithPatternImage:CPAppKitImage("tableview-headerview-pressed.png", CGSizeMake(1.0, 22.0))]];
+    else 
+        [self setBackgroundColor:[CPColor colorWithPatternImage:CPAppKitImage("tableview-headerview.png", CGSizeMake(1.0, 22.0))]];
+}
+
+- (void)setStringValue:(CPString)string
+{
+    [_textField setText:string];
+}
+
+- (CPString)stringValue
+{
+    return [_textField text];
+}
+
+- (void)textField
+{
+    return _textField;
+}
+
+- (void)sizeToFit
+{
+    [_textField sizeToFit];
+}
+
+- (void)setFont:(CPFont)aFont
+{
+    [_textField setFont:aFont];
+}
+
+- (void)setValue:(id)aValue forThemeAttribute:(id)aKey
+{
+    [_textField setValue:aValue forThemeAttribute:aKey];
+}
+
+- (void)_setIndicatorImage:(CPImage)anImage
+{
+	if (anImage)
+	{
+		[_textField setImage:anImage];
+		[_textField setImagePosition:CPImageRight];
+	}
+	else
+	{
+		[_textField setImagePosition:CPNoImage];
+	}
+}
+
+@end
+
+var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringValueKey",
+    _CPTableColumnHeaderViewFontKey = @"_CPTableColumnHeaderViewFontKey",
+    _CPTableColumnHeaderViewImageKey = @"_CPTableColumnHeaderViewImageKey";
+
+@implementation _CPTableColumnHeaderView (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    if (self = [super initWithCoder:aCoder])
+    {
+        [self _init];
+        [self _setIndicatorImage:[aCoder decodeObjectForKey:_CPTableColumnHeaderViewImageKey]];
+        [self setStringValue:[aCoder decodeObjectForKey:_CPTableColumnHeaderViewStringValueKey]];
+        [self setFont:[aCoder decodeObjectForKey:_CPTableColumnHeaderViewFontKey]];
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [super encodeWithCoder:aCoder];
+
+    [aCoder encodeObject:[_textField text] forKey:_CPTableColumnHeaderViewStringValueKey];
+    [aCoder encodeObject:[_textField image] forKey:_CPTableColumnHeaderViewImageKey];
+    [aCoder encodeObject:[_textField font] forKey:_CPTableColumnHeaderViewFontKey];
+}
+
+@end
 
 @implementation CPTableHeaderView : CPView
 {
-    int _resizedColumn @accessors(readonly, property=resizedColumn);
-    int _draggedColumn @accessors(readonly, property=draggedColumn);
-    
-    float _draggedDistance @accessors(readonly, property=draggedDistance);
-    
-    CPTableView _tableView @accessors(property=tableView);
+    CPPoint                 _mouseDownLocation;
+    CPPoint                 _previousTrackingLocation;
+    int                     _activeColumn;
+    int                     _pressedColumn;
+
+    BOOL                    _isResizing;
+    BOOL                    _isDragging;
+    BOOL                    _isTrackingColumn;
+
+    float                   _columnOldWidth;
+
+    CPTableView             _tableView @accessors(property=tableView);
 }
 
-- (void)initWithFrame:(CGRect)aFrame
+- (void)_init
+{
+    _mouseDownLocation = CPPointMakeZero();
+    _previousTrackingLocation = CPPointMakeZero();
+    _activeColumn = -1;
+    _pressedColumn = -1;
+
+    _isResizing = NO;
+    _isDragging = NO;
+    _isTrackingColumn = NO;
+
+    _columnOldWidth = 0.0;
+
+    [self setBackgroundColor:[CPColor colorWithPatternImage:CPAppKitImage("tableview-headerview.png", CGSizeMake(1.0, 22.0))]];
+}
+
+- (id)initWithFrame:(CGRect)aFrame
 {
     self = [super initWithFrame:aFrame];
 
     if (self)
-    {
-        _resizedColumn = CPNotFound;
-        _draggedColumn = CPNotFound;
-        _draggedDistance = 0.0;
-    }
+        [self _init];
 
     return self;
 }
 
 - (int)columnAtPoint:(CGPoint)aPoint
 {
-    if (!CGRectContainsPoint([self bounds], aPoint))
-        return CPNotFound;
-
-    // at this point, we can essentially ignore height, because all columns have equal heights
-    // and that height is equal to the height of our own bounds, which we know we are inside of
-
-    var index = 0,
-        count = [[_tableView tableColumns] count],
-        tableSpacing = [_tableView intercellSpacing],
-        tableColumns = [_tableView tableColumns],
-        leftOffset = 0,
-        pointX = aPoint.x;
-
-    for (; index < count; index++)
-    {
-        var width = [tableColumns[index] width] + tableSpacing.width;
-
-        if (pointX >= leftOffset && pointX < leftOffset + width)
-            return index;
-
-        leftOffset += width;
-    }
-
-    return CPNotFound;
+    return [_tableView columnAtPoint:CGPointMake(aPoint.x, aPoint.y)];
 }
 
 - (CGRect)headerRectOfColumn:(int)aColumnIndex
+{
+    var headerRect = [self bounds],
+        columnRect = [_tableView rectOfColumn:aColumnIndex];
+
+    headerRect.origin.x = CPRectGetMinX(columnRect);
+    headerRect.size.width = CPRectGetWidth(columnRect);
+
+    return headerRect;
+}
+
+- (CGRect)_cursorRectForColumn:(int)column
+{
+    if (column == -1 || !([_tableView._tableColumns[column] resizingMask] & CPTableColumnUserResizingMask))
+        return CGRectMakeZero();
+
+    var rect = [self headerRectOfColumn:column];
+
+    rect.origin.x = CGRectGetMaxX(rect) - 5;
+    rect.size.width = 20;
+
+    return rect;    
+}
+
+- (void)_setPressedColumn:(CPInteger)column
+{
+    if (_pressedColumn != -1)
+    {
+        var headerView = [_tableView._tableColumns[_pressedColumn] headerView];
+        [headerView unsetThemeState:CPThemeStateHighlighted];
+    }    
+
+    if (column != -1)
+    {
+        var headerView = [_tableView._tableColumns[column] headerView];
+        [headerView setThemeState:CPThemeStateHighlighted];
+    }
+
+    _pressedColumn = column;
+}
+
+- (void)mouseDown:(CPEvent)theEvent
+{
+    [self trackMouse:theEvent];
+}
+
+- (void)trackMouse:(CPEvent)theEvent
+{
+    var type = [theEvent type],
+        currentLocation = [self convertPoint:[theEvent locationInWindow] fromView:nil];
+
+    // Take the right columns resize tracking area into account
+    currentLocation.x -= 5.0;
+
+    var columnIndex = [self columnAtPoint:currentLocation],
+        shouldResize = [self shouldResizeTableColumn:columnIndex at:CPPointMake(currentLocation.x + 5.0, currentLocation.y)];
+
+    if (type === CPLeftMouseUp)
+    {
+        if (shouldResize)
+            [self stopResizingTableColumn:_activeColumn at:currentLocation];
+        else if ([self _shouldStopTrackingTableColumn:columnIndex at:currentLocation])
+        {
+            [_tableView _didClickTableColumn:columnIndex modifierFlags:[theEvent modifierFlags]];
+            [self stopTrackingTableColumn:columnIndex at:currentLocation];
+
+            _isTrackingColumn = NO;
+        }
+
+        [self _updateResizeCursor:[CPApp currentEvent]];
+
+        _activeColumn = CPNotFound;
+        return;
+    }
+
+    if (type === CPLeftMouseDown)
+    {
+        if (columnIndex === -1)
+            return;
+
+        _mouseDownLocation = currentLocation;
+        _activeColumn = columnIndex;
+
+        [_tableView _sendDelegateDidMouseDownInHeader:columnIndex];
+
+        if (shouldResize)
+            [self startResizingTableColumn:columnIndex at:currentLocation];
+        else
+        {
+            [self startTrackingTableColumn:columnIndex at:currentLocation];
+            _isTrackingColumn = YES;
+        }
+    }
+    else if (type === CPLeftMouseDragged)
+    {
+        if (shouldResize)
+            [self continueResizingTableColumn:_activeColumn at:currentLocation];
+        else
+        {
+            if (_activeColumn === columnIndex && CPRectContainsPoint([self headerRectOfColumn:columnIndex], currentLocation))
+            {
+                if (_isTrackingColumn && _pressedColumn !== -1)
+                {
+                    if (![self continueTrackingTableColumn:columnIndex at:currentLocation])
+                        return; // Stop tracking the column, because it's being dragged
+                } else
+                    [self startTrackingTableColumn:columnIndex at:currentLocation];
+
+            } else if (_isTrackingColumn && _pressedColumn !== -1)
+                [self stopTrackingTableColumn:_activeColumn at:currentLocation];
+        }
+    }
+
+    _previousTrackingLocation = currentLocation;
+    [CPApp setTarget:self selector:@selector(trackMouse:) forNextEventMatchingMask:CPLeftMouseDraggedMask | CPLeftMouseUpMask untilDate:nil inMode:nil dequeue:YES];
+}
+
+- (void)startTrackingTableColumn:(int)aColumnIndex at:(CPPoint)aPoint
+{
+    [self _setPressedColumn:aColumnIndex];
+}
+
+- (BOOL)continueTrackingTableColumn:(int)aColumnIndex at:(CPPoint)aPoint
+{
+    if ([self _shouldDragTableColumn:aColumnIndex at:aPoint])
+    {
+        var columnRect = [self headerRectOfColumn:aColumnIndex],
+            offset = CPPointMakeZero(),
+            view = [_tableView _dragViewForColumn:aColumnIndex event:[CPApp currentEvent] offset:offset],
+            viewLocation = CPPointMakeZero();
+
+        viewLocation.x = ( CPRectGetMinX(columnRect) + offset.x ) + ( aPoint.x - _mouseDownLocation.x );
+        viewLocation.y = CPRectGetMinY(columnRect) + offset.y;
+
+        [self dragView:view at:viewLocation offset:CPSizeMakeZero() event:[CPApp currentEvent] 
+            pasteboard:[CPPasteboard pasteboardWithName:CPDragPboard] source:self slideBack:YES];
+
+        return NO;
+    }
+
+    return YES;
+}
+
+- (BOOL)_shouldStopTrackingTableColumn:(int)aColumnIndex at:(CPPoint)aPoint
+{
+    return _isTrackingColumn && _activeColumn === aColumnIndex && 
+        CPRectContainsPoint([self headerRectOfColumn:aColumnIndex], aPoint);
+}
+
+- (void)stopTrackingTableColumn:(int)aColumnIndex at:(CPPoint)aPoint
+{
+    [self _setPressedColumn:CPNotFound];
+    [self _updateResizeCursor:[CPApp currentEvent]];
+}
+
+- (BOOL)_shouldDragTableColumn:(int)aColumnIndex at:(CPPoint)aPoint
+{
+    return [_tableView allowsColumnReordering] && ABS(aPoint.x - _mouseDownLocation.x) >= 10.0;
+}
+
+- (CPRect)_headerRectOfLastVisibleColumn
 {
     var tableColumns = [_tableView tableColumns],
-        tableSpacing = [_tableView intercellSpacing],
-        bounds = [self bounds];
+        columnIndex = [tableColumns count];
 
-    if (aColumnIndex < 0 || aColumnIndex > [tableColumns count])
-        [CPException raise:"invalid" reason:"tried to get headerRectOfColumn: on invalid column"];
+    while (columnIndex--)
+    {
+        var tableColumn = [tableColumns objectAtIndex:columnIndex];
 
-    bounds.size.width = [tableColumns[aColumnIndex] width] + tableSpacing.width;
+        if (![tableColumn isHidden])
+            return [self headerRectOfColumn:columnIndex];
+    }
 
-    while (--aColumnIndex >= 0)
-        bounds.origin.x += [tableColumns[aColumnIndex] width] + tableSpacing.width;
+    return nil;
+}
 
-    return bounds;
+- (void)_constrainDragView:(CPView)theDragView at:(CPPoint)aPoint
+{
+    var tableColumns = [_tableView tableColumns],
+        lastColumnRect = [self _headerRectOfLastVisibleColumn];
+        activeColumnRect = [self headerRectOfColumn:_activeColumn];
+        dragWindow = [theDragView window],
+        frame = [dragWindow frame];
+
+    // Convert the frame origin from the global coordinate system to the windows' coordinate system
+    frame.origin = [[self window] convertGlobalToBase:frame.origin];
+    // the from the window to the view
+    frame.origin = [self convertPoint:frame.origin fromView:nil];
+
+    // This effectively clamps the value between the minimum and maximum
+    frame.origin.x = MAX(0.0, MIN(CGRectGetMinX(frame), CGRectGetMaxX(lastColumnRect) - CGRectGetWidth(activeColumnRect)));
+
+    // Make sure the column cannot move vertically
+    frame.origin.y = CPRectGetMinY(lastColumnRect);
+
+    // Convert the calculated origin back to the window coordinate system
+    frame.origin = [self convertPoint:frame.origin toView:nil];
+    // Then back to the global coordinate system
+    frame.origin = [[self window] convertBaseToGlobal:frame.origin];
+
+    [dragWindow setFrame:frame];
+}
+
+- (void)_moveColumn:(int)aFromIndex toColumn:(int)aToIndex
+{
+    [_tableView moveColumn:aFromIndex toColumn:aToIndex];
+    _activeColumn = aToIndex;
+    _pressedColumn = _activeColumn;
+
+    [_tableView _setDraggedColumn:_activeColumn];
+}
+
+- (void)draggedView:(CPView)aView beganAt:(CPPoint)aPoint
+{
+    _isDragging = YES;
+
+    [[[[_tableView tableColumns] objectAtIndex:_activeColumn] headerView] setHidden:YES];
+    [_tableView _setDraggedColumn:_activeColumn];
+
+    [self setNeedsDisplay:YES];
+}
+
+- (void)draggedView:(CPView)aView movedTo:(CPPoint)aPoint
+{
+    [self _constrainDragView:aView at:aPoint];
+
+    var dragWindow = [aView window],
+        dragWindowFrame = [dragWindow frame];
+
+    var hoverPoint = CGPointCreateCopy(aPoint);
+
+    if (aPoint.x < _previousTrackingLocation.x)
+        hoverPoint = CGPointMake(CGRectGetMinX(dragWindowFrame), CGRectGetMinY(dragWindowFrame));
+    else if (aPoint.x > _previousTrackingLocation.x)
+        hoverPoint = CGPointMake(CGRectGetMaxX(dragWindowFrame), CGRectGetMinY(dragWindowFrame));
+
+    // Convert the hover point from the global coordinate system to windows' coordinate system
+    hoverPoint = [[self window] convertGlobalToBase:hoverPoint];
+    // then to the view
+    hoverPoint = [self convertPoint:hoverPoint fromView:nil];
+
+    var hoveredColumn = [self columnAtPoint:hoverPoint];
+
+    if (hoveredColumn !== -1)
+    {
+        var columnRect = [self headerRectOfColumn:hoveredColumn],
+            columnCenterPoint = [self convertPoint:CGPointMake(CGRectGetMidX(columnRect), CGRectGetMidY(columnRect)) fromView:self];
+        if (hoveredColumn < _activeColumn && hoverPoint.x < columnCenterPoint.x)
+            [self _moveColumn:_activeColumn toColumn:hoveredColumn];
+        else if (hoveredColumn > _activeColumn && hoverPoint.x > columnCenterPoint.x)
+            [self _moveColumn:_activeColumn toColumn:hoveredColumn];
+    }
+
+    _previousTrackingLocation = aPoint;
+}
+
+- (void)draggedView:(CPImage)aView endedAt:(CGPoint)aLocation operation:(CPDragOperation)anOperation
+{
+    _isDragging = NO;
+    _isTrackingColumn = NO; // We need to do this explicitly because the mouse up section of trackMouse is never reached
+
+    [_tableView _setDraggedColumn:-1];
+    [[[[_tableView tableColumns] objectAtIndex:_activeColumn] headerView] setHidden:NO];
+    [self stopTrackingTableColumn:_activeColumn at:aLocation];
+
+    [self setNeedsDisplay:YES];
+}
+
+- (BOOL)shouldResizeTableColumn:(int)aColumnIndex at:(CPPoint)aPoint
+{
+    if (_isResizing)
+        return YES;
+
+    if (_isTrackingColumn)
+        return NO;
+
+    return [_tableView allowsColumnResizing] && CPRectContainsPoint([self _cursorRectForColumn:aColumnIndex], aPoint);
+}
+
+- (void)startResizingTableColumn:(int)aColumnIndex at:(CPPoint)aPoint
+{
+    _isResizing = YES;
+
+    var tableColumn = [[_tableView tableColumns] objectAtIndex:aColumnIndex];
+
+    [tableColumn setDisableResizingPosting:YES];
+    [_tableView setDisableAutomaticResizing:YES];
+}
+
+- (void)continueResizingTableColumn:(int)aColumnIndex at:(CPPoint)aPoint
+{
+    var tableColumn = [[_tableView tableColumns] objectAtIndex:aColumnIndex],
+        newWidth = [tableColumn width] + aPoint.x - _previousTrackingLocation.x;
+
+    if (newWidth < [tableColumn minWidth])
+        [[CPCursor resizeRightCursor] set];
+    else if (newWidth > [tableColumn maxWidth])
+        [[CPCursor resizeLeftCursor] set];
+    else
+    {
+        _tableView._lastColumnShouldSnap = NO;
+        [tableColumn setWidth:newWidth];
+
+        [[CPCursor resizeLeftRightCursor] set];
+        [self setNeedsLayout];
+        [self setNeedsDisplay:YES];
+    }
+}
+
+- (void)stopResizingTableColumn:(int)aColumnIndex at:(CPPoint)aPoint
+{
+    var tableColumn = [[_tableView tableColumns] objectAtIndex:aColumnIndex];
+    [tableColumn _postDidResizeNotificationWithOldWidth:_columnOldWidth];
+    [tableColumn setDisableResizingPosting:NO];
+    [_tableView setDisableAutomaticResizing:NO];
+
+    _isResizing = NO;
+}
+
+- (void)_updateResizeCursor:(CPEvent)theEvent
+{
+    // never get stuck in resize cursor mode (FIXME take out when we turn on tracking rects)
+    if (![_tableView allowsColumnResizing] || ([theEvent type] === CPLeftMouseUp && ![[self window] acceptsMouseMovedEvents]))
+    {
+        [[CPCursor arrowCursor] set];
+        return;
+    }
+
+    var mouseLocation = [self convertPoint:[theEvent locationInWindow] fromView:nil],    
+        mouseOverLocation = CGPointMake(mouseLocation.x - 5, mouseLocation.y),
+        overColumn = [self columnAtPoint:mouseOverLocation];
+
+    if (overColumn >= 0 && CGRectContainsPoint([self _cursorRectForColumn:overColumn], mouseLocation))
+    {
+        var tableColumn = [[_tableView tableColumns] objectAtIndex:overColumn],
+            width = [tableColumn width];
+
+        if (width == [tableColumn minWidth])
+            [[CPCursor resizeRightCursor] set];
+        else if (width == [tableColumn maxWidth])
+            [[CPCursor resizeLeftCursor] set];
+        else
+            [[CPCursor resizeLeftRightCursor] set];
+    }
+    else
+        [[CPCursor arrowCursor] set];
+}
+
+- (void)mouseEntered:(CPEvent)theEvent
+{   
+    [self _updateResizeCursor:theEvent];
+}
+
+- (void)mouseMoved:(CPEvent)theEvent
+{
+    [self _updateResizeCursor:theEvent];
+}
+
+- (void)mouseExited:(CPEvent)theEvent
+{
+    // FIXME: we should use CPCursor push/pop (if previous currentCursor != arrow).
+    [[CPCursor arrowCursor] set];
 }
 
 - (void)layoutSubviews
 {
-    var tableColumns    = [_tableView tableColumns],
-        count = [tableColumns count],
-        columnRect = [self bounds],
-        spacing = [_tableView intercellSpacing];
- 
-    for (i = 0; i < count; ++i) 
+    var tableColumns = [_tableView tableColumns],
+        count = [tableColumns count];    
+
+    for (var i = 0; i < count; i++) 
     {
         var column = [tableColumns objectAtIndex:i],
             headerView = [column headerView];
 
-        columnRect.size.width = [column width] + spacing.width;
+        var frame = [self headerRectOfColumn:i];
+        frame.size.height -= 0.5;
+        if (i > 0) 
+        {
+            frame.origin.x += 0.5;
+            frame.size.width -= 1;
+        }
 
-        [headerView setFrame:columnRect];
+        [headerView setFrame:frame];
 
-        columnRect.origin.x += [column width] + spacing.width;
-
-        [self addSubview:headerView];
+        if([headerView superview] != self)
+            [self addSubview:headerView];
     }
 }
 
 - (void)drawRect:(CGRect)aRect
 {
-    [[_tableView gridColor] setStroke];
+    if (!_tableView)
+        return;
 
     var context = [[CPGraphicsContext currentContext] graphicsPort],
-        exposedColumnIndexes = exposedColumnIndexes = [_tableView columnIndexesInRect:aRect],
-        columnsArray = [];
+        exposedColumnIndexes = [_tableView columnIndexesInRect:aRect],
+        columnsArray = [],
+        tableColumns = [_tableView tableColumns],
+        exposedTableColumns = _tableView._exposedColumns,
+        firstIndex = [exposedTableColumns firstIndex],
+        exposedRange = CPMakeRange(firstIndex, [exposedTableColumns lastIndex] - firstIndex + 1);
 
-    [exposedColumnIndexes getIndexes:columnsArray maxCount:-1 inIndexRange:nil];
+    CGContextSetLineWidth(context, 1);
+    CGContextSetStrokeColor(context, [_tableView gridColor]);
+
+    [exposedColumnIndexes getIndexes:columnsArray maxCount:-1 inIndexRange:exposedRange];
 
     var columnArrayIndex = 0,
-        columnArrayCount = columnsArray.length;
+        columnArrayCount = columnsArray.length,
+        columnMaxX;
 
-    for(; columnArrayIndex < columnArrayCount; ++columnArrayIndex)
+    CGContextBeginPath(context);
+    for(; columnArrayIndex < columnArrayCount; columnArrayIndex++)
     {
-        // grab each column rect and add horizontal lines
-        var columnToStroke = [self headerRectOfColumn:columnArrayIndex];
+        // grab each column rect and add vertical lines
+        var columnIndex = columnsArray[columnArrayIndex],
+            columnToStroke = [self headerRectOfColumn:columnIndex];
 
-        CGContextBeginPath(context);
-        CGContextMoveToPoint(context, ROUND(columnToStroke.origin.x + columnToStroke.size.width) - 0.5, ROUND(columnToStroke.origin.y) - 0.5);
-        CGContextAddLineToPoint(context, ROUND(columnToStroke.origin.x + columnToStroke.size.width) - 0.5, ROUND(columnToStroke.origin.y + columnToStroke.size.height) - 0.5);
-        CGContextSetLineWidth(context, 1);
-        CGContextStrokePath(context);
+        columnMaxX = CGRectGetMaxX(columnToStroke);
+
+        CGContextMoveToPoint(context, ROUND(columnMaxX) + 0.5, ROUND(CGRectGetMinY(columnToStroke)));
+        CGContextAddLineToPoint(context, ROUND(columnMaxX) + 0.5, ROUND(CGRectGetMaxY(columnToStroke)));
+    }
+
+    CGContextClosePath(context);
+    CGContextStrokePath(context);
+
+    if (_isDragging)
+    {
+        CGContextSetFillColor(context, [CPColor grayColor]);
+        CGContextFillRect(context, [self headerRectOfColumn:_activeColumn])
     }
 }
 
 @end
+
+var CPTableHeaderViewTableViewKey = @"CPTableHeaderViewTableViewKey";
+
+@implementation CPTableHeaderView (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    if (self = [super initWithCoder:aCoder])
+    {
+        [self _init];
+        _tableView = [aCoder decodeObjectForKey:CPTableHeaderViewTableViewKey];
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [super encodeWithCoder:aCoder];
+    [aCoder encodeObject:_tableView forKey:CPTableHeaderViewTableViewKey];
+}
+
+@end

AppKit/CPTextField.j

@@ -24,19 +24,12 @@
 @import "CPControl.j"
 @import "CPStringDrawing.j"
 @import "CPCompatibility.j"
+@import "_CPImageAndTextView.j"
 
 #include "CoreGraphics/CGGeometry.h"
 #include "Platform/Platform.h"
 #include "Platform/DOM/CPDOMDisplayServer.h"
 
-
-CPLineBreakByWordWrapping       = 0;
-CPLineBreakByCharWrapping       = 1;
-CPLineBreakByClipping           = 2;
-CPLineBreakByTruncatingHead     = 3;
-CPLineBreakByTruncatingTail     = 4;
-CPLineBreakByTruncatingMiddle   = 5;
-
 CPTextFieldSquareBezel          = 0;    /*! A textfield bezel with a squared corners. */
 CPTextFieldRoundedBezel         = 1;    /*! A textfield bezel with rounded corners. */
 
@@ -169,7 +162,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[_CGInsetMakeZero(), _CGInsetMake(2.0, 2.0, 2.0, 2.0), nil]
+    return [CPDictionary dictionaryWithObjects:[_CGInsetMakeZero(), _CGInsetMake(2.0, 2.0, 2.0, 2.0), [CPNull null]]
                                        forKeys:[@"bezel-inset", @"content-inset", @"bezel-color"]];
 }
 
@@ -490,6 +483,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     window.setTimeout(function() 
     { 
         element.focus();
+        [self textDidFocus:[CPNotification notificationWithName:CPTextFieldDidFocusNotification object:self userInfo:nil]];
         CPTextFieldInputOwner = self;
     }, 0.0);
  
@@ -501,14 +495,12 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
     if (document.attachEvent)
     {
-        CPTextFieldCachedSelectStartFunction = document.body.onselectstart;
-        CPTextFieldCachedDragFunction = document.body.ondrag;
+        CPTextFieldCachedSelectStartFunction = [[self window] platformWindow]._DOMBodyElement.onselectstart;
+        CPTextFieldCachedDragFunction = [[self window] platformWindow]._DOMBodyElement.ondrag;
         
-        document.body.ondrag = function () {};
-        document.body.onselectstart = function () {};
+        [[self window] platformWindow]._DOMBodyElement.ondrag = function () {};
+        [[self window] platformWindow]._DOMBodyElement.onselectstart = function () {};
     }
-    
-    [self textDidFocus:[CPNotification notificationWithName:CPTextFieldDidFocusNotification object:self userInfo:nil]];
 #endif
 
     return YES;
@@ -548,8 +540,8 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         CPTextFieldCachedSelectStartFunction = nil;
         CPTextFieldCachedDragFunction = nil;
         
-        document.body.ondrag = CPTextFieldCachedDragFunction
-        document.body.onselectstart = CPTextFieldCachedSelectStartFunction
+        [[self window] platformWindow]._DOMBodyElement.ondrag = CPTextFieldCachedDragFunction;
+        [[self window] platformWindow]._DOMBodyElement.onselectstart = CPTextFieldCachedSelectStartFunction;
     }
     
 #endif
@@ -569,6 +561,14 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     return YES;
 }
 
+/*!
+    Text fields require panels to become key window, so this returns \c YES.
+*/
+- (BOOL)needsPanelToBecomeKey
+{
+    return YES;
+}
+
 - (void)mouseDown:(CPEvent)anEvent
 {
     // Don't track! (ever?)
@@ -683,9 +683,10 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 - (void)setObjectValue:(id)aValue
 {
     [super setObjectValue:aValue];
-
+	
 #if PLATFORM(DOM)
-    if (CPTextFieldInputOwner === self)
+
+    if (CPTextFieldInputOwner === self || [[self window] firstResponder] === self)
         [self _inputElement].value = aValue;
 #endif
 
@@ -791,41 +792,50 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
 - (void)copy:(id)sender
 {
-    var selectedRange = [self selectedRange];
+    if (![CPPlatform isBrowser])
+    {
+        var selectedRange = [self selectedRange];
 
-    if (selectedRange.length < 1)
-        return;
+        if (selectedRange.length < 1)
+            return;
 
-    var pasteboard = [CPPasteboard generalPasteboard],
-        stringValue = [self stringValue],
-        stringForPasting = [stringValue substringWithRange:selectedRange];
+        var pasteboard = [CPPasteboard generalPasteboard],
+            stringValue = [self stringValue],
+            stringForPasting = [stringValue substringWithRange:selectedRange];
 
-    [pasteboard declareTypes:[CPStringPboardType] owner:nil];
-    [pasteboard setString:stringForPasting forType:CPStringPboardType];    
+        [pasteboard declareTypes:[CPStringPboardType] owner:nil];
+        [pasteboard setString:stringForPasting forType:CPStringPboardType];
+    }
 }
 
 - (void)cut:(id)sender
 {
-    [self copy:sender];
-    [self deleteBackwards:sender];
+    if (![CPPlatform isBrowser])
+    {
+        [self copy:sender];
+        [self deleteBackward:sender];
+    }
 }
 
 - (void)paste:(id)sender
 {
-    var pasteboard = [CPPasteboard generalPasteboard];
-    
-    if (![[pasteboard types] containsObject:CPStringPboardType])
-        return;
+    if (![CPPlatform isBrowser])
+    {
+        var pasteboard = [CPPasteboard generalPasteboard];
 
-    [self deleteBackwards:sender];
+        if (![[pasteboard types] containsObject:CPStringPboardType])
+            return;
 
-    var selectedRange = [self selectedRange],
-        stringValue = [self stringValue],
-        pasteString = [pasteboard stringForType:CPStringPboardType],
-        newValue = [stringValue stringByReplacingCharactersInRange:selectedRange withString:pasteString];
+        [self deleteBackward:sender];
 
-    [self setStringValue:newValue];
-    [self setSelectedRange:CPMakeRange(selectedRange.location+pasteString.length, 0)];
+        var selectedRange = [self selectedRange],
+            stringValue = [self stringValue],
+            pasteString = [pasteboard stringForType:CPStringPboardType],
+            newValue = [stringValue stringByReplacingCharactersInRange:selectedRange withString:pasteString];
+
+        [self setStringValue:newValue];
+        [self setSelectedRange:CPMakeRange(selectedRange.location+pasteString.length, 0)];
+    }
 }
 
 - (CPRange)selectedRange
@@ -902,7 +912,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     [self selectText:sender];
 }
 
-- (void)deleteBackwards:(id)sender
+- (void)deleteBackward:(id)sender
 {
     var selectedRange = [self selectedRange],
         stringValue = [self stringValue],
@@ -987,7 +997,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     return bounds;
 }
 
-- (CGRect)bezelRectForBounds:(CFRect)bounds
+- (CGRect)bezelRectForBounds:(CGRect)bounds
 {
     var bezelInset = [self currentValueForThemeAttribute:@"bezel-inset"];
 
@@ -1028,6 +1038,8 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         var view = [[_CPImageAndTextView alloc] initWithFrame:_CGRectMakeZero()];
         //[view setImagePosition:CPNoImage];
         
+        [view setHitTests:NO];
+        
         return view;
     }
     
@@ -1075,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/CPTheme.j

@@ -22,7 +22,7 @@
 
 @import <Foundation/CPObject.j>
 @import <Foundation/CPString.j>
-
+@import <Foundation/CPKeyedUnarchiver.j>
 
 var CPThemesByName      = { },
     CPThemeDefaultTheme = nil;

AppKit/CPThemeBlend.j

@@ -43,7 +43,7 @@
     
     if (self)
     {
-        _bundle = [[CPBundle alloc] initWithPath:aURL + "/Info.plist"];
+        _bundle = [[CPBundle alloc] initWithPath:aURL];
     }
     
     return self;
@@ -65,7 +65,7 @@
     {
         var path = [aBundle pathForResource:themes[count]],
             unarchiver = [[_CPThemeKeyedUnarchiver alloc]
-                            initForReadingWithData:[CPData dataWithString:objj_files[path].contents]
+                            initForReadingWithData:[[CPURL URLWithString:path] staticResourceData]
                             bundle:_bundle];
 
         [unarchiver decodeObjectForKey:@"root"];

AppKit/CPToolbar.j

@@ -58,7 +58,7 @@ var CPToolbarConfigurationsByIdentifier = nil;
 /*!
     @ingroup appkit
     @class CPToolbar
-    
+
     A CPToolbar is displayed at the top of a window with multiple
     buttons (tools) that offer the user quick access to features.
 
@@ -73,7 +73,7 @@ var CPToolbarConfigurationsByIdentifier = nil;
     Called to obtain the toolbar's default item identifiers. Required.
     @param toolbar the toolbar to obtain identifiers for
     @return an array of default item identifiers in the order on the toolbar
-    
+
     @delegate - (CPToolbarItem)toolbar:(CPToolbar)toolbar itemForItemIdentifier:(CPString)itemIdentifier willBeInsertedIntoToolbar:(BOOL)flag;
     Called to obtain a toolbar item. Required.
     @param toolbar the toolbar the item belongs to
@@ -89,19 +89,19 @@ var CPToolbarConfigurationsByIdentifier = nil;
     BOOL                    _showsBaselineSeparator;
     BOOL                    _allowsUserCustomization;
     BOOL                    _isVisible;
-    
+
     id                      _delegate;
-    
+
     CPArray                 _itemIdentifiers;
-    
+
     CPDictionary            _identifiedItems;
     CPArray                 _defaultItems;
     CPArray                 _allowedItems;
     CPArray                 _selectableItems;
-    
+
     CPArray                 _items;
     CPArray                 _itemsSortedByVisibilityPriority;
-    
+
     CPView                  _toolbarView;
     CPWindow                _window;
 }
@@ -111,7 +111,7 @@ var CPToolbarConfigurationsByIdentifier = nil;
 {
     if (self != [CPToolbar class])
         return;
-        
+
     CPToolbarsByIdentifier = [CPDictionary dictionary];
     CPToolbarConfigurationsByIdentifier = [CPDictionary dictionary];
 }
@@ -120,13 +120,13 @@ var CPToolbarConfigurationsByIdentifier = nil;
 + (void)_addToolbar:(CPToolbar)toolbar forIdentifier:(CPString)identifier
 {
     var toolbarsSharingIdentifier = [CPToolbarsByIdentifier objectForKey:identifier];
-    
+
     if (!toolbarsSharingIdentifier)
     {
         toolbarsSharingIdentifier = []
         [CPToolbarsByIdentifier setObject:toolbarsSharingIdentifier forKey:identifier];
     }
-        
+
     [toolbarsSharingIdentifier addObject:toolbar];
 }
 
@@ -143,17 +143,17 @@ var CPToolbarConfigurationsByIdentifier = nil;
 - (id)initWithIdentifier:(CPString)anIdentifier
 {
     self = [super init];
-    
+
     if (self)
     {
         _items = [];
-        
+
         _identifier = anIdentifier;
         _isVisible = YES;
-    
+
         [CPToolbar _addToolbar:self forIdentifier:_identifier];
     }
-    
+
     return self;
 }
 
@@ -163,7 +163,7 @@ var CPToolbarConfigurationsByIdentifier = nil;
 */
 - (void)setDisplayMode:(CPToolbarDisplayMode)aDisplayMode
 {
-    
+
 }
 
 /*!
@@ -198,7 +198,7 @@ var CPToolbarConfigurationsByIdentifier = nil;
 {
     if (_isVisible === aFlag)
         return;
-    
+
     _isVisible = aFlag;
 
     [_window _noteToolbarChanged];
@@ -220,11 +220,11 @@ var CPToolbarConfigurationsByIdentifier = nil;
 */
 - (void)setDelegate:(id)aDelegate
 {
-    if (_delegate == aDelegate)
+    if (_delegate === aDelegate)
         return;
-        
+
     _delegate = aDelegate;
-    
+
     [self _reloadToolbarItems];
 }
 
@@ -240,57 +240,68 @@ var CPToolbarConfigurationsByIdentifier = nil;
     if (!_toolbarView)
     {
         _toolbarView = [[_CPToolbarView alloc] initWithFrame:CPRectMake(0.0, 0.0, 1200.0, 59.0)];
-        
+
         [_toolbarView setToolbar:self];
         [_toolbarView setAutoresizingMask:CPViewWidthSizable];
         [_toolbarView reloadToolbarItems];
     }
-    
+
     return _toolbarView;
 }
 
 /* @ignore */
 - (void)_reloadToolbarItems
 {
-    if (!_delegate)
-        return;
+    // As of OS X 10.5 (Leopard), toolbar items can be set in IB and a
+    // toolbar delegate is optional. Toolbar items can be combined from
+    // both IB and a delegate (see Apple's NSToolbar guide for IB, for more details).
 
-    var count = [_itemIdentifiers count];
-    
-    if (!count)
+    // _defaultItems may have been loaded from Cib
+    _itemIdentifiers = [_defaultItems valueForKey:@"itemIdentifier"] || [];
+
+    if (_delegate)
     {
-         _itemIdentifiers = [[_delegate toolbarDefaultItemIdentifiers:self] mutableCopy];
-         count = [_itemIdentifiers count];
+        var itemIdentifiersFromDelegate = [[_delegate toolbarDefaultItemIdentifiers:self] mutableCopy];
+
+        if (itemIdentifiersFromDelegate)
+            _itemIdentifiers = [_itemIdentifiers arrayByAddingObjectsFromArray:itemIdentifiersFromDelegate];
     }
 
+    var index = 0,
+        count = [_itemIdentifiers count];
+
     _items = [];
 
-    var index = 0;
-    
     for (; index < count; ++index)
     {
         var identifier = _itemIdentifiers[index],
             item = [CPToolbarItem _standardItemWithItemIdentifier:identifier];
-        
+
+        // May come from a Cib.
         if (!item)
+            item = [_identifiedItems objectForKey:identifier];
+
+        if (!item && _delegate)
             item = [_delegate toolbar:self itemForItemIdentifier:identifier willBeInsertedIntoToolbar:YES];
-        
+
         item = [item copy];
-        
-        if (item == nil)
+
+        if (item === nil)
             [CPException raise:CPInvalidArgumentException
-                         reason:sprintf(@"_delegate %s returned nil toolbar item returned for identifier %s", _delegate, identifier)];
-            
+                         reason:@"Toolbar delegate " + _delegate + " returned nil toolbar item for identifier \"" + identifier + "\""];
+
+        item._toolbar = self;
+
         [_items addObject:item];
     }
-  
+
 //    _items = [[self _defaultToolbarItems] mutableCopy];
-    
+
     // Store items sorted by priority.  We want items to be removed first at the end of the array,
     // items to be removed last at the front.
-    
+
     _itemsSortedByVisibilityPriority = [_items sortedArrayUsingFunction:_CPToolbarItemVisibilityPriorityCompare context:NULL];
-    
+
     [_toolbarView reloadToolbarItems];
 }
 
@@ -339,9 +350,9 @@ var CPToolbarConfigurationsByIdentifier = nil;
             item = [[_delegate toolbar:self itemForItemIdentifier:identifier willBeInsertedIntoToolbar:toolbar] copy];
             if (!item)
                 [CPException raise:CPInvalidArgumentException
-                            reason:sprintf(@"_delegate %s returned nil toolbar item returned for identifier %s", _delegate, identifier)];
+                            reason:@"Toolbar delegate " + _delegate + " returned nil toolbar item for identifier " + identifier];
         }
-        
+
         [_identifiedItems setObject:item forKey:identifier];
     }
 
@@ -350,7 +361,7 @@ var CPToolbarConfigurationsByIdentifier = nil;
 
 /* @ignore */
 - (id)_itemsWithIdentifiers:(CPArray)identifiers
-{   
+{
     var items = [];
     for (var i = 0; i < identifiers.length; i++)
         [items addObject:[self _itemForItemIdentifier:identifiers[i] willBeInsertedIntoToolbar:NO]];
@@ -359,28 +370,62 @@ var CPToolbarConfigurationsByIdentifier = nil;
 }
 
 /* @ignore */
--(id)_defaultToolbarItems
+- (id)_defaultToolbarItems
 {
-    if (!_defaultItems)
-        if ([_delegate respondsToSelector:@selector(toolbarDefaultItemIdentifiers:)])
-            _defaultItems = [self _itemsWithIdentifiers:[_delegate toolbarDefaultItemIdentifiers:self]];
-    
+    if (!_defaultItems && [_delegate respondsToSelector:@selector(toolbarDefaultItemIdentifiers:)])
+    {
+        _defaultItems = [];
+
+        var identifiers = [_delegate toolbarDefaultItemIdentifiers:self],
+            index = 0,
+            count = [identifiers count];
+
+        for (; index < count; ++index)
+            [_defaultItems addObject:[self _itemForItemIdentifier:identifiers[index] willBeInsertedIntoToolbar:NO]];
+    }
+
     return _defaultItems;
 }
 
+/*!
+    Notifies the toolbar that an item has been changed. This will cause the toolbar to reload its items.
+    @param anItem the item that has been changed
+*/
+- (void)toolbarItemDidChange:(CPToolbarItem)anItem
+{
+    if ([_identifiedItems objectForKey:[anItem itemIdentifier]])
+        [_identifiedItems setObject:anItem forKey:[anItem itemIdentifier]];
+
+    var index = 0,
+        count = [_items count];
+
+    for (; index <= count; ++index)
+    {
+        var item = _items[index];
+
+        if ([item itemIdentifier] === [anItem itemIdentifier])
+        {
+            _items[index] = anItem;
+            _itemsSortedByVisibilityPriority = [_items sortedArrayUsingFunction:_CPToolbarItemVisibilityPriorityCompare context:NULL];
+
+            [_toolbarView reloadToolbarItems];
+        }
+    }
+}
+
 @end
 
 
-var CPToolbarIdentifierKey              = "CPToolbarIdentifierKey",
-    CPToolbarDisplayModeKey             = "CPToolbarDisplayModeKey",
-    CPToolbarShowsBaselineSeparatorKey  = "CPToolbarShowsBaselineSeparatorKey",
-    CPToolbarAllowsUserCustomizationKey = "CPToolbarAllowsUserCustomizationKey",
-    CPToolbarIsVisibleKey               = "CPToolbarIsVisibleKey",
-    CPToolbarDelegateKey                = "CPToolbarDelegateKey",
-    CPToolbarIdentifiedItemsKey         = "CPToolbarIdentifiedItemsKey",
-    CPToolbarDefaultItemsKey            = "CPToolbarDefaultItemsKey",
-    CPToolbarAllowedItemsKey            = "CPToolbarAllowedItemsKey",
-    CPToolbarSelectableItemsKey         = "CPToolbarSelectableItemsKey";
+var CPToolbarIdentifierKey              = @"CPToolbarIdentifierKey",
+    CPToolbarDisplayModeKey             = @"CPToolbarDisplayModeKey",
+    CPToolbarShowsBaselineSeparatorKey  = @"CPToolbarShowsBaselineSeparatorKey",
+    CPToolbarAllowsUserCustomizationKey = @"CPToolbarAllowsUserCustomizationKey",
+    CPToolbarIsVisibleKey               = @"CPToolbarIsVisibleKey",
+    CPToolbarDelegateKey                = @"CPToolbarDelegateKey",
+    CPToolbarIdentifiedItemsKey         = @"CPToolbarIdentifiedItemsKey",
+    CPToolbarDefaultItemsKey            = @"CPToolbarDefaultItemsKey",
+    CPToolbarAllowedItemsKey            = @"CPToolbarAllowedItemsKey",
+    CPToolbarSelectableItemsKey         = @"CPToolbarSelectableItemsKey";
 
 @implementation CPToolbar (CPCoding)
 
@@ -391,26 +436,39 @@ var CPToolbarIdentifierKey              = "CPToolbarIdentifierKey",
 - (id)initWithCoder:(CPCoder)aCoder
 {
     self = [super init];
-    
+
     if (self)
     {
-        _identifier                 = [aCoder decodeObjectForKey:CPToolbarIdentifierKey];
-        _displayMode                = [aCoder decodeIntForKey:CPToolbarDisplayModeKey];
-        _showsBaselineSeparator     = [aCoder decodeBoolForKey:CPToolbarShowsBaselineSeparatorKey];
-        _allowsUserCustomization    = [aCoder decodeBoolForKey:CPToolbarAllowsUserCustomizationKey];
-        _isVisible                  = [aCoder decodeBoolForKey:CPToolbarIsVisibleKey];
-        
-        _identifiedItems            = [aCoder decodeObjectForKey:CPToolbarIdentifiedItemsKey];
-        _defaultItems               = [aCoder decodeObjectForKey:CPToolbarDefaultItemsKey];
-        _allowedItems               = [aCoder decodeObjectForKey:CPToolbarAllowedItemsKey];
-        _selectableItems            = [aCoder decodeObjectForKey:CPToolbarSelectableItemsKey];
-        
+        _identifier = [aCoder decodeObjectForKey:CPToolbarIdentifierKey];
+        _displayMode = [aCoder decodeIntForKey:CPToolbarDisplayModeKey];
+        _showsBaselineSeparator = [aCoder decodeBoolForKey:CPToolbarShowsBaselineSeparatorKey];
+        _allowsUserCustomization = [aCoder decodeBoolForKey:CPToolbarAllowsUserCustomizationKey];
+        _isVisible = [aCoder decodeBoolForKey:CPToolbarIsVisibleKey];
+
+        _identifiedItems = [aCoder decodeObjectForKey:CPToolbarIdentifiedItemsKey];
+        _defaultItems = [aCoder decodeObjectForKey:CPToolbarDefaultItemsKey];
+        _allowedItems = [aCoder decodeObjectForKey:CPToolbarAllowedItemsKey];
+        _selectableItems = [aCoder decodeObjectForKey:CPToolbarSelectableItemsKey];
+
+        [[_identifiedItems allValues] makeObjectsPerformSelector:@selector(_setToolbar:) withObject:self];
+
         _items = [];
+
         [CPToolbar _addToolbar:self forIdentifier:_identifier];
-        
+
+        // This won't come from a Cib, but can come from manual encoding.
         [self setDelegate:[aCoder decodeObjectForKey:CPToolbarDelegateKey]];
+
+        // Because we don't know if a delegate will be set later (it is optional
+        // as of OS X 10.5), we need to call -_reloadToolbarItems here.
+        // In order to load any toolbar items that may have been configured in the
+        // Cib. Unfortunatelly this means that if there is a delegate
+        // specified, it will be read later and the resulting call to -setDelegate:
+        // will cause -_reloadToolbarItems] to run again :-(
+        // FIXME: Can we make this better?
+        [self _reloadToolbarItems];
     }
-    
+
     return self;
 }
 
@@ -420,18 +478,18 @@ var CPToolbarIdentifierKey              = "CPToolbarIdentifierKey",
 */
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
-    [aCoder encodeObject:_identifier            forKey:CPToolbarIdentifierKey];
-    [aCoder encodeInt:_displayMode              forKey:CPToolbarDisplayModeKey];
-    [aCoder encodeBool:_showsBaselineSeparator  forKey:CPToolbarShowsBaselineSeparatorKey];
+    [aCoder encodeObject:_identifier forKey:CPToolbarIdentifierKey];
+    [aCoder encodeInt:_displayMode forKey:CPToolbarDisplayModeKey];
+    [aCoder encodeBool:_showsBaselineSeparator forKey:CPToolbarShowsBaselineSeparatorKey];
     [aCoder encodeBool:_allowsUserCustomization forKey:CPToolbarAllowsUserCustomizationKey];
-    [aCoder encodeBool:_isVisible               forKey:CPToolbarIsVisibleKey];
-    
-    [aCoder encodeObject:_identifiedItems       forKey:CPToolbarIdentifiedItemsKey];
-    [aCoder encodeObject:_defaultItems          forKey:CPToolbarDefaultItemsKey];
-    [aCoder encodeObject:_allowedItems          forKey:CPToolbarAllowedItemsKey];
-    [aCoder encodeObject:_selectableItems       forKey:CPToolbarSelectableItemsKey];
-    
-    [aCoder encodeConditionalObject:_delegate   forKey:CPToolbarDelegateKey];
+    [aCoder encodeBool:_isVisible forKey:CPToolbarIsVisibleKey];
+
+    [aCoder encodeObject:_identifiedItems forKey:CPToolbarIdentifiedItemsKey];
+    [aCoder encodeObject:_defaultItems forKey:CPToolbarDefaultItemsKey];
+    [aCoder encodeObject:_allowedItems forKey:CPToolbarAllowedItemsKey];
+    [aCoder encodeObject:_selectableItems forKey:CPToolbarSelectableItemsKey];
+
+    [aCoder encodeConditionalObject:_delegate forKey:CPToolbarDelegateKey];
 }
 
 @end
@@ -454,10 +512,10 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
 @implementation _CPToolbarView : CPView
 {
     CPToolbar           _toolbar;
-    
+
     CPIndexSet          _flexibleWidthIndexes;
     CPIndexSet          _visibleFlexibleWidthIndexes;
-    
+
     CPDictionary        _itemInfos;
     JSObject            _viewsForToolbarItems;
 
@@ -467,7 +525,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
     CPPopUpButton       _additionalItemsButton;
     CPColor             _labelColor;
     CPColor             _labelShadowColor;
-    
+
     float               _minWidth;
 
     BOOL                _FIXME_isHUD;
@@ -475,11 +533,11 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
 
 + (void)initialize
 {
-    if (self != [_CPToolbarView class])
+    if (self !== [_CPToolbarView class])
         return;
-    
+
     var bundle = [CPBundle bundleForClass:self];
-    
+
     _CPToolbarViewExtraItemsImage = [[CPImage alloc] initWithContentsOfFile: [bundle pathForResource:"_CPToolbarView/_CPToolbarViewExtraItemsImage.png"] size: CPSizeMake(10.0, 15.0)];
 
     _CPToolbarViewExtraItemsAlternateImage = [[CPImage alloc] initWithContentsOfFile: [bundle pathForResource:"_CPToolbarView/_CPToolbarViewExtraItemsAlternateImage.png"] size:CGSizeMake(10.0, 15.0)];
@@ -488,23 +546,23 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
 - (id)initWithFrame:(CGRect)aFrame
 {
     self = [super initWithFrame:aFrame];
-    
+
     if (self)
     {
         _minWidth = 0;
-        
+
         _labelColor = [CPColor blackColor];
         _labelShadowColor = [CPColor colorWithWhite:1.0 alpha:0.75];
-        
+
         _additionalItemsButton = [[CPPopUpButton alloc] initWithFrame:CGRectMake(0.0, 0.0, 10.0, 15.0) pullsDown:YES];
         [_additionalItemsButton setBordered:NO];
 
         [_additionalItemsButton setImagePosition:CPImageOnly];
         [[_additionalItemsButton menu] setShowsStateColumn:NO];
-        
+
         [_additionalItemsButton setAlternateImage:_CPToolbarViewExtraItemsAlternateImage];
     }
-    
+
     return self;
 }
 
@@ -551,17 +609,17 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
         minWidth = _minWidth,
         // FIXME: This should be a CPSet.
         invisibleItemsSortedByPriority = [];
-    
+
     _visibleItems = items;
 
-    // We only have hidden items if our actual width is smaller than our 
+    // We only have hidden items if our actual width is smaller than our
     // minimum width for hiding items.
     if (itemsWidth < minWidth)
     {
         itemsWidth -= TOOLBAR_EXTRA_ITEMS_WIDTH;
-                
+
         _visibleItems = [_visibleItems copy];
-        
+
         var itemsSortedByVisibilityPriority = [_toolbar itemsSortedByVisibilityPriority],
             count = itemsSortedByVisibilityPriority.length;
 
@@ -620,18 +678,18 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
 
         [view setHidden:NO];
     }
-    
+
     var remainingSpace = itemsWidth - minWidth,
         proportionate = 0.0;
 
-    // Continue to distribute space proportionately while we have it, 
-    // and there are flexible items left that want it. (Those with max 
+    // Continue to distribute space proportionately while we have it,
+    // and there are flexible items left that want it. (Those with max
     // widths may eventually not want it anymore).
     while (remainingSpace && [flexibleItemIndexes count])
     {
         // Divy out the space.
         proportionate += remainingSpace / [flexibleItemIndexes count];
-        
+
         // Reset the remaining space to 0
         remainingSpace = 0.0;
 
@@ -654,7 +712,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
             [view setFrameSize:CGSizeMake(constrainedWidth, height)];
         }
     }
-    
+
     // Now that all the visible items are the correct width, give them their final frames.
     var index = 0,
         count = _visibleItems.length,
@@ -676,9 +734,9 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
     {
         var index = 0,
             count = [items count];
-            
+
         _invisibleItems = [];
-        
+
         for (; index < count; ++index)
         {
             var item = items[index];
@@ -732,18 +790,17 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
             hasNonSeparatorItem = YES;
 
             [_additionalItemsButton addItemWithTitle:[item label]];
-            
+
             var menuItem = [_additionalItemsButton itemArray][index + 1];
-            
+
             [menuItem setImage:[item image]];
-            
+
             [menuItem setTarget:[item target]];
             [menuItem setAction:[item action]];
         }
     }
     else
         [_additionalItemsButton removeFromSuperview];
-    
 }
 
 - (void)reloadToolbarItems
@@ -751,14 +808,14 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
     // Get rid of all our current subviews.
     var subviews = [self subviews],
         count = subviews.length;
-    
+
     while (count--)
         [subviews[count] removeFromSuperview];
-    
+
     // Populate with new subviews.
     var items = [_toolbar items],
         index = 0;
-    
+
     count = items.length;
 
     _minWidth = TOOLBAR_ITEM_MARGIN;
@@ -774,7 +831,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
 
         _minWidth += [view minSize].width + TOOLBAR_ITEM_MARGIN;
     }
-    
+
     [self tile];
 }
 
@@ -785,13 +842,13 @@ var _CPToolbarItemVisibilityPriorityCompare = function(lhs, rhs)
 {
     var lhsVisibilityPriority = [lhs visibilityPriority],
         rhsVisibilityPriority = [rhs visibilityPriority];
-        
+
     if (lhsVisibilityPriority == rhsVisibilityPriority)
         return CPOrderedSame;
-    
+
     if (lhsVisibilityPriority > rhsVisibilityPriority)
         return CPOrderedAscending;
-    
+
     return CPOrderedDescending;
 }
 
@@ -837,7 +894,16 @@ var TOP_MARGIN      = 5.0,
 
         _toolbar = aToolbar;
 
-        [_toolbarItem addObserver:self forKeyPath:"enabled" options:0 context:NULL];
+        var keyPaths = [@"label", @"image", @"alternateImage", @"minSize", @"maxSize", @"target", @"action", @"enabled"],
+            index = 0,
+            count = [keyPaths count];
+
+        for (; index < count; ++index)
+            [_toolbarItem
+                addObserver:self
+                 forKeyPath:keyPaths[index]
+                    options:0
+                    context:NULL];
     }
 
     return self;
@@ -918,6 +984,8 @@ var TOP_MARGIN      = 5.0,
     [_labelField setStringValue:[_toolbarItem label]];
     [_labelField sizeToFit]; // FIXME
 
+    [self setEnabled:[_toolbarItem isEnabled]];
+
     _labelSize = [_labelField frame].size;
 
     _minSize = CGSizeMake(MAX(_labelSize.width, minSize.width), _labelSize.height + minSize.height + LABEL_MARGIN + TOP_MARGIN);
@@ -1027,14 +1095,27 @@ var TOP_MARGIN      = 5.0,
     [_labelField setTextShadowColor:[self FIXME_labelShadowColor]];
 }
 
+- (void)sendAction:(SEL)anAction to:(id)aSender
+{
+    [CPApp sendAction:anAction to:aSender from:_toolbarItem];
+}
+
 - (void)observeValueForKeyPath:(CPString)aKeyPath
                       ofObject:(id)anObject
                         change:(CPDictionary)aChange
                        context:(id)aContext
 {
-    // FIXME: Not clear if -synchronizeWindowTitleWithDocumentName is the best way to go.
     if (aKeyPath === "enabled")
         [self setEnabled:[anObject isEnabled]];
+
+    else if (aKeyPath === @"target")
+        [self setTarget:[anObject target]];
+
+    else if (aKeyPath === @"action")
+        [self setAction:[anObject action]];
+
+    else
+        [self updateFromItem];
 }
 
 @end

AppKit/CPToolbarItem.j

@@ -26,35 +26,18 @@
 @import <AppKit/CPImage.j>
 @import <AppKit/CPView.j>
 
-
-/*
-    @global
-    @class CPToolbarItem
-*/
 CPToolbarItemVisibilityPriorityStandard = 0;
-/*
-    @global
-    @class CPToolbarItem
-*/
 CPToolbarItemVisibilityPriorityLow      = -1000;
-/*
-    @global
-    @class CPToolbarItem
-*/
 CPToolbarItemVisibilityPriorityHigh     = 1000;
-/*
-    @global
-    @class CPToolbarItem
-*/
 CPToolbarItemVisibilityPriorityUser     = 2000;
 
-CPToolbarSeparatorItemIdentifier        = @"CPToolbarSeparatorItemIdentifier";
-CPToolbarSpaceItemIdentifier            = @"CPToolbarSpaceItemIdentifier";
-CPToolbarFlexibleSpaceItemIdentifier    = @"CPToolbarFlexibleSpaceItemIdentifier";
-CPToolbarShowColorsItemIdentifier       = @"CPToolbarShowColorsItemIdentifier";
-CPToolbarShowFontsItemIdentifier        = @"CPToolbarShowFontsItemIdentifier";
-CPToolbarCustomizeToolbarItemIdentifier = @"CPToolbarCustomizeToolbarItemIdentifier";
-CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItemIdentifier";
+CPToolbarSeparatorItemIdentifier        = @"CPToolbarSeparatorItem";
+CPToolbarSpaceItemIdentifier            = @"CPToolbarSpaceItem";
+CPToolbarFlexibleSpaceItemIdentifier    = @"CPToolbarFlexibleSpaceItem";
+CPToolbarShowColorsItemIdentifier       = @"CPToolbarShowColorsItem";
+CPToolbarShowFontsItemIdentifier        = @"CPToolbarShowFontsItem";
+CPToolbarCustomizeToolbarItemIdentifier = @"CPToolbarCustomizeToolbarItem";
+CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 
 /*! 
     @ingroup appkit
@@ -65,9 +48,9 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItemIdentifier";
 @implementation CPToolbarItem : CPObject
 {
     CPString    _itemIdentifier;
-
+    
     CPToolbar   _toolbar;
-
+    
     CPString    _label;
     CPString    _paletteLabel;
     CPString    _toolTip;
@@ -77,12 +60,12 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItemIdentifier";
     BOOL        _isEnabled;
     CPImage     _image;
     CPImage     _alternateImage;
-
+    
     CPView      _view;
-
+    
     CGSize      _minSize;
     CGSize      _maxSize;    
-
+    
     int         _visibilityPriority;
 
     BOOL        _autovalidates;
@@ -114,6 +97,7 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItemIdentifier";
         _maxSize = CGSizeMakeZero();
      
         _visibilityPriority = CPToolbarItemVisibilityPriorityStandard;
+        _autovalidates = YES;
     }
     
     return self;
@@ -136,6 +120,12 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItemIdentifier";
     return _toolbar;
 }
 
+/* @ignore */
+- (void)_setToolbar:(CPToolbar)aToolbar
+{
+    _toolbar = aToolbar;
+}
+
 /*!
     Returns the item's label
 */
@@ -190,7 +180,7 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItemIdentifier";
 - (void)setToolTip:(CPString)aToolTip
 {
     if ([_view respondsToSelector:@selector(setToolTip:)])
-        [view setToolTip:aToolTip];
+        [_view setToolTip:aToolTip];
     
     _toolTip = aToolTip;
 }
@@ -315,8 +305,8 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItemIdentifier";
     if (!_image)
         return;
     
-    if (_minSize.width == 0 && _minSize.height == 0 && 
-        _maxSize.width == 0 && _maxSize.height == 0)
+    if (_minSize.width === 0 && _minSize.height === 0 && 
+        _maxSize.width === 0 && _maxSize.height === 0)
     {
         var imageSize = [_image size];
 
@@ -395,6 +385,9 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItemIdentifier";
 */
 - (void)setMinSize:(CGSize)aMinSize
 {
+    if(!aMinSize.height || !aMinSize.width)
+        return;
+
     _minSize = CGSizeMakeCopy(aMinSize);
     
     // Try to provide some sanity: Make maxSize >= minSize
@@ -415,6 +408,9 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItemIdentifier";
 */
 - (void)setMaxSize:(CGSize)aMaxSize
 {
+    if(!aMaxSize.height || !aMaxSize.width)
+        return;
+        
     _maxSize = CGSizeMakeCopy(aMaxSize);
     
     // Try to provide some sanity: Make minSize <= maxSize
@@ -453,6 +449,9 @@ CPToolbarItemVisibilityPriorityUser
 
 - (void)validate
 {
+    var action = [self action],
+        target = [self target];
+
     // View items do not do any target-action analysis.
     if (_view)
     {
@@ -462,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];
 
@@ -495,7 +490,7 @@ CPToolbarItemVisibilityPriorityUser
 
 @end
 
-var CPToolbarItemIdentifierKey          = @"CPToolbarItemIdentifierKey",
+var CPToolbarItemItemIdentifierKey      = @"CPToolbarItemItemIdentifierKey",
     CPToolbarItemLabelKey               = @"CPToolbarItemLabelKey",
     CPToolbarItemPaletteLabelKey        = @"CPToolbarItemPaletteLabelKey",
     CPToolbarItemToolTipKey             = @"CPToolbarItemToolTipKey",
@@ -508,7 +503,8 @@ var CPToolbarItemIdentifierKey          = @"CPToolbarItemIdentifierKey",
     CPToolbarItemViewKey                = @"CPToolbarItemViewKey",
     CPToolbarItemMinSizeKey             = @"CPToolbarItemMinSizeKey",
     CPToolbarItemMaxSizeKey             = @"CPToolbarItemMaxSizeKey",
-    CPToolbarItemVisibilityPriorityKey  = @"CPToolbarItemVisibilityPriorityKey";
+    CPToolbarItemVisibilityPriorityKey  = @"CPToolbarItemVisibilityPriorityKey",
+    CPToolbarItemAutovalidatesKey       = @"CPToolbarItemAutovalidatesKey";
 
 @implementation CPToolbarItem (CPCoding)
 
@@ -518,7 +514,10 @@ var CPToolbarItemIdentifierKey          = @"CPToolbarItemIdentifierKey",
 
     if (self)
     {
-        _itemIdentifier = [aCoder decodeObjectForKey:CPToolbarItemIdentifierKey];
+        _itemIdentifier = [aCoder decodeObjectForKey:CPToolbarItemItemIdentifierKey];
+
+        _minSize = [aCoder decodeSizeForKey:CPToolbarItemMinSizeKey];
+        _maxSize = [aCoder decodeSizeForKey:CPToolbarItemMaxSizeKey];
 
         [self setLabel:[aCoder decodeObjectForKey:CPToolbarItemLabelKey]];
         [self setPaletteLabel:[aCoder decodeObjectForKey:CPToolbarItemPaletteLabelKey]];
@@ -526,19 +525,17 @@ var CPToolbarItemIdentifierKey          = @"CPToolbarItemIdentifierKey",
 
         [self setTag:[aCoder decodeObjectForKey:CPToolbarItemTagKey]];
         [self setTarget:[aCoder decodeObjectForKey:CPToolbarItemTargetKey]];
-        [self setAction:[aCoder decodeObjectForKey:CPToolbarItemActionKey]];
+        [self setAction:CPSelectorFromString([aCoder decodeObjectForKey:CPToolbarItemActionKey])];
 
         [self setEnabled:[aCoder decodeBoolForKey:CPToolbarItemEnabledKey]];
 
-        [self setImage:[aCoder decodeBoolForKey:CPToolbarItemImageKey]];
-        [self setAlternateImage:[aCoder decodeBoolForKey:CPToolbarItemAlternateImageKey]];
+        [self setImage:[aCoder decodeObjectForKey:CPToolbarItemImageKey]];
+        [self setAlternateImage:[aCoder decodeObjectForKey:CPToolbarItemAlternateImageKey]];
 
         [self setView:[aCoder decodeObjectForKey:CPToolbarItemViewKey]];
 
-        [self setMinSize:[aCoder decodeSizeForKey:CPToolbarItemMinSizeKey]];
-        [self setMaxSize:[aCoder decodeSizeForKey:CPToolbarItemMaxSizeKey]];
-
         [self setVisibilityPriority:[aCoder decodeIntForKey:CPToolbarItemVisibilityPriorityKey]];
+        [self setAutovalidates:[aCoder decodeBoolForKey:CPToolbarItemAutovalidatesKey]];
     }
 
     return self;
@@ -568,6 +565,7 @@ var CPToolbarItemIdentifierKey          = @"CPToolbarItemIdentifierKey",
     [aCoder encodeSize:[self maxSize] forKey:CPToolbarItemMaxSizeKey];
 
     [aCoder encodeObject:[self visibilityPriority] forKey:CPToolbarItemVisibilityPriorityKey];
+    [aCoder encodeBool:[self autovalidates] forKey:CPToolbarItemAutovalidatesKey];
 }
 
 @end
@@ -577,10 +575,12 @@ var CPToolbarItemIdentifierKey          = @"CPToolbarItemIdentifierKey",
 - (id)copy
 {
     var copy = [[[self class] alloc] initWithItemIdentifier:_itemIdentifier];
-    
+
     if (_view)
         [copy setView:[CPKeyedUnarchiver unarchiveObjectWithData:[CPKeyedArchiver archivedDataWithRootObject:_view]]];
-    
+
+    [copy _setToolbar:_toolbar];
+
     [copy setLabel:_label];
     [copy setPaletteLabel:_paletteLabel];
     [copy setToolTip:[self toolTip]];
@@ -588,7 +588,7 @@ var CPToolbarItemIdentifierKey          = @"CPToolbarItemIdentifierKey",
     [copy setTag:[self tag]];
     [copy setTarget:[self target]];
     [copy setAction:[self action]];
-    
+
     [copy setEnabled:[self isEnabled]];
 
     [copy setImage:[self image]];
@@ -596,9 +596,10 @@ var CPToolbarItemIdentifierKey          = @"CPToolbarItemIdentifierKey",
 
     [copy setMinSize:_minSize];
     [copy setMaxSize:_maxSize];
-    
-    [copy setVisibilityPriority:_visibilityPriority];
-    
+
+    [copy setVisibilityPriority:[self visibilityPriority]];
+    [copy setAutovalidates:[self autovalidates]];
+
     return copy;
 }
 
@@ -611,26 +612,12 @@ var CPToolbarItemIdentifierKey          = @"CPToolbarItemIdentifierKey",
 /* @ignore */
 + (CPToolbarItem)_standardItemWithItemIdentifier:(CPString)anItemIdentifier
 {
-    var item = [[CPToolbarItem alloc] initWithItemIdentifier:anItemIdentifier];                                                        
-
     switch (anItemIdentifier)
     {
-        case CPToolbarSeparatorItemIdentifier:          [item setMinSize:CGSizeMake(2.0, 0.0)];
-                                                        [item setMaxSize:CGSizeMake(2.0, 100000.0)];
-                                                        
-                                                        return item;
-
-        case CPToolbarSpaceItemIdentifier:              [item setMinSize:CGSizeMake(32.0, 32.0)];
-                                                        [item setMaxSize:CGSizeMake(32.0, 32.0)];
-                                                        
-                                                        return item;
-                                                        
-        case CPToolbarFlexibleSpaceItemIdentifier:      [item setMinSize:CGSizeMake(32.0, 32.0)];
-                                                        [item setMaxSize:CGSizeMake(10000.0, 32.0)];
-                                                        
-                                                        return item;
-                                                        
-        case CPToolbarShowColorsItemIdentifier:         return nil;
+        case CPToolbarSeparatorItemIdentifier:          return [_CPToolbarSeparatorItem new];
+        case CPToolbarSpaceItemIdentifier:              return [_CPToolbarSpaceItem new];
+        case CPToolbarFlexibleSpaceItemIdentifier:      return [_CPToolbarFlexibleSpaceItem new];
+        case CPToolbarShowColorsItemIdentifier:         return [_CPToolbarShowColorsItem new];
         case CPToolbarShowFontsItemIdentifier:          return nil;
         case CPToolbarCustomizeToolbarItemIdentifier:   return nil;
         case CPToolbarPrintItemIdentifier:              return nil;
@@ -640,3 +627,9 @@ var CPToolbarItemIdentifierKey          = @"CPToolbarItemIdentifierKey",
 }
 
 @end
+
+@import "_CPToolbarFlexibleSpaceItem.j"
+@import "_CPToolbarShowColorsItem.j"
+@import "_CPToolbarSeparatorItem.j"
+@import "_CPToolbarSpaceItem.j"
+

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;
@@ -243,6 +245,11 @@ var CPViewFlags                     = { },
     return [CPSet setWithObjects:@"boundsOrigin", @"boundsSize"];
 }
 
++ (CPMenu)defaultMenu
+{
+    return nil;
+}
+
 - (id)init
 {
     return [self initWithFrame:CGRectMakeZero()];
@@ -272,6 +279,7 @@ var CPViewFlags                     = { },
 
         _autoresizingMask = CPViewNotSizable;
         _autoresizesSubviews = YES;
+        _clipsToBounds = YES;
     
         _opacity = 1.0;
         _isHidden = NO;
@@ -528,6 +536,7 @@ var CPViewFlags                     = { },
 
     _subviews = [newSubviews copy];
 
+#if PLATFORM(DOM)
     var index = 0,
         count = [_subviews count];
 
@@ -538,6 +547,7 @@ var CPViewFlags                     = { },
         CPDOMDisplayServerRemoveChild(_DOMElement, subview._DOMElement);
         CPDOMDisplayServerAppendChild(_DOMElement, subview._DOMElement);
     }
+#endif
 }
 
 /* @ignore */
@@ -666,7 +676,7 @@ var CPViewFlags                     = { },
     return _tag;
 }
 
-- (void)viewWithTag:(CPInteger)aTag
+- (CPView)viewWithTag:(CPInteger)aTag
 {
     if ([self tag] == aTag)
         return self;
@@ -828,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
@@ -1181,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.
@@ -1197,7 +1229,7 @@ var CPViewFlags                     = { },
     
     if (CPFeatureIsCompatible(CPOpacityRequiresFilterFeature))
     {
-        if (anAlphaValue == 1.0)
+        if (anAlphaValue === 1.0)
             try { _DOMElement.style.removeAttribute("filter") } catch (anException) { }
         else
             _DOMElement.style.filter = "alpha(opacity=" + anAlphaValue * 100 + ")";
@@ -1284,6 +1316,14 @@ var CPViewFlags                     = { },
     return self;
 }
 
+/*!
+    Returns \c YES if this view requires a panel to become key. Normally only text fields, so this returns \c NO.
+*/
+- (BOOL)needsPanelToBecomeKey
+{
+    return NO;
+}
+
 /*!
     Returns \c YES if mouse events aren't needed by the receiver and can be sent to the superview. The
     default implementation returns \c NO if the view is opaque.
@@ -1299,6 +1339,22 @@ var CPViewFlags                     = { },
         [super mouseDown:anEvent];
 }
 
+- (void)rightMouseDown:(CPEvent)anEvent
+{
+    var menu = [self menuForEvent:anEvent];
+    if (menu)
+        [CPMenu popUpContextMenu:menu withEvent:anEvent forView:self];
+    else if ([[self nextResponder] isKindOfClass:CPView])
+        [super rightMouseDown:anEvent];
+    else
+        [[[anEvent window] platformWindow] _propagateContextMenuDOMEvent:YES];
+}
+
+- (CPMenu)menuForEvent:(CPEvent)anEvent
+{
+    return [self menu] || [[self class] defaultMenu];
+}
+
 /*!
     Sets the background color of the receiver.
     @param aColor the new color for the receiver's background
@@ -1307,56 +1363,72 @@ var CPViewFlags                     = { },
 {
     if (_backgroundColor == aColor)
         return;
-    
+
     _backgroundColor = aColor;
-    
+
 #if PLATFORM(DOM)
     var patternImage = [_backgroundColor patternImage],
+        colorExists = _backgroundColor && ([_backgroundColor patternImage] || [_backgroundColor alphaComponent] > 0.0),
+        colorHasAlpha = colorExists && [_backgroundColor alphaComponent] < 1.0,
+        supportsRGBA = CPFeatureIsCompatible(CPCSSRGBAFeature),
+        colorNeedsDOMElement = colorHasAlpha && !supportsRGBA,
         amount = 0;
-    
+
     if ([patternImage isThreePartImage])
     {
         _backgroundType = [patternImage isVertical] ? BackgroundVerticalThreePartImage : BackgroundHorizontalThreePartImage;
-        
         amount = 3 - _DOMImageParts.length;
     }
     else if ([patternImage isNinePartImage])
     {
         _backgroundType = BackgroundNinePartImage;
-        
-        amount = 9 - _DOMImageParts.length;   
+        amount = 9 - _DOMImageParts.length;
     }
     else
     {
-        _backgroundType = BackgroundTrivialColor;
-
-        amount = 0 - _DOMImageParts.length;
+        _backgroundType = colorNeedsDOMElement ? BackgroundTransparentColor : BackgroundTrivialColor;
+        amount = (colorNeedsDOMElement ? 1 : 0) - _DOMImageParts.length;
     }
 
     if (amount > 0)
+    {
         while (amount--)
         {
             var DOMElement = DOMElementPrototype.cloneNode(false);
-            
+
             DOMElement.style.zIndex = -1000;
-            
+
             _DOMImageParts.push(DOMElement);
             _DOMElement.appendChild(DOMElement);
         }
+    }
     else
     {
         amount = -amount;
-        
         while (amount--)
             _DOMElement.removeChild(_DOMImageParts.pop());
     }
-    
-    if (_backgroundType == BackgroundTrivialColor)
-    
-        // Opera doesn't like DOM properties set to nil.
-        // https://trac.280north.com/ticket/7
-        _DOMElement.style.background = _backgroundColor ? [_backgroundColor cssString] : "";
-    
+
+    if (_backgroundType === BackgroundTrivialColor || _backgroundType === BackgroundTransparentColor)
+    {
+        var colorCSS = colorExists ? [_backgroundColor cssString] : "";
+
+        if (colorNeedsDOMElement)
+        {
+            _DOMElement.style.background = "";
+            _DOMImageParts[0].style.background = [_backgroundColor cssString];
+
+            if (CPFeatureIsCompatible(CPOpacityRequiresFilterFeature))
+                _DOMImageParts[0].style.filter = "alpha(opacity=" + [_backgroundColor alphaComponent] * 100 + ")";
+            else
+                _DOMImageParts[0].style.opacity = [_backgroundColor alphaComponent];
+
+            var size = [self bounds].size;
+            CPDOMDisplayServerSetStyleSize(_DOMImageParts[0], size.width, size.height);
+        }
+        else
+            _DOMElement.style.background = colorCSS;
+    }
     else
     {
         var slices = [patternImage imageSlices],
@@ -1367,23 +1439,31 @@ var CPViewFlags                     = { },
         {
             var image = slices[count],
                 size = _DOMImageSizes[count] = image ? [image size] : _CGSizeMakeZero();
-            
+
             CPDOMDisplayServerSetStyleSize(_DOMImageParts[count], size.width, size.height);
 
             _DOMImageParts[count].style.background = image ? "url(\"" + [image filename] + "\")" : "";
+
+            if (!supportsRGBA)
+            {
+                if (CPFeatureIsCompatible(CPOpacityRequiresFilterFeature))
+                    try { _DOMImageParts[count].style.removeAttribute("filter") } catch (anException) { }
+                else
+                    _DOMImageParts[count].style.opacity = 1.0;
+            }
         }
-        
+
         if (_backgroundType == BackgroundNinePartImage)
         {
             var width = frameSize.width - _DOMImageSizes[0].width - _DOMImageSizes[2].width,
                 height = frameSize.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);
-                
+
             CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[0], NULL, 0.0, 0.0);            
             CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[1], NULL, _DOMImageSizes[0].width, 0.0);
             CPDOMDisplayServerSetStyleRightTop(_DOMImageParts[2], NULL, 0.0, 0.0);
@@ -1397,7 +1477,7 @@ var CPViewFlags                     = { },
         else if (_backgroundType == BackgroundVerticalThreePartImage)
         {    
             CPDOMDisplayServerSetStyleSize(_DOMImageParts[1], frameSize.width, frameSize.height - _DOMImageSizes[0].height - _DOMImageSizes[2].height);
-            
+
             CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[0], NULL, 0.0, 0.0);
             CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[1], NULL, 0.0, _DOMImageSizes[0].height);        
             CPDOMDisplayServerSetStyleLeftBottom(_DOMImageParts[2], NULL, 0.0, 0.0);
@@ -1405,7 +1485,7 @@ var CPViewFlags                     = { },
         else if (_backgroundType == BackgroundHorizontalThreePartImage)
         {
             CPDOMDisplayServerSetStyleSize(_DOMImageParts[1], frameSize.width - _DOMImageSizes[0].width - _DOMImageSizes[2].width, frameSize.height);
-        
+
             CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[0], NULL, 0.0, 0.0);
             CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[1], NULL, _DOMImageSizes[0].width, 0.0);        
             CPDOMDisplayServerSetStyleRightTop(_DOMImageParts[2], NULL, 0.0, 0.0);
@@ -1748,8 +1828,9 @@ setBoundsOrigin:
         _DOMContentsElement.style.width = ROUND(_CGRectGetWidth(_frame)) + "px";
         _DOMContentsElement.style.height = ROUND(_CGRectGetHeight(_frame)) + "px";
 
+#if PLATFORM(DOM)
         CPDOMDisplayServerAppendChild(_DOMElement, _DOMContentsElement);
-        
+#endif
         _graphicsContext = [CPGraphicsContext graphicsContextWithGraphicsPort:graphicsPort flipped:YES];
     }
     
@@ -2127,7 +2208,8 @@ setBoundsOrigin:
 
     var theClass = [self class],
         CPViewClass = [CPView class],
-        attributes = [];
+        attributes = [],
+        nullValue = [CPNull null];
 
     for (; theClass && theClass !== CPViewClass; theClass = [theClass superclass])
     {
@@ -2151,9 +2233,10 @@ setBoundsOrigin:
 
         while (attributeCount--)
         {
-            var attributeName = attributeKeys[attributeCount];
+            var attributeName = attributeKeys[attributeCount],
+                attributeValue = [attributeDictionary objectForKey:attributeName];
 
-            attributes.push([attributeDictionary objectForKey:attributeName]);
+            attributes.push(attributeValue === nullValue ? nil : attributeValue);
             attributes.push(attributeName);
         }
     }
@@ -2281,7 +2364,7 @@ setBoundsOrigin:
     return [_themeAttributes[aName] value];
 }
 
-- (void)currentValueForThemeAttribute:(CPString)aName
+- (id)currentValueForThemeAttribute:(CPString)aName
 {
     if (!_themeAttributes || !_themeAttributes[aName])
         [CPException raise:CPInvalidArgumentException reason:[self className] + " does not contain theme attribute '" + aName + "'"];

AppKit/CPViewAnimation.j

@@ -0,0 +1,179 @@
+/*
+ * CPFlashView.j
+ * AppKit
+ *
+ * Created by Klaas Pieter Annema on September 3, 2009.
+ * Copyright 2009, Sofa BV
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <AppKit/CPAnimation.j>
+
+CPViewAnimationTargetKey = @"CPViewAnimationTarget";
+CPViewAnimationStartFrameKey = @"CPViewAnimationStartFrame";
+CPViewAnimationEndFrameKey = @"CPViewAnimationEndFrame";
+CPViewAnimationEffectKey = @"CPViewAnimationEffect";
+
+CPViewAnimationFadeInEffect = @"CPViewAnimationFadeIn";
+CPViewAnimationFadeOutEffect = @"CPViewAnimationFadeOut";
+
+@implementation CPViewAnimation : CPAnimation
+{
+    CPArray _viewAnimations;
+}
+
+- (id)initWithViewAnimations:(CPArray)viewAnimations
+{
+    if (self = [super initWithDuration:0.5 animationCurve:CPAnimationLinear])
+    {
+        [self setViewAnimations:viewAnimations];
+    }
+
+    return self;
+}
+
+- (void)startAnimation
+{
+    var animationIndex = [_viewAnimations count];
+    while (animationIndex--)
+    {
+        var dictionary = [_viewAnimations objectAtIndex:animationIndex],
+            view = [self _targetView:dictionary],
+            startFrame = [self _startFrame:dictionary];
+
+        [view setFrame:startFrame];
+
+        var effect = [self _effect:dictionary];
+        if (effect === CPViewAnimationFadeInEffect)
+        {
+            [view setAlphaValue:0.0];
+            [view setHidden:NO];
+        }
+        else if (effect === CPViewAnimationFadeOutEffect)
+            [view setAlphaValue:1.0];
+    }
+
+    [super startAnimation];
+}
+
+- (void)setCurrentProgress:(NSAnimationProgress)progress
+{
+    [super setCurrentProgress:progress];
+
+    var animationIndex = [_viewAnimations count];
+    while (animationIndex--)
+    {
+        var dictionary = [_viewAnimations objectAtIndex:animationIndex],
+            view = [self _targetView:dictionary]
+            startFrame = [self _startFrame:dictionary]
+            endFrame = [self _endFrame:dictionary]
+            differenceFrame = CPRectMakeZero();
+
+        differenceFrame.origin.x = endFrame.origin.x - startFrame.origin.x;
+        differenceFrame.origin.y = endFrame.origin.y - startFrame.origin.y;
+        differenceFrame.size.width = endFrame.size.width - startFrame.size.width;
+        differenceFrame.size.height = endFrame.size.height - startFrame.size.height;
+
+        var intermediateFrame = CPRectMakeZero();
+        intermediateFrame.origin.x = startFrame.origin.x + differenceFrame.origin.x * progress;
+        intermediateFrame.origin.y = startFrame.origin.y + differenceFrame.origin.y * progress;
+        intermediateFrame.size.width = startFrame.size.width + differenceFrame.size.width * progress;
+        intermediateFrame.size.height = startFrame.size.height + differenceFrame.size.height * progress;
+
+        [view setFrame:intermediateFrame];
+
+        // Update the view's alpha value
+        var effect = [self _effect:dictionary];
+        if (effect === CPViewAnimationFadeInEffect)
+            [view setAlphaValue:1.0 * progress];
+        else if (effect === CPViewAnimationFadeOutEffect)
+            [view setAlphaValue:1.0 + ( 0.0 - 1.0 ) * progress];
+
+        if (progress === 1.0)
+            [view setHidden:CPRectIsNull(endFrame) || [view alphaValue] === 0.0];
+    }
+}
+
+- (void)stopAnimation
+{
+    var animationIndex = [_viewAnimations count];
+    while (animationIndex--)
+    {
+        var dictionary = [_viewAnimations objectAtIndex:animationIndex],
+            view = [self _targetView:dictionary],
+            endFrame = [self _endFrame:dictionary];
+
+        [view setFrame:endFrame];
+
+        var effect = [self _effect:dictionary];
+        if (effect === CPViewAnimationFadeInEffect)
+            [view setAlphaValue:1.0];
+        else if (effect === CPViewAnimationFadeOutEffect)
+            [view setAlphaValue:0.0];
+
+        [view setHidden:CPRectIsNull(endFrame) || [view alphaValue] === 0.0];
+    }
+
+    [super stopAnimation];
+}
+
+- (id)_targetView:(CPDictionary)dictionary
+{
+    var targetView = [dictionary valueForKey:CPViewAnimationTargetKey];
+    if (!targetView)
+        [CPException raise:CPInternalInconsistencyException reason:[CPString stringWithFormat:@"view animation: %@ does not have a target view", [dictionary description]]];
+
+    return targetView;
+}
+
+- (CPRect)_startFrame:(CPDictionary)dictionary
+{
+    var startFrame = [dictionary valueForKey:CPViewAnimationStartFrameKey];
+    if (!startFrame)
+        return [[self _targetView:dictionary] frame];
+
+    return startFrame;
+}
+
+- (CPRect)_endFrame:(CPDictionary)dictionary
+{
+    var endFrame = [dictionary valueForKey:CPViewAnimationEndFrameKey];
+    if (!endFrame)
+        return [[self _targetView:dictionary] frame];
+
+    return endFrame;
+}
+
+- (CPString)_effect:(CPDictionary)dictionary
+{
+    return [dictionary valueForKey:CPViewAnimationEffectKey];
+}
+
+- (CPArray)viewAnimations
+{
+    return _viewAnimations;
+}
+
+- (void)setViewAnimations:(CPArray)viewAnimations
+{
+    if (viewAnimations != _viewAnimations)
+    {
+        [self stopAnimation];
+        _viewAnimations = [viewAnimations copy];
+    }
+}
+
+@end

AppKit/CPViewController.j

@@ -138,8 +138,6 @@ var CPViewControllerCachedCibs;
     Returns the view that the controller manages.
     If this property is nil, the controller sends loadView to itself to create the view that it manages.
     Subclasses should override the loadView method to create any custom views. The default value is nil.
-
-    Note: An error will not be thrown if after -loadView, the view property is still nil. -view will simply return nil, but will continue to call -loadView on subsequent calls.
 */
 - (CPView)view
 {
@@ -155,14 +153,34 @@ var CPViewControllerCachedCibs;
         if (_view === nil && [cibOwner isKindOfClass:[CPDocument class]])
             [self setView:[cibOwner valueForKey:@"view"]];
 
+        if (!_view) 
+        {
+            var reason = [CPString stringWithFormat:@"View for %@ could not be loaded from Cib or no view specified. Override loadView to load the view manually.", self];
+
+            [CPException raise:CPInternalInconsistencyException reason:reason];
+        }
+
         if ([cibOwner respondsToSelector:@selector(viewControllerDidLoadCib:)])
             [cibOwner viewControllerDidLoadCib:self];
+
+        [self viewDidLoad];
     }
 
     return _view;
 }
 
 
+/*!
+    This method is called after the view controller has loaded its associated views into memory. 
+    This method is called regardless of whether the views were stored in a nib file or created programmatically in the loadView method. 
+    This method is most commonly used to perform additional initialization steps on views that are loaded from nib files.
+*/
+- (void)viewDidLoad
+{
+    
+}
+
+
 /*!
     Manually sets the view that the controller manages.
     Setting to nil will cause -loadView to be called on all subsequent calls of -view.

AppKit/CPWebView.j

@@ -69,11 +69,13 @@ CPWebViewScrollNative                           = 2;
     
     CPString    _url;
     CPString    _html;
-    
+
     Function    _loadCallback;
-    
+
     int         _scrollMode;
     CGSize      _scrollSize;
+
+    int         _loadHTMLStringTimer;
 }
 
 - (id)initWithFrame:(CPRect)frameRect frameName:(CPString)frameName groupName:(CPString)groupName
@@ -110,6 +112,7 @@ CPWebViewScrollNative                           = 2;
     _iframe.style.width = "100%";
     _iframe.style.height = "100%";
     _iframe.style.borderWidth = "0px";
+    _iframe.frameBorder = "0";
     
     [self setDrawsBackground:YES];
     
@@ -171,7 +174,32 @@ CPWebViewScrollNative                           = 2;
     [self _resizeWebFrame];
 }
 
-- (BOOL)_resizeWebFrame
+- (void)_attachScrollEventIfNecessary
+{
+    if (_scrollMode !== CPWebViewScrollAppKit)
+        return;
+
+    var win = null;
+    try { win = [self DOMWindow]; } catch (e) {}
+
+    if (win && win.addEventListener)
+    {
+        var scrollEventHandler = function(anEvent)
+        {
+            var frameBounds = [self bounds],
+                frameCenter = CGPointMake(CGRectGetMidX(frameBounds), CGRectGetMidY(frameBounds)),
+                windowOrigin = [self convertPoint:frameCenter toView:nil],
+                globalOrigin = [[self window] convertBaseToBridge:windowOrigin];
+
+            anEvent._overrideLocation = globalOrigin;
+            [[[self window] platformWindow] scrollEvent:anEvent];
+        };
+
+        win.addEventListener("DOMMouseScroll", scrollEventHandler, false);
+    }
+}
+
+- (void)_resizeWebFrame
 {
     if (_scrollMode === CPWebViewScrollAppKit)
     {
@@ -181,13 +209,14 @@ CPWebViewScrollNative                           = 2;
         }
         else
         {
-            [_frameView setFrameSize:[_scrollView contentSize]];
+            var visibleRect = [_frameView visibleRect];
+            [_frameView setFrameSize:CGSizeMake(CGRectGetMaxX(visibleRect), CGRectGetMaxY(visibleRect))];
             
             // try to get the document size so we can correctly set the frame
             var win = null;
             try { win = [self DOMWindow]; } catch (e) {}
 
-            if (win && win.document)
+            if (win && win.document && win.document.body)
             {
                 var width = win.document.body.scrollWidth,
                     height = win.document.body.scrollHeight;
@@ -203,6 +232,8 @@ CPWebViewScrollNative                           = 2;
             
                 [_frameView setFrameSize:CGSizeMake(800, 1600)];
             }
+
+            [_frameView scrollRectToVisible:visibleRect];
         }
     }
 }
@@ -217,7 +248,10 @@ CPWebViewScrollNative                           = 2;
 
 - (void)_setScrollMode:(int)aScrollMode
 {
-    _scrollMode = aScrollMode;
+    if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
+        _scrollMode = CPWebViewScrollNative;
+    else
+        _scrollMode = aScrollMode;
         
     _ignoreLoadStart = YES;
     _ignoreLoadEnd  = YES;
@@ -256,6 +290,8 @@ CPWebViewScrollNative                           = 2;
 
     [self _setScrollMode:CPWebViewScrollAppKit];
 
+    [_frameView setFrameSize:[_scrollView contentSize]];
+
     [self _startedLoading];
     
     _ignoreLoadStart = YES;
@@ -293,8 +329,15 @@ CPWebViewScrollNative                           = 2;
         // clear the iframe
         _iframe.src = "";
 
+        if (_loadHTMLStringTimer !== nil)
+        {
+            window.clearTimeout(_loadHTMLStringTimer);
+            _loadHTMLStringTimer = nil;
+        }
+
         // need to give the browser a chance to reset iframe, otherwise we'll be document.write()-ing the previous document 
-        window.setTimeout(function() {
+        _loadHTMLStringTimer = window.setTimeout(function()
+        {
             var win = [self DOMWindow];
             
             win.document.write(_html);
@@ -315,7 +358,8 @@ CPWebViewScrollNative                           = 2;
 - (void)_finishedLoading
 {
     [self _resizeWebFrame];
-    
+    [self _attachScrollEventIfNecessary];
+
     [[CPNotificationCenter defaultCenter] postNotificationName:CPWebViewProgressFinishedNotification object:self];
 
     if ([_frameLoadDelegate respondsToSelector:@selector(webView:didFinishLoadForFrame:)])

AppKit/CPWindow/CPWindow.j

@@ -175,6 +175,8 @@ CPWindowBelow                   = 2;
 CPWindowWillCloseNotification       = @"CPWindowWillCloseNotification";
 CPWindowDidBecomeMainNotification   = @"CPWindowDidBecomeMainNotification";
 CPWindowDidResignMainNotification   = @"CPWindowDidResignMainNotification";
+CPWindowDidBecomeKeyNotification    = @"CPWindowDidBecomeKeyNotification";
+CPWindowDidResignKeyNotification    = @"CPWindowDidResignKeyNotification";
 CPWindowDidResizeNotification       = @"CPWindowDidResizeNotification";
 CPWindowDidMoveNotification         = @"CPWindowDidMoveNotification";
 CPWindowWillBeginSheetNotification  = @"CPWindowWillBeginSheetNotification";
@@ -370,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;
         }
@@ -470,9 +481,6 @@ CPTexturedBackgroundWindowMask
 
 - (void)awakeFromCib
 {
-    if (_initialFirstResponder)
-        [self makeFirstResponder:_initialFirstResponder];
-
     _keyViewLoopIsDirty = ![self _hasKeyViewLoop];
 }
 
@@ -614,6 +622,13 @@ CPTexturedBackgroundWindowMask
     @param shouldDisplay whether the window should redraw its views
     @param shouldAnimate whether the window resize should be animated
 */
+- (void)_setClippedFrame:(CGRect)aFrame display:(BOOL)shouldDisplay animate:(BOOL)shouldAnimate
+{
+    aFrame.size.width = MIN(MAX(aFrame.size.width, _minSize.width), _maxSize.width)
+    aFrame.size.height = MIN(MAX(aFrame.size.height, _minSize.height), _maxSize.height);
+    [self setFrame:aFrame display:shouldDisplay animate:shouldAnimate];
+}
+
 - (void)setFrame:(CGRect)aFrame display:(BOOL)shouldDisplay animate:(BOOL)shouldAnimate
 {
     aFrame = _CGRectMakeCopy(aFrame);
@@ -673,8 +688,8 @@ CPTexturedBackgroundWindowMask
 
         if (!_CGSizeEqualToSize(size, newSize))
         {
-            size.width = MIN(MAX(newSize.width, _minSize.width), _maxSize.width);
-            size.height = MIN(MAX(newSize.height, _minSize.height), _maxSize.height);
+            size.width = newSize.width;
+            size.height = newSize.height;
 
             [_windowView setFrameSize:size];
 
@@ -692,7 +707,7 @@ CPTexturedBackgroundWindowMask
 
 - (void)setFrame:(CGRect)aFrame display:(BOOL)shouldDisplay
 {
-    [super setFrame:aFrame display:shouldDisplay animate:NO];
+    [self _setClippedFrame:aFrame display:shouldDisplay animate:NO];
 }
 
 /*!
@@ -700,7 +715,7 @@ CPTexturedBackgroundWindowMask
 */
 - (void)setFrame:(CGRect)aFrame
 {
-    [self setFrame:aFrame display:YES animate:NO];
+    [self _setClippedFrame:aFrame display:YES animate:NO];
 }
 
 /*!
@@ -709,7 +724,7 @@ CPTexturedBackgroundWindowMask
 */
 - (void)setFrameOrigin:(CGPoint)anOrigin
 {
-    [self setFrame:_CGRectMake(anOrigin.x, anOrigin.y, _CGRectGetWidth(_frame), _CGRectGetHeight(_frame)) display:YES animate:NO];
+    [self _setClippedFrame:_CGRectMake(anOrigin.x, anOrigin.y, _CGRectGetWidth(_frame), _CGRectGetHeight(_frame)) display:YES animate:NO];
 }
 
 /*!
@@ -718,7 +733,7 @@ CPTexturedBackgroundWindowMask
 */
 - (void)setFrameSize:(CGSize)aSize
 {
-    [self setFrame:_CGRectMake(_CGRectGetMinX(_frame), _CGRectGetMinY(_frame), aSize.width, aSize.height) display:YES animate:NO];
+    [self _setClippedFrame:_CGRectMake(_CGRectGetMinX(_frame), _CGRectGetMinY(_frame), aSize.width, aSize.height) display:YES animate:NO];
 }
 
 /*!
@@ -729,6 +744,15 @@ CPTexturedBackgroundWindowMask
 {
     [_platformWindow orderFront:self];
     [_platformWindow order:CPWindowAbove window:self relativeTo:nil];
+
+    if (_firstResponder === self || !_firstResponder)
+        [self makeFirstResponder:[self initialFirstResponder]];
+
+    if (!CPApp._keyWindow)
+        [self makeKeyWindow];
+
+    if (!CPApp._mainWindow)
+        [self makeMainWindow];
 }
 
 /*
@@ -755,12 +779,7 @@ CPTexturedBackgroundWindowMask
 
     [_platformWindow order:CPWindowOut window:self relativeTo:nil];
 
-    if ([CPApp keyWindow] == self)
-    {
-        [self resignKeyWindow];
-
-        CPApp._keyWindow = nil;
-    }
+    [self _updateMainAndKeyWindows];
 }
 
 /*!
@@ -779,6 +798,11 @@ CPTexturedBackgroundWindowMask
 */
 - (void)setLevel:(int)aLevel
 {
+    if (aLevel === _level)
+        return;
+
+    [_platformWindow moveWindow:self fromLevel:_level toLevel:aLevel];
+
     _level = aLevel;
 
     if ([self _sharesChromeWithPlatformWindow])
@@ -868,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
@@ -1059,13 +1100,31 @@ CPTexturedBackgroundWindowMask
 */
 - (void)setDelegate:(id)aDelegate
 {
-    // FIXME: Unregister for notifications!
+    var defaultCenter = [CPNotificationCenter defaultCenter];
+
+    [defaultCenter removeObserver:_delegate name:CPWindowDidResignKeyNotification object:self];
+    [defaultCenter removeObserver:_delegate name:CPWindowDidBecomeKeyNotification object:self];
+    [defaultCenter removeObserver:_delegate name:CPWindowDidBecomeMainNotification object:self];
+    [defaultCenter removeObserver:_delegate name:CPWindowDidResignMainNotification object:self];
+    [defaultCenter removeObserver:_delegate name:CPWindowDidMoveNotification object:self];
+    [defaultCenter removeObserver:_delegate name:CPWindowDidResizeNotification object:self];
 
     _delegate = aDelegate;
-    
     _delegateRespondsToWindowWillReturnUndoManagerSelector = [_delegate respondsToSelector:@selector(windowWillReturnUndoManager:)];
 
-    var defaultCenter = [CPNotificationCenter defaultCenter];
+    if ([_delegate respondsToSelector:@selector(windowDidResignKey:)])
+        [defaultCenter
+            addObserver:_delegate
+               selector:@selector(windowDidResignKey:)
+                   name:CPWindowDidResignKeyNotification
+                 object:self];
+
+    if ([_delegate respondsToSelector:@selector(windowDidBecomeKey:)])
+        [defaultCenter
+            addObserver:_delegate
+               selector:@selector(windowDidBecomeKey:)
+                   name:CPWindowDidBecomeKeyNotification
+                 object:self];
     
     if ([_delegate respondsToSelector:@selector(windowDidBecomeMain:)])
         [defaultCenter
@@ -1134,6 +1193,16 @@ CPTexturedBackgroundWindowMask
     return YES;
 }
 
+- (id)initialFirstResponder
+{
+    return _initialFirstResponder;
+}
+
+- (void)setInitialFirstResponder:(id)aResponder
+{
+    _initialFirstResponder = aResponder;
+}
+
 /*!
     Attempts to make the \c aResponder the first responder. Before trying
     to make it the first responder, the receiver will ask the current first responder
@@ -1141,9 +1210,9 @@ CPTexturedBackgroundWindowMask
     \c aResponder accept first responder, then finally tell it to become first responder.
     @return \c YES if the attempt was successful. \c NO otherwise.
 */
-- (void)makeFirstResponder:(CPResponder)aResponder
+- (BOOL)makeFirstResponder:(CPResponder)aResponder
 {
-    if (_firstResponder == aResponder)
+    if (_firstResponder === aResponder)
         return YES;
 
     if(![_firstResponder resignFirstResponder])
@@ -1304,44 +1373,58 @@ CPTexturedBackgroundWindowMask
 
         case CPScrollWheel:         return [[_windowView hitTest:point] scrollWheel:anEvent];
 
-        case CPLeftMouseUp:         if (!_leftMouseDownView)
-                                        return [[_windowView hitTest:point] mouseUp:anEvent];
+        case CPLeftMouseUp:
+        case CPRightMouseUp:        var hitTestedView = _leftMouseDownView,
+                                        selector = type == CPRightMouseUp ? @selector(rightMouseUp:) : @selector(mouseUp:);
 
-                                    [_leftMouseDownView mouseUp:anEvent]
+                                    if (!hitTestedView)
+                                        hitTestedView = [_windowView hitTest:point];
+
+                                    [hitTestedView performSelector:selector withObject:anEvent];
 
                                     _leftMouseDownView = nil;
 
                                     return;
-        case CPLeftMouseDown:       _leftMouseDownView = [_windowView hitTest:point];
+        case CPLeftMouseDown:
+        case CPRightMouseDown:      _leftMouseDownView = [_windowView hitTest:point];
 
                                     if (_leftMouseDownView != _firstResponder && [_leftMouseDownView acceptsFirstResponder])
                                         [self makeFirstResponder:_leftMouseDownView];
 
                                     [CPApp activateIgnoringOtherApps:YES];
 
-                                    var theWindow = [anEvent window];
+                                    var theWindow = [anEvent window],
+                                        selector = type == CPRightMouseDown ? @selector(rightMouseDown:) : @selector(mouseDown:);
 
-                                    if ([theWindow isKeyWindow] || [theWindow becomesKeyOnlyIfNeeded])
-                                        return [_leftMouseDownView mouseDown:anEvent];
+                                    if ([theWindow isKeyWindow] || [theWindow becomesKeyOnlyIfNeeded] && ![_leftMouseDownView needsPanelToBecomeKey])
+                                        return [_leftMouseDownView performSelector:selector withObject:anEvent];
                                     else
                                     {
                                         // FIXME: delayed ordering?
                                         [self makeKeyAndOrderFront:self];
 
                                         if ([_leftMouseDownView acceptsFirstMouse:anEvent])
-                                            return [_leftMouseDownView mouseDown:anEvent]
+                                            return [_leftMouseDownView performSelector:selector withObject:anEvent];
                                     }
                                     break;
-        case CPLeftMouseDragged:    if (!_leftMouseDownView)
+
+        case CPLeftMouseDragged:
+        case CPRightMouseDragged:   if (!_leftMouseDownView)
                                         return [[_windowView hitTest:point] mouseDragged:anEvent];
 
-                                    return [_leftMouseDownView mouseDragged:anEvent];
-        
-        case CPRightMouseUp:        return [_rightMouseDownView mouseUp:anEvent];
-        case CPRightMouseDown:      _rightMouseDownView = [_windowView hitTest:point];
-                                    return [_rightMouseDownView mouseDown:anEvent];
-        case CPRightMouseDragged:   return [_rightMouseDownView mouseDragged:anEvent];
-        
+                                    var selector;
+                                    if (type == CPRightMouseDragged)
+                                    {
+                                        selector = @selector(rightMouseDragged:)
+                                        if (![_leftMouseDownView respondsToSelector:selector])
+                                            selector = nil;
+                                    }
+
+                                    if (!selector)
+                                        selector = @selector(mouseDragged:)
+
+                                    return [_leftMouseDownView performSelector:selector withObject:anEvent];
+
         case CPMouseMoved:          if (!_acceptsMouseMovedEvents)
                                         return;
 
@@ -1411,8 +1494,14 @@ CPTexturedBackgroundWindowMask
 */
 - (void)becomeKeyWindow
 {
-    if (_firstResponder != self && [_firstResponder respondsToSelector:@selector(becomeKeyWindow)])
+    CPApp._keyWindow = self;
+
+    if (_firstResponder !== self && [_firstResponder respondsToSelector:@selector(becomeKeyWindow)])
         [_firstResponder becomeKeyWindow];
+
+    [[CPNotificationCenter defaultCenter]
+        postNotificationName:CPWindowDidBecomeKeyNotification
+                      object:self];
 }
 
 /*!
@@ -1449,13 +1538,10 @@ CPTexturedBackgroundWindowMask
 */
 - (void)makeKeyWindow
 {
-    if (![self canBecomeKeyWindow])
+    if ([CPApp keyWindow] === self || ![self canBecomeKeyWindow])
         return;
 
-    [CPApp._keyWindow resignKeyWindow];
-    
-    CPApp._keyWindow = self;
-    
+    [[CPApp keyWindow] resignKeyWindow];
     [self becomeKeyWindow];
 }
 
@@ -1464,11 +1550,15 @@ CPTexturedBackgroundWindowMask
 */
 - (void)resignKeyWindow
 {
-    if (_firstResponder != self && [_firstResponder respondsToSelector:@selector(resignKeyWindow)])
+    if (_firstResponder !== self && [_firstResponder respondsToSelector:@selector(resignKeyWindow)])
         [_firstResponder resignKeyWindow];
-    
-    if ([_delegate respondsToSelector:@selector(windowDidResignKey:)])
-        [_delegate windowDidResignKey:self];
+
+    if (CPApp._keyWindow === self)
+        CPApp._keyWindow = nil;
+
+    [[CPNotificationCenter defaultCenter]
+        postNotificationName:CPWindowDidResignKeyNotification
+                      object:self];
 }
 
 /*!
@@ -1497,7 +1587,7 @@ CPTexturedBackgroundWindowMask
     [_inclusiveRegisteredDraggedTypes unionSet:pasteboardTypes];
 }
 
-- (void)_noteUnregisteredDraggedTypes:(CPArray)pasteboardTypes
+- (void)_noteUnregisteredDraggedTypes:(CPSet)pasteboardTypes
 {
     if (!pasteboardTypes)
         return;
@@ -1657,6 +1747,8 @@ CPTexturedBackgroundWindowMask
 
     [[self platformWindow] miniaturize:sender];
 
+    [self _updateMainAndKeyWindows];
+
     [[CPNotificationCenter defaultCenter] postNotificationName:CPWindowDidMiniaturizeNotification object:self];
 
     _isMiniaturized = YES;
@@ -1792,13 +1884,10 @@ CPTexturedBackgroundWindowMask
 */
 - (void)makeMainWindow
 {
-    if (![self canBecomeMainWindow])
+    if ([CPApp mainWindow] === self || ![self canBecomeMainWindow])
         return;
 
-    [CPApp._mainWindow resignMainWindow];
-    
-    CPApp._mainWindow = self;
-    
+    [[CPApp mainWindow] resignMainWindow];
     [self becomeMainWindow];
 }
 
@@ -1807,9 +1896,11 @@ CPTexturedBackgroundWindowMask
 */
 - (void)becomeMainWindow
 {
+    CPApp._mainWindow = self;
+
     [self _synchronizeMenuBarTitleWithWindowTitle];
     [self _synchronizeSaveMenuWithDocumentSaving];
-    
+
     [[CPNotificationCenter defaultCenter]
         postNotificationName:CPWindowDidBecomeMainNotification
                       object:self];
@@ -1823,6 +1914,70 @@ CPTexturedBackgroundWindowMask
     [[CPNotificationCenter defaultCenter]
         postNotificationName:CPWindowDidResignMainNotification
                       object:self];
+
+    if (CPApp._mainWindow === self)
+        CPApp._mainWindow = nil;
+}
+
+- (void)_updateMainAndKeyWindows
+{
+    var allWindows = [CPApp orderedWindows],
+        windowCount = [allWindows count];
+
+    if ([self isKeyWindow])
+    {
+        var keyWindow = [CPApp keyWindow];
+        [self resignKeyWindow];
+
+        if (keyWindow && keyWindow !== self && [keyWindow canBecomeKeyWindow])
+            [keyWindow makeKeyWindow];
+        else
+        {
+            var mainMenu = [CPApp mainMenu],
+                menuWindow = mainMenu ? mainMenu._menuWindow : nil;
+            for (var i = 0; i < windowCount; i++)
+            {
+                var currentWindow = allWindows[i];
+                if (currentWindow === self || currentWindow === menuWindow)
+                    continue;
+
+                if ([currentWindow isVisible] && [currentWindow canBecomeKeyWindow])
+                {
+                    [currentWindow makeKeyWindow];
+                    break;
+                }
+            }
+
+            if (![CPApp keyWindow])
+                [menuWindow makeKeyWindow];
+        }
+    }
+
+    if ([self isMainWindow])
+    {
+        var mainWindow = [CPApp mainWindow];
+        [self resignMainWindow];
+
+        if (mainWindow && mainWindow !== self && [mainWindow canBecomeMainWindow])
+            [mainWindow makeMainWindow];
+        else
+        {
+            var mainMenu = [CPApp mainMenu],
+                menuWindow = mainMenu ? mainMenu._menuWindow : nil;
+            for (var i = 0; i < windowCount; i++)
+            {
+                var currentWindow = allWindows[i];
+                if (currentWindow === self || currentWindow === menuWindow)
+                    continue;
+
+                if ([currentWindow isVisible] && [currentWindow canBecomeMainWindow])
+                {
+                    [currentWindow makeMainWindow];
+                    break;
+                }
+            }
+        }
+    }
 }
 
 // Managing Toolbars
@@ -1908,8 +2063,8 @@ CPTexturedBackgroundWindowMask
         
     sheetFrame.origin.y = CGRectGetMinY(_frame) + CGRectGetMinY(contentRect);
     sheetFrame.origin.x = CGRectGetMinX(_frame) + FLOOR((CGRectGetWidth(_frame) - CGRectGetWidth(sheetFrame)) / 2.0);
-   
-    [attachedSheet setFrameOrigin:sheetFrame.origin];
+
+    [attachedSheet setFrame:sheetFrame display:YES animate:NO];
 }
 
 /* @ignore */
@@ -1943,7 +2098,7 @@ CPTexturedBackgroundWindowMask
     [CPApp runModalForWindow:aSheet];
     
     [aSheet orderFront:self];
-    [aSheet setFrame:startFrame];
+    [aSheet setFrame:startFrame display:YES animate:NO];
     _sheetContext["opened"] = YES;
 
     [aSheet _setFrame:endFrame delegate:self duration:0.2 curve:CPAnimationEaseOut];
@@ -2499,9 +2654,13 @@ var interpolate = function(fromValue, toValue, progress)
     
     if (value == 1.0)
         _window._isAnimating = NO;
-    
-    [_window setFrameOrigin:CGPointMake(interpolate(CGRectGetMinX(_startFrame), CGRectGetMinX(_targetFrame), value), interpolate(CGRectGetMinY(_startFrame), CGRectGetMinY(_targetFrame), value))];
-    [_window setFrameSize:CGSizeMake(interpolate(CGRectGetWidth(_startFrame), CGRectGetWidth(_targetFrame), value), interpolate(CGRectGetHeight(_startFrame), CGRectGetHeight(_targetFrame), value))];
+
+    var newFrame = CGRectMake(interpolate(CGRectGetMinX(_startFrame), CGRectGetMinX(_targetFrame), value),
+                              interpolate(CGRectGetMinY(_startFrame), CGRectGetMinY(_targetFrame), value),
+                              interpolate(CGRectGetWidth(_startFrame), CGRectGetWidth(_targetFrame), value),
+                              interpolate(CGRectGetHeight(_startFrame), CGRectGetHeight(_targetFrame), value));
+
+    [_window setFrame:newFrame display:YES animate:NO];
 }
 
 @end

AppKit/CPWindow/_CPBorderlessBridgeWindowView.j

@@ -71,11 +71,12 @@ var _CPToolbarViewBackgroundColor = nil;
         [self addSubview:_toolbarBackgroundView positioned:CPWindowBelow relativeTo:nil];
     }
             
-    var frame = CGRectMakeZero();
-    
-    frame.origin = CGPointMakeCopy([self toolbarOffset]);
+    var frame = CGRectMakeZero(),
+        toolbarOffset = [self toolbarOffset];
+
+    frame.origin = CGPointMake(toolbarOffset.width, toolbarOffset.height);
     frame.size = [_toolbarView frame].size;
-    
+
     [_toolbarBackgroundView setFrame:frame];
 }
 

AppKit/CPWindow/_CPWindowView.j

@@ -36,6 +36,7 @@ var _CPWindowViewResizeIndicatorImage = nil;
     CGSize      _resizeIndicatorOffset;
     
     CPView      _toolbarView;
+    CGSize      _toolbarOffset;
 //    BOOL        _isAnimatingToolbar;
 
     
@@ -80,8 +81,8 @@ var _CPWindowViewResizeIndicatorImage = nil;
     if (self)
     {
         _styleMask = aStyleMask;
-        _resizeIndicatorOffset = CGSizeMake(0.0, 0.0);
-        _toolbarOffset = CGSizeMake(0.0, 0.0);
+        _resizeIndicatorOffset = CGSizeMakeZero();
+        _toolbarOffset = CGSizeMakeZero();
     }
     
     return self;
@@ -228,7 +229,7 @@ var _CPWindowViewResizeIndicatorImage = nil;
     }
 }
 
-- (CPImage)showsResizeIndicator
+- (BOOL)showsResizeIndicator
 {
     return _resizeIndicator !== nil;
 }
@@ -269,7 +270,7 @@ var _CPWindowViewResizeIndicatorImage = nil;
 
 - (CGSize)toolbarOffset
 {
-    return CGSizeMakeZero();
+    return _toolbarOffset;
 }
 
 - (CPColor)toolbarLabelColor

AppKit/CPWindowController.j

@@ -322,25 +322,6 @@
     return _documents;
 }
 
-- (void)setViewController:(CPViewController)aViewController
-{
-    var containerView = [self viewControllerContainerView] || [[self window] contentView],
-        view = [_viewController view],
-        frame = view ? [view frame] : [containerView bounds];
-
-    [view removeFromSuperview];
-
-    _viewController = aViewController;
-
-    view = [_viewController view];
-
-    if (view)
-    {
-        [view setFrame:frame];
-        [containerView addSubview:view];
-    }
-}
-
 - (void)setViewControllerContainerView:(CPView)aView
 {
     _viewControllerContainerView = aView;

AppKit/Cib/CPCib.j

@@ -60,7 +60,7 @@ var CPCibObjectDataKey  = @"CPCibObjectDataKey";
 
     if (self)
     {
-        _data = [CPURLConnection sendSynchronousRequest:[CPURLRequest requestWithURL:aURL] returningResponse:nil error:nil];
+        _data = [CPURLConnection sendSynchronousRequest:[CPURLRequest requestWithURL:aURL] returningResponse:nil];
         _awakenCustomResources = YES;
     }
 
@@ -171,12 +171,17 @@ var CPCibObjectDataKey  = @"CPCibObjectDataKey";
 
 - (void)connection:(CPURLConnection)aConnection didReceiveData:(CPString)data
 {
-    _data = [CPData dataWithString:data];
+    // FIXME: Why aren't we getting connection:didFailWithError:
+    if (!data)
+        return [self connection:aConnection didFailWithError:nil];
+
+    _data = [CPData dataWithRawString:data];
 }
 
 - (void)connection:(CPURLConnection)aConnection didFailWithError:(CPError)anError
 {
-    alert("cib: connection failed.");
+    if ([_loadDelegate respondsToSelector:@selector(cibDidFailToLoad:)])
+        [_loadDelegate cibDidFailToLoad:self];
 
     _loadDelegate = nil;
 }

AppKit/Cib/CPCibControlConnector.j

@@ -32,7 +32,7 @@
     var selectorName = _label,
         selectorNameLength = [selectorName length];
 
-    if (selectorNameLength && selectorName[selectorNameLength - 1] !== ':')
+    if (selectorNameLength && selectorName.charAt(selectorNameLength - 1) !== ':')
         selectorName += ':';
 
     var selector = CPSelectorFromString(selectorName);

AppKit/Cib/CPCibLoading.j

@@ -27,8 +27,6 @@
 
 var CPCibOwner = @"CPCibOwner";
 
-var LoadInfoForCib = {};
-
 @implementation CPObject (CPCibLoading)
 
 - (void)awakeFromCib
@@ -39,12 +37,12 @@ var LoadInfoForCib = {};
 
 @implementation CPBundle (CPCibLoading)
 
-+ (void)loadCibFile:(CPString)anAbsolutePath externalNameTable:(CPDictionary)aNameTable
++ (CPCib)loadCibFile:(CPString)anAbsolutePath externalNameTable:(CPDictionary)aNameTable
 {
-    [[[CPCib alloc] initWithContentsOfURL:anAbsolutePath] instantiateCibWithExternalNameTable:aNameTable];
+    return [[[CPCib alloc] initWithContentsOfURL:anAbsolutePath] instantiateCibWithExternalNameTable:aNameTable];
 }
 
-+ (void)loadCibNamed:(CPString)aName owner:(id)anOwner
++ (CPCib)loadCibNamed:(CPString)aName owner:(id)anOwner
 {
     if (![aName hasSuffix:@".cib"])
         aName = [aName stringByAppendingString:@".cib"];
@@ -53,22 +51,24 @@ var LoadInfoForCib = {};
     var bundle = anOwner ? [CPBundle bundleForClass:[anOwner class]] : [CPBundle mainBundle],
         path = [bundle pathForResource:aName];
 
-    [self loadCibFile:path externalNameTable:[CPDictionary dictionaryWithObject:anOwner forKey:CPCibOwner]];
+    return [self loadCibFile:path externalNameTable:[CPDictionary dictionaryWithObject:anOwner forKey:CPCibOwner]];
 }
 
-- (void)loadCibFile:(CPString)aFileName externalNameTable:(CPDictionary)aNameTable
+- (CPCib)loadCibFile:(CPString)aFileName externalNameTable:(CPDictionary)aNameTable
 {
-    [[[CPCib alloc] initWithContentsOfURL:aFileName] instantiateCibWithExternalNameTable:aNameTable];
+    return [[[CPCib alloc] initWithContentsOfURL:aFileName] instantiateCibWithExternalNameTable:aNameTable];
 }
 
-+ (void)loadCibFile:(CPString)anAbsolutePath externalNameTable:(CPDictionary)aNameTable loadDelegate:aDelegate
++ (CPCib)loadCibFile:(CPString)anAbsolutePath externalNameTable:(CPDictionary)aNameTable loadDelegate:aDelegate
 {
-    var cib = [[CPCib alloc] initWithContentsOfURL:anAbsolutePath loadDelegate:self];
-
-    LoadInfoForCib[[cib UID]] = { loadDelegate:aDelegate, externalNameTable:aNameTable };
+    return ([[CPCib alloc]
+    initWithContentsOfURL:anAbsolutePath
+             loadDelegate:[[_CPCibLoadDelegate alloc]
+                initWithLoadDelegate:aDelegate
+                   externalNameTable:aNameTable]]);
 }
 
-+ (void)loadCibNamed:(CPString)aName owner:(id)anOwner loadDelegate:(id)aDelegate
++ (CPCib)loadCibNamed:(CPString)aName owner:(id)anOwner loadDelegate:(id)aDelegate
 {
     if (![aName hasSuffix:@".cib"])
         aName = [aName stringByAppendingString:@".cib"];
@@ -77,25 +77,50 @@ var LoadInfoForCib = {};
     var bundle = anOwner ? [CPBundle bundleForClass:[anOwner class]] : [CPBundle mainBundle],
         path = [bundle pathForResource:aName];
     
-    [self loadCibFile:path externalNameTable:[CPDictionary dictionaryWithObject:anOwner forKey:CPCibOwner] loadDelegate:aDelegate];
+    return [self loadCibFile:path externalNameTable:[CPDictionary dictionaryWithObject:anOwner forKey:CPCibOwner] loadDelegate:aDelegate];
 }
 
-- (void)loadCibFile:(CPString)aFileName externalNameTable:(CPDictionary)aNameTable loadDelegate:(id)aDelegate
+- (CPCib)loadCibFile:(CPString)aFileName externalNameTable:(CPDictionary)aNameTable loadDelegate:(id)aDelegate
 {
-    var cib = [[CPCib alloc] initWithCibNamed:aFileName bundle:self loadDelegate:[self class]];
-
-    LoadInfoForCib[[cib UID]] = { loadDelegate:aDelegate, externalNameTable:aNameTable };
-}
-
-+ (void)cibDidFinishLoading:(CPCib)aCib
-{
-    var loadInfo = LoadInfoForCib[[aCib UID]];
-    
-    delete LoadInfoForCib[[aCib UID]];
-    
-    [aCib instantiateCibWithExternalNameTable:loadInfo.externalNameTable];
-    
-    [loadInfo.loadDelegate cibDidFinishLoading:aCib];
+    return ([[CPCib alloc]
+        initWithCibNamed:aFileName
+                  bundle:self
+            loadDelegate:[[_CPCibLoadDelegate alloc]
+                initWithLoadDelegate:aDelegate
+                   externalNameTable:aNameTable]]);
+}
+
+@end
+
+@implementation _CPCibLoadDelegate : CPObject
+{
+    id              _loadDelegate;
+    CPDictionary    _externalNameTable;
+}
+
+- (id)initWithLoadDelegate:(id)aLoadDelegate externalNameTable:(id)anExternalNameTable
+{
+    self = [self init];
+
+    if (self)
+    {
+        _loadDelegate = aLoadDelegate;
+        _externalNameTable = anExternalNameTable;
+    }
+
+    return self;
+}
+
+- (void)cibDidFinishLoading:(CPCib)aCib
+{
+    [aCib instantiateCibWithExternalNameTable:_externalNameTable];
+
+    [_loadDelegate cibDidFinishLoading:aCib];
+}
+
+- (void)cibDidFailToLoad:(CPCib)aCib
+{
+    [_loadDelegate cibDidFailToLoad:aCib];
 }
 
 @end

AppKit/Cib/_CPCibCustomResource.j

@@ -83,7 +83,7 @@ var _CPCibCustomResourceClassNameKey    = @"_CPCibCustomResourceClassNameKey",
     if ([aCoder respondsToSelector:@selector(bundle)] && 
         (![aCoder respondsToSelector:@selector(awakenCustomResources)] || [aCoder awakenCustomResources]))
         if (_className === @"CPImage")
-            return [[CPImage alloc] initWithContentsOfFile:[[aCoder bundle] pathForResource:_resourceName] size:[_properties objectForKey:@"size"]];
+            return [[CPImage alloc] initWithContentsOfFile:[[aCoder bundle] pathForResource:_resourceName] size:_properties.valueForKey(@"size")];
 
     return self;
 }

AppKit/CoreAnimation/CALayer.j

@@ -777,8 +777,7 @@ if (_DOMContentsElement && aLayer._zPosition > _DOMContentsElement.style.zIndex)
     @ignore
 */
 + (void)runLoopUpdateLayers
-{if (window.oops) {alert(window.latest); objj_debug_print_backtrace();}
-    window.loop = true;
+{
     for (UID in CALayerRegisteredRunLoopUpdates)
     {
         var layer = CALayerRegisteredRunLoopUpdates[UID],

AppKit/CoreGraphics/CGPath.j

@@ -210,7 +210,7 @@ function CGPathAddQuadCurveToPoint(aPath, aTransform, cpx, cpy, x, y)
         
     if (aTransform)
     {
-        cp = _CGPointApplyAffineTransform(control, aTransform);
+        cp = _CGPointApplyAffineTransform(cp, aTransform);
         end = _CGPointApplyAffineTransform(end, aTransform);
     }
     

AppKit/Jakefile

@@ -1,10 +1,15 @@
 
 require("../common.jake");
 
+var framework = require("objective-j/jake").framework;
+var BundleTask = require("objective-j/jake").BundleTask;
 
 $BUILD_PATH = FILE.join($BUILD_DIR, $CONFIGURATION, 'AppKit');
 
-AppKitFiles = new FileList("**/*.j").exclude('CoreGraphics/CGContextCanvas.j', 'CoreGraphics/CGContextVML.j', 'Themes/**/*', 'Tools/**/*');
+AppKitFiles = new FileList("**/*.j").exclude('CoreGraphics/CGContextCanvas.j', 'CoreGraphics/CGContextVML.j', 'Themes/**/*', 'Tools/**/*', "Platform/DOM/CPPlatform.j", "Platform/DOM/CPPlatformString.j");
+
+FIXME_fileDependency (FILE.join("Platform", "CPPlatform.j"), FILE.join("Platform", "DOM", "CPPlatform.j"));
+FIXME_fileDependency (FILE.join("Platform", "CPPlatformString.j"), FILE.join("Platform", "DOM", "CPPlatformString.j"));
 
 appKitTask = framework ("AppKit", function(appKitTask)
 {
@@ -15,7 +20,7 @@ appKitTask = framework ("AppKit", function(appKitTask)
     appKitTask.setEmail("feedback @nospam@ 280north.com");
     appKitTask.setSummary("AppKit classes for Cappuccino");
     appKitTask.setIdentifier("com.280n.AppKit");
-    appKitTask.setVersion("0.7.9");
+    appKitTask.setVersion(getCappuccinoVersion());
     appKitTask.setLicense(BundleTask.License.LGPL_v2_1);
     appKitTask.setSources(AppKitFiles);
     appKitTask.setResources(new FileList("Resources/**/*"));

AppKit/Platform/CPPlatform.j

@@ -1,72 +1,82 @@
+/*
+ * CPPlatform.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2010, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
 
 @import <Foundation/CPObject.j>
 
 #include "Platform.h"
 
 
-@implementation CPPlatform : CPObject
+@implementation CPBasePlatform : CPObject
 {
 }
 
 + (void)bootstrap
 {
-#if PLATFORM(DOM)
-    var body = document.getElementsByTagName("body")[0];
-
-    body.innerHTML = ""; // Get rid of anything that might be lingering in the body element.
-    body.style.overflow = "hidden";
-
-    if (document.documentElement)
-        document.documentElement.style.overflow = "hidden";
-#endif
-
     [CPPlatformString bootstrap];
     [CPPlatformWindow setPrimaryPlatformWindow:[[CPPlatformWindow alloc] _init]];
 }
 
 + (BOOL)isBrowser
 {
-    return typeof window.cpIsDesktop === "undefined";
+    return NO;
 }
 
 + (BOOL)supportsDragAndDrop
 {
-    return CPFeatureIsCompatible(CPHTMLDragAndDropFeature);
+    return NO;
 }
 
 + (BOOL)supportsNativeMainMenu
 {
-    return (typeof window["cpSetMainMenu"] === "function");
+    return NO;
 }
 
 + (void)terminateApplication
 {
-    if (typeof window["cpTerminate"] === "function")
-        window.cpTerminate();
 }
 
 + (void)activateIgnoringOtherApps:(BOOL)shouldIgnoreOtherApps
 {
-#if PLATFORM(DOM)
-    if (typeof window["cpActivateIgnoringOtherApps"] === "function")
-        window.cpActivateIgnoringOtherApps(!!shouldIgnoreOtherApps);
-#endif
+}
+
++ (void)deactivate
+{
 }
 
 + (void)hideOtherApplications:(id)aSender
 {
-#if PLATFORM(DOM)
-    if (typeof window["cpHideOtherApplications"] === "function")
-        window.cpHideOtherApplications();
-#endif
 }
 
 + (void)hide:(id)aSender
 {
-#if PLATFORM(DOM)
-    if (typeof window["cpHide"] === "function")
-        window.cpHide();
-#endif
 }
 
 @end
+
+#if PLATFORM(DOM)
+#include "DOM/CPPlatform.j"
+#else
+@implementation CPPlatform : CPBasePlatform
+{
+}
+@end
+#endif

AppKit/Platform/CPPlatformString.j

@@ -1,4 +1,24 @@
-
+/*
+ * CPPlatformString.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2010, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
 
 @import <Foundation/CPObject.j>
 
@@ -6,99 +26,26 @@
 #include "Platform.h"
 
 
-#if PLATFORM(DOM)
-var DOMIFrameElement    = nil,
-    DOMSpanElement      = nil,
-    DefaultFont         = nil;
-#endif
-
-@implementation CPPlatformString : CPObject
+@implementation CPBasePlatformString : CPObject
 {
 }
 
 + (void)bootstrap
 {
-#if PLATFORM(DOM)
-    DOMIFrameElement = document.createElement("iframe");
-    
-    DOMIFrameElement.name = name = "iframe_" + FLOOR(RAND() * 10000);
-    DOMIFrameElement.style.position = "absolute";
-    DOMIFrameElement.style.left = "-100px";
-    DOMIFrameElement.style.top = "-100px";
-    DOMIFrameElement.style.width = "1px";
-    DOMIFrameElement.style.height = "1px";
-    DOMIFrameElement.style.borderWidth = "0px";
-    DOMIFrameElement.style.background = "blue";
-    DOMIFrameElement.style.overflow = "hidden";
-    DOMIFrameElement.style.zIndex = 100000000000;
-
-    document.getElementsByTagName("body")[0].appendChild(DOMIFrameElement);
-
-    var DOMIFrameDocument = (DOMIFrameElement.contentDocument || DOMIFrameElement.contentWindow.document);
-
-    DOMIFrameDocument.write("<html><head></head><body></body></html>");
-    DOMIFrameDocument.close();
-
-    DOMSpanElement = DOMIFrameDocument.createElement("span");
-
-    DOMSpanElement.style.position = "absolute";
-    DOMSpanElement.style.whiteSpace = "pre";
-    DOMSpanElement.style.visibility = "visible";
-    DOMSpanElement.style.padding = "0px";
-    DOMSpanElement.style.margin = "0px";
-    DOMSpanElement.style.background = "red";
-
-    DOMIFrameDocument.getElementsByTagName("body")[0].appendChild(DOMSpanElement);
-#endif
 }
 
 + (CGSize)sizeOfString:(CPString)aString withFont:(CPFont)aFont forWidth:(float)aWidth
 {
-#if PLATFORM(DOM)
-    if (!aFont)
-    {
-        if (!DefaultFont)
-            DefaultFont = [CPFont systemFontOfSize:12.0];
-
-        aFont = DefaultFont;
-    }
-
-    var style = DOMSpanElement.style;
-
-    if (aWidth === NULL)
-    {
-        style.width = "";
-        style.whiteSpace = "pre";
-    }
-    
-    else
-    {
-        style.width = ROUND(aWidth) + "px";
-        
-        if (document.attachEvent)
-            style.wordWrap = "break-word";
-        
-        else
-        {
-            style.whiteSpace = "-o-pre-wrap";
-            style.whiteSpace = "-pre-wrap";
-            style.whiteSpace = "-moz-pre-wrap";
-            style.whiteSpace = "pre-wrap";
-        }
-    }
-
-    style.font = [aFont cssString];
-
-    if (CPFeatureIsCompatible(CPJavascriptInnerTextFeature))
-        DOMSpanElement.innerText = aString;
-
-    else if (CPFeatureIsCompatible(CPJavascriptTextContentFeature))
-        DOMSpanElement.textContent = aString;
-
-    return _CGSizeMake(DOMSpanElement.clientWidth, DOMSpanElement.clientHeight);
-#else
     return _CGSizeMakeZero();
-#endif
 }
 
 @end
+
+#if PLATFORM(DOM)
+#include "DOM/CPPlatformString.j"
+#else
+@implementation CPPlatformString : CPBasePlatformString
+{
+}
+@end
+#endif

AppKit/Platform/CPPlatformWindow.j

@@ -1,9 +1,31 @@
+/*
+ * CPPlatformWindow.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2010, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
 
 @import <Foundation/CPObject.j>
 
 #import "Platform.h"
 #import "../CoreGraphics/CGGeometry.h"
 
+
 var PrimaryPlatformWindow   = NULL;
 
 @implementation CPPlatformWindow : CPObject
@@ -19,11 +41,13 @@ var PrimaryPlatformWindow   = NULL;
 
     DOMElement      _DOMBodyElement;
     DOMElement      _DOMFocusElement;
+    DOMElement      _DOMEventGuard;
 
     CPArray         _windowLevels;
     CPDictionary    _windowLayers;
 
     BOOL            _mouseIsDown;
+    BOOL            _mouseDownIsRightClick;
     CPWindow        _mouseDownWindow;
     CPTimeInterval  _lastMouseUp;
     CPTimeInterval  _lastMouseDown;
@@ -50,6 +74,15 @@ var PrimaryPlatformWindow   = NULL;
     return [CPSet set];
 }
 
++ (BOOL)supportsMultipleInstances
+{
+#if PLATFORM(DOM)
+    return !CPBrowserIsEngine(CPInternetExplorerBrowserEngine);
+#else
+    return NO;
+#endif
+}
+
 + (CPPlatformWindow)primaryPlatformWindow
 {
     return PrimaryPlatformWindow;
@@ -115,7 +148,7 @@ var PrimaryPlatformWindow   = NULL;
     return frame;
 }
 
-- (void)usableContentFrame
+- (CGRect)usableContentFrame
 {
     return [self visibleFrame];
 }
@@ -174,6 +207,20 @@ var PrimaryPlatformWindow   = NULL;
 #endif
 }
 
+- (void)moveWindow:(CPWindow)aWindow fromLevel:(int)fromLevel toLevel:(int)toLevel
+{
+#if PLATFORM(DOM)
+    if (!aWindow._isVisible)
+        return;
+
+    var fromLayer = [self layerAtLevel:fromLevel create:NO],
+        toLayer = [self layerAtLevel:toLevel create:YES];
+
+    [fromLayer removeWindow:aWindow];
+    [toLayer insertWindow:aWindow atIndex:CPNotFound];
+#endif
+}
+
 - (void)setLevel:(CPInteger)aLevel
 {
     _level = aLevel;

AppKit/Platform/DOM/CPPlatform.j

@@ -0,0 +1,139 @@
+/*
+ * CPPlatform+DOM.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2010, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+if (typeof window["CPPlatformEnableHTMLDragAndDrop"] === "undefined")
+    CPPlatformEnableHTMLDragAndDrop = NO;
+
+CPPlatformDidClearBodyElementNotification   = @"CPPlatformDidClearBodyElementNotification";
+CPPlatformWillClearBodyElementNotification  = @"CPPlatformWillClearBodyElementNotification";
+
+var screenNeedsInitialization   = NO,
+    mainBodyElement = nil,
+    elementRemovalTest = new RegExp("\\bcpdontremove\\b", "g");
+
+@implementation CPPlatform : CPBasePlatform
+{
+}
+
++ (void)initialize
+{
+    if (self !== [CPPlatform class])
+        return;
+
+    screenNeedsInitialization = [CPPlatform isBrowser];
+
+    // We do this here because doing it later breaks IE.
+    if (document.documentElement)
+        document.documentElement.style.overflow = "hidden";
+
+    if ([CPPlatform isBrowser])
+        window.onunload = function()
+        {
+            [CPApp terminate:nil];
+        }
+}
+
++ (BOOL)isBrowser
+{
+    return typeof window.cpIsDesktop === "undefined";
+}
+
++ (BOOL)supportsDragAndDrop
+{
+    return CPFeatureIsCompatible(CPHTMLDragAndDropFeature) && (CPPlatformEnableHTMLDragAndDrop || ![self isBrowser]);
+}
+
++ (BOOL)supportsNativeMainMenu
+{
+    return (typeof window["cpSetMainMenu"] === "function");
+}
+
++ (void)terminateApplication
+{
+    if (typeof window["cpTerminate"] === "function")
+        window.cpTerminate();
+}
+
++ (void)activateIgnoringOtherApps:(BOOL)shouldIgnoreOtherApps
+{
+    if (typeof window["cpActivateIgnoringOtherApps"] === "function")
+        window.cpActivateIgnoringOtherApps(!!shouldIgnoreOtherApps);
+}
+
++ (void)deactivate
+{
+    if (typeof window["cpDeactivate"] === "function")
+        window.cpDeactivate();
+}
+
++ (void)hideOtherApplications:(id)aSender
+{
+    if (typeof window["cpHideOtherApplications"] === "function")
+        window.cpHideOtherApplications();
+}
+
++ (void)hide:(id)aSender
+{
+    if (typeof window["cpHide"] === "function")
+        window.cpHide();
+}
+
++ (DOMElement)mainBodyElement
+{
+    if (!mainBodyElement)
+        mainBodyElement = document.getElementById("cappuccino-body") || document.body;
+
+    return mainBodyElement;
+}
+
++ (void)initializeScreenIfNecessary
+{
+    if (!screenNeedsInitialization)
+        return;
+
+    screenNeedsInitialization = NO;
+
+    [[CPNotificationCenter defaultCenter]
+        postNotificationName:CPPlatformWillClearBodyElementNotification
+                      object:self];
+
+    var bodyElement = [self mainBodyElement];
+
+    // Get rid of any of the original contents of the page.
+    var children = bodyElement.childNodes,
+        length = children.length;
+
+    while (length--)
+    {
+        var element = children[length];
+        if (!element.className || element.className.match(elementRemovalTest) === null)
+            bodyElement.removeChild(element);
+    }
+
+    bodyElement.style.overflow = "hidden";
+
+    [[CPNotificationCenter defaultCenter]
+        postNotificationName:CPPlatformDidClearBodyElementNotification
+                      object:self];
+}
+
+@end

AppKit/Platform/DOM/CPPlatformString.j

@@ -0,0 +1,141 @@
+/*
+ * CPPlatformString.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2010, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "../CoreGraphics/CGGeometry.h"
+
+var DOMFixedWidthSpanElement    = nil,
+    DOMFlexibleWidthSpanElement = nil,
+    DOMIFrameElement            = nil,
+    DefaultFont                 = nil;
+
+@implementation CPPlatformString : CPBasePlatformString
+{
+}
+
++ (void)bootstrap
+{
+    [self createDOMElements];
+}
+
++ (void)createDOMElements
+{
+    var style;
+
+    DOMIFrameElement = document.createElement("iframe");
+    // necessary for Safari caching bug:
+    DOMIFrameElement.name = "iframe_" + FLOOR(RAND() * 10000);
+    DOMIFrameElement.className = "cpdontremove";
+
+    style = DOMIFrameElement.style;
+    style.position = "absolute";
+    style.left = "-100px";
+    style.top = "-100px";
+    style.width = "1px";
+    style.height = "1px";
+    style.borderWidth = "0px";
+    style.overflow = "hidden";
+    style.zIndex = 100000000000;
+
+    var bodyElement = [CPPlatform mainBodyElement];
+
+    bodyElement.appendChild(DOMIFrameElement);
+
+    var DOMIFrameDocument = (DOMIFrameElement.contentDocument || DOMIFrameElement.contentWindow.document);
+    DOMIFrameDocument.write('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'+
+                            '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head></head><body></body></html>');
+    DOMIFrameDocument.close();
+
+    // IE needs this wide <div> to prevent unwanted text wrapping:
+    var DOMDivElement = DOMIFrameDocument.createElement("div");
+    DOMDivElement.style.position = "absolute";
+    DOMDivElement.style.width = "100000px";
+
+    DOMIFrameDocument.body.appendChild(DOMDivElement);
+
+    DOMFlexibleWidthSpanElement = DOMIFrameDocument.createElement("span");
+    style = DOMFlexibleWidthSpanElement.style;
+    style.position = "absolute";
+    style.visibility = "visible";
+    style.padding = "0px";
+    style.margin = "0px";
+    style.whiteSpace = "pre";
+
+    DOMFixedWidthSpanElement = DOMIFrameDocument.createElement("span");
+    style = DOMFixedWidthSpanElement.style;
+    style.display = "block";
+    style.position = "absolute";
+    style.visibility = "visible";
+    style.padding = "0px";
+    style.margin = "0px";
+    style.width = "1px";
+    style.wordWrap = "break-word";
+    try
+    {
+        style.whiteSpace = "pre";
+        style.whiteSpace = "-o-pre-wrap";
+        style.whiteSpace = "-pre-wrap";
+        style.whiteSpace = "-moz-pre-wrap";
+        style.whiteSpace = "pre-wrap";
+    }
+    catch(e)
+    {
+        //some versions of IE throw exceptions for unsupported properties.
+        style.whiteSpace = "pre";
+    }
+
+    DOMDivElement.appendChild(DOMFlexibleWidthSpanElement);
+    DOMDivElement.appendChild(DOMFixedWidthSpanElement);
+}
+
++ (CGSize)sizeOfString:(CPString)aString withFont:(CPFont)aFont forWidth:(float)aWidth
+{
+    if (!aFont)
+    {
+        if (!DefaultFont)
+            DefaultFont = [CPFont systemFontOfSize:12.0];
+
+        aFont = DefaultFont;
+    }
+
+    if (!DOMIFrameElement)
+        [self createDOMElements];
+
+    var span;
+    if (!aWidth)
+        span = DOMFlexibleWidthSpanElement;
+    else
+    {
+        span = DOMFixedWidthSpanElement;
+        span.style.width = ROUND(aWidth) + "px";
+    }
+
+    span.style.font = [aFont cssString];
+
+    if (CPFeatureIsCompatible(CPJavascriptInnerTextFeature))
+        span.innerText = aString;
+    else if (CPFeatureIsCompatible(CPJavascriptTextContentFeature))
+        span.textContent = aString;
+
+    return _CGSizeMake(span.clientWidth, span.clientHeight);
+}
+
+@end

AppKit/Platform/DOM/CPPlatformWindow+DOM.j

@@ -1,5 +1,5 @@
 /*
- * _CPDOMWindow.j
+ * CPPlatformWindow+DOM.j
  * AppKit
  *
  * Created by Francisco Tolmasky.
@@ -127,7 +127,8 @@ var PlatformWindows = [CPSet set];
 // Define up here so compressor knows about em.
 var CPDOMEventGetClickCount,
     CPDOMEventStop,
-    StopDOMEventPropagation;
+    StopDOMEventPropagation,
+    StopContextMenuDOMEventPropagation;
 
 //right now we hard code q, w, r and t as keys to propogate
 //these aren't normal keycodes, they are with modifier key codes
@@ -228,18 +229,10 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
         _DOMWindow.blur();
 }
 
-- (void)registerDOMWindow
+- (void)createDOMElements
 {
     var theDocument = _DOMWindow.document;
 
-    _DOMBodyElement = theDocument.getElementsByTagName("body")[0];
-
-    // FIXME: Always do this?
-    if ([CPPlatform supportsDragAndDrop])
-        _DOMBodyElement.style["-khtml-user-select"] = "none";
-
-    _DOMBodyElement.webkitTouchCallout = "none";
-
     // This guy fixes an issue in Firefox where if you focus the URL field, we stop getting key events
     _DOMFocusElement = theDocument.createElement("input");
 
@@ -247,7 +240,8 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
     _DOMFocusElement.style.zIndex = "-1000";
     _DOMFocusElement.style.opacity = "0";
     _DOMFocusElement.style.filter = "alpha(opacity=0)";
-    
+    _DOMFocusElement.className = "cpdontremove";
+
     _DOMBodyElement.appendChild(_DOMFocusElement);
 
     // Create Native Pasteboard handler.
@@ -256,12 +250,40 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
     _DOMPasteboardElement.style.position = "absolute";
     _DOMPasteboardElement.style.top = "-10000px";
     _DOMPasteboardElement.style.zIndex = "999";
+    _DOMPasteboardElement.className = "cpdontremove";
 
     _DOMBodyElement.appendChild(_DOMPasteboardElement);
 
     // Make sure the pastboard element is blurred.
     _DOMPasteboardElement.blur();
 
+    // Create a full screen div to protect against iframes and other elements from consuming events during tracking
+    // FIXME: multiple windows
+    _DOMEventGuard = theDocument.createElement("div");
+    _DOMEventGuard.style.position = "absolute";
+    _DOMEventGuard.style.top = "0px";
+    _DOMEventGuard.style.left = "0px";
+    _DOMEventGuard.style.width = "100%";
+    _DOMEventGuard.style.height = "100%";
+    _DOMEventGuard.style.zIndex = "999";
+    _DOMEventGuard.style.display = "none";
+    _DOMEventGuard.className = "cpdontremove";
+    _DOMBodyElement.appendChild(_DOMEventGuard);
+}
+
+- (void)registerDOMWindow
+{
+    var theDocument = _DOMWindow.document;
+
+    _DOMBodyElement = theDocument.getElementById("cappuccino-body") || theDocument.body;
+
+    // FIXME: Always do this?
+    if (supportsNativeDragAndDrop)
+        _DOMBodyElement.style["-khtml-user-select"] = "none";
+
+    _DOMBodyElement.webkitTouchCallout = "none";
+
+    [self createDOMElements];
     [self _addLayers];
 
     var theClass = [self class],
@@ -289,6 +311,10 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
         mouseEventImplementation = class_getMethodImplementation(theClass, mouseEventSelector),
         mouseEventCallback = function (anEvent) { mouseEventImplementation(self, nil, anEvent); },
         
+        contextMenuEventSelector = @selector(contextMenuEvent:),
+        contextMenuEventImplementation = class_getMethodImplementation(theClass, contextMenuEventSelector),
+        contextMenuEventCallback = function (anEvent) { return contextMenuEventImplementation(self, nil, anEvent); },
+
         scrollEventSelector = @selector(scrollEvent:),
         scrollEventImplementation = class_getMethodImplementation(theClass, scrollEventSelector),
         scrollEventCallback = function (anEvent) { scrollEventImplementation(self, nil, anEvent); },
@@ -297,7 +323,6 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
         touchEventImplementation = class_getMethodImplementation(theClass, touchEventSelector),
         touchEventCallback = function (anEvent) { touchEventImplementation(self, nil, anEvent); };
 
-
     if (theDocument.addEventListener)
     {
         if ([CPPlatform supportsDragAndDrop])
@@ -313,6 +338,7 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
         theDocument.addEventListener("mouseup", mouseEventCallback, NO);
         theDocument.addEventListener("mousedown", mouseEventCallback, NO);
         theDocument.addEventListener("mousemove", mouseEventCallback, NO);
+        theDocument.addEventListener("contextmenu", contextMenuEventCallback, NO);
 
         theDocument.addEventListener("beforecopy", copyEventCallback, NO);
         theDocument.addEventListener("beforecut", copyEventCallback, NO);
@@ -340,6 +366,7 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
             theDocument.removeEventListener("mouseup", mouseEventCallback, NO);
             theDocument.removeEventListener("mousedown", mouseEventCallback, NO);
             theDocument.removeEventListener("mousemove", mouseEventCallback, NO);
+            theDocument.removeEventListener("contextmenu", contextMenuEventCallback, NO);
 
             theDocument.removeEventListener("keyup", keyEventCallback, NO);
             theDocument.removeEventListener("keydown", keyEventCallback, NO);
@@ -372,6 +399,7 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
         theDocument.attachEvent("onmousedown", mouseEventCallback);
         theDocument.attachEvent("onmousemove", mouseEventCallback);
         theDocument.attachEvent("ondblclick", mouseEventCallback);
+        theDocument.attachEvent("oncontextmenu", contextMenuEventCallback);
         
         theDocument.attachEvent("onkeyup", keyEventCallback);
         theDocument.attachEvent("onkeydown", keyEventCallback);
@@ -382,8 +410,8 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
         _DOMWindow.onmousewheel = scrollEventCallback;
         theDocument.onmousewheel = scrollEventCallback;
         
-        theDocument.body.ondrag = function () { return NO; };
-        theDocument.body.onselectstart = function () { return _DOMWindow.event.srcElement === _DOMPasteboardElement; };
+        _DOMBodyElement.ondrag = function () { return NO; };
+        _DOMBodyElement.onselectstart = function () { return _DOMWindow.event.srcElement === _DOMPasteboardElement; };
 
         _DOMWindow.attachEvent("onbeforeunload", function()
         {
@@ -394,6 +422,7 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
             theDocument.detachEvent("onmousedown", mouseEventCallback);
             theDocument.detachEvent("onmousemove", mouseEventCallback);
             theDocument.detachEvent("ondblclick", mouseEventCallback);
+            theDocument.detachEvent("oncontextmenu", contextMenuEventCallback);
 
             theDocument.detachEvent("onkeyup", keyEventCallback);
             theDocument.detachEvent("onkeydown", keyEventCallback);
@@ -404,8 +433,8 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
             _DOMWindow.onmousewheel = NULL;
             theDocument.onmousewheel = NULL;
 
-            theDocument.body.ondrag = NULL;
-            theDocument.body.onselectstart = NULL;
+            _DOMBodyElement.ondrag = NULL;
+            _DOMBodyElement.onselectstart = NULL;
 
             //_DOMWindow.removeEvent("beforeunload", this);
 
@@ -418,7 +447,14 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
 
 + (CPSet)visiblePlatformWindows
 {
-    return PlatformWindows;
+    if ([[CPPlatformWindow primaryPlatformWindow] isVisible])
+    {
+        var set = [CPSet setWithSet:PlatformWindows];
+        [set addObject:[CPPlatformWindow primaryPlatformWindow]];
+        return set;
+    }
+    else
+        return PlatformWindows;
 }
 
 - (void)orderFront:(id)aSender
@@ -431,7 +467,7 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
     [PlatformWindows addObject:self];
 
     // FIXME: cpSetFrame?
-    _DOMWindow.document.write("<html><head></head><body style = 'background-color:transparent;'></body></html>");
+    _DOMWindow.document.write("<!DOCTYPE html><html lang='en'><head></head><body style='background-color:transparent;'></body></html>");
     _DOMWindow.document.close();
 
     if (![CPPlatform isBrowser])
@@ -443,9 +479,9 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
         _DOMWindow.cpSetShadowStyle(_shadowStyle);
     }
 
-    _DOMWindow.document.body.style.cursor = [[CPCursor currentCursor] _cssString];
-
     [self registerDOMWindow];
+
+    _DOMBodyElement.style.cursor = [[CPCursor currentCursor] _cssString];
 }
 
 - (void)orderOut:(id)aSender
@@ -478,11 +514,17 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
         DOMDragElement.style.left = -_CGRectGetWidth(draggedWindowFrame) + "px";
         DOMDragElement.style.top = -_CGRectGetHeight(draggedWindowFrame) + "px";
 
-        document.getElementsByTagName("body")[0].appendChild(DOMDragElement);
+        var parentNode = DOMDragElement.parentNode;
+
+        if (parentNode)
+            parentNode.removeChild(DOMDragElement);
+
+        _DOMBodyElement.appendChild(DOMDragElement);
 
         var draggingOffset = [dragServer draggingOffset];
 
         aDOMEvent.dataTransfer.setDragImage(DOMDragElement, draggingOffset.width, draggingOffset.height);
+        aDOMEvent.dataTransfer.effectAllowed = "all";
 
         [dragServer draggingStartedInPlatformWindow:self globalLocation:[CPPlatform isBrowser] ? location : _CGPointMake(aDOMEvent.screenX, aDOMEvent.screenY)];
     }
@@ -699,7 +741,7 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
 
     if (StopDOMEventPropagation)
         CPDOMEventStop(aDOMEvent, self);
-        
+
     [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
 }
 
@@ -774,7 +816,6 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
     }
 }
 
-
 - (void)_checkPasteboardElement
 {
     var value = _DOMPasteboardElement.value;
@@ -810,12 +851,13 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
     if(!aDOMEvent)
         aDOMEvent = window.event;
 
+    var location = nil;
     if (CPFeatureIsCompatible(CPJavaScriptMouseWheelValues_8_15))
     {
-        var x = 0.0,
-            y = 0.0,
+        var x = aDOMEvent._offsetX || 0.0,
+            y = aDOMEvent._offsetY || 0.0,
             element = aDOMEvent.target;
-        
+
         while (element.nodeType !== 1)
             element = element.parentNode;
 
@@ -829,11 +871,13 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
             } while (element = element.offsetParent);
         }
     
-        var location = _CGPointMake((x + ((aDOMEvent.clientX - 8) / 15)), (y + ((aDOMEvent.clientY - 8) / 15)));
+        location = _CGPointMake((x + ((aDOMEvent.clientX - 8) / 15)), (y + ((aDOMEvent.clientY - 8) / 15)));
     }
+    else if (aDOMEvent._overrideLocation)
+        location = aDOMEvent._overrideLocation;
     else
-        var location = _CGPointMake(aDOMEvent.clientX, aDOMEvent.clientY);
-        
+        location = _CGPointMake(aDOMEvent.clientX, aDOMEvent.clientY);
+
     var deltaX = 0.0,
         deltaY = 0.0,
         windowNumber = 0,
@@ -842,7 +886,7 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
                         (aDOMEvent.ctrlKey ? CPControlKeyMask : 0) | 
                         (aDOMEvent.altKey ? CPAlternateKeyMask : 0) | 
                         (aDOMEvent.metaKey ? CPCommandKeyMask : 0);
-          
+
     StopDOMEventPropagation = YES;
 
     var theWindow = [self hitTest:location];
@@ -886,7 +930,7 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
         
     if (StopDOMEventPropagation)
         CPDOMEventStop(aDOMEvent, self);
-        
+
     [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
 }
 
@@ -1017,11 +1061,12 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
     {
         if(_mouseIsDown)
         {
-            event = _CPEventFromNativeMouseEvent(aDOMEvent, CPLeftMouseUp, location, modifierFlags, timestamp, windowNumber, nil, -1, CPDOMEventGetClickCount(_lastMouseUp, timestamp, location), 0);
+            event = _CPEventFromNativeMouseEvent(aDOMEvent, _mouseDownIsRightClick ? CPRightMouseUp : CPLeftMouseUp, location, modifierFlags, timestamp, windowNumber, nil, -1, CPDOMEventGetClickCount(_lastMouseUp, timestamp, location), 0);
         
             _mouseIsDown = NO;
             _lastMouseUp = event;
             _mouseDownWindow = nil;
+            _mouseDownIsRightClick = NO;
         }
 
         if(_DOMEventMode)
@@ -1061,8 +1106,13 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
             _DOMBodyElement.style["-khtml-user-drag"] = "element";
         }
 
-        event = _CPEventFromNativeMouseEvent(aDOMEvent, CPLeftMouseDown, location, modifierFlags, timestamp, windowNumber, nil, -1, CPDOMEventGetClickCount(_lastMouseDown, timestamp, location), 0);
-                    
+        var button = aDOMEvent.button;
+        _mouseDownIsRightClick = button == 2 || (button == 0 && modifierFlags & CPControlKeyMask);
+
+        StopContextMenuDOMEventPropagation = YES;
+
+        event = _CPEventFromNativeMouseEvent(aDOMEvent, _mouseDownIsRightClick ? CPRightMouseDown : CPLeftMouseDown, location, modifierFlags, timestamp, windowNumber, nil, -1, CPDOMEventGetClickCount(_lastMouseDown, timestamp, location), 0);
+
         _mouseIsDown = YES;
         _lastMouseDown = event;
     }
@@ -1072,7 +1122,7 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
         if (_DOMEventMode)
             return;
 
-        event = _CPEventFromNativeMouseEvent(aDOMEvent, _mouseIsDown ? CPLeftMouseDragged : CPMouseMoved, location, modifierFlags, timestamp, windowNumber, nil, -1, 1, 0);
+        event = _CPEventFromNativeMouseEvent(aDOMEvent, _mouseIsDown ? (_mouseDownIsRightClick ? CPRightMouseDragged : CPLeftMouseDragged) : CPMouseMoved, location, modifierFlags, timestamp, windowNumber, nil, -1, 1, 0);
     }
 
     var isDragging = [[CPDragServer sharedDragServer] isDragging];
@@ -1087,13 +1137,24 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
     if (StopDOMEventPropagation && (!supportsNativeDragAndDrop || type !== "mousedown" && !isDragging))
         CPDOMEventStop(aDOMEvent, self);
 
+    // if there are any tracking event listeners then show the event guard so we don't lose events to iframes
+    _DOMEventGuard.style.display = (CPApp._eventListeners.length === 0) ? "none" : "";
+
     [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
 }
 
- (CPArray)orderedWindowsAtLevel:(int)aLevel
+- (void)contextMenuEvent:(DOMEvent)aDOMEvent
+{
+    if (StopContextMenuDOMEventPropagation)
+        CPDOMEventStop(aDOMEvent, self);
+
+    return !StopContextMenuDOMEventPropagation;
+}
+
+- (CPArray)orderedWindowsAtLevel:(int)aLevel
 {
     var layer = [self layerAtLevel:aLevel create:NO];
-    
+
     if (!layer)
         return [];
     
@@ -1103,7 +1164,7 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
 - (CPDOMWindowLayer)layerAtLevel:(int)aLevel create:(BOOL)aFlag
 {
     var layer = [_windowLayers objectForKey:aLevel];
-    
+
     // If the layer doesn't currently exist, and the create flag is true,
     // create the layer.
     if (!layer && aFlag)
@@ -1111,7 +1172,7 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
         layer = [[CPDOMWindowLayer alloc] initWithLevel:aLevel];
         
         [_windowLayers setObject:layer forKey:aLevel];
-        
+
         // Find the nearest layer.  This is similar to a binary search, 
         // only we know we won't find the value.
         var low = 0,
@@ -1128,8 +1189,13 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
                 low = middle + 1;
         }
 
-        [_windowLevels insertObject:aLevel atIndex:_windowLevels[middle] > aLevel ? middle : middle + 1];
+        var insertionIndex = 0;
+        if (middle !== undefined) 
+            insertionIndex = _windowLevels[middle] > aLevel ? middle : middle + 1
+
+        [_windowLevels insertObject:aLevel atIndex:insertionIndex];
         layer._DOMElement.style.zIndex = aLevel;
+
         _DOMBodyElement.appendChild(layer._DOMElement);
     }
     
@@ -1138,17 +1204,23 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
 
 - (void)order:(CPWindowOrderingMode)aPlace window:(CPWindow)aWindow relativeTo:(CPWindow)otherWindow
 {
+    [CPPlatform initializeScreenIfNecessary];
+
     // Grab the appropriate level for the layer, and create it if 
     // necessary (if we are not simply removing the window).
-    var layer = [self layerAtLevel:[aWindow level] create:aPlace != CPWindowOut];
-        
+    var layer = [self layerAtLevel:[aWindow level] create:aPlace !== CPWindowOut];
+
     // Ignore otherWindow, simply remove this window from it's level.  
     // If layer is nil, this will be a no-op.
-    if (aPlace == CPWindowOut)
+    if (aPlace === CPWindowOut)
         return [layer removeWindow:aWindow];
 
+    var insertionIndex = CPNotFound;
+    if (otherWindow)
+        insertionIndex = aPlace === CPWindowAbove ? otherWindow._index + 1 : otherWindow._index;
+
     // Place the window at the appropriate index.
-    [layer insertWindow:aWindow atIndex:(otherWindow ? (aPlace == CPWindowAbove ? otherWindow._index + 1 : otherWindow._index) : CPNotFound)];
+    [layer insertWindow:aWindow atIndex:insertionIndex];
 }
 
 - (void)_removeLayers
@@ -1221,6 +1293,19 @@ var supportsNativeDragAndDrop = [CPPlatform supportsDragAndDrop];
     return !StopDOMEventPropagation;
 }
 
+- (void)_propagateContextMenuDOMEvent:(BOOL)aFlag
+{
+    if (aFlag && CPBrowserIsEngine(CPGeckoBrowserEngine))
+        StopDOMEventPropagation = !aFlag;
+
+    StopContextMenuDOMEventPropagation = !aFlag;
+}
+
+- (BOOL)_willPropagateContextMenuDOMEvent
+{
+    return StopContextMenuDOMEventPropagation;
+}
+
 - (CPWindow)hitTest:(CPPoint)location
 {
     if (self._only) 
@@ -1363,19 +1448,25 @@ var CPDOMEventStop = function(aDOMEvent, aPlatformWindow)
 
 function CPWindowObjectList()
 {
-    var platformWindow = [CPPlatformWindow primaryPlatformWindow],
-        levels = platformWindow._windowLevels,
-        layers = platformWindow._windowLayers,
-        levelCount = levels.length,
+    var platformWindows = [CPPlatformWindow visiblePlatformWindows],
+        platformWindowEnumerator = [platformWindows objectEnumerator],
+        platformWindow = nil,
         windowObjects = [];
 
-    while (levelCount--)
+    while (platformWindow = [platformWindowEnumerator nextObject])
     {
-        var windows = [layers objectForKey:levels[levelCount]]._windows,
-            windowCount = windows.length;
+        var levels = platformWindow._windowLevels,
+            layers = platformWindow._windowLayers,
+            levelCount = levels.length;
 
-        while (windowCount--)
-            windowObjects.push(windows[windowCount]);
+        while (levelCount--)
+        {
+            var windows = [layers objectForKey:levels[levelCount]]._windows,
+                windowCount = windows.length;
+
+            while (windowCount--)
+                windowObjects.push(windows[windowCount]);
+        }
     }
 
     return windowObjects;
@@ -1383,20 +1474,11 @@ function CPWindowObjectList()
 
 function CPWindowList()
 {
-    var platformWindow = [CPPlatformWindow primaryPlatformWindow],
-        levels = platformWindow._windowLevels,
-        layers = platformWindow._windowLayers,
-        levelCount = levels.length,
-        windowNumbers = [];
+    var windowObjectList = CPWindowObjectList(),
+        windowList = [];
 
-    while (levelCount--)
-    {
-        var windows = [layers objectForKey:levels[levelCount]]._windows,
-            windowCount = windows.length;
+    for (var i = 0, count = [windowObjectList count]; i < count; i++)
+        windowList.push([windowObjectList[i] windowNumber]);
 
-        while (windowCount--)
-            windowNumbers.push([windows[windowCount] windowNumber]);
-    }
-
-    return windowNumbers;
+    return windowList;
 }

AppKit/Resources/CPCursor/test.html

@@ -1,18 +0,0 @@
-<html>
-<head>
-</head>
-<body>
-<div>Test custom cursors with .cur images.</div>
-<div style="width: 20px; height: 20px; margin: 10px; background: #ddd; cursor: url(disappearingItemCursor.cur), default">disappearingItemCursor</div>
-<div style="width: 20px; height: 20px; margin: 10px; background: #ddd; cursor: url(closedHandCursor.cur), default">closedHandCursor</div>
-<div style="width: 20px; height: 20px; margin: 10px; background: #ddd; cursor: url(contextMenuCursor.cur), default">contextMenuCursor</div>
-<div style="width: 20px; height: 20px; margin: 10px; background: #ddd; cursor: url(dragCopyCursor.cur), default">dragCopyCursor</div>
-<div style="width: 20px; height: 20px; margin: 10px; background: #ddd; cursor: url(dragLinkCursor.cur), default">dragLinkCursor</div>
-<div style="width: 20px; height: 20px; margin: 10px; background: #ddd; cursor: url(openHandCursor.cur), default">openHandCursor</div>
-<div style="width: 20px; height: 20px; margin: 10px; background: #ddd; cursor: url(resizeDownCursor.cur), default">resizeDownCursor</div>
-<div style="width: 20px; height: 20px; margin: 10px; background: #ddd; cursor: url(resizeLeftCursor.cur), default">resizeLeftCursor</div>
-<div style="width: 20px; height: 20px; margin: 10px; background: #ddd; cursor: url(resizeRightCursor.cur), default">resizeRightCursor</div>
-<div style="width: 20px; height: 20px; margin: 10px; background: #ddd; cursor: url(resizeUpCursor.cur), default">resizeUpCursor</div>
-</body>
-</html>
-