Fixed race condition when editing table cells

Previously, when double-clicking on a table cell to edit it, there was a possibility of a race condition. A refresh of the display was requested, then the run loop was passed through once. But it was possible for the display refresh to not be queued when the run loop was passed through, in which case the refresh would cancel the editing. Or at least I think that's what was happening.  ;-)

This commit (hopefully) eliminates the race condition by synchronously refreshing the layout and display.

Made some miscellaneous formatting fixes as well.

AppKit/AppKit.j

@@ -20,12 +20,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+@import "_CPObject+Theme.j"
 @import "_CPToolTip.j"
 @import "CALayer.j"
 @import "CGGeometry.j"
 @import "CPAccordionView.j"
 @import "CPAlert.j"
 @import "CPAnimation.j"
+@import "CPAppearance.j"
 @import "CPApplication.j"
 @import "CPArrayController.j"
 @import "CPBezierPath.j"
@@ -101,12 +103,14 @@
 @import "CPTokenField.j"
 @import "CPToolbar.j"
 @import "CPToolbarItem.j"
+@import "CPTrackingArea.j"
 @import "CPTreeNode.j"
 @import "CPUserDefaultsController.j"
 @import "CPView.j"
 @import "CPViewAnimation.j"
 @import "CPViewController.j"
+@import "CPVisualEffectView.j"
 @import "CPWebView.j"
 @import "CPWindow.j"
 @import "CPWindowController.j"
-@import "CPWorkspace.j"
+@import "CPWorkspace.j"

AppKit/CPAlert.j

@@ -821,12 +821,12 @@ var bottomHeight = 71;
     else if (_modalDelegate)
     {
         if (_didEndSelector)
-            objj_msgSend(_modalDelegate, _didEndSelector, self, returnCode, contextInfo);
+            _modalDelegate.isa.objj_msgSend3(_modalDelegate, _didEndSelector, self, returnCode, contextInfo);
     }
     else if (_delegate)
     {
         if (_didEndSelector)
-            objj_msgSend(_delegate, _didEndSelector, self, returnCode);
+            _delegate.isa.objj_msgSend2(_delegate, _didEndSelector, self, returnCode);
         else
             [self _sendDelegateAlertDidEndReturnCode:returnCode];
     }

AppKit/CPAppearance.j

@@ -0,0 +1,162 @@
+/*
+ * CPAppearance.j
+ * AppKit
+ *
+ * Created by Antoine Mercadal.
+ * Copyright 2015, Cappuccino Project.
+ *
+ * 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/Foundation.j>
+@import "CPTheme.j"
+
+CPAppearanceNameAqua         = @"CPAppearanceNameAqua";
+CPAppearanceNameLightContent = @"CPAppearanceNameLightContent";
+CPAppearanceNameVibrantDark  = @"CPAppearanceNameVibrantDark";
+CPAppearanceNameVibrantLight = @"CPAppearanceNameVibrantLight";
+
+var _CPAppearanceCurrent = nil,
+    _CPAppearancesRegistry = @{};
+
+
+@protocol CPAppearanceCustomization <CPObject>
+
+@required
+- (CPAppearance)appearance;
+- (void)setAppearance:(CPAppearance)appearance;
+- (CPAppearance)effectiveAppearance;
+- (void)setEffectiveAppearance:(CPAppearance)appearance;
+
+@end
+
+CPThemeStateAppearanceAqua             = CPThemeState("appearance-aqua");
+CPThemeStateAppearanceLightContent     = CPThemeState("appearance-light-content");
+CPThemeStateAppearanceVibrantLight     = CPThemeState("appearance-vibrant-light");
+CPThemeStateAppearanceVibrantDark      = CPThemeState("appearance-vibrant-dark");
+
+
+/*!
+    @ingroup appkit
+
+    A CPAppareance represents the appearance of an to a subset of UI elements.
+    This is a very lightweight implementation of the NSAppearance system, but
+    We are using it for compliance, and especially for the CPVisualEffectView
+*/
+@implementation CPAppearance : CPObject
+{
+    BOOL            _allowsVibrancy     @accessors(property=allowsVibrancy);
+
+    CPString        _name;
+}
+
+
+#pragma mark -
+#pragma mark Class Methods
+
+/*! Returns the current default CPAppearance
+*/
++ (CPAppearance)currentAppearance
+{
+    if (!_CPAppearanceCurrent)
+        _CPAppearanceCurrent = [CPAppearance appearanceNamed:CPAppearanceNameAqua];
+
+    return _CPAppearanceCurrent;
+}
+
+/*! Sets the current default CPAppearance
+    @param appearance the new current appearance
+*/
++ (void)setCurrentAppearance:(CPAppearance)anAppearance
+{
+    _CPAppearanceCurrent = anAppearance;
+}
+
+/*! Returns the CPAppearance object with the given name
+    @param name the name of the appearance
+*/
++ (CPAppearance)appearanceNamed:(CPString)aName
+{
+    if (![_CPAppearancesRegistry containsKey:aName])
+    {
+        [_CPAppearancesRegistry setObject:[[CPAppearance alloc] initWithAppearanceNamed:aName bundle:nil]
+                                   forKey:aName];
+    }
+
+    return [_CPAppearancesRegistry objectForKey:aName];
+}
+
+
+#pragma mark -
+#pragma mark Initialization
+
+/*! Creates a CPAppearance object initialized to the specified appearance file in the specified bundle
+    This method does actually nothing special. It just creates a default appearance object
+*/
+- (id)initWithAppearanceNamed:(CPString)aName bundle:(CPBundle)bundle
+{
+    if (self = [super init])
+    {
+        _name = aName;
+        _allowsVibrancy = YES;
+
+        if ([_CPAppearancesRegistry containsKey:aName])
+            [CPException raise:CPInternalInconsistencyException reason:"Appearance with name '" + aName + "' is already declared."];
+
+        [_CPAppearancesRegistry setObject:self forKey:aName];
+    }
+
+    return self;
+}
+
+
+#pragma mark -
+#pragma mark Implementation
+
+- (BOOL)isEqual:(id)anObject
+{
+    if (![anObject isKindOfClass:CPAppearance])
+        return NO;
+
+    return self._name == anObject._name;
+}
+
+- (CPString)description
+{
+    return @"<CPAppearance @" + [self UID] + @" name: " + _name + ">";
+}
+
+
+#pragma mark -
+#pragma mark CPCoding
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    if (self = [super init])
+    {
+        _name           = [aCoder decodeObjectForKey:@"_name"];
+        _allowsVibrancy = [aCoder decodeBoolForKey:@"_allowsVibrancy"];
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [aCoder encodeObject:_name forKey:@"_name"];
+    [aCoder encodeBool:_allowsVibrancy forKey:@"_allowsVibrancy"];
+}
+
+@end

AppKit/CPApplication.j

@@ -47,6 +47,8 @@ var CPMainCibFile               = @"CPMainCibFile",
 @protocol CPApplicationDelegate <CPObject>
 
 @optional
+- (CPApplicationTerminateReply)applicationShouldTerminate:(CPApplication)sender;
+- (CPString)applicationShouldTerminateMessage:(CPApplication)sender;
 - (void)applicationDidBecomeActive:(CPNotification)aNotification;
 - (void)applicationDidChangeScreenParameters:(CPNotification)aNotification;
 - (void)applicationDidFinishLaunching:(CPNotification)aNotification;
@@ -58,6 +60,9 @@ var CPMainCibFile               = @"CPMainCibFile",
 
 @end
 
+var CPApplicationDelegate_applicationShouldTerminate_           = 1 << 0,
+    CPApplicationDelegate_applicationShouldTerminateMessage_    = 1 << 1;
+
 /*!
     @ingroup appkit
     @class CPApplication
@@ -103,6 +108,8 @@ var CPMainCibFile               = @"CPMainCibFile",
 
     //
     id <CPApplicationDelegate>  _delegate;
+    CPInteger                   _implementedDelegateMethods;
+
     BOOL                        _finishedLaunching;
     BOOL                        _isActive;
 
@@ -165,6 +172,8 @@ var CPMainCibFile               = @"CPMainCibFile",
     if (_delegate == aDelegate)
         return;
 
+    _implementedDelegateMethods = 0;
+
     var defaultCenter = [CPNotificationCenter defaultCenter],
         delegateNotifications =
         [
@@ -205,6 +214,12 @@ var CPMainCibFile               = @"CPMainCibFile",
         if ([_delegate respondsToSelector:selector])
             [defaultCenter addObserver:_delegate selector:selector name:notificationName object:self];
     }
+
+    if ([_delegate respondsToSelector:@selector(applicationShouldTerminate:)])
+        _implementedDelegateMethods |= CPApplicationDelegate_applicationShouldTerminate_
+
+    if ([_delegate respondsToSelector:@selector(applicationShouldTerminateMessage:)])
+        _implementedDelegateMethods |= CPApplicationDelegate_applicationShouldTerminateMessage_
 }
 
 /*!
@@ -426,12 +441,7 @@ var CPMainCibFile               = @"CPMainCibFile",
 {
     // callback method for terminate:
     if (didCloseAll)
-    {
-        if ([_delegate respondsToSelector:@selector(applicationShouldTerminate:)])
-            [self replyToApplicationShouldTerminate:[_delegate applicationShouldTerminate:self]];
-        else
-            [self replyToApplicationShouldTerminate:YES];
-    }
+        [self replyToApplicationShouldTerminate:[self _sendDelegateApplicationShouldTerminate]];
 }
 
 - (void)replyToApplicationShouldTerminate:(BOOL)terminate
@@ -445,6 +455,9 @@ var CPMainCibFile               = @"CPMainCibFile",
 
 - (void)activateIgnoringOtherApps:(BOOL)shouldIgnoreOtherApps
 {
+    if (_isActive)
+        return;
+
     [self _willBecomeActive];
 
     [CPPlatform activateIgnoringOtherApps:shouldIgnoreOtherApps];
@@ -455,6 +468,9 @@ var CPMainCibFile               = @"CPMainCibFile",
 
 - (void)deactivate
 {
+    if (!_isActive)
+        return;
+
     [self _willResignActive];
 
     [CPPlatform deactivate];
@@ -480,6 +496,15 @@ var CPMainCibFile               = @"CPMainCibFile",
 - (void)run
 {
     [self finishLaunching];
+    [self sendEvent:[CPEvent otherEventWithType:CPAppKitDefined
+                                       location:CGPointMakeZero()
+                                  modifierFlags:0
+                                      timestamp:[CPEvent currentTimestamp]
+                                   windowNumber:[_keyWindow windowNumber]
+                                        context:nil
+                                        subtype:nil
+                                          data1:nil
+                                          data2:nil]];
 }
 
 // Managing the Event Loop
@@ -959,7 +984,7 @@ var CPMainCibFile               = @"CPMainCibFile",
 */
 - (void)setTarget:(id)aTarget selector:(SEL)aSelector forNextEventMatchingMask:(unsigned int)aMask untilDate:(CPDate)anExpiration inMode:(CPString)aMode dequeue:(BOOL)shouldDequeue
 {
-    _eventListeners.splice(_eventListenerInsertionIndex++, 0, _CPEventListenerMake(aMask, function (anEvent) { objj_msgSend(aTarget, aSelector, anEvent); }, shouldDequeue));
+    _eventListeners.splice(_eventListenerInsertionIndex++, 0, _CPEventListenerMake(aMask, function (anEvent) { if (aTarget != null) aTarget.isa.objj_msgSend1(aTarget, aSelector, anEvent); }, shouldDequeue));
 }
 
 /*!
@@ -1195,6 +1220,22 @@ var CPMainCibFile               = @"CPMainCibFile",
                                                       userInfo:nil];
 }
 
+- (BOOL)_sendDelegateApplicationShouldTerminate
+{
+    if (!(_implementedDelegateMethods & CPApplicationDelegate_applicationShouldTerminate_))
+        return YES;
+
+    return [_delegate applicationShouldTerminate:self];
+}
+
+- (CPString)_sendDelegateApplicationShouldTerminateMessage
+{
+    if (!(_implementedDelegateMethods & CPApplicationDelegate_applicationShouldTerminateMessage_))
+        return @"You have attempted to leave this page. Are you sure you want to exit this page?";
+
+    return [_delegate applicationShouldTerminateMessage:self];
+}
+
 - (void)_didResignActive
 {
     if (self._activeMenu)
@@ -1317,7 +1358,7 @@ var _CPAppBootstrapperActions = nil;
     {
         var action = _CPAppBootstrapperActions.shift();
 
-        if (objj_msgSend(self, action))
+        if (self.isa.objj_msgSend0(self, action))
             return;
     }
 

AppKit/CPApplication_Constants.j

@@ -31,6 +31,7 @@ CPApplicationWillResignActiveNotification           = @"CPApplicationWillResignA
 CPApplicationDidResignActiveNotification            = @"CPApplicationDidResignActiveNotification";
 CPApplicationDidChangeScreenParametersNotification  = @"CPApplicationDidChangeScreenParametersNotification";
 
+@typedef CPApplicationTerminateReply
 CPTerminateNow      = YES;
 CPTerminateCancel   = NO;
 CPTerminateLater    = -1; // not currently supported

AppKit/CPButton.j

@@ -280,7 +280,7 @@ CPButtonImageOffset   = 3.0;
             break;
 
         case CPOffState:
-            [self unsetThemeState:[CPThemeStateSelected, CPButtonStateMixed, CPThemeStateHighlighted]];
+            [self unsetThemeStates:[CPThemeStateSelected, CPButtonStateMixed, CPThemeStateHighlighted]];
     }
 }
 
@@ -665,10 +665,10 @@ CPButtonImageOffset   = 3.0;
 */
 - (void)sizeToFit
 {
-    [self setFrameSize:[self _minimumFrameSize]];
-
     [self layoutSubviews];
 
+    [self setFrameSize:[self _minimumFrameSize]];
+
     if ([self ephemeralSubviewNamed:@"content-view"])
         [self layoutSubviews];
 }

AppKit/CPButtonBar.j

@@ -112,6 +112,8 @@
 
 - (void)awakeFromCib
 {
+    [super awakeFromCib];
+
     var view = [self superview],
         subview = self;
 
@@ -270,15 +272,15 @@
             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:normalColor forThemeAttribute:@"bezel-color" inStates:[CPThemeStateNormal, CPThemeStateBordered]];
+        [button setValue:highlightedColor forThemeAttribute:@"bezel-color" inStates:[CPThemeStateHighlighted,  CPThemeStateBordered, ]];
+        [button setValue:disabledColor forThemeAttribute:@"bezel-color" inStates:[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]];
+        [button setValue:normalColor forThemeAttribute:@"bezel-color" inStates:[CPThemeStateNormal, CPThemeStateBordered, CPPopUpButtonStatePullsDown]];
+        [button setValue:highlightedColor forThemeAttribute:@"bezel-color" inStates:[CPThemeStateHighlighted, CPThemeStateBordered, CPPopUpButtonStatePullsDown]];
+        [button setValue:disabledColor forThemeAttribute:@"bezel-color" inStates:[CPThemeStateDisabled, CPThemeStateBordered, CPPopUpButtonStatePullsDown]];
 
         [self addSubview:button];
     }

AppKit/CPClipView.j

@@ -195,7 +195,7 @@
 
 - (CGRect)documentVisibleRect
 {
-    return [self convertRect:[self bounds] fromView:_documentView];
+    return [_documentView visibleRect];
 }
 
 @end

AppKit/CPCollectionView.j

@@ -60,6 +60,8 @@ var CPCollectionViewDelegate_collectionView_acceptDrop_index_dropOperation_
 
 @end
 
+var HORIZONTAL_MARGIN = 2;
+
 /*!
     @ingroup appkit
     @class CPCollectionView
@@ -88,9 +90,6 @@ var CPCollectionViewDelegate_collectionView_acceptDrop_index_dropOperation_
     @param indices the indices to obtain drag types
     @return an array of drag types (CPString)
 */
-
-var HORIZONTAL_MARGIN = 2;
-
 @implementation CPCollectionView : CPView
 {
     CPArray                         _content;

AppKit/CPColor.j

@@ -25,6 +25,7 @@
 
 @import "CGColor.j"
 
+@import "_CPObject+Theme.j"
 @import "CPCompatibility.j"
 @import "CPImage.j"
 
@@ -65,7 +66,8 @@ var cachedBlackColor,
     cachedOrangeColor,
     cachedPurpleColor,
     cachedShadowColor,
-    cachedClearColor;
+    cachedClearColor,
+    cachedThemeColor;
 
 /// @endcond
 
@@ -78,7 +80,7 @@ var cachedBlackColor,
     <p>It also provides some class helper methods that
     returns instances of commonly used colors.</p>
 */
-@implementation CPColor : CPObject
+@implementation CPColor : CPObject <CPTheme>
 {
     CPArray     _components;
 
@@ -86,6 +88,27 @@ var cachedBlackColor,
     CPString    _cssString;
 }
 
+
+#pragma mark -
+#pragma mark Theming
+
++ (CPString)defaultThemeClass
+{
+    return "color";
+}
+
++ (CPDictionary)themeAttributes
+{
+    return @{
+            @"alternate-selected-control-color": [CPNull null],
+            @"secondary-selected-control-color" : [CPNull null]
+        };
+}
+
+
+#pragma mark -
+#pragma mark Static methods
+
 /*!
     Creates a color in the RGB colorspace, with an alpha value.
     Each component should be between the range of 0.0 to 1.0. For
@@ -436,14 +459,22 @@ var cachedBlackColor,
     return cachedClearColor;
 }
 
++ (CPColor)_cachedThemeColor
+{
+    if (!cachedThemeColor)
+        cachedThemeColor = [self colorWithCalibratedWhite:0.0 alpha:0.0];
+
+    return cachedThemeColor;
+}
+
 + (CPColor)alternateSelectedControlColor
 {
-    return [[CPColor alloc] _initWithRGBA:[0.22, 0.46, 0.84, 1.0]];
+    return [[self _cachedThemeColor] valueForThemeAttribute:@"alternate-selected-control-color"];
 }
 
 + (CPColor)secondarySelectedControlColor
 {
-    return [[CPColor alloc] _initWithRGBA:[0.83, 0.83, 0.83, 1.0]];
+    return [[self _cachedThemeColor] valueForThemeAttribute:@"secondary-selected-control-color"];
 }
 
 /*!
@@ -489,6 +520,10 @@ var cachedBlackColor,
     // use it (issue #1413.)
     [self _initCSSStringFromComponents];
 
+    _theme = [CPTheme defaultTheme];
+    _themeState = CPThemeStateNormal;
+    [self _loadThemeAttributes];
+
     return self;
 }
 
@@ -502,6 +537,10 @@ var cachedBlackColor,
         _components = components;
 
         [self _initCSSStringFromComponents];
+
+        _theme = [CPTheme defaultTheme];
+        _themeState = CPThemeStateNormal;
+        [self _loadThemeAttributes];
     }
 
     return self;
@@ -528,6 +567,10 @@ var cachedBlackColor,
         _patternImage = anImage;
         _cssString = "url(\"" + [_patternImage filename] + "\")";
         _components = [0.0, 0.0, 0.0, 1.0];
+
+        _theme = [CPTheme defaultTheme];
+        _themeState = CPThemeStateNormal;
+        [self _loadThemeAttributes];
     }
 
     return self;
@@ -835,9 +878,13 @@ var CPColorComponentsKey    = @"CPColorComponentsKey",
 - (id)initWithCoder:(CPCoder)aCoder
 {
     if ([aCoder containsValueForKey:CPColorPatternImageKey])
-        return [self _initWithPatternImage:[aCoder decodeObjectForKey:CPColorPatternImageKey]];
+        self = [self _initWithPatternImage:[aCoder decodeObjectForKey:CPColorPatternImageKey]];
+    else
+        self = [self _initWithRGBA:[aCoder decodeObjectForKey:CPColorComponentsKey]];
 
-    return [self _initWithRGBA:[aCoder decodeObjectForKey:CPColorComponentsKey]];
+    [self _decodeThemeObjectsWithCoder:aCoder];
+
+    return self;
 }
 
 /*!
@@ -850,6 +897,8 @@ var CPColorComponentsKey    = @"CPColorComponentsKey",
         [aCoder encodeObject:_patternImage forKey:CPColorPatternImageKey];
     else
         [aCoder encodeObject:_components forKey:CPColorComponentsKey];
+
+    [self _encodeThemeObjectsWithCoder:aCoder];
 }
 
 @end

AppKit/CPColorPanel.j

@@ -71,7 +71,6 @@ var SharedColorPanel = nil,
 */
 @implementation CPColorPanel : CPPanel
 {
-    _CPColorPanelToolbar    _toolbar;
     _CPColorPanelSwatches   _swatchView;
     _CPColorPanelPreview    _previewView;
 

AppKit/CPComboBox.j

@@ -74,7 +74,7 @@ var CPComboBoxTextSubview = @"text",
     BOOL                        _usesDataSource;
     CGSize                      _intercellSpacing;
     CPArray                     _items;
-    id<CPComboBoxDataSource>    _dataSource;
+    id <CPComboBoxDataSource>   _dataSource;
     CPInteger                   _implementedDelegateComboBoxMethods;
     CPString                    _selectedStringValue;
     float                       _itemHeight;
@@ -843,7 +843,17 @@ var CPComboBoxTextSubview = @"text",
         // In FireFox this needs to be done in setTimeout, otherwise there is no caret
         // We have to save the input element now, when we lose focus it will change.
         var element = [self _inputElement];
-        window.setTimeout(function() { element.focus(); }, 0);
+
+        [[CPRunLoop mainRunLoop] performBlock:function()
+        {
+            // This will prevent to jump to the focused element
+            var previousScrollingOrigin = [self _scrollToVisibleRectAndReturnPreviousOrigin];
+
+            element.focus();
+
+            [self _restorePreviousScrollingOrigin:previousScrollingOrigin];
+
+        } argument:nil order:0 modes:[CPDefaultRunLoopMode]];
 #endif
 
         return NO;

AppKit/CPCompatibility.j

@@ -438,3 +438,12 @@ function CPBrowserCSSProperty(aProperty)
 
     return browserProperty.toLowerCase();
 }
+
+function CPBrowserBackingStorePixelRatio(context)
+{
+    return  context.webkitBackingStorePixelRatio ||
+            context.mozBackingStorePixelRatio ||
+            context.msBackingStorePixelRatio ||
+            context.oBackingStorePixelRatio ||
+            context.backingStorePixelRatio || 1;
+}

AppKit/CPControl.j

@@ -27,6 +27,7 @@
 @import "CPShadow.j"
 @import "CPView.j"
 @import "CPKeyValueBinding.j"
+@import "CPTrackingArea.j"
 
 @global CPApp
 
@@ -42,13 +43,6 @@
 
 @end
 
-@typedef CPTextAlignment
-CPLeftTextAlignment      = 0;
-CPRightTextAlignment     = 1;
-CPCenterTextAlignment    = 2;
-CPJustifiedTextAlignment = 3;
-CPNaturalTextAlignment   = 4;
-
 @typedef CPControlSize
 CPRegularControlSize = 0;
 CPSmallControlSize   = 1;
@@ -126,6 +120,8 @@ var CPControlBlackColor = [CPColor blackColor];
     CGPoint             _previousTrackingLocation;
 
     CPControlSize       _controlSize;
+
+    CPWritingDirection  _baseWritingDirection   @accessors(property=baseWritingDirection);
 }
 
 + (CPDictionary)themeAttributes
@@ -205,7 +201,6 @@ var CPControlBlackColor = [CPColor blackColor];
     return self;
 }
 
-
 #pragma mark -
 #pragma mark Control Size
 
@@ -240,7 +235,7 @@ var CPControlBlackColor = [CPColor blackColor];
 */
 - (ThemeState)_controlSizeThemeState
 {
-    switch(_controlSize)
+    switch (_controlSize)
     {
         case CPSmallControlSize:
             return CPThemeStateControlSizeSmall;
@@ -1016,6 +1011,62 @@ var CPControlBlackColor = [CPColor blackColor];
     return [self hasThemeState:CPThemeStateHighlighted];
 }
 
+
+#pragma mark -
+#pragma mark Base writing direction
+
+/*!
+    Sets the initial writing direction of the receiver
+    @param writingDirection - It could be CPWritingDirectionNatural, CPWritingDirectionLeftToRight, CPWritingDirectionRightToLeft
+*/
+- (void)setBaseWritingDirection:(CPWritingDirection)writingDirection
+{
+    if (writingDirection == _baseWritingDirection)
+        return;
+
+    [self willChangeValueForKey:@"baseWritingDirection"];
+    _baseWritingDirection = writingDirection;
+    [self didChangeValueForKey:@"baseWritingDirection"];
+
+#if PLATFORM(DOM)
+
+    var style;
+
+    switch (_baseWritingDirection)
+    {
+        case CPWritingDirectionNatural:
+            style = "initial";
+            break;
+
+        case CPWritingDirectionLeftToRight:
+            style = "ltr";
+            break;
+
+        case CPWritingDirectionRightToLeft:
+            style = "rtl";
+            break;
+
+        default:
+            style = "initial";
+    }
+
+    _DOMElement.style.direction = style;
+#endif
+}
+
+@end
+
+@implementation CPControl (CPTrackingArea)
+
+- (void)updateTrackingAreas
+{
+    [self removeAllTrackingAreas];
+    [self addTrackingArea:[[CPTrackingArea alloc] initWithRect:CGRectMakeZero()
+                                                       options:CPTrackingMouseEnteredAndExited | CPTrackingActiveInKeyWindow | CPTrackingInVisibleRect
+                                                         owner:self
+                                                      userInfo:nil]];
+}
+
 @end
 
 var CPControlActionKey                  = @"CPControlActionKey",
@@ -1027,6 +1078,7 @@ var CPControlActionKey                  = @"CPControlActionKey",
     CPControlSendsActionOnEndEditingKey = @"CPControlSendsActionOnEndEditingKey",
     CPControlTargetKey                  = @"CPControlTargetKey",
     CPControlValueKey                   = @"CPControlValueKey",
+    CPControlBaseWrittingDirectionKey   = @"CPControlBaseWrittingDirectionKey";
 
     __Deprecated__CPImageViewImageKey   = @"CPImageViewImageKey";
 
@@ -1055,6 +1107,8 @@ var CPControlActionKey                  = @"CPControlActionKey",
         [self setFormatter:[aCoder decodeObjectForKey:CPControlFormatterKey]];
 
         [self setControlSize:[aCoder decodeIntForKey:CPControlControlSizeKey]];
+
+        [self setBaseWritingDirection:[aCoder decodeIntForKey:CPControlBaseWrittingDirectionKey]];
     }
 
     return self;
@@ -1089,6 +1143,9 @@ var CPControlActionKey                  = @"CPControlActionKey",
         [aCoder encodeObject:_formatter forKey:CPControlFormatterKey];
 
     [aCoder encodeInt:_controlSize forKey:CPControlControlSizeKey];
+
+    [aCoder encodeInt:_baseWritingDirection forKey:CPControlBaseWrittingDirectionKey];
+
 }
 
 @end

AppKit/CPCursor.j

@@ -123,6 +123,9 @@ var currentCursor = nil,
 
 - (void)set
 {
+    if (currentCursor === self)
+        return;
+    
     currentCursor = self;
 
 #if PLATFORM(DOM)

AppKit/CPDatePicker/CPDatePicker.j

@@ -323,6 +323,14 @@ CPEraDatePickerElementFlag              = 0x0100;
 */
 - (void)_setDateValue:(CPDate)aDateValue timeInterval:(CPTimeInterval)aTimeInterval
 {
+    // Make sure to have a valid date and avoid NaN values
+    if (!isFinite(aDateValue))
+    {
+        [CPException raise:CPInvalidArgumentException
+                    reason:@"aDateValue is not valid"];
+        return;
+    }
+
     if (_minDate)
         aDateValue = new Date (MAX(aDateValue, _minDate));
 
@@ -622,14 +630,6 @@ CPEraDatePickerElementFlag              = 0x0100;
     return [[_locale objectForKey:CPLocaleCountryCode] isEqualToString:@"US"];
 }
 
-/*! Check if we are in the english format or not. Depending on the locale
-*/
-- (BOOL)_isEnglishFormat
-{
-    return [[_locale objectForKey:CPLocaleLanguageCode] isEqualToString:@"en"];
-}
-
-
 #pragma mark -
 #pragma mark Key event
 

AppKit/CPDatePicker/_CPDatePickerCalendar.j

@@ -1114,30 +1114,30 @@ var CPShortWeekDayNameArrayEn = [@"Mo", @"Tu", @"We", @"Th", @"Fr", @"Sa", @"Su"
         [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-color" inState:CPThemeStateDisabled] forThemeAttribute:@"text-shadow-color" inState:CPThemeStateDisabled];
         [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-offset" inState:CPThemeStateDisabled] forThemeAttribute:@"text-shadow-offset" inState:CPThemeStateDisabled];
 
-        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-font" inState:[CPThemeStateDisabled, CPThemeStateSelected]] forThemeAttribute:@"font" inState:[CPThemeStateDisabled, CPThemeStateSelected]];
-        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-color" inState:[CPThemeStateDisabled, CPThemeStateSelected]]forThemeAttribute:@"text-color" inState:[CPThemeStateDisabled, CPThemeStateSelected]];
-        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-color" inState:[CPThemeStateDisabled, CPThemeStateSelected]] forThemeAttribute:@"text-shadow-color" inState:[CPThemeStateDisabled, CPThemeStateSelected]];
-        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-offset" inState:[CPThemeStateDisabled, CPThemeStateSelected]] forThemeAttribute:@"text-shadow-offset" inState:[CPThemeStateDisabled, CPThemeStateSelected]];
+        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-font" inStates:[CPThemeStateDisabled, CPThemeStateSelected]] forThemeAttribute:@"font" inStates:[CPThemeStateDisabled, CPThemeStateSelected]];
+        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-color" inStates:[CPThemeStateDisabled, CPThemeStateSelected]]forThemeAttribute:@"text-color" inStates:[CPThemeStateDisabled, CPThemeStateSelected]];
+        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-color" inStates:[CPThemeStateDisabled, CPThemeStateSelected]] forThemeAttribute:@"text-shadow-color" inStates:[CPThemeStateDisabled, CPThemeStateSelected]];
+        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-offset" inStates:[CPThemeStateDisabled, CPThemeStateSelected]] forThemeAttribute:@"text-shadow-offset" inStates:[CPThemeStateDisabled, CPThemeStateSelected]];
 
         [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-font" inState:CPThemeStateHighlighted] forThemeAttribute:@"font" inState:CPThemeStateHighlighted];
         [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-color" inState:CPThemeStateHighlighted] forThemeAttribute:@"text-color" inState:CPThemeStateHighlighted];
         [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-color" inState:CPThemeStateHighlighted] forThemeAttribute:@"text-shadow-color" inState:CPThemeStateHighlighted];
         [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-offset" inState:CPThemeStateHighlighted] forThemeAttribute:@"text-shadow-offset" inState:CPThemeStateHighlighted];
 
-        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-font" inState:[CPThemeStateHighlighted, CPThemeStateSelected]] forThemeAttribute:@"font" inState:[CPThemeStateHighlighted, CPThemeStateSelected]];
-        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-color" inState:[CPThemeStateHighlighted, CPThemeStateSelected]] forThemeAttribute:@"text-color" inState:[CPThemeStateHighlighted, CPThemeStateSelected]];
-        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-color" inState:[CPThemeStateHighlighted, CPThemeStateSelected]] forThemeAttribute:@"text-shadow-color" inState:[CPThemeStateHighlighted, CPThemeStateSelected]];
-        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-offset" inState:[CPThemeStateHighlighted, CPThemeStateSelected]] forThemeAttribute:@"text-shadow-offset" inState:[CPThemeStateHighlighted, CPThemeStateSelected]];
+        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-font" inStates:[CPThemeStateHighlighted, CPThemeStateSelected]] forThemeAttribute:@"font" inStates:[CPThemeStateHighlighted, CPThemeStateSelected]];
+        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-color" inStates:[CPThemeStateHighlighted, CPThemeStateSelected]] forThemeAttribute:@"text-color" inStates:[CPThemeStateHighlighted, CPThemeStateSelected]];
+        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-color" inStates:[CPThemeStateHighlighted, CPThemeStateSelected]] forThemeAttribute:@"text-shadow-color" inStates:[CPThemeStateHighlighted, CPThemeStateSelected]];
+        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-offset" inStates:[CPThemeStateHighlighted, CPThemeStateSelected]] forThemeAttribute:@"text-shadow-offset" inStates:[CPThemeStateHighlighted, CPThemeStateSelected]];
 
-        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-font" inState:[CPThemeStateDisabled, CPThemeStateHighlighted, CPThemeStateSelected]] forThemeAttribute:@"font" inState:[CPThemeStateDisabled, CPThemeStateHighlighted, CPThemeStateSelected]];
-        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-color" inState:[CPThemeStateDisabled, CPThemeStateHighlighted, CPThemeStateSelected]] forThemeAttribute:@"text-color" inState:[CPThemeStateDisabled, CPThemeStateHighlighted, CPThemeStateSelected]];
-        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-color" inState:[CPThemeStateDisabled, CPThemeStateHighlighted, CPThemeStateSelected]] forThemeAttribute:@"text-shadow-color" inState:[CPThemeStateDisabled, CPThemeStateHighlighted, CPThemeStateSelected]];
-        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-offset" inState:[CPThemeStateDisabled, CPThemeStateHighlighted, CPThemeStateSelected]] forThemeAttribute:@"text-shadow-offset" inState:[CPThemeStateDisabled, CPThemeStateHighlighted, CPThemeStateSelected]];
+        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-font" inStates:[CPThemeStateDisabled, CPThemeStateHighlighted, CPThemeStateSelected]] forThemeAttribute:@"font" inStates:[CPThemeStateDisabled, CPThemeStateHighlighted, CPThemeStateSelected]];
+        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-color" inStates:[CPThemeStateDisabled, CPThemeStateHighlighted, CPThemeStateSelected]] forThemeAttribute:@"text-color" inStates:[CPThemeStateDisabled, CPThemeStateHighlighted, CPThemeStateSelected]];
+        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-color" inStates:[CPThemeStateDisabled, CPThemeStateHighlighted, CPThemeStateSelected]] forThemeAttribute:@"text-shadow-color" inStates:[CPThemeStateDisabled, CPThemeStateHighlighted, CPThemeStateSelected]];
+        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-offset" inStates:[CPThemeStateDisabled, CPThemeStateHighlighted, CPThemeStateSelected]] forThemeAttribute:@"text-shadow-offset" inStates:[CPThemeStateDisabled, CPThemeStateHighlighted, CPThemeStateSelected]];
 
-        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-font" inState:[CPThemeStateDisabled, CPThemeStateHighlighted]] forThemeAttribute:@"font" inState:[CPThemeStateDisabled, CPThemeStateHighlighted]];
-        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-color" inState:[CPThemeStateDisabled, CPThemeStateHighlighted]] forThemeAttribute:@"text-color" inState:[CPThemeStateDisabled, CPThemeStateHighlighted]];
-        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-color" inState:[CPThemeStateDisabled, CPThemeStateHighlighted]] forThemeAttribute:@"text-shadow-color" inState:[CPThemeStateDisabled, CPThemeStateHighlighted]];
-        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-offset" inState:[CPThemeStateDisabled, CPThemeStateHighlighted]] forThemeAttribute:@"text-shadow-offset" inState:[CPThemeStateDisabled, CPThemeStateHighlighted]];
+        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-font" inStates:[CPThemeStateDisabled, CPThemeStateHighlighted]] forThemeAttribute:@"font" inStates:[CPThemeStateDisabled, CPThemeStateHighlighted]];
+        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-color" inStates:[CPThemeStateDisabled, CPThemeStateHighlighted]] forThemeAttribute:@"text-color" inStates:[CPThemeStateDisabled, CPThemeStateHighlighted]];
+        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-color" inStates:[CPThemeStateDisabled, CPThemeStateHighlighted]] forThemeAttribute:@"text-shadow-color" inStates:[CPThemeStateDisabled, CPThemeStateHighlighted]];
+        [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-offset" inStates:[CPThemeStateDisabled, CPThemeStateHighlighted]] forThemeAttribute:@"text-shadow-offset" inStates:[CPThemeStateDisabled, CPThemeStateHighlighted]];
 
         [self addSubview:_textField];
 

AppKit/CPDatePicker/_CPDatePickerClock.j

@@ -139,7 +139,7 @@ var RADIANS = Math.PI / 180;
     [_minuteHandLayer setImage:[_datePicker currentValueForThemeAttribute:@"minute-hand-image"]];
     [_secondHandLayer setImage:[_datePicker currentValueForThemeAttribute:@"second-hand-image"]];
 
-    if ([_datePicker _isEnglishFormat])
+    if ([_datePicker _isAmericanFormat])
     {
         if (dateValue.getHours() > 11)
             [_PMAMTextField setStringValue:@"PM"]

AppKit/CPDatePicker/_CPDatePickerTextField.j

@@ -198,7 +198,6 @@ var CPZeroKeyCode = 48,
         else
             [self _selectTextField:_firstTextField];
     }
-
 }
 
 /*! Select a textField
@@ -277,74 +276,99 @@ var CPZeroKeyCode = 48,
     }
 }
 
-/*! performKeyEquivalent event
-    Used for moving in the textField
+/*!
+    PerformKeyEquivalent event
+    We need to override that to handle the tab key
 */
 - (BOOL)performKeyEquivalent:(CPEvent)anEvent
 {
     if (![self isEnabled] || !_currentTextField || [[self window] firstResponder] != _datePicker)
         return NO;
 
-    var key = [anEvent charactersIgnoringModifiers];
-
-    if (key == CPUpArrowFunctionKey)
+    if ([anEvent charactersIgnoringModifiers] === CPTabCharacter)
     {
-        [_currentTextField _invalidTimer];
-        [_stepper setDoubleValue:[_currentTextField intValue]];
-        [_stepper performClickUp:self];
+        if ([anEvent modifierFlags] & CPShiftKeyMask)
+            [self insertBacktab:self];
+        else
+            [self insertTab:self];
+
         return YES;
     }
-
-    if (key == CPDownArrowFunctionKey)
+    else if ([anEvent charactersIgnoringModifiers] === CPBackTabCharacter)
     {
-        [_currentTextField _invalidTimer];
-        [_stepper setDoubleValue:[_currentTextField intValue]];
-        [_stepper performClickDown:self];
+        [self insertBacktab:self];
         return YES;
     }
 
-    if (key == CPLeftArrowFunctionKey || [anEvent keyCode] == CPTabKeyCode && [anEvent modifierFlags] & CPShiftKeyMask)
-    {
-        if (_currentTextField == _firstTextField && [anEvent keyCode] == CPTabKeyCode)
-        {
-            var previousValidKeyView = [_datePicker previousValidKeyView];
-
-            if (previousValidKeyView)
-                [[self window] makeFirstResponder:previousValidKeyView];
-
-            return YES;
-        }
-
-        [self _selectTextField:[_currentTextField previousTextField]];
-        return YES;
-    }
-
-    if (key == CPRightArrowFunctionKey || [anEvent keyCode] == CPTabKeyCode)
-    {
-        if (_currentTextField == _lastTextField && [anEvent keyCode] == CPTabKeyCode)
-        {
-            var nextValidKeyView = [_datePicker nextValidKeyView];
-
-            if (nextValidKeyView)
-                [[self window] makeFirstResponder:nextValidKeyView];
-
-            return YES;
-        }
-
-        [self _selectTextField:[_currentTextField nextTextField]];
-        return YES;
-    }
-
-    if ([anEvent keyCode] == CPReturnKeyCode)
-    {
-        [_currentTextField _endEditing];
-
-        return [super performKeyEquivalent:anEvent];
-    }
-
     return [super performKeyEquivalent:anEvent];
 }
 
+- (void)insertTab:(id)sender
+{
+    if (!_currentTextField)
+        return;
+
+    if (_currentTextField == _lastTextField)
+        [[self window] selectNextKeyView:self];
+    else
+        [self moveRight:sender];
+}
+
+- (void)moveRight:(id)sender
+{
+    if (!_currentTextField)
+        return;
+
+    [self _selectTextField:[_currentTextField nextTextField]];
+}
+
+- (void)insertBacktab:(id)sender
+{
+    if (!_currentTextField)
+        return;
+
+    if (_currentTextField == _firstTextField)
+        [[self window] selectPreviousKeyView:self];
+    else
+        [self moveLeft:sender];
+}
+
+- (void)moveLeft:(id)sender
+{
+    if (!_currentTextField)
+        return;
+
+    [self _selectTextField:[_currentTextField previousTextField]];
+}
+
+- (void)moveDown:(id)sender
+{
+    if (!_currentTextField)
+        return;
+
+    [_currentTextField _invalidTimer];
+    [_stepper setDoubleValue:[_currentTextField intValue]];
+    [_stepper performClickDown:self];
+}
+
+- (void)moveUp:(id)sender
+{
+    if (!_currentTextField)
+        return;
+
+    [_currentTextField _invalidTimer];
+    [_stepper setDoubleValue:[_currentTextField intValue]];
+    [_stepper performClickUp:self];
+}
+
+- (void)insertNewline:(id)sender
+{
+    if (!_currentTextField)
+        return;
+
+    [_currentTextField _endEditing];
+}
+
 /*! KeyDown event
     We just care care about the event A/P and every numbers
 */
@@ -353,7 +377,9 @@ var CPZeroKeyCode = 48,
     if (![self isEnabled])
         return;
 
-    if ([_datePicker _isEnglishFormat] && [_currentTextField dateType] == CPAMPMDateType && ([anEvent keyCode] == CPAKeyCode || [anEvent keyCode] == CPPKeyCode || [anEvent keyCode] == CPMajAKeyCode || [anEvent keyCode] == CPMajPKeyCode))
+    [self interpretKeyEvents:[anEvent]];
+
+    if ([_datePicker _isAmericanFormat] && [_currentTextField dateType] == CPAMPMDateType && ([anEvent keyCode] == CPAKeyCode || [anEvent keyCode] == CPPKeyCode || [anEvent keyCode] == CPMajAKeyCode || [anEvent keyCode] == CPMajPKeyCode))
     {
         if ([anEvent keyCode] == CPAKeyCode || [anEvent keyCode] == CPMajAKeyCode)
             [_currentTextField setStringValue:@"AM"];
@@ -368,6 +394,7 @@ var CPZeroKeyCode = 48,
     [_currentTextField setValueForKeyEvent:anEvent];
 }
 
+
 #pragma mark -
 #pragma mark Layout methods
 
@@ -725,7 +752,7 @@ var CPZeroKeyCode = 48,
 
         if (hour != currentHour)
         {
-            if (([_datePicker _isEnglishFormat] || [_datePicker _isAmericanFormat]))
+            if ([_datePicker _isAmericanFormat])
             {
                 if (![self _isAMHour])
                 {
@@ -1050,7 +1077,7 @@ var CPZeroKeyCode = 48,
 - (void)_updateHiddenTextFields
 {
     var datePickerElements = [_datePicker datePickerElements],
-        isEnglishFormat = [_datePicker _isEnglishFormat];
+        isAmericanFormat = [_datePicker _isAmericanFormat];
 
     if (datePickerElements & CPYearMonthDatePickerElementFlag)
     {
@@ -1083,7 +1110,7 @@ var CPZeroKeyCode = 48,
         [_textFieldSeparatorThree setHidden:NO];
         [_textFieldSeparatorFour setHidden:YES];
 
-        if (isEnglishFormat)
+        if (isAmericanFormat)
             [_textFieldPMAM setHidden:NO];
         else
             [_textFieldPMAM setHidden:YES];
@@ -1115,9 +1142,9 @@ var CPZeroKeyCode = 48,
         verticalInset = contentInset.top - contentInset.bottom,
         firstTexField = _textFieldMonth,
         secondTextField = _textFieldDay,
-        isEnglishFormat = [_datePicker _isEnglishFormat];
+        isAmericanFormat = [_datePicker _isAmericanFormat];
 
-    if (!isEnglishFormat)
+    if (!isAmericanFormat)
     {
         firstTexField = _textFieldDay;
         secondTextField = _textFieldMonth;
@@ -1131,7 +1158,7 @@ var CPZeroKeyCode = 48,
     else
         [secondTextField setFrameOrigin:CGPointMake(CGRectGetMaxX([_textFieldSeparatorOne frame]) + separatorContentInset.right, verticalInset)];
 
-    if (isEnglishFormat && [secondTextField isHidden])
+    if (isAmericanFormat && [secondTextField isHidden])
         [_textFieldSeparatorTwo setFrameOrigin:CGPointMake(CGRectGetMaxX([firstTexField frame]) + separatorContentInset.left, verticalInset)];
     else
         [_textFieldSeparatorTwo setFrameOrigin:CGPointMake(CGRectGetMaxX([secondTextField frame]) + separatorContentInset.left, verticalInset)];
@@ -1206,7 +1233,7 @@ var CPZeroKeyCode = 48,
 {
     var datePickerElements = [_datePicker datePickerElements];
 
-    if ([_datePicker _isEnglishFormat])
+    if ([_datePicker _isAmericanFormat])
     {
         if (datePickerElements & CPYearMonthDayDatePickerElementFlag || datePickerElements & CPYearMonthDatePickerElementFlag)
             [[self superview] setFirstTextField:_textFieldMonth];
@@ -1249,9 +1276,9 @@ var CPZeroKeyCode = 48,
     var datePickerElements = [_datePicker datePickerElements],
         firstTexField = _textFieldMonth,
         secondTextField = _textFieldDay,
-        isEnglishFormat = [_datePicker _isEnglishFormat];
+        isAmericanFormat = [_datePicker _isAmericanFormat];
 
-    if (!isEnglishFormat)
+    if (!isAmericanFormat)
     {
         firstTexField = _textFieldDay;
         secondTextField = _textFieldMonth;
@@ -1266,7 +1293,7 @@ var CPZeroKeyCode = 48,
 
     if (datePickerElements & CPHourMinuteSecondDatePickerElementFlag || datePickerElements & CPHourMinuteDatePickerElementFlag)
         [_textFieldYear setNextTextField:_textFieldHour];
-    else if (isEnglishFormat || (datePickerElements & CPYearMonthDayDatePickerElementFlag) == CPYearMonthDayDatePickerElementFlag)
+    else if (isAmericanFormat || (datePickerElements & CPYearMonthDayDatePickerElementFlag) == CPYearMonthDayDatePickerElementFlag)
         [_textFieldYear setNextTextField:firstTexField];
     else
         [_textFieldYear setNextTextField:secondTextField];
@@ -1275,7 +1302,7 @@ var CPZeroKeyCode = 48,
 
     if ((datePickerElements & CPHourMinuteSecondDatePickerElementFlag) == CPHourMinuteSecondDatePickerElementFlag)
         [_textFieldMinute setNextTextField:_textFieldSecond];
-    else if (isEnglishFormat)
+    else if (isAmericanFormat)
         [_textFieldMinute setNextTextField:_textFieldPMAM];
     else if ((datePickerElements & CPYearMonthDayDatePickerElementFlag) == CPYearMonthDayDatePickerElementFlag)
         [_textFieldMinute setNextTextField:firstTexField];
@@ -1284,7 +1311,7 @@ var CPZeroKeyCode = 48,
     else
         [_textFieldMinute setNextTextField:_textFieldHour];
 
-    if (isEnglishFormat)
+    if (isAmericanFormat)
         [_textFieldSecond setNextTextField:_textFieldPMAM];
     else if ((datePickerElements & CPYearMonthDayDatePickerElementFlag) == CPYearMonthDayDatePickerElementFlag)
         [_textFieldSecond setNextTextField:firstTexField];
@@ -1304,9 +1331,9 @@ var CPZeroKeyCode = 48,
     var datePickerElements = [_datePicker datePickerElements],
         firstTexField = _textFieldMonth,
         secondTextField = _textFieldDay,
-        isEnglishFormat = [_datePicker _isEnglishFormat];
+        isAmericanFormat = [_datePicker _isAmericanFormat];
 
-    if (!isEnglishFormat)
+    if (!isAmericanFormat)
     {
         firstTexField = _textFieldDay;
         secondTextField = _textFieldMonth;
@@ -1322,14 +1349,14 @@ var CPZeroKeyCode = 48,
 
     if (datePickerElements & CPYearMonthDatePickerElementFlag)
         [_textFieldHour setPreviousTextField:_textFieldYear];
-    else if (isEnglishFormat)
+    else if (isAmericanFormat)
         [_textFieldHour setPreviousTextField:_textFieldPMAM];
     else if ((datePickerElements & CPHourMinuteSecondDatePickerElementFlag) == CPHourMinuteSecondDatePickerElementFlag)
         [_textFieldHour setPreviousTextField:_textFieldSecond];
     else
         [_textFieldHour setPreviousTextField:_textFieldMinute];
 
-    if (!isEnglishFormat)
+    if (!isAmericanFormat)
         [_textFieldYear setPreviousTextField:_textFieldMonth];
     else if ((datePickerElements & CPYearMonthDayDatePickerElementFlag) == CPYearMonthDayDatePickerElementFlag)
         [_textFieldYear setPreviousTextField:_textFieldDay];
@@ -1338,7 +1365,7 @@ var CPZeroKeyCode = 48,
 
     [secondTextField setPreviousTextField:firstTexField];
 
-    if (isEnglishFormat && datePickerElements & CPHourMinuteDatePickerElementFlag)
+    if (isAmericanFormat && datePickerElements & CPHourMinuteDatePickerElementFlag)
         [firstTexField setPreviousTextField:_textFieldPMAM];
     else if ((datePickerElements & CPHourMinuteSecondDatePickerElementFlag) == CPHourMinuteSecondDatePickerElementFlag)
         [firstTexField setPreviousTextField:_textFieldSecond];
@@ -1530,7 +1557,7 @@ var CPMonthDateType = 0,
         }
     }
 
-    if (parseInt(newValue) > [self _maxNumberWithMaxDate] || ([_datePicker _isEnglishFormat] && _dateType == CPHourDateType && parseInt(newValue) > 12))
+    if (parseInt(newValue) > [self _maxNumberWithMaxDate] || ([_datePicker _isAmericanFormat] && _dateType == CPHourDateType && parseInt(newValue) > 12))
         return;
 
     _firstEvent = NO;
@@ -1549,7 +1576,7 @@ var CPMonthDateType = 0,
 
     if ([stringValue length])
     {
-        if ([_datePicker _isEnglishFormat] && [self dateType] == CPHourDateType)
+        if ([_datePicker _isAmericanFormat] && [self dateType] == CPHourDateType)
         {
             var isAMHour = [[self superview] _isAMHour];
 
@@ -1593,7 +1620,7 @@ var CPMonthDateType = 0,
     if (![objectValue length])
         objectValue = [self objectValue];
 
-    if ([_datePicker _isEnglishFormat] && [self dateType] == CPHourDateType)
+    if ([_datePicker _isAmericanFormat] && [self dateType] == CPHourDateType)
     {
         var isAMHour = [[self superview] _isAMHour];
 
@@ -1621,7 +1648,7 @@ var CPMonthDateType = 0,
     }
     else if (_dateType != CPAMPMDateType)
     {
-        if (_dateType == CPHourDateType && [_datePicker _isEnglishFormat])
+        if (_dateType == CPHourDateType && [_datePicker _isAmericanFormat])
         {
             var value = parseInt(aStringValue);
 

AppKit/CPDocument.j

@@ -515,7 +515,9 @@ var CPDocumentUntitledCount = 0;
 
         alert("There was an error retrieving the document.");
 
-        objj_msgSend(session.delegate, session.didReadSelector, self, NO, session.contextInfo);
+        var theDelegate = session.delegate;
+
+        theDelegate.isa.objj_msgSend3(theDelegate, session.didReadSelector, self, NO, session.contextInfo);
     }
     else
     {
@@ -540,7 +542,9 @@ var CPDocumentUntitledCount = 0;
 
                 _writeRequest = nil;
 
-                objj_msgSend(session.delegate, session.didSaveSelector, self, NO, session.contextInfo);
+                var theDelegate = session.delegate;
+
+                theDelegate.isa.objj_msgSend3(theDelegate, session.didSaveSelector, self, NO, session.contextInfo);
                 [self _sendDocumentSavedNotification:NO];
             }
         }
@@ -553,14 +557,15 @@ var CPDocumentUntitledCount = 0;
 */
 - (void)connection:(CPURLConnection)aConnection didReceiveData:(CPString)aData
 {
-    var session = aConnection.session;
+    var session = aConnection.session,
+        theDelegate = session.delegate;
 
     // READ
     if (aConnection == _readConnection)
     {
         [self readFromData:[CPData dataWithRawString:aData] ofType:session.fileType error:nil];
 
-        objj_msgSend(session.delegate, session.didReadSelector, self, YES, session.contextInfo);
+        theDelegate.isa.objj_msgSend3(theDelegate, session.didReadSelector, self, YES, session.contextInfo);
     }
     else
     {
@@ -569,7 +574,7 @@ var CPDocumentUntitledCount = 0;
 
         _writeRequest = nil;
 
-        objj_msgSend(session.delegate, session.didSaveSelector, self, YES, session.contextInfo);
+        theDelegate.isa.objj_msgSend3(theDelegate, session.didSaveSelector, self, YES, session.contextInfo);
         [self _sendDocumentSavedNotification:YES];
     }
 }
@@ -580,10 +585,11 @@ var CPDocumentUntitledCount = 0;
 */
 - (void)connection:(CPURLConnection)aConnection didFailWithError:(CPError)anError
 {
-    var session = aConnection.session;
+    var session = aConnection.session,
+        theDelegate = session.delegate;
 
     if (_readConnection == aConnection)
-        objj_msgSend(session.delegate, session.didReadSelector, self, NO, session.contextInfo);
+        theDelegate.isa.objj_msgSend3(theDelegate, session.didReadSelector, self, NO, session.contextInfo);
 
     else
     {
@@ -597,7 +603,7 @@ var CPDocumentUntitledCount = 0;
 
         alert("There was an error saving the document.");
 
-        objj_msgSend(session.delegate, session.didSaveSelector, self, NO, session.contextInfo);
+        theDelegate.isa.objj_msgSend3(theDelegate, session.didSaveSelector, self, NO, session.contextInfo);
         [self _sendDocumentSavedNotification:NO];
     }
 }
@@ -858,21 +864,24 @@ var CPDocumentUntitledCount = 0;
         [self canCloseDocumentWithDelegate:self shouldCloseSelector:@selector(_document:shouldClose:context:) contextInfo:{delegate:delegate, selector:selector, context:info}];
 
     else if ([delegate respondsToSelector:selector])
-        objj_msgSend(delegate, selector, self, YES, info);
+        delegate.isa.objj_msgSend3(delegate, selector, self, YES, info);
 }
 
 - (void)_document:(CPDocument)aDocument shouldClose:(BOOL)shouldClose context:(Object)context
 {
+    var theDelegate = context.delegate;
+
     if (aDocument === self && shouldClose)
         [self close];
 
-    objj_msgSend(context.delegate, context.selector, aDocument, shouldClose, context.context);
+    if (theDelegate != null)
+        theDelegate.isa.objj_msgSend3(theDelegate, context.selector, aDocument, shouldClose, context.context);
 }
 
 - (void)canCloseDocumentWithDelegate:(id)aDelegate shouldCloseSelector:(SEL)aSelector contextInfo:(Object)context
 {
     if (![self isDocumentEdited])
-        return [aDelegate respondsToSelector:aSelector] && objj_msgSend(aDelegate, aSelector, self, YES, context);
+        return [aDelegate respondsToSelector:aSelector] && aDelegate.isa.objj_msgSend3(aDelegate, aSelector, self, YES, context);
 
     _canCloseAlert = [[CPAlert alloc] init];
 
@@ -901,8 +910,8 @@ var CPDocumentUntitledCount = 0;
 
     if (returnCode === 0)
         [self saveDocumentWithDelegate:delegate didSaveSelector:selector contextInfo:context];
-    else
-        objj_msgSend(delegate, selector, self, returnCode === 2, context);
+    else if (delegate != null)
+        delegate.isa.objj_msgSend3(delegate, selector, self, returnCode === 2, context);
 
     _canCloseAlert = nil;
 }

AppKit/CPDocumentController.j

@@ -402,8 +402,10 @@ var CPSharedDocumentController = nil;
         }
     }
 
-    if ([context.delegate respondsToSelector:context.selector])
-        objj_msgSend(context.delegate, context.selector, self, [[self documents] count] === 0, context.context);
+    var theDelegate = context.delegate;
+
+    if ([theDelegate respondsToSelector:context.selector])
+        theDelegate.isa.objj_msgSend3(theDelegate, context.selector, self, [[self documents] count] === 0, context.context);
 }
 
 @end

AppKit/CPEvent.j

@@ -29,6 +29,7 @@
 @import "CPCompatibility.j"
 @import "CGGeometry.j"
 @import "CPText.j"
+@import "CPTrackingArea.j"
 
 @class CPTextField
 @class CPWindow
@@ -82,6 +83,8 @@ var _CPEventPeriodicEventPeriod         = 0,
     BOOL                _suppressCappuccinoCut;
     BOOL                _suppressCappuccinoPaste;
 #endif
+    
+    CPTrackingArea      _trackingArea;
 }
 
 /*!
@@ -141,6 +144,27 @@ var _CPEventPeriodicEventPeriod         = 0,
         timestamp:aTimestamp windowNumber:aWindowNumber context:aGraphicsContext eventNumber:anEventNumber clickCount:aClickCount pressure:aPressure];
 }
 
+/*!
+    Creates a new mouse tracking event.
+ 
+    @param anEventType the event type
+    @param aPoint the location of the cursor in the window specified by \c aWindowNumber
+    @param modifierFlags a bitwise combination of the modifiers specified in the CPEvent globals
+    @param aTimestamp the time the event occurred
+    @param aWindowNumber the number of the CPWindow where the event occurred
+    @param aGraphicsContext the graphics context where the event occurred
+    @param anEventNumber a number for this event
+    @param aTrackingArea the tracking area that triggered the event
+    @throws CPInternalInconsistencyException if an invalid event type is provided
+    @return the new mouse event
+ */
++ (id)enterExitEventWithType:(CPEventType)anEventType location:(CGPoint)aPoint modifierFlags:(unsigned)modifierFlags
+               timestamp:(CPTimeInterval)aTimestamp windowNumber:(int)aWindowNumber context:(CPGraphicsContext)aGraphicsContext
+             eventNumber:(int)anEventNumber trackingArea:(CPTrackingArea)aTrackingArea
+{
+    return [[self alloc] _initEnterExitEventWithType:anEventType location:aPoint modifierFlags:modifierFlags timestamp:aTimestamp windowNumber:aWindowNumber context:aGraphicsContext eventNumber:anEventNumber trackingArea:aTrackingArea];
+}
+
 /*!
     Creates a new custom event.
 
@@ -201,6 +225,28 @@ var _CPEventPeriodicEventPeriod         = 0,
     return self;
 }
 
+/* @ignore */
+- (id)_initEnterExitEventWithType:(CPEventType)anEventType location:(CGPoint)aPoint modifierFlags:(unsigned)modifierFlags
+                        timestamp:(CPTimeInterval)aTimestamp windowNumber:(int)aWindowNumber context:(CPGraphicsContext)aGraphicsContext
+                      eventNumber:(int)anEventNumber trackingArea:(CPTrackingArea)aTrackingArea
+{
+    if ((anEventType != CPMouseEntered) && (anEventType != CPMouseExited) && (anEventType != CPCursorUpdate))
+        [CPException raise:CPInternalInconsistencyException reason:"Invalid event type"];
+  
+    if (self = [self _initWithType:anEventType])
+    {
+        _location = CGPointCreateCopy(aPoint);
+        _modifierFlags = modifierFlags;
+        _timestamp = aTimestamp;
+        _context = aGraphicsContext;
+        _eventNumber = anEventNumber;
+        _trackingArea = aTrackingArea;
+        _window = [CPApp windowWithWindowNumber:aWindowNumber];
+    }
+    
+    return self;
+}
+
 /* @ignore */
 - (id)_initKeyEventWithType:(CPEventType)anEventType location:(CGPoint)aPoint modifierFlags:(unsigned int)modifierFlags
     timestamp:(CPTimeInterval)aTimestamp windowNumber:(int)aWindowNumber context:(CPGraphicsContext)aGraphicsContext
@@ -236,6 +282,7 @@ var _CPEventPeriodicEventPeriod         = 0,
         _subtype = aSubtype;
         _data1 = aData1;
         _data2 = aData2;
+        _windowNumber = aWindowNumber;
     }
 
     return self;
@@ -582,6 +629,14 @@ var _CPEventPeriodicEventPeriod         = 0,
     }
 }
 
+- (CPTrackingArea)trackingArea
+{
+    if ((_type !== CPMouseEntered) && (_type !== CPMouseExited) && (_type !== CPCursorUpdate))
+        [CPException raise:CPInternalInconsistencyException format:@"You can't call trackingArea for events of type %#x", _type]
+    
+    return _trackingArea;
+}
+
 @end
 
 function _CPEventFirePeriodEvent()

AppKit/CPImage.j

@@ -275,7 +275,7 @@ function CPAppKitImage(aFilename, aSize)
 */
 - (CGSize)size
 {
-    return _size;
+    return CGSizeMakeCopy(_size);
 }
 
 + (id)imageNamed:(CPString)aName

AppKit/CPKeyValueBinding.j

@@ -182,7 +182,7 @@ var CPBindingOperationAnd = 0,
             allBindings = [bindingsForObject allKeys],
             count = [allBindings count];
 
-        while(count--)
+        while (count--)
         {
             if ([[anObject class] isBindingExclusive:allBindings[count]])
                 return NO;

AppKit/CPMenu/_CPMenuBarWindow.j

@@ -32,7 +32,6 @@
 
 @implementation _CPMenuBarWindow : CPPanel
 {
-    CPMenu      _menu;
     CPView      _highlightView;
     CPArray     _menuItemViews;
 

AppKit/CPObjectController.j

@@ -749,7 +749,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
 
 - (void)setValue:(id)theValue forKey:(CPString)theKeyPath
 {
-    [self setValue:theKeyPath forKeyPath:theKeyPath];
+    [self setValue:theValue forKeyPath:theKeyPath];
 }
 
 - (unsigned)count

AppKit/CPOutlineView.j

@@ -223,6 +223,22 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
 
     return self;
 }
+
+- (void)_initSubclass
+{
+    _BlockDeselectView = function(view, row, column)
+    {
+        [view unsetThemeState:CPThemeStateSelectedDataView];
+        [_disclosureControlsForRows[row] unsetThemeState:CPThemeStateSelected];
+    };
+
+    _BlockSelectView = function(view, row, column)
+    {
+        [view setThemeState:CPThemeStateSelectedDataView];
+        [_disclosureControlsForRows[row] setThemeState:CPThemeStateSelected];
+    };
+}
+
 /*!
     In addition to standard delegation, the outline view also supports data
     source delegation. This method sets the data source object. Just like the
@@ -679,7 +695,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
 
     [self _cleanPendingItem];
 
-    [super reloadData];
+    [super _reloadDataViews];
 }
 
 - (void)_reloadItem:(id)anItem
@@ -1308,7 +1324,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
 /*!
     Reloads all the data of the outlineview.
 */
-- (void)reloadData
+- (void)_reloadDataViews
 {
     [self reloadItem:nil reloadChildren:YES];
 }
@@ -1340,6 +1356,25 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
     else
         [super removeTableColumn:aTableColumn];
 }
+
+- (void)_addDraggedDataView:(CPView)aDataView toView:(CPView)aSuperview forColumn:(CPInteger)column row:(CPInteger)row offset:(CGPoint)offset
+{
+    var control;
+
+    [super _addDraggedDataView:aDataView toView:aSuperview forColumn:column row:row offset:offset];
+
+    if (_tableColumns[column] === _outlineTableColumn && (control = _disclosureControlsForRows[row]))
+    {
+        var controlFrame = [self frameOfOutlineDisclosureControlAtRow:row];
+
+        controlFrame.origin.x -= offset.x;
+        controlFrame.origin.y -= offset.y;
+
+        [control setFrame:controlFrame];
+        [aSuperview addSubview:control];
+    }
+}
+
 /*!
     @ignore
     We override this because we need a special behavior for the outline
@@ -1355,67 +1390,6 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
     return [super frameOfDataViewAtColumn:aColumn row:aRow];
 }
 
-/*!
-    @ignore
-    We need to offset the dataview and add the disclosure triangle.
-*/
-- (CPView)_dragViewForColumn:(CPInteger)theColumnIndex event:(CPEvent)theDragEvent offset:(CGPoint)theDragViewOffset
-{
-    var dragView = [[_CPColumnDragView alloc] initWithLineColor:[self gridColor]],
-        tableColumn = [[self tableColumns] objectAtIndex:theColumnIndex],
-        defaultRowHeight = [self valueForThemeAttribute:@"default-row-height"],
-        bounds = CGRectMake(0.0, 0.0, [tableColumn width], CGRectGetHeight([self exposedRect]) + defaultRowHeight),
-        columnRect = [self rectOfColumn:theColumnIndex],
-        headerView = [tableColumn headerView],
-        row = [_exposedRows firstIndex];
-
-    while (row !== CPNotFound)
-    {
-        var dataView = [self _newDataViewForRow:row tableColumn:tableColumn],
-            dataViewFrame = [self frameOfDataViewAtColumn:theColumnIndex row:row];
-
-        // Only one column is ever dragged so we just place the view at
-        dataViewFrame.origin.x = 0.0;
-
-        // Offset by table header height - scroll position
-        dataViewFrame.origin.y = (CGRectGetMinY(dataViewFrame) - CGRectGetMinY([self exposedRect])) + defaultRowHeight;
-        [dataView setFrame:dataViewFrame];
-
-        [dataView setObjectValue:[self _objectValueForTableColumn:tableColumn row:row]];
-
-
-        if (tableColumn === _outlineTableColumn)
-        {
-            // first inset the dragview
-            var indentationWidth = ([self levelForRow:row] + 1) * [self indentationPerLevel];
-
-            dataViewFrame.origin.x += indentationWidth;
-            dataViewFrame.size.width -= indentationWidth;
-
-            [dataView setFrame:dataViewFrame];
-        }
-
-        [dragView addSubview:dataView];
-
-        row = [_exposedRows indexGreaterThanIndex:row];
-    }
-
-    // Add the column header view
-    var headerFrame = [headerView frame];
-    headerFrame.origin = CGPointMakeZero();
-
-    var columnHeaderView = [[_CPTableColumnHeaderView alloc] initWithFrame:headerFrame];
-    [columnHeaderView setStringValue:[headerView stringValue]];
-    [columnHeaderView setThemeState:[headerView themeState]];
-    [dragView addSubview:columnHeaderView];
-
-    [dragView setBackgroundColor:[CPColor whiteColor]];
-    [dragView setAlphaValue:0.7];
-    [dragView setFrame:bounds];
-
-    return dragView;
-}
-
 /*!
     Retargets the drop item for the outlineview.
 
@@ -1443,7 +1417,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
             if (_dropItem)
             {
                 [_dropOperationFeedbackView blink];
-                [CPTimer scheduledTimerWithTimeInterval:.3 callback:objj_msgSend(self, "expandItem:", _dropItem) repeats:NO];
+                [CPTimer scheduledTimerWithTimeInterval:.3 callback:[self expandItem:_dropItem] repeats:NO];
             }
         };
 
@@ -1539,43 +1513,22 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
     @ignore
     We need to move the disclosure control too.
 */
-- (void)_layoutDataViewsInRows:(CPIndexSet)rows columns:(CPIndexSet)columns
+- (void)_layoutViewsForRowIndexes:(CPIndexSet)rowIndexes columnIndexes:(CPIndexSet)columnIndexes
 {
-    var rowArray = [],
-        columnArray = [];
-
-    [rows getIndexes:rowArray maxCount:-1 inIndexRange:nil];
-    [columns getIndexes:columnArray maxCount:-1 inIndexRange:nil];
-
-    var columnIndex = 0,
-        columnsCount = columnArray.length;
-
-    for (; columnIndex < columnsCount; ++columnIndex)
+    [self _enumerateViewsInRows:rowIndexes columns:columnIndexes usingBlock:function(view, row, column, stop)
     {
-        var column = columnArray[columnIndex],
-            tableColumn = _tableColumns[column],
-            tableColumnUID = [tableColumn UID],
-            dataViewsForTableColumn = _dataViewsForTableColumns[tableColumnUID],
-            rowIndex = 0,
-            rowsCount = rowArray.length;
+        var control;
 
-        for (; rowIndex < rowsCount; ++rowIndex)
+        [view setFrame:[self frameOfDataViewAtColumn:column row:row]];
+
+        if (_tableColumns[column] === _outlineTableColumn && (control = _disclosureControlsForRows[row]))
         {
-            var row = rowArray[rowIndex],
-                dataView = dataViewsForTableColumn[row],
-                dataViewFrame = [self frameOfDataViewAtColumn:column row:row];
-
-            [dataView setFrame:dataViewFrame];
-
-            if (tableColumn === _outlineTableColumn)
-            {
-                var control = _disclosureControlsForRows[row],
-                    frame = [self frameOfOutlineDisclosureControlAtRow:row];
-
-                [control setFrame:frame];
-            }
+            var frame = [self frameOfOutlineDisclosureControlAtRow:row];
+            [control setFrame:frame];
         }
-    }
+    }];
+
+    [self setNeedsDisplay:YES];
 }
 
 /*!
@@ -1587,7 +1540,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
 
     var outlineColumn = [[self tableColumns] indexOfObjectIdenticalTo:[self outlineTableColumn]];
 
-    if (![columns containsIndex:outlineColumn] ||  [self outlineTableColumn] === _draggedColumn)
+    if (![columns containsIndex:outlineColumn] || outlineColumn === _draggedColumnIndex)
         return;
 
     var rowArray = [];
@@ -1890,6 +1843,14 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
     return _implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_dataViewForTableColumn_item_;
 }
 
+- (id)_hitTest:(CPView)aView
+{
+    if ([aView isKindOfClass:[CPDisclosureButton class]])
+        return aView;
+
+    return [super _hitTest:aView];
+}
+
 - (BOOL)_delegateRespondsToShouldExpandItem
 {
     return _implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_shouldExpandItem_;

AppKit/CPPanel.j

@@ -22,10 +22,13 @@
 
 @import "CPWindow.j"
 
+@global CPApp
 
 CPOKButton      = 1;
 CPCancelButton  = 0;
 
+CPDocModalWindowMask    = 1 << 6;
+
 /*!
     @ingroup appkit
     @class CPPanel
@@ -51,8 +54,6 @@ CPCancelButton  = 0;
     @global
     @class CPWindow
 */
-CPDocModalWindowMask    = 1 << 6;
-
 @implementation CPPanel : CPWindow
 {
     BOOL    _becomesKeyOnlyIfNeeded;

AppKit/CPProgressIndicator.j

@@ -86,6 +86,9 @@ var CPProgressIndicatorSpinningStyleColors = [];
             @"spinning-mini-gif": [CPNull null],
             @"spinning-small-gif": [CPNull null],
             @"spinning-regular-gif": [CPNull null],
+            @"circular-border-color": [CPNull null],
+            @"circular-border-size": 1,
+            @"circular-color": [CPNull null]
         };
 }
 
@@ -368,6 +371,7 @@ var CPProgressIndicatorSpinningStyleColors = [];
 - (void)drawBar
 {
     [self setNeedsLayout];
+    [self setNeedsDisplay:YES];
 }
 
 - (CPView)createEphemeralSubviewNamed:(CPString)aName
@@ -413,6 +417,9 @@ var CPProgressIndicatorSpinningStyleColors = [];
     {
         if (_style == CPProgressIndicatorSpinningStyle)
         {
+            if (!_indeterminate)
+                return;
+
             // This will cause the bar view to go away due to having a nil rect when _style == CPProgressIndicatorSpinningStyle.
             [self layoutEphemeralSubviewNamed:"bar-view"
                                    positioned:CPWindowBelow
@@ -438,6 +445,54 @@ var CPProgressIndicatorSpinningStyleColors = [];
         [self setBackgroundColor:nil];
 }
 
+- (void)drawRect:(CGRect)aRect
+{
+    if (_style == CPProgressIndicatorSpinningStyle && !_indeterminate)
+    {
+        var context = [[CPGraphicsContext currentContext] graphicsPort],
+            rect = CGRectMakeCopy(aRect),
+            borderSize = [self currentValueForThemeAttribute:@"circular-border-size"];
+
+        rect.origin.x += borderSize;
+        rect.origin.y += borderSize;
+        rect.size.width = rect.size.width - borderSize * 2;
+        rect.size.height = rect.size.height - borderSize * 2;
+
+        if ([self doubleValue] > [self minValue] && [self doubleValue] < [self maxValue])
+        {
+            var midX = CGRectGetMidX(rect),
+                midY = CGRectGetMidY(rect),
+                endAngle = Math.PI * 2 * (([self doubleValue] - [self minValue]) / ([self maxValue] - [self minValue])) - Math.PI / 2,
+                radius = MIN(rect.size.width / 2, rect.size.height / 2)
+
+            CGContextBeginPath(context);
+            CGContextSetLineWidth(context, borderSize);
+            CGContextSetFillColor(context, [self currentValueForThemeAttribute:@"circular-color"])
+            CGContextMoveToPoint(context, midX, midY);
+            CGContextAddArc(context, midX, midY, radius, 3 * Math.PI / 2, endAngle, YES)
+            CGContextAddLineToPoint(context, midX, midY);
+            CGContextClosePath(context);
+            CGContextFillPath(context);
+            CGContextStrokePath(context);
+        }
+        else if ([self doubleValue] == [self maxValue])
+        {
+            CGContextBeginPath(context);
+            CGContextSetFillColor(context, [self currentValueForThemeAttribute:@"circular-color"])
+            CGContextAddEllipseInRect(context, rect);
+            CGContextClosePath(context);
+            CGContextFillPath(context);
+        }
+
+        CGContextBeginPath(context);
+        CGContextSetStrokeColor(context , [self currentValueForThemeAttribute:@"circular-border-color"]);
+        CGContextSetLineWidth(context, borderSize);
+        CGContextAddEllipseInRect(context, rect);
+        CGContextClosePath(context);
+        CGContextStrokePath(context);
+    }
+}
+
 @end
 
 

AppKit/CPRadio.j

@@ -29,6 +29,7 @@
 
 @global CPApp
 
+CPRadioImageOffset = 4.0;
 
 /*!
     @ingroup appkit
@@ -67,9 +68,6 @@
     option.
 
 */
-
-CPRadioImageOffset = 4.0;
-
 @implementation CPRadio : CPButton
 {
     CPRadioGroup    _radioGroup;
@@ -269,9 +267,9 @@ var CPRadioRadioGroupKey    = @"CPRadioRadioGroupKey";
 - (BOOL)selectRadioWithTag:(int)tag
 {
     var index = [_radios indexOfObjectPassingTest:function(radio)
-                    {
-                        return [radio tag] === tag;
-                    }];
+                {
+                    return [radio tag] === tag;
+                }];
 
     if (index !== CPNotFound)
     {

AppKit/CPResponder.j

@@ -24,6 +24,7 @@
 @import <Foundation/CPObjJRuntime.j>
 
 @import "CPEvent.j"
+@import "CPCursor.j"
 
 @class CPKeyBinding
 @class CPMenu
@@ -200,6 +201,18 @@ CPDeleteForwardKeyCode  = 46;
     [_nextResponder performSelector:_cmd withObject:anEvent];
 }
 
+/*!
+ Notifies the receiver that the mouse entered the receiver's area and that it can adapt the cursor.
+ @param anEvent contains information about the exit
+ */
+- (void)cursorUpdate:(CPEvent)anEvent
+{
+    if (_nextResponder)
+        [_nextResponder performSelector:_cmd withObject:anEvent];
+    else
+        [[CPCursor arrowCursor] set];
+}
+
 /*!
     Notifies the receiver that the mouse scroll wheel has moved.
     @param anEvent information about the scroll

AppKit/CPRuleEditor/CPPredicateEditorRowTemplate.j

@@ -487,9 +487,9 @@ CPTransformableAttributeType = 1800;
 
 - (id)copy
 {
-    var views = [CPArray array];
+    var views = [CPArray array],
+        copy = [[[self class] alloc] init];
 
-    var copy = [[[self class] alloc] init];
     [copy _setTemplateType:_templateType];
     [copy _setOptions:_predicateOptions];
     [copy _setModifier:_predicateModifier];

AppKit/CPRuleEditor/CPRuleEditor.j

@@ -2121,7 +2121,7 @@ TODO: implement
         return;
 
     var point = [self convertPoint:[event locationInWindow] fromView:nil],
-        view = [_slices objectAtIndex:FLOOR(point.y / _sliceHeight)];
+        view = [_slices objectAtIndex:FLOOR(MAX(0, point.y) / _sliceHeight)];
 
     if ([self _dragShouldBeginFromMouseDown:view])
         [self _performDragForSlice:view withEvent:event];

AppKit/CPRuleEditor/_CPRuleEditorViewSlice.j

@@ -29,7 +29,6 @@
     CGRect       _animationTargetRect   @accessors(property=_animationTargetRect);
     BOOL         _selected              @accessors(getter=_isSelected, setter=_setSelected:);
     BOOL         _lastSelected          @accessors(getter=_isLastSelected, setter=_setLastSelected:);
-    CPColor      _backgroundColor       @accessors(property=backgroundColor);
     BOOL         _editable              @accessors(getter=isEditable, setter=setEditable:);
 }
 

AppKit/CPScrollView.j

@@ -33,6 +33,15 @@
 #define SHOULD_SHOW_CORNER_VIEW() (_scrollerStyle === CPScrollerStyleLegacy && _verticalScroller && ![_verticalScroller isHidden])
 
 
+@protocol CPScrollViewDelegate <CPObject>
+
+@optional
+- (void)scrollViewWillScroll:(CPScrollView)aScrollView;
+- (void)scrollViewDidScroll:(CPScrollView)aScrollView;
+
+@end
+
+
 /*! @ignore */
 var _isBrowserUsingOverlayScrollers = function()
 {
@@ -77,15 +86,6 @@ var _isBrowserUsingOverlayScrollers = function()
 #endif
 };
 
-/*!
-    @ingroup appkit
-    @class CPScrollView
-
-    Used to display views that are too large for the viewing area. the CPScrollView
-    places scroll bars on the side of the view to allow the user to scroll and see the entire
-    contents of the view.
-*/
-
 var TIMER_INTERVAL                              = 0.2,
     CPScrollViewDelegate_scrollViewWillScroll_  = 1 << 0,
     CPScrollViewDelegate_scrollViewDidScroll_   = 1 << 1,
@@ -95,38 +95,45 @@ var TIMER_INTERVAL                              = 0.2,
 var CPScrollerStyleGlobal                       = CPScrollerStyleOverlay,
     CPScrollerStyleGlobalChangeNotification     = @"CPScrollerStyleGlobalChangeNotification";
 
+/*!
+    @ingroup appkit
+    @class CPScrollView
 
+    Used to display views that are too large for the viewing area. the CPScrollView
+    places scroll bars on the side of the view to allow the user to scroll and see the entire
+    contents of the view.
+*/
 @implementation CPScrollView : CPView
 {
-    CPClipView      _contentView;
-    CPClipView      _headerClipView;
-    CPView          _cornerView;
-    CPView          _bottomCornerView;
+    CPClipView                  _contentView;
+    CPClipView                  _headerClipView;
+    CPView                      _cornerView;
+    CPView                      _bottomCornerView;
 
-    id              _delegate;
-    CPTimer         _scrollTimer;
+    id <CPScrollViewDelegate>   _delegate;
+    CPTimer                     _scrollTimer;
 
-    BOOL            _hasVerticalScroller;
-    BOOL            _hasHorizontalScroller;
-    BOOL            _autohidesScrollers;
+    BOOL                        _hasVerticalScroller;
+    BOOL                        _hasHorizontalScroller;
+    BOOL                        _autohidesScrollers;
 
-    CPScroller      _verticalScroller;
-    CPScroller      _horizontalScroller;
+    CPScroller                  _verticalScroller;
+    CPScroller                  _horizontalScroller;
 
-    CPInteger       _recursionCount;
-    CPInteger       _implementedDelegateMethods;
+    CPInteger                   _recursionCount;
+    CPInteger                   _implementedDelegateMethods;
 
-    float           _verticalLineScroll;
-    float           _verticalPageScroll;
-    float           _horizontalLineScroll;
-    float           _horizontalPageScroll;
+    float                       _verticalLineScroll;
+    float                       _verticalPageScroll;
+    float                       _horizontalLineScroll;
+    float                       _horizontalPageScroll;
 
-    CPBorderType    _borderType;
+    CPBorderType                _borderType;
 
-    CPTimer         _timerScrollersHide;
+    CPTimer                     _timerScrollersHide;
 
-    int             _scrollerStyle;
-    int             _scrollerKnobStyle;
+    int                         _scrollerStyle;
+    int                         _scrollerKnobStyle;
 }
 
 
@@ -296,7 +303,7 @@ Notifies the delegate when the scroll view has finished scrolling.
 @endcode
 
 */
-- (void)setDelegate:(id)aDelegate
+- (void)setDelegate:(id <CPScrollViewDelegate>)aDelegate
 {
     if (aDelegate === _delegate)
         return;
@@ -1575,6 +1582,8 @@ var CPScrollViewContentViewKey          = @"CPScrollViewContentView",
 */
 - (void)awakeFromCib
 {
+    [super awakeFromCib];
+
     [self _updateScrollerStyle];
     [self _updateCornerAndHeaderView];
 }

AppKit/CPScroller.j

@@ -50,11 +50,6 @@ CPNoScrollerParts           = 0;
 CPOnlyScrollerArrows        = 1;
 CPAllScrollerParts          = 2;
 
-/*!
-    @ingroup appkit
-    @class CPScroller
-*/
-
 var PARTS_ARRANGEMENT   = [CPScrollerKnobSlot, CPScrollerDecrementLine, CPScrollerIncrementLine, CPScrollerKnob],
     NAMES_FOR_PARTS     = {},
     PARTS_FOR_NAMES     = {};
@@ -78,6 +73,11 @@ CPThemeStateScrollViewLegacy    = CPThemeState("scroller-style-legacy");
 CPThemeStateScrollerKnobLight   = CPThemeState("scroller-knob-light");
 CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 
+/*!
+    @ingroup appkit
+    @class CPScroller
+*/
+
 @implementation CPScroller : CPControl
 {
     CPUsableScrollerParts   _usableParts;

AppKit/CPSearchField.j

@@ -34,9 +34,8 @@ CPSearchFieldRecentsMenuItemTag         = 1001;
 CPSearchFieldClearRecentsMenuItemTag    = 1002;
 CPSearchFieldNoRecentsMenuItemTag       = 1003;
 
-var CPAutosavedRecentsChangedNotification = @"CPAutosavedRecentsChangedNotification";
-
-var RECENT_SEARCH_PREFIX = @"   ";
+var CPAutosavedRecentsChangedNotification = @"CPAutosavedRecentsChangedNotification",
+    RECENT_SEARCH_PREFIX = @"   ";
 
 /*!
     @ingroup appkit
@@ -73,7 +72,9 @@ var RECENT_SEARCH_PREFIX = @"   ";
             @"image-search": [CPNull null],
             @"image-find": [CPNull null],
             @"image-cancel": [CPNull null],
-            @"image-cancel-pressed": [CPNull null]
+            @"image-cancel-pressed": [CPNull null],
+            @"image-search-inset" : CGInsetMake(0, 0, 0, 5),
+            @"image-cancel-inset" : CGInsetMake(0, 5, 0, 0)
         };
 }
 
@@ -266,9 +267,10 @@ var RECENT_SEARCH_PREFIX = @"   ";
 */
 - (CGRect)searchButtonRectForBounds:(CGRect)rect
 {
-    var size = [[self valueForThemeAttribute:@"image-search"] size] || CGSizeMakeZero();
+    var size = [[self currentValueForThemeAttribute:@"image-search"] size] || CGSizeMakeZero(),
+        inset = [self currentValueForThemeAttribute:@"image-search-inset"];
 
-    return CGRectMake(5, (CGRectGetHeight(rect) - size.height) / 2, size.width, size.height);
+    return CGRectMake(inset.left - inset.right, inset.top - inset.bottom + (CGRectGetHeight(rect) - size.height) / 2, size.width, size.height);
 }
 
 /*!
@@ -278,9 +280,10 @@ var RECENT_SEARCH_PREFIX = @"   ";
 */
 - (CGRect)cancelButtonRectForBounds:(CGRect)rect
 {
-    var size = [[self valueForThemeAttribute:@"image-cancel"] size] || CGSizeMakeZero();
+    var size = [[self currentValueForThemeAttribute:@"image-cancel"] size] || CGSizeMakeZero(),
+        inset = [self currentValueForThemeAttribute:@"image-cancel-inset"];
 
-    return CGRectMake(CGRectGetWidth(rect) - size.width - 5, (CGRectGetHeight(rect) - size.width) / 2, size.height, size.height);
+    return CGRectMake(CGRectGetWidth(rect) - size.width + inset.left - inset.right, inset.top - inset.bottom + (CGRectGetHeight(rect) - size.width) / 2, size.height, size.height);
 }
 
 // Managing Menu Templates

AppKit/CPSegmentedControl.j

@@ -42,7 +42,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 @implementation CPSegmentedControl : CPControl
 {
-    CPArray                 _segments;
+    CPArray                 _segments @accessors(getter=segments);
     CPArray                 _themeStates;
 
     int                     _selectedSegment;
@@ -87,6 +87,8 @@ CPSegmentSwitchTrackingMomentary = 2;
         _selectedSegment = -1;
 
         _trackingMode = CPSegmentSwitchTrackingSelectOne;
+        _trackingHighlighted = NO;
+        _trackingSegment = -1;
     }
 
     return self;
@@ -107,7 +109,54 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (int)selectedTag
 {
-    return [_segments[_selectedSegment] tag];
+    return [[_segments objectAtIndex:_selectedSegment] tag];
+}
+
+/*! @ignore */
+- (void)setSegments:(CPArray)segments
+{
+    [self removeSegmentsAtIndexes:[CPIndexSet indexSetWithIndexesInRange:CPMakeRange(0, [self  segmentCount])]];
+
+    [self insertSegments:segments atIndexes:[CPIndexSet indexSetWithIndexesInRange:CPMakeRange(0, [segments count])]];
+}
+
+/*! @ignore */
+- (void)insertSegments:(CPArray)segments atIndexes:(CPIndexSet)indices
+{
+    if ([segments count] == 0)
+        return;
+
+    var newStates = @[],
+        count = [indices count];
+
+    while (count--)
+        [newStates addObject:CPThemeStateNormal];
+
+    [_segments insertObjects:segments atIndexes:indices];
+    [_themeStates insertObjects:newStates atIndexes:indices];
+
+    if (_selectedSegment >= [indices firstIndex])
+        _selectedSegment += [indices count];
+}
+
+/*! @ignore */
+- (void)removeSegmentsAtIndexes:(CPIndexSet)indices
+{
+    if ([indices count] == 0)
+        return;
+
+    [indices enumerateIndexesUsingBlock:function(idx, stop)
+    {
+        [[_segments objectAtIndex:idx] setSelected:NO];
+    }];
+
+    if ([indices containsIndex:_selectedSegment])
+        _selectedSegment = -1;
+    else if ([indices lastIndex] < _selectedSegment)
+        _selectedSegment -= [indices count];
+
+    [_segments removeObjectsAtIndexes:indices];
+    [_themeStates removeObjectsAtIndexes:indices];
 }
 
 // Specifying the number of segments
@@ -117,41 +166,32 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (void)setSegmentCount:(unsigned)aCount
 {
-    if (_segments.length == aCount)
+    var prevCount = [_segments count];
+
+    if (aCount == prevCount)
         return;
 
-    var height = CGRectGetHeight([self bounds]),
-        dividersBefore = MAX(0, _segments.length - 1),
-        dividersAfter = MAX(0, aCount - 1);
-
-    if (_segments.length < aCount)
+    if (aCount > prevCount)
     {
-        for (var index = _segments.length; index < aCount; ++index)
-        {
-            _segments[index] = [[_CPSegmentItem alloc] init];
-            _themeStates[index] = CPThemeStateNormal;
-        }
-    }
-    else if (aCount < _segments.length)
-    {
-        _segments.length = aCount;
-        _themeStates.length = aCount;
-    }
+        var count = aCount - prevCount,
+            segments = @[];
 
-    if (_selectedSegment >= _segments.length)
+        while (count--)
+            [segments addObject:[[_CPSegmentItem alloc] init]];
+
+        [self insertSegments:segments atIndexes:[CPIndexSet indexSetWithIndexesInRange:CPMakeRange(prevCount, aCount - prevCount)]];
+    }
+    else
+        [self removeSegmentsAtIndexes:[CPIndexSet indexSetWithIndexesInRange:CPMakeRange(aCount, prevCount - aCount)]];
+
+    [self _updateSelectionIfNeeded];
+    [self tileWithChangedSegment:MAX(MIN(prevCount, aCount) - 1, 0)];
+}
+
+- (void)_updateSelectionIfNeeded
+{
+    if (_selectedSegment >= [self segmentCount])
         _selectedSegment = -1;
-
-    var thickness = [self currentValueForThemeAttribute:@"divider-thickness"],
-        frame = [self frame],
-        widthOfAllSegments = 0,
-        dividerExtraSpace = ([_segments count] - 1) * thickness;
-
-    for (var i = 0; i < [_segments count]; i++)
-        widthOfAllSegments += [_segments[i] width];
-
-    [self setFrameSize:CGSizeMake(widthOfAllSegments + dividerExtraSpace, frame.size.height)];
-
-    [self tileWithChangedSegment:0];
 }
 
 /*!
@@ -159,7 +199,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (unsigned)segmentCount
 {
-    return _segments.length;
+    return [_segments count];
 }
 
 // Specifying Selected Segment
@@ -171,7 +211,20 @@ CPSegmentSwitchTrackingMomentary = 2;
 - (void)setSelectedSegment:(unsigned)aSegment
 {
     // setSelected:forSegment throws the exception for us (if necessary)
-    [self setSelected:YES forSegment:aSegment];
+    if (_selectedSegment == aSegment)
+        return;
+
+    if (aSegment == -1)
+    {
+        var count = [self segmentCount];
+
+        while (count--)
+            [self setSelected:NO forSegment:count];
+
+        _selectedSegment = -1;
+    }
+    else
+        [self setSelected:YES forSegment:aSegment];
 }
 
 /*!
@@ -189,8 +242,8 @@ CPSegmentSwitchTrackingMomentary = 2;
 {
     var index = 0;
 
-    for (; index < _segments.length; ++index)
-        if (_segments[index].tag == aTag)
+    for (; index < [_segments count]; ++index)
+        if ([[_segments objectAtIndex:index] tag] == aTag)
         {
             [self setSelectedSegment:index];
 
@@ -204,8 +257,8 @@ CPSegmentSwitchTrackingMomentary = 2;
 {
     var index = 0;
 
-    for (; index < _segments.length; ++index)
-        if (_segments[index].label == aLabel)
+    for (; index < [_segments count]; ++index)
+        if ([[_segments objectAtIndex:index] label] == aLabel)
         {
             [self setSelectedSegment:index];
 
@@ -216,7 +269,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 }
 
 // Specifying Tracking Mode
-
+/*! @ignore */
 - (BOOL)isTracking
 {
 
@@ -234,7 +287,7 @@ CPSegmentSwitchTrackingMomentary = 2;
         var index = 0,
             selected = NO;
 
-        for (; index < _segments.length; ++index)
+        for (; index < [self segmentCount]; ++index)
             if ([_segments[index] selected])
                 if (selected)
                     [self setSelected:NO forSegment:index];
@@ -246,7 +299,7 @@ CPSegmentSwitchTrackingMomentary = 2;
     {
         var index = 0;
 
-        for (; index < _segments.length; ++index)
+        for (; index < [self segmentCount]; ++index)
             if ([_segments[index] selected])
                 [self setSelected:NO forSegment:index];
     }
@@ -269,7 +322,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (void)setWidth:(float)aWidth forSegment:(unsigned)aSegment
 {
-    [_segments[aSegment] setWidth:aWidth];
+    [[_segments objectAtIndex:aSegment] setWidth:aWidth];
     [self tileWithChangedSegment:aSegment];
 }
 
@@ -280,7 +333,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (float)widthForSegment:(unsigned)aSegment
 {
-    return [_segments[aSegment] width];
+    return [[_segments objectAtIndex:aSegment] width];
 }
 
 /*!
@@ -291,7 +344,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (void)setImage:(CPImage)anImage forSegment:(unsigned)aSegment
 {
-    [_segments[aSegment] setImage:anImage];
+    [[_segments objectAtIndex:aSegment] setImage:anImage];
 
     [self tileWithChangedSegment:aSegment];
 }
@@ -303,7 +356,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (CPImage)imageForSegment:(unsigned)aSegment
 {
-    return [_segments[aSegment] image];
+    return [[_segments objectAtIndex:aSegment] image];
 }
 
 /*!
@@ -314,7 +367,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (void)setLabel:(CPString)aLabel forSegment:(unsigned)aSegment
 {
-    [_segments[aSegment] setLabel:aLabel];
+    [[_segments objectAtIndex:aSegment] setLabel:aLabel];
 
     [self tileWithChangedSegment:aSegment];
 }
@@ -326,7 +379,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (CPString)labelForSegment:(unsigned)aSegment
 {
-    return [_segments[aSegment] label];
+    return [[_segments objectAtIndex:aSegment] label];
 }
 
 /*!
@@ -337,7 +390,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (void)setMenu:(CPMenu)aMenu forSegment:(unsigned)aSegment
 {
-    [_segments[aSegment] setMenu:aMenu];
+    [[_segments objectAtIndex:aSegment] setMenu:aMenu];
 }
 
 /*!
@@ -347,7 +400,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (CPMenu)menuForSegment:(unsigned)aSegment
 {
-    return [_segments[aSegment] menu];
+    return [[_segments objectAtIndex:aSegment] menu];
 }
 
 /*!
@@ -359,7 +412,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (void)setSelected:(BOOL)isSelected forSegment:(unsigned)aSegment
 {
-    var segment = _segments[aSegment];
+    var segment = [_segments objectAtIndex:aSegment];
 
     // If we're already in this state, bail.
     if ([segment selected] == isSelected)
@@ -376,7 +429,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 
         _selectedSegment = aSegment;
 
-        if (_trackingMode == CPSegmentSwitchTrackingSelectOne && oldSelectedSegment != aSegment && oldSelectedSegment != -1)
+        if (_trackingMode == CPSegmentSwitchTrackingSelectOne && oldSelectedSegment != aSegment && oldSelectedSegment != -1 && oldSelectedSegment < _segments.length)
         {
             [_segments[oldSelectedSegment] setSelected:NO];
             _themeStates[oldSelectedSegment] = CPThemeStateNormal;
@@ -399,7 +452,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (BOOL)isSelectedForSegment:(unsigned)aSegment
 {
-    return [_segments[aSegment] selected];
+    return [[_segments objectAtIndex:aSegment] selected];
 }
 
 /*!
@@ -410,10 +463,12 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (void)setEnabled:(BOOL)shouldBeEnabled forSegment:(unsigned)aSegment
 {
-    if ([_segments[aSegment] enabled] === shouldBeEnabled)
+    var segment = [_segments objectAtIndex:aSegment];
+
+    if ([segment enabled] === shouldBeEnabled)
         return;
 
-    [_segments[aSegment] setEnabled:shouldBeEnabled];
+    [segment setEnabled:shouldBeEnabled];
 
     if (shouldBeEnabled)
         _themeStates[aSegment] = _themeStates[aSegment].without(CPThemeStateDisabled);
@@ -431,7 +486,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (BOOL)isEnabledForSegment:(unsigned)aSegment
 {
-    return [_segments[aSegment] enabled];
+    return [[_segments objectAtIndex:aSegment] enabled];
 }
 
 /*!
@@ -441,7 +496,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (void)setTag:(int)aTag forSegment:(unsigned)aSegment
 {
-    [_segments[aSegment] setTag:aTag];
+    [[_segments objectAtIndex:aSegment] setTag:aTag];
 }
 
 /*!
@@ -450,7 +505,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (int)tagForSegment:(unsigned)aSegment
 {
-    return [_segments[aSegment] tag];
+    return [[_segments objectAtIndex:aSegment] tag];
 }
 
 // Drawings
@@ -461,7 +516,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (void)drawSegmentBezel:(int)aSegment highlight:(BOOL)shouldHighlight
 {
-    if(aSegment < _themeStates.length)
+    if (aSegment < _themeStates.length)
     {
         if (shouldHighlight)
             _themeStates[aSegment] = _themeStates[aSegment].and(CPThemeStateHighlighted);
@@ -475,14 +530,12 @@ CPSegmentSwitchTrackingMomentary = 2;
 
 - (float)_leftOffsetForSegment:(unsigned)segment
 {
-    var bezelInset = [self currentValueForThemeAttribute:@"bezel-inset"];
-
     if (segment == 0)
-        return bezelInset.left;
+        return [self currentValueForThemeAttribute:@"bezel-inset"].left;
 
     var thickness = [self currentValueForThemeAttribute:@"divider-thickness"];
 
-    return [self _leftOffsetForSegment:segment - 1] + [self widthForSegment:segment - 1] + thickness;
+    return [self _leftOffsetForSegment:segment - 1] + CGRectGetWidth([self frameForSegment:segment - 1]) + thickness;
 }
 
 - (unsigned)_indexOfLastSegment
@@ -516,7 +569,7 @@ CPSegmentSwitchTrackingMomentary = 2;
     else if (aName.indexOf("segment-bezel") === 0)
     {
         var segment = parseInt(aName.substring("segment-bezel-".length), 10),
-            frame = CGRectCreateCopy([_segments[segment] frame]);
+            frame = CGRectCreateCopy([self frameForSegment:segment]);
 
         if (segment === 0)
         {
@@ -524,7 +577,7 @@ CPSegmentSwitchTrackingMomentary = 2;
             frame.size.width -= contentInset.left;
         }
 
-        if (segment === _segments.length - 1)
+        if (segment === [self segmentCount] - 1)
             frame.size.width = CGRectGetWidth([self bounds]) - contentInset.right - frame.origin.x;
 
         return frame;
@@ -532,7 +585,7 @@ CPSegmentSwitchTrackingMomentary = 2;
     else if (aName.indexOf("divider-bezel") === 0)
     {
         var segment = parseInt(aName.substring("divider-bezel-".length), 10),
-            width = [self widthForSegment:segment],
+            width = CGRectGetWidth([self frameForSegment:segment]),
             left = [self _leftOffsetForSegment:segment],
             thickness = [self currentValueForThemeAttribute:@"divider-thickness"];
 
@@ -558,7 +611,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 
 - (void)layoutSubviews
 {
-    if (_segments.length <= 0)
+    if ([self segmentCount] <= 0)
         return;
 
     var themeState = _themeStates[0],
@@ -646,9 +699,8 @@ CPSegmentSwitchTrackingMomentary = 2;
         if (i == count - 1)
             continue;
 
-        var borderState = _themeStates[i].and(_themeStates[i + 1]);
 
-        borderState = (borderState.hasThemeState(CPThemeStateSelected) && !borderState.hasThemeState(CPThemeStateHighlighted)) ? CPThemeStateSelected : CPThemeStateNormal;
+        var borderState = _themeStates[i].and(_themeStates[i + 1]);
 
         borderState = isDisabled ? borderState.and(CPThemeStateDisabled) : borderState;
 
@@ -678,60 +730,33 @@ CPSegmentSwitchTrackingMomentary = 2;
 {
 }
 
-- (void)tileWithChangedSegment:(unsigned)aSegment
+/*! @ignore */
+- (void)tile
 {
-    if (aSegment >= _segments.length)
+    [self tileWithChangedSegment:0];
+}
+
+/*! @ignore */
+- (void)tileWithChangedSegment:(CPInteger)aSegment
+{
+    var segmentCount = [self segmentCount];
+
+    // Corner case: when segmentCount == 0 and aSegment == 0, we do not return here because we still need to set the new frameSize bellow.
+    if (aSegment < 0 || (segmentCount > 0 && aSegment >= segmentCount))
         return;
 
-    var segment = _segments[aSegment],
-        segmentWidth = [segment width],
-        themeState = _themeState.hasThemeState(CPThemeStateDisabled) ? _themeStates[aSegment].and(CPThemeStateDisabled) : _themeStates[aSegment],
-        contentInset = [self valueForThemeAttribute:@"content-inset" inState:themeState],
-        font = [self font];
+    var width = 0;
 
-    if (!segmentWidth)
+    if (segmentCount > 0)
     {
-        if ([segment image] && [segment label])
-            segmentWidth = [[segment label] sizeWithFont:font].width + [[segment image] size].width + contentInset.left + contentInset.right;
-        else if (segment.image)
-            segmentWidth = [[segment image] size].width + contentInset.left + contentInset.right;
-        else if (segment.label)
-            segmentWidth = [[segment label] sizeWithFont:font].width + contentInset.left + contentInset.right;
-        else
-            segmentWidth = 0.0;
+        // Invalidate frames for segments on the right. They will be lazily computed by -frameForSegment:.
+        for (var i = aSegment; i < segmentCount; i++)
+            [_segments[i] setFrame:CGRectMakeZero()];
+
+        width = CGRectGetMaxX([self frameForSegment:(segmentCount - 1)]);
     }
 
-    var delta = segmentWidth - CGRectGetWidth([segment frame]);
-
-    if (!delta)
-    {
-        [self setNeedsLayout];
-        [self setNeedsDisplay:YES];
-
-        return;
-    }
-
-    // Update control size
-    var frame = [self frame];
-    [self setFrameSize:CGSizeMake(CGRectGetWidth(frame) + delta, CGRectGetHeight(frame))];
-
-    // Update segment width
-    [segment setWidth:segmentWidth];
-    [segment setFrame:[self frameForSegment:aSegment]];
-
-    // Update following segments widths
-    var index = aSegment + 1;
-
-    for (; index < _segments.length; ++index)
-    {
-        [_segments[index] frame].origin.x += delta;
-
-        [self drawSegmentBezel:index highlight:NO];
-        [self drawSegment:index highlight:NO];
-    }
-
-    [self drawSegmentBezel:aSegment highlight:NO];
-    [self drawSegment:aSegment highlight:NO];
+    [self setFrameSize:CGSizeMake(width, CGRectGetHeight([self frame]))];
 
     [self setNeedsLayout];
     [self setNeedsDisplay:YES];
@@ -743,29 +768,57 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (CGRect)frameForSegment:(unsigned)aSegment
 {
-    return [self bezelFrameForSegment:aSegment];
+    var segment = [_segments objectAtIndex:aSegment],
+        frame = [segment frame];
+
+    if (CGRectEqualToRect(frame, CGRectMakeZero()))
+    {
+        frame = [self bezelFrameForSegment:aSegment];
+        [segment setFrame:frame];
+    }
+
+    return frame;
 }
 
 - (CGRect)bezelFrameForSegment:(unsigned)aSegment
 {
-    var height = [self currentValueForThemeAttribute:@"min-size"].height,
-        bezelInset = [self currentValueForThemeAttribute:@"bezel-inset"],
+    var left = [self _leftOffsetForSegment:aSegment],
+        top = [self currentValueForThemeAttribute:@"bezel-inset"].top,
         width = [self widthForSegment:aSegment],
-        left = [self _leftOffsetForSegment:aSegment];
+        height = [self currentValueForThemeAttribute:@"min-size"].height;
 
-    return CGRectMake(left, bezelInset.top, width, height);
+    if (width == 0)
+    {
+        var themeState = _themeState.hasThemeState(CPThemeStateDisabled) ? _themeStates[aSegment].and(CPThemeStateDisabled) : _themeStates[aSegment],
+            contentInset = [self valueForThemeAttribute:@"content-inset" inState:themeState],
+            contentInsetWidth = contentInset.left + contentInset.right,
+
+            segment = _segments[aSegment],
+            label = [segment label],
+            image = [segment image];
+
+        width = (label ? [label sizeWithFont:[self font]].width : 4.0) + (image ? [image size].width : 0) + contentInsetWidth;
+    }
+
+    return CGRectMake(left, top, width, height);
 }
 
 - (CGRect)contentFrameForSegment:(unsigned)aSegment
 {
     var height = [self currentValueForThemeAttribute:@"min-size"].height,
         contentInset = [self currentValueForThemeAttribute:@"content-inset"],
-        width = [self widthForSegment:aSegment],
+        width = CGRectGetWidth([self frameForSegment:aSegment]),
         left = [self _leftOffsetForSegment:aSegment];
 
     return CGRectMake(left + contentInset.left, contentInset.top, width - contentInset.left - contentInset.right, height - contentInset.top - contentInset.bottom);
 }
 
+- (CGSize)_minimumFrameSize
+{
+    // The current width is always the minimum width.
+    return CGSizeMake(CGRectGetWidth([self frame]), [self currentValueForThemeAttribute:@"min-size"].height);
+}
+
 /*!
     Returns the segment that is hit by the specified point.
     @param aPoint the point to test for a segment hit
@@ -774,19 +827,19 @@ CPSegmentSwitchTrackingMomentary = 2;
 - (unsigned)testSegment:(CGPoint)aPoint
 {
     var location = [self convertPoint:aPoint fromView:nil],
-        count = _segments.length;
+        count = [self segmentCount];
 
     while (count--)
-        if (CGRectContainsPoint([_segments[count] frame], aPoint))
+        if (CGRectContainsPoint([self frameForSegment:count], aPoint))
             return count;
 
-    if (_segments.length)
+    if ([self segmentCount])
     {
-        var adjustedLastFrame = CGRectCreateCopy([_segments[_segments.length - 1] frame]);
+        var adjustedLastFrame = CGRectCreateCopy([self frameForSegment:(_segments.length - 1)]);
         adjustedLastFrame.size.width = CGRectGetWidth([self bounds]) - adjustedLastFrame.origin.x;
 
         if (CGRectContainsPoint(adjustedLastFrame, aPoint))
-            return _segments.length - 1;
+            return [self segmentCount] - 1;
     }
 
     return -1;
@@ -837,7 +890,7 @@ CPSegmentSwitchTrackingMomentary = 2;
             {
                 [self setSelected:NO forSegment:_trackingSegment];
 
-                _selectedSegment = -1;
+                _selectedSegment = CPNotFound;
             }
         }
 
@@ -881,7 +934,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 {
     [super setFont:aFont];
 
-    [self tileWithChangedSegment:0];
+    [self tile];
 }
 
 @end
@@ -913,7 +966,7 @@ var CPSegmentedControlSegmentsKey       = "CPSegmentedControlSegmentsKey",
         if ([aCoder containsValueForKey:CPSegmentedControlSelectedKey])
             _selectedSegment = [aCoder decodeIntForKey:CPSegmentedControlSelectedKey];
         else
-            _selectedSegment = -1;
+            _selectedSegment = CPNotFound;
 
         if ([aCoder containsValueForKey:CPSegmentedControlTrackingModeKey])
             _trackingMode = [aCoder decodeIntForKey:CPSegmentedControlTrackingModeKey];
@@ -921,23 +974,24 @@ var CPSegmentedControlSegmentsKey       = "CPSegmentedControlSegmentsKey",
             _trackingMode = CPSegmentSwitchTrackingSelectOne;
 
         // Here we update the themeStates array for each segments to know if there are selected or not
-        for (var i = 0; i < _segments.length; i++)
+        for (var i = 0; i < [self segmentCount]; i++)
             _themeStates[i] = [_segments[i] selected] ? CPThemeStateSelected : CPThemeStateNormal;
 
-        // We do this in a second loop because it relies on all the themeStates being set first
-        for (var i = 0; i < _segments.length; i++)
-            [self tileWithChangedSegment:i];
+        [self tile];
 
         var thickness = [self currentValueForThemeAttribute:@"divider-thickness"],
             dividerExtraSpace = ([_segments count] - 1) * thickness,
             difference = MAX(originalWidth - [self frame].size.width - dividerExtraSpace, 0.0),
-            remainingWidth = FLOOR(difference / _segments.length),
+            remainingWidth = FLOOR(difference / [self segmentCount]),
             widthOfAllSegments = 0;
 
-        for (var i = 0; i < _segments.length; i++)
+        // We do this in a second loop because it relies on all the themeStates being set first
+        for (var i = 0; i < [self segmentCount]; i++)
         {
-            [self setWidth:[_segments[i] width] + remainingWidth forSegment:i];
-            widthOfAllSegments += [_segments[i] width];
+            var frame = [_segments[i] frame];
+            frame.size.width += remainingWidth;
+
+            widthOfAllSegments += CGRectGetWidth(frame);
         }
 
         // Here we handle the leftovers pixel, and we will add one pixel to each segment cell till we have the same size as the originalSize.
@@ -945,16 +999,16 @@ var CPSegmentedControlSegmentsKey       = "CPSegmentedControlSegmentsKey",
         var leftOversPixel = originalWidth - (widthOfAllSegments + dividerExtraSpace);
 
         // Make sure we don't make an out of range
-        if (leftOversPixel < _segments.length - 1)
+        if (leftOversPixel < [self segmentCount] - 1)
         {
             for (var i = 0; i < leftOversPixel; i++)
             {
-                [self setWidth:[_segments[i] width] + 1 forSegment:i];
+                [_segments[i] frame].size.width += 1;
             }
         }
 
-        [self setFrameSize:CGSizeMake(originalWidth, [self frame].size.height)];
-        [self tileWithChangedSegment:0];
+        [self setFrameSize:CGSizeMake(originalWidth, CGRectGetHeight([self frame]))];
+        [self tile];
     }
 
     return self;

AppKit/CPSplitView.j

@@ -26,6 +26,7 @@
 @import "CPImage.j"
 @import "CPView.j"
 @import "CPCursor.j"
+@import "CPTrackingArea.j"
 
 @class CPUserDefaults
 @global CPApp
@@ -55,7 +56,9 @@ var CPSplitViewDelegate_splitView_canCollapseSubview_
     CPSplitViewDelegate_splitView_constrainMaxCoordinate_ofSubviewAt_                   = 1 << 5,
     CPSplitViewDelegate_splitView_constrainMinCoordinate_ofSubviewAt_                   = 1 << 6,
     CPSplitViewDelegate_splitView_constrainSplitPosition_ofSubviewAt_                   = 1 << 7,
-    CPSplitViewDelegate_splitView_resizeSubviewsWithOldSize_                            = 1 << 8;
+    CPSplitViewDelegate_splitView_resizeSubviewsWithOldSize_                            = 1 << 8,
+    CPSplitViewDelegate_splitViewDidResizeSubviews_                                     = 1 << 9,
+    CPSplitViewDelegate_splitViewWillResizeSubviews_                                    = 1 << 10;
 
 #define SPLIT_VIEW_MAYBE_POST_WILL_RESIZE() \
     if ((_suppressResizeNotificationsMask & DidPostWillResizeNotification) === 0) \
@@ -560,26 +563,6 @@ var ShouldSuppressResizeNotifications   = 1,
     //[[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];
@@ -967,26 +950,14 @@ The sum of the views and the sum of the dividers should be equal to the size of
     if (_delegate === aDelegate)
         return;
 
-    if ([_delegate respondsToSelector:@selector(splitViewDidResizeSubviews:)])
-        [[CPNotificationCenter defaultCenter] removeObserver:_delegate name:CPSplitViewDidResizeSubviewsNotification object:self];
+    _delegate = aDelegate;
+    _implementedDelegateMethods = 0;
 
     if ([_delegate respondsToSelector:@selector(splitViewWillResizeSubviews:)])
-        [[CPNotificationCenter defaultCenter] removeObserver:_delegate name:CPSplitViewWillResizeSubviewsNotification object:self];
+        _implementedDelegateMethods |= CPSplitViewDelegate_splitViewWillResizeSubviews_;
 
-   _delegate = aDelegate;
-   _implementedDelegateMethods = 0;
-
-   if ([_delegate respondsToSelector:@selector(splitViewDidResizeSubviews:)])
-       [[CPNotificationCenter defaultCenter] addObserver:_delegate
-                                                selector:@selector(splitViewDidResizeSubviews:)
-                                                    name:CPSplitViewDidResizeSubviewsNotification
-                                                  object:self];
-
-   if ([_delegate respondsToSelector:@selector(splitViewWillResizeSubviews:)])
-       [[CPNotificationCenter defaultCenter] addObserver:_delegate
-                                                selector:@selector(splitViewWillResizeSubviews:)
-                                                    name:CPSplitViewWillResizeSubviewsNotification
-                                                  object:self];
+    if ([_delegate respondsToSelector:@selector(splitViewDidResizeSubviews:)])
+        _implementedDelegateMethods |= CPSplitViewDelegate_splitViewDidResizeSubviews_;
 
     if ([_delegate respondsToSelector:@selector(splitView:canCollapseSubview:)])
         _implementedDelegateMethods |= CPSplitViewDelegate_splitView_canCollapseSubview_;
@@ -1064,27 +1035,12 @@ The sum of the views and the sum of the dividers should be equal to the size of
 
 - (void)_postNotificationWillResize
 {
-    var userInfo = nil;
-
-    if (_currentDivider !== CPNotFound)
-        userInfo = @{ @"CPSplitViewDividerIndex": _currentDivider };
-
-    [[CPNotificationCenter defaultCenter] postNotificationName:CPSplitViewWillResizeSubviewsNotification
-                                                        object:self
-                                                      userInfo:userInfo];
+    [self _sendDelegateSplitViewWillResizeSubviews];
 }
 
 - (void)_postNotificationDidResize
 {
-    var userInfo = nil;
-
-    if (_currentDivider !== CPNotFound)
-        userInfo = @{ @"CPSplitViewDividerIndex": _currentDivider };
-
-    [[CPNotificationCenter defaultCenter] postNotificationName:CPSplitViewDidResizeSubviewsNotification
-                                                        object:self
-                                                      userInfo:userInfo];
-
+    [self _sendDelegateSplitViewDidResizeSubviews];
 
     // TODO Cocoa always autosaves on "viewDidEndLiveResize". If Cappuccino adds support for this we
     // should do the same.
@@ -1230,6 +1186,29 @@ The sum of the views and the sum of the dividers should be equal to the size of
 
 @end
 
+@implementation CPSplitView (CPTrackingArea)
+
+- (void)updateTrackingAreas
+{
+    [self removeAllTrackingAreas];
+
+    var options = CPTrackingCursorUpdate | CPTrackingActiveInKeyWindow;
+    
+    for (var i = 0; i < _subviews.length - 1; i++)
+        [self addTrackingArea:[[CPTrackingArea alloc] initWithRect:[self effectiveRectOfDividerAtIndex:i]
+                                                           options:options
+                                                             owner:self
+                                                          userInfo:nil]];
+}
+
+- (void)cursorUpdate:(CPEvent)anEvent
+{
+    if (_currentDivider === CPNotFound)
+        [self _updateResizeCursor:anEvent];
+}
+
+@end
+
 
 @implementation CPSplitView (CPSplitViewDelegate)
 
@@ -1369,6 +1348,42 @@ The sum of the views and the sum of the dividers should be equal to the size of
     [_delegate splitView:self resizeSubviewsWithOldSize:oldSize];
 }
 
+/*!
+    @ignore
+    Call the delegate splitViewWillResizeSubviews:
+*/
+- (void)_sendDelegateSplitViewWillResizeSubviews
+{
+    var userInfo = nil;
+
+    if (_currentDivider !== CPNotFound)
+        userInfo = @{ @"CPSplitViewDividerIndex": _currentDivider };
+
+    if (_implementedDelegateMethods & CPSplitViewDelegate_splitViewWillResizeSubviews_)
+        [_delegate splitViewWillResizeSubviews:[[CPNotification alloc] initWithName:CPSplitViewWillResizeSubviewsNotification object:self userInfo:userInfo]];
+
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPSplitViewWillResizeSubviewsNotification object:self userInfo:userInfo];
+}
+
+/*!
+    @ignore
+    Call the delegate splitViewDidResizeSubviews:
+*/
+- (void)_sendDelegateSplitViewDidResizeSubviews
+{
+    var userInfo = nil;
+
+    if (_currentDivider !== CPNotFound)
+        userInfo = @{ @"CPSplitViewDividerIndex": _currentDivider };
+
+    if (_implementedDelegateMethods & CPSplitViewDelegate_splitViewDidResizeSubviews_)
+        [_delegate splitViewDidResizeSubviews:[[CPNotification alloc] initWithName:CPSplitViewDidResizeSubviewsNotification object:self userInfo:userInfo]];
+
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPSplitViewDidResizeSubviewsNotification object:self userInfo:userInfo];
+
+    [self updateTrackingAreas];
+}
+
 @end
 
 

AppKit/CPStepper.j

@@ -188,12 +188,12 @@
     [_buttonUp setFrame:upFrame];
     [_buttonDown setFrame:downFrame];
 
-    [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inState:[controlSizeThemeState, CPThemeStateBordered]] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered];
-    [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inState:[controlSizeThemeState, CPThemeStateBordered, CPThemeStateDisabled]] forThemeAttribute:@"bezel-color" inState:[CPThemeStateBordered, CPThemeStateDisabled]];
-    [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inState:[controlSizeThemeState, CPThemeStateBordered, CPThemeStateHighlighted]] forThemeAttribute:@"bezel-color" inState:[CPThemeStateBordered, CPThemeStateHighlighted]];
-    [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inState:[controlSizeThemeState, CPThemeStateBordered]] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered];
-    [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inState:[controlSizeThemeState, CPThemeStateBordered, CPThemeStateDisabled]] forThemeAttribute:@"bezel-color" inState:[CPThemeStateBordered, CPThemeStateDisabled]];
-    [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inState:[controlSizeThemeState, CPThemeStateBordered, CPThemeStateHighlighted]] forThemeAttribute:@"bezel-color" inState:[CPThemeStateBordered, CPThemeStateHighlighted]];
+    [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inStates:[controlSizeThemeState, CPThemeStateBordered]] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered];
+    [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inStates:[controlSizeThemeState, CPThemeStateBordered, CPThemeStateDisabled]] forThemeAttribute:@"bezel-color" inStates:[CPThemeStateBordered, CPThemeStateDisabled]];
+    [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inStates:[controlSizeThemeState, CPThemeStateBordered, CPThemeStateHighlighted]] forThemeAttribute:@"bezel-color" inStates:[CPThemeStateBordered, CPThemeStateHighlighted]];
+    [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inStates:[controlSizeThemeState, CPThemeStateBordered]] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered];
+    [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inStates:[controlSizeThemeState, CPThemeStateBordered, CPThemeStateDisabled]] forThemeAttribute:@"bezel-color" inStates:[CPThemeStateBordered, CPThemeStateDisabled]];
+    [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inStates:[controlSizeThemeState, CPThemeStateBordered, CPThemeStateHighlighted]] forThemeAttribute:@"bezel-color" inStates:[CPThemeStateBordered, CPThemeStateHighlighted]];
 }
 
 - (void)_sizeToFit

AppKit/CPTabView.j

@@ -34,6 +34,8 @@ CPNoTabsBezelBorder      = 4; //Displays no tabs and has a bezeled border.
 CPNoTabsLineBorder       = 5; //Has no tabs and displays a line border.
 CPNoTabsNoBorder         = 6; //Displays no tabs and no border.
 
+@class _CPTabViewBox
+
 var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
     CPTabViewShouldSelectTabViewItemSelector        = 1 << 2,
     CPTabViewWillSelectTabViewItemSelector          = 1 << 3,
@@ -64,9 +66,10 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
     CPArray                 _items;
 
     CPSegmentedControl      _tabs;
-    CPBox                   _box;
+    _CPTabViewBox           _box;
+    CPView                  _placeHolderView;
 
-    CPNumber                _selectedIndex;
+    CPTabViewItem           _selectedTabViewItem;
 
     CPTabViewType           _type;
     CPFont                  _font;
@@ -79,9 +82,8 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
 {
     if (self = [super initWithFrame:aFrame])
     {
-        _items = [CPArray array];
-
         [self _init];
+        _selectedTabViewItem = nil;
         [self setTabViewType:CPTopTabsBezelBorder];
     }
 
@@ -90,19 +92,26 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
 
 - (void)_init
 {
-    _selectedIndex = CPNotFound;
-
-    _tabs = [[CPSegmentedControl alloc] initWithFrame:CGRectMake(0, 0, 0, 0)];
+    _tabs = [[CPSegmentedControl alloc] initWithFrame:CGRectMakeZero()];
     [_tabs setHitTests:NO];
+    [_tabs setSegments:[CPArray array]];
 
     var height = [_tabs valueForThemeAttribute:@"min-size"].height;
     [_tabs setFrameSize:CGSizeMake(0, height)];
 
-    _box = [[CPBox alloc] initWithFrame:[self  bounds]];
+    _box = [[_CPTabViewBox alloc] initWithFrame:[self  bounds]];
+    [_box setTabView:self];
     [self setBackgroundColor:[CPColor colorWithCalibratedWhite:0.95 alpha:1.0]];
 
     [self addSubview:_box];
     [self addSubview:_tabs];
+
+    _placeHolderView = nil;
+}
+
+- (CPArray)items
+{
+    return [_tabs segments];
 }
 
 // Adding and Removing Tabs
@@ -112,7 +121,7 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
 */
 - (void)addTabViewItem:(CPTabViewItem)aTabViewItem
 {
-    [self insertTabViewItem:aTabViewItem atIndex:[_items count]];
+    [self insertTabViewItem:aTabViewItem atIndex:[self numberOfTabViewItems]];
 }
 
 /*!
@@ -122,15 +131,18 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
 */
 - (void)insertTabViewItem:(CPTabViewItem)aTabViewItem atIndex:(CPUInteger)anIndex
 {
-    [_items insertObject:aTabViewItem atIndex:anIndex];
+    [self _insertTabViewItems:[aTabViewItem] atIndexes:[CPIndexSet indexSetWithIndex:anIndex]];
+}
 
-    [self _updateItems];
-    [self _repositionTabs];
+- (void)_insertTabViewItems:(CPArray)tabViewItems atIndexes:(CPIndexSet)indexes
+{
+    [_tabs insertSegments:tabViewItems atIndexes:indexes];
+    [tabViewItems makeObjectsPerformSelector:@selector(_setTabView:) withObject:self];
 
-    [aTabViewItem _setTabView:self];
+    [self tileWithChangedItem:[tabViewItems firstObject]];
+    [self _reverseSetContent];
 
-    if (_delegateSelectors & CPTabViewDidChangeNumberOfTabViewItemsSelector)
-        [_delegate tabViewDidChangeNumberOfTabViewItems:self];
+    [self _sendDelegateTabViewDidChangeNumberOfTabViewItems];
 }
 
 /*!
@@ -139,23 +151,39 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
 */
 - (void)removeTabViewItem:(CPTabViewItem)aTabViewItem
 {
-    var count = [_items count];
-    for (var i = 0; i < count; i++)
-    {
-        if ([_items objectAtIndex:i] === aTabViewItem)
-        {
-            [_items removeObjectAtIndex:i];
-            break;
-        }
-    }
+    var idx = [[self items] indexOfObjectIdenticalTo:aTabViewItem];
 
-    [self _updateItems];
-    [self _repositionTabs];
+    if (idx == CPNotFound)
+        return;
 
+    [_tabs removeSegmentsAtIndexes:[CPIndexSet indexSetWithIndex:idx]];
     [aTabViewItem _setTabView:nil];
 
-    if (_delegateSelectors & CPTabViewDidChangeNumberOfTabViewItemsSelector)
-        [_delegate tabViewDidChangeNumberOfTabViewItems:self];
+    [self tileWithChangedItem:nil];
+    [self _didRemoveTabViewItem:aTabViewItem atIndex:idx];
+    [self _reverseSetContent];
+
+    [self _sendDelegateTabViewDidChangeNumberOfTabViewItems];
+}
+
+- (void)_didRemoveTabViewItem:(CPTabViewItem)aTabViewItem atIndex:(CPInteger)idx
+{
+    // If the selection is managed by bindings, let the binder do that.
+    if ([self binderForBinding:CPSelectionIndexesBinding] || [self binderForBinding:CPSelectedIndexBinding])
+        return;
+
+    if (_selectedTabViewItem == aTabViewItem)
+    {
+        var didSelect = NO;
+
+        if (idx > 0)
+            didSelect = [self selectTabViewItemAtIndex:idx - 1];
+        else if ([self numberOfTabViewItems] > 0)
+            didSelect = [self selectTabViewItemAtIndex:0];
+
+        if (didSelect == NO)
+            _selectedTabViewItem == nil;
+    }
 }
 
 // Accessing Tabs
@@ -166,7 +194,7 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
 */
 - (int)indexOfTabViewItem:(CPTabViewItem)aTabViewItem
 {
-    return [_items indexOfObjectIdenticalTo:aTabViewItem];
+    return [[self items] indexOfObjectIdenticalTo:aTabViewItem];
 }
 
 /*!
@@ -176,11 +204,10 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
 */
 - (int)indexOfTabViewItemWithIdentifier:(CPString)anIdentifier
 {
-    for (var index = [_items count]; index >= 0; index--)
-        if ([[_items[index] identifier] isEqual:anIdentifier])
-            return index;
-
-    return CPNotFound;
+    return [[self items] indexOfObjectPassingTest:function(item, idx, stop)
+    {
+        return [[item identifier] isEqual:anIdentifier];
+    }];
 }
 
 /*!
@@ -189,7 +216,7 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
 */
 - (unsigned)numberOfTabViewItems
 {
-    return [_items count];
+    return [[self items] count];
 }
 
 /*!
@@ -198,7 +225,7 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
 */
 - (CPTabViewItem)tabViewItemAtIndex:(CPUInteger)anIndex
 {
-    return [_items objectAtIndex:anIndex];
+    return [[self items] objectAtIndex:anIndex];
 }
 
 /*!
@@ -207,7 +234,7 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
 */
 - (CPArray)tabViewItems
 {
-    return [_items copy]; // Copy?
+    return [[self items] copy]; // Copy?
 }
 
 // Selecting a Tab
@@ -217,7 +244,7 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
 */
 - (void)selectFirstTabViewItem:(id)aSender
 {
-    if ([_items count] === 0)
+    if ([self numberOfTabViewItems] === 0)
         return; // throw?
 
     [self selectTabViewItemAtIndex:0];
@@ -229,10 +256,10 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
 */
 - (void)selectLastTabViewItem:(id)aSender
 {
-    if ([_items count] === 0)
+    if ([self numberOfTabViewItems] === 0)
         return; // throw?
 
-    [self selectTabViewItemAtIndex:[_items count] - 1];
+    [self selectTabViewItemAtIndex:[self numberOfTabViewItems] - 1];
 }
 
 /*!
@@ -241,12 +268,12 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
 */
 - (void)selectNextTabViewItem:(id)aSender
 {
-    if (_selectedIndex === CPNotFound)
+    if (_selectedTabViewItem === nil)
         return;
 
-    var nextIndex = _selectedIndex + 1;
+    var nextIndex = [self indexOfTabViewItem:_selectedTabViewItem] + 1;
 
-    if (nextIndex === [_items count])
+    if (nextIndex === [self numberOfTabViewItems])
         // does nothing. According to spec at (http://developer.apple.com/mac/library/DOCUMENTATION/Cocoa/Reference/ApplicationKit/Classes/NSTabView_Class/Reference/Reference.html#//apple_ref/occ/instm/NSTabView/selectNextTabViewItem:)
         return;
 
@@ -259,10 +286,10 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
 */
 - (void)selectPreviousTabViewItem:(id)aSender
 {
-    if (_selectedIndex === CPNotFound)
+    if (_selectedTabViewItem === nil)
         return;
 
-    var previousIndex = _selectedIndex - 1;
+    var previousIndex = [self indexOfTabViewItem:_selectedTabViewItem] - 1;
 
     if (previousIndex < 0)
         return; // does nothing. See above.
@@ -285,22 +312,32 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
 */
 - (BOOL)selectTabViewItemAtIndex:(CPUInteger)anIndex
 {
-    if (anIndex === _selectedIndex)
-        return;
-
-    var aTabViewItem = [self tabViewItemAtIndex:anIndex];
-
-    if ((_delegateSelectors & CPTabViewShouldSelectTabViewItemSelector) && ![_delegate tabView:self shouldSelectTabViewItem:aTabViewItem])
+    if (![self _selectTabViewItemAtIndex:anIndex])
         return NO;
 
-    if (_delegateSelectors & CPTabViewWillSelectTabViewItemSelector)
-        [_delegate tabView:self willSelectTabViewItem:aTabViewItem];
+    [self _reverseSetSelectedIndex];
 
-    [_tabs selectSegmentWithTag:anIndex];
-    [self _setSelectedIndex:anIndex];
+    return YES;
+}
 
-    if (_delegateSelectors & CPTabViewDidSelectTabViewItemSelector)
-        [_delegate tabView:self didSelectTabViewItem:aTabViewItem];
+// Like selectTabViewItemAtIndex: but without bindings interaction
+- (BOOL)_selectTabViewItemAtIndex:(CPUInteger)anIndex
+{
+    var aTabViewItem = [self tabViewItemAtIndex:anIndex];
+
+    if (aTabViewItem == _selectedTabViewItem)
+        return NO;
+
+    if (![self _sendDelegateShouldSelectTabViewItem:aTabViewItem])
+        return NO;
+
+    [self _sendDelegateWillSelectTabViewItem:aTabViewItem];
+
+    [_tabs setSelectedSegment:anIndex];
+    _selectedTabViewItem = aTabViewItem;
+    [self _displayItemView:[aTabViewItem view]];
+
+    [self _sendDelegateDidSelectTabViewItem:aTabViewItem];
 
     return YES;
 }
@@ -311,10 +348,7 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
 */
 - (CPTabViewItem)selectedTabViewItem
 {
-    if (_selectedIndex != CPNotFound)
-        return [_items objectAtIndex:_selectedIndex];
-
-    return nil;
+    return _selectedTabViewItem;
 }
 
 // Modifying the font
@@ -375,6 +409,14 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
     [self setNeedsLayout];
 }
 
+- (void)tileWithChangedItem:(CPTabViewItem)aTabViewItem
+{
+    var segment = aTabViewItem ? [self indexOfTabViewItem:aTabViewItem] : 0;
+    [_tabs tileWithChangedSegment:segment];
+
+    [self setNeedsLayout];
+}
+
 - (void)layoutSubviews
 {
     // Even if CPTabView's autoresizesSubviews is NO, _tabs and _box has to be laid out.
@@ -392,7 +434,6 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
         [_box setFrame:CGRectMake(0, origin, CGRectGetWidth(aFrame),
                                    CGRectGetHeight(aFrame) - segmentedHeight / 2)];
 
-        [self _updateItems];
         [self _repositionTabs];
     }
 }
@@ -470,30 +511,238 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
         [_tabs setCenter:CGPointMake(horizontalCenterOfSelf, verticalCenterOfTabs)];
 }
 
-- (void)_setSelectedIndex:(CPNumber)index
+- (void)_displayItemView:(CPView)aView
 {
-    _selectedIndex = index;
-    [self _setContentViewFromItem:[_items objectAtIndex:_selectedIndex]];
+    [_box setContentView:aView];
 }
 
-- (void)_setContentViewFromItem:(CPTabViewItem)anItem
+// DELEGATE METHODS
+
+- (BOOL)_sendDelegateShouldSelectTabViewItem:(CPTabViewItem)aTabViewItem
 {
-    [_box setContentView:[anItem view]];
+    if (_delegateSelectors & CPTabViewShouldSelectTabViewItemSelector)
+        return [_delegate tabView:self shouldSelectTabViewItem:aTabViewItem];
+
+    return YES;
 }
 
-- (void)_updateItems
+- (void)_sendDelegateWillSelectTabViewItem:(CPTabViewItem)aTabViewItem
 {
-    var count = [_items count];
-    [_tabs setSegmentCount:count];
+    if (_delegateSelectors & CPTabViewWillSelectTabViewItemSelector)
+        [_delegate tabView:self willSelectTabViewItem:aTabViewItem];
+}
 
-    for (var i = 0; i < count; i++)
+- (void)_sendDelegateDidSelectTabViewItem:(CPTabViewItem)aTabViewItem
+{
+    if (_delegateSelectors & CPTabViewDidSelectTabViewItemSelector)
+        [_delegate tabView:self didSelectTabViewItem:aTabViewItem];
+}
+
+- (void)_sendDelegateTabViewDidChangeNumberOfTabViewItems
+{
+    if (_delegateSelectors & CPTabViewDidChangeNumberOfTabViewItemsSelector)
+        [_delegate tabViewDidChangeNumberOfTabViewItems:self];
+}
+
+@end
+
+@implementation CPTabView (BindingSupport)
+
++ (Class)_binderClassForBinding:(CPString)aBinding
+{
+    if (aBinding == CPContentBinding)
+        return [_CPTabViewContentBinder class];
+    else if (aBinding == CPSelectionIndexesBinding || aBinding == CPSelectedIndexBinding)
+        return [_CPTabViewSelectionBinder class];
+
+    return [super _binderClassForBinding:aBinding];
+}
+
++ (BOOL)isBindingExclusive:(CPString)aBinding
+{
+    return (aBinding == CPSelectionIndexesBinding || aBinding == CPSelectedIndexBinding);
+}
+
+- (void)_reverseSetContent
+{
+    var theBinder = [self binderForBinding:CPContentBinding];
+    [theBinder reverseSetValueFor:@"items"];
+}
+
+- (void)_reverseSetSelectedIndex
+{
+    var theBinder = [self binderForBinding:CPSelectionIndexesBinding];
+
+    if (theBinder !== nil)
+        [theBinder reverseSetValueFor:@"selectionIndexes"];
+    else
     {
-        [_tabs setLabel:[[_items objectAtIndex:i] label] forSegment:i];
-        [_tabs setTag:i forSegment:i];
+        theBinder = [self binderForBinding:CPSelectedIndexBinding];
+        [theBinder reverseSetValueFor:@"selectedIndex"];
+    }
+}
+
+- (CPBinder)binderForBinding:(CPString)aBinding
+{
+    var cls = [[self class] _binderClassForBinding:aBinding]
+    return [cls getBinding:aBinding forObject:self];
+}
+
+- (void)setItems:(CPArray)tabViewItems
+{
+    if ([tabViewItems isEqualToArray:[_tabs segments]])
+        return;
+
+    [[self items] makeObjectsPerformSelector:@selector(_setTabView:) withObject:nil];
+    [_tabs setSegments:tabViewItems];
+    [tabViewItems makeObjectsPerformSelector:@selector(_setTabView:) withObject:self];
+
+    [self tileWithChangedItem:nil];
+
+    // Update the selection because setSegments: did remove all previous segments AND the selection.
+    [_tabs setSelectedSegment:[self indexOfTabViewItem:_selectedTabViewItem]];
+
+    // should we send delegate methods in bindings mode ?
+    //[self _delegateTabViewDidChangeNumberOfTabViewItems:self];
+}
+
+- (void)_deselectAll
+{
+    [_tabs setSelectedSegment:-1];
+    _selectedTabViewItem = nil;
+}
+
+- (void)_displayPlaceholder:(CPString)aPlaceholder
+{
+    if (_placeHolderView == nil)
+    {
+        _placeHolderView = [[CPView alloc] initWithFrame:CGRectMakeZero()];
+        var textField = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
+        [textField setTag:1000];
+        [textField setTextColor:[CPColor whiteColor]];
+        [textField setFont:[CPFont boldFontWithName:@"Geneva" size:18 italic:YES]];
+        [_placeHolderView addSubview:textField];
     }
 
-    if (_selectedIndex === CPNotFound)
-        [self selectFirstTabViewItem:self];
+    var textField = [_placeHolderView viewWithTag:1000];
+    [textField setStringValue:aPlaceholder];
+    [textField sizeToFit];
+
+    var boxBounds = [_box bounds],
+        textFieldBounds = [textField bounds],
+        origin = CGPointMake(CGRectGetWidth(boxBounds)/2 - CGRectGetWidth(textFieldBounds)/2, CGRectGetHeight(boxBounds)/2 - CGRectGetHeight(textFieldBounds));
+
+    [textField setFrameOrigin:origin];
+
+    [self _displayItemView:_placeHolderView];
+}
+
+#pragma mark -
+#pragma mark Override
+
+/*!
+    Enabled controls accept first mouse by default.
+*/
+- (BOOL)acceptsFirstMouse:(CPEvent)anEvent
+{
+    return YES;
+}
+
+@end
+
+var _CPTabViewContentBinderNull = @"NO CONTENT";
+
+@implementation _CPTabViewContentBinder : CPBinder
+{
+}
+
+- (void)_updatePlaceholdersWithOptions:(CPDictionary)options
+{
+    [super _updatePlaceholdersWithOptions:options];
+    [self _setPlaceholder:_CPTabViewContentBinderNull forMarker:CPNullMarker isDefault:YES];
+}
+
+- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
+{
+    [_source setItems:@[]];
+    [_source _setPlaceholderView:aValue];
+}
+
+- (void)setValue:(id)aValue forBinding:(CPString)aBinding
+{
+    [_source setItems:aValue];
+}
+
+- (id)valueForBinding:(CPString)aBinding
+{
+    return [_source items];
+}
+
+@end
+
+var _CPTabViewSelectionBinderMultipleValues = @"Multiple Selection",
+    _CPTabViewSelectionBinderNoSelection = @"No Selection";
+
+@implementation _CPTabViewSelectionBinder : CPBinder
+{
+}
+
+- (void)_updatePlaceholdersWithOptions:(CPDictionary)options
+{
+    [super _updatePlaceholdersWithOptions:options];
+
+    [self _setPlaceholder:_CPTabViewSelectionBinderMultipleValues forMarker:CPMultipleValuesMarker isDefault:YES];
+    [self _setPlaceholder:_CPTabViewSelectionBinderNoSelection forMarker:CPNoSelectionMarker isDefault:YES];
+}
+
+- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
+{
+    if (aMarker == CPNoSelectionMarker || aMarker == CPNullMarker)
+        [_source _deselectAll];
+
+    [_source _displayPlaceholder:aValue];
+}
+
+- (void)setValue:(id)aValue forBinding:(CPString)aBinding
+{
+    if (aBinding == CPSelectionIndexesBinding)
+    {
+        if (aValue == nil || [aValue count] == 0)
+        {
+            [_source _deselectAll];
+            [_source _displayPlaceholder:_CPTabViewSelectionBinderNoSelection];
+        }
+        else if ([aValue count] > 1)
+            [_source _displayPlaceholder:_CPTabViewSelectionBinderMultipleValues];
+        else if ([aValue firstIndex] < [_source numberOfTabViewItems])
+            [_source _selectTabViewItemAtIndex:[aValue firstIndex]];
+    }
+    else if (aBinding == CPSelectedIndexBinding)
+    {
+        if (aValue == CPNotFound)
+        {
+            [_source _deselectAll];
+            [_source _displayPlaceholder:_CPTabViewSelectionBinderNoSelection];
+        }
+        else if (aValue < [_source numberOfTabViewItems])
+            [_source _selectTabViewItemAtIndex:aValue];
+    }
+}
+
+- (id)valueForBinding:(CPString)aBinding
+{
+    if (aBinding == CPSelectionIndexesBinding)
+    {
+        var result = [CPIndexSet indexSet],
+            idx = [_source indexOfTabViewItem:[_source selectedTabViewItem]];
+
+        if (idx !== CPNotFound)
+            [result addIndex:idx];
+
+        return result;
+    }
+    else if (aBinding == CPSelectedIndexBinding)
+        return [_source indexOfTabViewItem:[_source selectedTabViewItem]];
 }
 
 @end
@@ -515,12 +764,13 @@ var CPTabViewItemsKey               = "CPTabViewItemsKey",
         _font = [aCoder decodeObjectForKey:CPTabViewFontKey];
         [_tabs setFont:_font];
 
-        _items = [aCoder decodeObjectForKey:CPTabViewItemsKey];
-        [_items makeObjectsPerformSelector:@selector(_setTabView:) withObject:self];
+        var items = [aCoder decodeObjectForKey:CPTabViewItemsKey] || [CPArray array];
+        [self _insertTabViewItems:items atIndexes:[CPIndexSet indexSetWithIndexesInRange:CPMakeRange(0, [items count])]];
 
         [self setDelegate:[aCoder decodeObjectForKey:CPTabViewDelegateKey]];
 
-        self.selectOnAwake = [aCoder decodeObjectForKey:CPTabViewSelectedItemKey];
+        _selectedTabViewItem = [aCoder decodeObjectForKey:CPTabViewSelectedItemKey];
+
         _type = [aCoder decodeIntForKey:CPTabViewTypeKey];
     }
 
@@ -529,14 +779,23 @@ var CPTabViewItemsKey               = "CPTabViewItemsKey",
 
 - (void)awakeFromCib
 {
+    [super awakeFromCib];
+
     // This cannot be run in initWithCoder because it might call selectTabViewItem:, which is
     // not safe to call before the views of the tab views items are fully decoded.
-    [self _updateItems];
 
-    if (self.selectOnAwake)
+    if (_selectedTabViewItem)
     {
-        [self selectTabViewItem:self.selectOnAwake];
-        delete self.selectOnAwake;
+        var idx = [self indexOfTabViewItem:_selectedTabViewItem];
+
+        if (idx !== CPNotFound)
+        {
+            // Temporarily set the selected item to not selected.
+            // It allows the initial selection to be made correctly.
+            _selectedTabViewItem = nil;
+
+            [self selectTabViewItemAtIndex:idx];
+        }
     }
 
     var type = _type;
@@ -558,9 +817,7 @@ var CPTabViewItemsKey               = "CPTabViewItemsKey",
 
     [aCoder encodeObject:_items forKey:CPTabViewItemsKey];
 
-    var selected = [self selectedTabViewItem];
-    if (selected)
-        [aCoder encodeObject:selected forKey:CPTabViewSelectedItemKey];
+    [aCoder encodeConditionalObject:_selectedTabViewItem forKey:CPTabViewSelectedItemKey];
 
     [aCoder encodeInt:_type forKey:CPTabViewTypeKey];
     [aCoder encodeObject:_font forKey:CPTabViewFontKey];
@@ -569,3 +826,26 @@ var CPTabViewItemsKey               = "CPTabViewItemsKey",
 }
 
 @end
+
+@implementation _CPTabViewBox : CPBox
+{
+    CPTabView _tabView @accessors(property=tabView);
+}
+
+
+#pragma mark -
+#pragma mark Override
+
+- (CPView)hitTest:(CGPoint)aPoint
+{
+    // Here we check if we have clicked on the segmentedControl of the tabView or not
+    // If YES, the CPBox should not handle the click
+    var segmentIndex = [_tabView._tabs testSegment:[_tabView._tabs convertPoint:aPoint fromView:[self superview]]];
+
+    if (segmentIndex != CPNotFound)
+        return nil;
+
+    return [super hitTest:aPoint];
+}
+
+@end

AppKit/CPTabViewItem.j

@@ -24,6 +24,7 @@
 
 @import "CPView.j"
 @class CPTabView
+@class CPViewController
 
 /*
     The tab is currently selected.
@@ -53,14 +54,34 @@ CPPressedTab    = 2;
 */
 @implementation CPTabViewItem : CPObject
 {
-    id          _identifier;
-    CPString    _label;
+    id               _identifier;
+    CPString         _label;
+    CPInteger        _tag            @accessors(property=tag);
 
-    CPView      _view;
-    CPView      _auxiliaryView;
+    CPView           _view;
+    CPView           _auxiliaryView;
 
-    CPTabView   _tabView;
-    unsigned    _tabState;      // Looks like it is not yet implemented
+    CPTabView        _tabView;
+    unsigned         _tabState;      // Looks like it is not yet implemented
+
+    CPImage          _image          @accessors(property=image);
+    CPViewController _viewController @accessors(getter=viewController);
+
+    BOOL             _enabled        @accessors(property=enabled);
+    BOOL             _selected       @accessors(property=selected);
+    CGRect           _tabRect        @accessors(property=frame);
+    float            _width          @accessors(property=width);
+}
+
+/*
+
+*/
++ (CPTabViewItem)tabViewItemWithViewController:(CPViewController)aViewController
+{
+    var item = [[CPTabViewItem alloc] init];
+    [item setViewController:aViewController];
+
+    return item;
 }
 
 - (id)init
@@ -68,6 +89,19 @@ CPPressedTab    = 2;
     return [self initWithIdentifier:@""];
 }
 
+- (void)_init
+{
+    _tag = 0;
+    _viewController = nil;
+    _image = nil;
+    _tabState = 0;
+    _tabView = nil;
+    _enabled = YES;
+    _selected = NO;
+    _tabRect = CGRectMakeZero();
+    _width = 0;
+}
+
 /*!
     Initializes the tab view item with the specified identifier.
     @return the initialized CPTabViewItem
@@ -76,8 +110,12 @@ CPPressedTab    = 2;
 {
     self = [super init];
 
-    if (self)
-        _identifier = anIdentifier;
+    [self _init];
+
+    _identifier = anIdentifier;
+    _label = nil;
+    _view = nil;
+    //_auxiliaryView = nil;
 
     return self;
 }
@@ -89,8 +127,11 @@ CPPressedTab    = 2;
 */
 - (void)setLabel:(CPString)aLabel
 {
+    if ([aLabel isEqualToString:_label])
+        return;
+
     _label = aLabel;
-    [_tabView setNeedsLayout];
+    [_tabView tileWithChangedItem:self];
 }
 
 /*!
@@ -101,6 +142,28 @@ CPPressedTab    = 2;
     return _label;
 }
 
+// Working With Images
+/*!
+    Sets the CPTabViewItem's image.
+    @param anImage the image for the item
+*/
+- (void)setImage:(CPImage)anImage
+{
+    if ([anImage isEqual:_image])
+        return;
+
+    _image = anImage;
+    [_tabView tileWithChangedItem:self];
+}
+
+/*!
+    Returns the CPTabViewItem's image
+*/
+- (CPImage)image
+{
+    return _image;
+}
+
 // Checking the Tab Display State
 /*!
     Returns the tab's current state.
@@ -140,7 +203,7 @@ CPPressedTab    = 2;
     _view = aView;
 
     if ([_tabView selectedTabViewItem] == self)
-        [_tabView _setContentViewFromItem:self];
+        [_tabView _displayItemView:_view];
 }
 
 /*!
@@ -148,6 +211,9 @@ CPPressedTab    = 2;
 */
 - (CPView)view
 {
+    if (!_view && _viewController)
+        return [_viewController view]; // The view controller loads here.
+
     return _view;
 }
 
@@ -186,10 +252,32 @@ CPPressedTab    = 2;
     _tabView = aView;
 }
 
+/*!
+    Sets the specified view controller for the tab view item.
+    @param aViewController an instance of CPViewController.
+*/
+- (void)setViewController:(CPViewController)aViewController
+{
+    _viewController = aViewController;
+
+    var identifier = [aViewController cibName],
+        title = [_viewController title];
+
+    if (identifier)
+        _identifier = identifier;
+
+    if (title)
+        [self setLabel:title];
+
+    if ([_tabView selectedTabViewItem] == self)
+        [_tabView _displayItemView:[_viewController view]];
+}
+
 @end
 
 var CPTabViewItemIdentifierKey  = "CPTabViewItemIdentifierKey",
     CPTabViewItemLabelKey       = "CPTabViewItemLabelKey",
+    CPTabViewItemImageKey       = "CPTabViewItemImageKey",
     CPTabViewItemViewKey        = "CPTabViewItemViewKey",
     CPTabViewItemAuxViewKey     = "CPTabViewItemAuxViewKey";
 
@@ -202,8 +290,11 @@ var CPTabViewItemIdentifierKey  = "CPTabViewItemIdentifierKey",
 
     if (self)
     {
+       [self _init];
+
         _identifier     = [aCoder decodeObjectForKey:CPTabViewItemIdentifierKey];
         _label          = [aCoder decodeObjectForKey:CPTabViewItemLabelKey];
+        _image          = [aCoder decodeObjectForKey:CPTabViewItemImageKey];
 
         _view           = [aCoder decodeObjectForKey:CPTabViewItemViewKey];
         _auxiliaryView  = [aCoder decodeObjectForKey:CPTabViewItemAuxViewKey];
@@ -216,6 +307,7 @@ var CPTabViewItemIdentifierKey  = "CPTabViewItemIdentifierKey",
 {
     [aCoder encodeObject:_identifier    forKey:CPTabViewItemIdentifierKey];
     [aCoder encodeObject:_label         forKey:CPTabViewItemLabelKey];
+    [aCoder encodeObject:_image         forKey:CPTabViewItemImageKey];
 
     [aCoder encodeObject:_view          forKey:CPTabViewItemViewKey];
     [aCoder encodeObject:_auxiliaryView forKey:CPTabViewItemAuxViewKey];

AppKit/CPTableColumn.j

@@ -180,7 +180,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
             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 _layoutViewsForRowIndexes:rows columnIndexes:columns];
         [tableView tile];
 
         if (!_disableResizingPosting)
@@ -393,8 +393,8 @@ CPTableColumnUserResizingMask   = 1 << 1;
 */
 - (void)setDataView:(CPView)aView
 {
-    if (_dataView)
-        _dataViewData = nil;
+    if (_dataView === aView)
+        return;
 
     [aView setThemeState:CPThemeStateTableDataView];
 
@@ -546,11 +546,22 @@ CPTableColumnUserResizingMask   = 1 << 1;
 - (void)setValueFor:(CPString)aBinding
 {
     var tableView = [_source tableView],
-        column = [[tableView tableColumns] indexOfObjectIdenticalTo:_source],
-        rowIndexes = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(0, [tableView numberOfRows])],
-        columnIndexes = [CPIndexSet indexSetWithIndex:column];
+        newNumberOfRows = [tableView _numberOfRows];
 
-    [tableView reloadDataForRowIndexes:rowIndexes columnIndexes:columnIndexes];
+    if ([tableView numberOfRows] == newNumberOfRows)
+    {
+        var rowIndexes = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(0, newNumberOfRows)],
+            column = [[tableView tableColumns] indexOfObjectIdenticalTo:_source],
+            columnIndexes = [CPIndexSet indexSetWithIndex:column];
+
+        // Reloads objectValues only, not the views.
+        // FIXME: reload data for all rows or just rows intersecting exposed rows ?
+        [tableView _reloadDataForRowIndexes:rowIndexes columnIndexes:columnIndexes];
+    }
+    else
+    {
+        [tableView reloadData];
+    }
 }
 
 - (CPSortDescriptor)_defaultSortDescriptorPrototype
@@ -590,7 +601,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
 }
 
 /*!
-    Binds the receiver to an object.
+    Binds the receiver to an object. Note that unlike Cocoa, this works only *after* the receiver has been added to a \c CPTableView.
 
     @param CPString aBinding - The binding you wish to make. Typically CPValueBinding.
     @param id anObject - The object to bind the receiver to.

AppKit/CPText.j

@@ -38,4 +38,16 @@ CPLeftTextMovement              = 19;
 CPRightTextMovement             = 20;
 CPUpTextMovement                = 21;
 CPDownTextMovement              = 22;
-CPCancelTextMovement            = 23;
+CPCancelTextMovement            = 23;
+
+@typedef CPWritingDirection
+CPWritingDirectionNatural       = -1;
+CPWritingDirectionLeftToRight   = 0;
+CPWritingDirectionRightToLeft   = 1;
+
+@typedef CPTextAlignment
+CPLeftTextAlignment      = 0;
+CPRightTextAlignment     = 1;
+CPCenterTextAlignment    = 2;
+CPJustifiedTextAlignment = 3;
+CPNaturalTextAlignment   = 4;

AppKit/CPTextField.j

@@ -28,12 +28,12 @@
 @import "_CPImageAndTextView.j"
 
 @class CPPasteboard
+@class CPScrollView
 
 @global CPApp
 @global CPStringPboardType
 @global CPCursor
 
-
 @protocol CPTextFieldDelegate <CPControlTextEditingDelegate>
 
 @end
@@ -65,11 +65,11 @@ var CPTextFieldDOMCurrentElement = nil,
     CPTextFieldCachedSelectStartFunction = nil,
     CPTextFieldCachedDragFunction = nil,
     CPTextFieldBlurHandler = nil,
-    CPTextFieldInputFunction = nil;
+    CPTextFieldInputFunction = nil,
+    CPTexFieldCurrentCSSSelectableField = nil;
 
 var CPSecureTextFieldCharacter = "\u2022";
 
-
 function CPTextFieldBlurFunction(anEvent, owner, domElement, inputElement, resigning, didBlurRef)
 {
     if (owner && domElement != inputElement.parentNode)
@@ -86,10 +86,16 @@ function CPTextFieldBlurFunction(anEvent, owner, domElement, inputElement, resig
         */
         if ([owner _isWithinUsablePlatformRect])
         {
-            window.setTimeout(function()
+            [[CPRunLoop mainRunLoop] performBlock:function()
             {
+                // This will prevent to jump to the focused element
+                var previousScrollingOrigin = [owner _scrollToVisibleRectAndReturnPreviousOrigin];
+
                 inputElement.focus();
-            }, 0.0);
+
+                [owner _restorePreviousScrollingOrigin:previousScrollingOrigin];
+            } 
+            argument:nil order:0 modes:[CPDefaultRunLoopMode]];
         }
     }
 
@@ -370,7 +376,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
         _sendActionOn = CPKeyUpMask | CPKeyDownMask;
 
-        [self setValue:CPLeftTextAlignment forThemeAttribute:@"alignment"];
+        [self setValue:CPNaturalTextAlignment forThemeAttribute:@"alignment"];
     }
 
     return self;
@@ -643,6 +649,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
     _stringValue = [self stringValue];
 
+
 #if PLATFORM(DOM)
 
     [self _setCSSStyleForInputElement];
@@ -664,30 +671,56 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
     CPTextFieldInputOwner = self;
 
-    window.setTimeout(function()
+    [[CPRunLoop mainRunLoop] performBlock:function()
     {
-        /*
-            setTimeout handlers are not guaranteed to fire in the order they were initiated. This can cause a race condition when several windows with text fields are opened quickly, resulting in several instances of this timeout function being fired, perhaps out of order. So we have to check that by the time this function is fired, CPTextFieldInputOwner has not been changed to another text field in the meantime.
-        */
         if (CPTextFieldInputOwner !== self)
             return;
 
+        // This will prevent to jump to the focused element
+        var previousScrollingOrigin = [self _scrollToVisibleRectAndReturnPreviousOrigin];
+
         element.focus();
 
+        [self _restorePreviousScrollingOrigin:previousScrollingOrigin];
+
         // Select the text if the textfield became first responder through keyboard interaction
         if (!_willBecomeFirstResponderByClick)
+        {
             [self _selectText:self immediately:YES];
+        }
+        else
+        {
+            var point = CGPointMake([self convertPointFromBase:[[CPApp currentEvent] locationInWindow]].x - [self currentValueForThemeAttribute:@"content-inset"].left, 0),
+                position = [CPPlatformString charPositionOfString:[self stringValue] withFont:[self font] forPoint:point];
+
+            [self setSelectedRange:CPMakeRange(position, 0)];
+        }
 
         _willBecomeFirstResponderByClick = NO;
 
         [self textDidFocus:[CPNotification notificationWithName:CPTextFieldDidFocusNotification object:self userInfo:nil]];
-    }, 0.0);
+    } argument:nil order:0 modes:[CPDefaultRunLoopMode]];
 
 #endif
 
     return YES;
 }
 
+/*!
+    Set the selection css style for the DOM element of the textField
+    @ignore
+*/
+- (void)_setEnableCSSSelection:(BOOL)shouldEnable
+{
+#if PLATFORM (DOM)
+    if (CPTexFieldCurrentCSSSelectableField)
+        CPTexFieldCurrentCSSSelectableField._DOMElement.style[CPBrowserStyleProperty(@"user-select")] = @"none";
+
+    CPTexFieldCurrentCSSSelectableField = self;
+    _DOMElement.style[CPBrowserStyleProperty(@"user-select")] = shouldEnable ? @"text" : @"none";
+#endif
+}
+
 /*!
     Set the css style for the input element of the textField
     @ignore
@@ -741,6 +774,10 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
             element.style.textAlign = "right";
             break;
 
+        case CPNaturalTextAlignment:
+            element.style.textAlign = "";
+            break;
+
         default:
             element.style.textAlign = "left";
     }
@@ -783,7 +820,13 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         // even if the value has not changed.
         if ([self _valueIsValid:newValue] === NO)
         {
+            // This will prevent to jump to the focused element
+            var previousScrollingOrigin = [self _scrollToVisibleRectAndReturnPreviousOrigin];
+
             element.focus();
+
+            [self _restorePreviousScrollingOrigin:previousScrollingOrigin];
+
             return NO;
         }
     }
@@ -792,9 +835,11 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     // When we are no longer the first responder we don't worry about the key status of our window anymore.
     [self _setObserveWindowKeyNotifications:NO];
 
-    [self _resignFirstKeyResponder];
+    if ([[self window] isKeyWindow])
+        [self _resignFirstKeyResponder];
 
     _isEditing = NO;
+    
     if ([self isEditable])
     {
         [self textDidEndEditing:[CPNotification notificationWithName:CPControlTextDidEndEditingNotification object:self userInfo:@{"CPTextMovement": [self _currentTextMovement]}]];
@@ -970,6 +1015,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     }
     else if ([self isSelectable])
     {
+        [self _setEnableCSSSelection:YES];
         if (document.attachEvent)
         {
             CPTextFieldCachedSelectStartFunction = [[self window] platformWindow]._DOMBodyElement.onselectstart;
@@ -1011,6 +1057,14 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     }
 }
 
+- (void)rightMouseDown:(CPEvent)anEvent
+{
+    if ([self menuForEvent:anEvent] || [[self nextResponder] isKindOfClass:CPView])
+        [super rightMouseDown:anEvent];
+    else
+        [[[anEvent window] platformWindow] _propagateContextMenuDOMEvent:YES];
+}
+
 - (void)mouseDragged:(CPEvent)anEvent
 {
     if (![self isEnabled] || !([self isSelectable] || [self isEditable]))
@@ -1161,7 +1215,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 - (void)textDidFocus:(CPNotification)note
 {
     // this looks to prevent false propagation of notifications for other objects
-    if ([note object] != self)
+    if ([note object] !== self)
         return;
 
     if (_implementedDelegateMethods & CPTextFieldDelegate_controlTextDidFocus_)
@@ -1463,7 +1517,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
                 if (immediately)
                     element.select();
                 else
-                    window.setTimeout(function() { element.select(); }, 0);
+                    [[CPRunLoop mainRunLoop] performBlock:function(){ element.select(); } argument:nil order:0 modes:[CPDefaultRunLoopMode]];
             }
             else if (wind !== nil && [wind makeFirstResponder:self])
                 [self _selectText:sender immediately:immediately];
@@ -1950,17 +2004,55 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     if (!wind)
         return NO;
 
+    var scrollView = [self enclosingScrollView],
+        previousContentViewBoundsOrigin;
+
+    // Here we scroll to the textField, otherwise the textField could not be in the usable platformRect
+    var previousScrollingOrigin = [self _scrollToVisibleRectAndReturnPreviousOrigin];
+
     var frame = [self convertRectToBase:[self contentRectForBounds:[self bounds]]],
         usableRect = [[wind platformWindow] usableContentFrame];
 
     frame.origin = [wind convertBaseToGlobal:frame.origin];
 
+    // Here we restore the the previous scrolling posiition
+    [self _restorePreviousScrollingOrigin:previousScrollingOrigin];
+
     return (CGRectGetMinX(frame) >= CGRectGetMinX(usableRect) &&
             CGRectGetMaxX(frame) <= CGRectGetMaxX(usableRect) &&
             CGRectGetMinY(frame) >= CGRectGetMinY(usableRect) &&
             CGRectGetMaxY(frame) <= CGRectGetMaxY(usableRect));
 }
 
+/*!
+    @ignore
+*/
+- (CGPoint)_scrollToVisibleRectAndReturnPreviousOrigin
+{
+    var scrollView = [self enclosingScrollView],
+        previousContentViewBoundsOrigin;
+
+    // Here we scroll to the textField, otherwise the textField could not be in the usable platformRect
+    if ([scrollView isKindOfClass:[CPScrollView class]])
+    {
+        previousContentViewBoundsOrigin = CGPointMakeCopy([[scrollView contentView] boundsOrigin]);
+
+        if (![[self superview] scrollRectToVisible:[self frame]])
+            previousContentViewBoundsOrigin = nil;
+    }
+
+    return previousContentViewBoundsOrigin;
+}
+
+/*!
+    @ignore
+*/
+- (void)_restorePreviousScrollingOrigin:(CGPoint)scrollingOrigin
+{
+    if (scrollingOrigin)
+        [[[self enclosingScrollView] contentView] setBoundsOrigin:scrollingOrigin];
+}
+
 @end
 
 var secureStringForString = function(aString)
@@ -2082,7 +2174,8 @@ var CPTextFieldIsEditableKey            = "CPTextFieldIsEditableKey",
         newValue    = [self valueForBinding:aBinding],
         value       = [destination valueForKeyPath:keyPath];
 
-    if (CPIsControllerMarker(value) && newValue === nil) return;
+    if (CPIsControllerMarker(value) && newValue === nil)
+        return;
 
     newValue = [self reverseTransformValue:newValue withOptions:options];
 
@@ -2109,4 +2202,4 @@ var CPTextFieldIsEditableKey            = "CPTextFieldIsEditableKey",
     [_source setObjectValue:aValue];
 }
 
-@end
+@end

AppKit/CPTheme.j

@@ -36,7 +36,6 @@ var CPThemesByName          = { },
 /*!
     @ingroup appkit
 */
-
 @implementation CPTheme : CPObject
 {
     CPString        _name;
@@ -142,20 +141,19 @@ var CPThemesByName          = { },
 
     if (!className)
     {
-        if ([aClass isKindOfClass:[CPView class]])
+        if ([aClass respondsToSelector:@selector(defaultThemeClass)])
         {
-            if ([aClass respondsToSelector:@selector(defaultThemeClass)])
-                className = [aClass defaultThemeClass];
-            else if ([aClass respondsToSelector:@selector(themeClass)])
-            {
-                CPLog.warn(@"%@ themeClass is deprecated in favor of defaultThemeClass", CPStringFromClass(aClass));
-                className = [aClass themeClass];
-            }
-            else
-                return nil;
+            className = [aClass defaultThemeClass];
+        }
+        else if ([aClass respondsToSelector:@selector(themeClass)])
+        {
+            CPLog.warn(@"%@ themeClass is deprecated in favor of defaultThemeClass", CPStringFromClass(aClass));
+            className = [aClass themeClass];
         }
         else
-            [CPException raise:CPInvalidArgumentException reason:@"aClass must be a class object or a string."];
+        {
+            return nil;
+        }
     }
 
     return [_attributes objectForKey:className];
@@ -328,6 +326,7 @@ function ThemeState(stateNames)
     {
         if (!stateNames.hasOwnProperty(key))
             continue;
+
         if (key !== 'normal')
         {
             this._stateNames[key] = true;
@@ -345,8 +344,10 @@ function ThemeState(stateNames)
     this._stateNameString = stateNameKeys[0];
 
     var stateNameLength = stateNameKeys.length;
+
     for (var stateIndex = 1; stateIndex < stateNameLength; stateIndex++)
         this._stateNameString = this._stateNameString + "+" + stateNameKeys[stateIndex];
+
     this._stateNameCount = stateNameLength;
 }
 
@@ -393,7 +394,19 @@ ThemeState.prototype.without = function(aState)
     if (!aState || aState === [CPNull null])
         return this;
 
+    var firstTransform = CPThemeWithoutTransform[this._stateNameString],
+        result;
+
+    if (firstTransform)
+    {
+        result = firstTransform[aState._stateNameString];
+
+        if (result)
+            return result;
+    }
+
     var newStates = {};
+
     for (var stateName in this._stateNames)
     {
         if (!this._stateNames.hasOwnProperty(stateName))
@@ -403,25 +416,54 @@ ThemeState.prototype.without = function(aState)
             newStates[stateName] = true;
     }
 
-    return ThemeState._cacheThemeState(new ThemeState(newStates));
+    result = ThemeState._cacheThemeState(new ThemeState(newStates));
+
+    if (!firstTransform)
+        firstTransform = CPThemeWithoutTransform[this._stateNameString] = {};
+
+    firstTransform[aState._stateNameString] = result;
+
+    return result;
 }
 
 ThemeState.prototype.and  = function(aState)
 {
-    return CPThemeState(this, aState);
+    var firstTransform = CPThemeAndTransform[this._stateNameString],
+        result;
+
+    if (firstTransform)
+    {
+        result = firstTransform[aState._stateNameString];
+
+        if (result)
+            return result;
+    }
+
+    result = CPThemeState(this, aState);
+
+    if (!firstTransform)
+        firstTransform = CPThemeAndTransform[this._stateNameString] = {};
+
+    firstTransform[aState._stateNameString] = result;
+
+    return result;
 }
 
-var CPThemeStates = {};
+var CPThemeStates = {},
+    CPThemeWithoutTransform = {},
+    CPThemeAndTransform = {};
 
 ThemeState._cacheThemeState = function(aState)
 {
     // We do this caching so themeState equality works.  Basically, doing CPThemeState('foo+bar') === CPThemeState('bar', 'foo') will return true.
     var themeState = CPThemeStates[String(aState)];
+
     if (themeState === undefined)
     {
         themeState = aState;
         CPThemeStates[String(themeState)] = themeState;
     }
+
     return themeState;
 }
 
@@ -439,14 +481,17 @@ function CPThemeState()
         throw "CPThemeState() must be called with at least one string argument";
 
     var themeState;
+
     if (arguments.length === 1 && typeof arguments[0] === 'string')
     {
         themeState = CPThemeStates[arguments[0]];
+
         if (themeState !== undefined)
             return themeState;
     }
 
     var stateNames = {};
+
     for (var argIndex = 0; argIndex < arguments.length; argIndex++)
     {
         if (arguments[argIndex] === [CPNull null] || !arguments[argIndex])
@@ -458,12 +503,14 @@ function CPThemeState()
             {
                 if (!arguments[argIndex]._stateNames.hasOwnProperty(stateName))
                     continue;
+
                 stateNames[stateName] = true;
             }
         }
         else
         {
             var allNames = arguments[argIndex].split('+');
+
             for (var nameIndex = 0; nameIndex < allNames.length; nameIndex++)
                 stateNames[allNames[nameIndex]] = true;
         }
@@ -523,6 +570,9 @@ CPThemeStateControlSizeRegular  = CPThemeState("controlSizeRegular");
 CPThemeStateControlSizeSmall    = CPThemeState("controlSizeSmall");
 CPThemeStateControlSizeMini     = CPThemeState("controlSizeMini");
 
+CPThemeStateNormalString        = String(CPThemeStateNormal);
+
+
 @implementation _CPThemeAttribute : CPObject
 {
     CPString            _name;
@@ -533,7 +583,7 @@ CPThemeStateControlSizeMini     = CPThemeState("controlSizeMini");
     _CPThemeAttribute   _themeDefaultAttribute;
 }
 
-- (id)initWithName:(CPString)aName defaultValue:(id)aDefaultValue
+- (id)initWithName:(CPString)aName defaultValue:(id)aDefaultValue defaultAttribute:(_CPThemeAttribute)aDefaultAttribute
 {
     self = [super init];
 
@@ -542,7 +592,9 @@ CPThemeStateControlSizeMini     = CPThemeState("controlSizeMini");
         _cache = { };
         _name = aName;
         _defaultValue = aDefaultValue;
-        _values = @{};
+
+        if (aDefaultAttribute)
+            _themeDefaultAttribute = aDefaultAttribute;
     }
 
     return self;
@@ -563,24 +615,41 @@ CPThemeStateControlSizeMini     = CPThemeState("controlSizeMini");
     return [_values count] > 0;
 }
 
-- (void)setValue:(id)aValue
+- (_CPThemeAttribute)attributeBySettingValue:(id)aValue
 {
-    _cache = {};
+    var attribute = [[_CPThemeAttribute alloc] initWithName:_name defaultValue:_defaultValue defaultAttribute:_themeDefaultAttribute];
 
-    if (aValue === undefined || aValue === nil)
-        _values = @{};
-    else
-        _values = @{ String(CPThemeStateNormal): aValue };
+    if (aValue !== undefined && aValue !== nil)
+        attribute._values = @{ CPThemeStateNormalString: aValue };
+
+    return attribute;
 }
 
-- (void)setValue:(id)aValue forState:(ThemeState)aState
+- (_CPThemeAttribute)attributeBySettingValue:(id)aValue forState:(ThemeState)aState
 {
-    _cache = { };
+    var shouldRemoveValue = aValue === undefined || aValue === nil,
+        attribute = [[_CPThemeAttribute alloc] initWithName:_name defaultValue:_defaultValue defaultAttribute:_themeDefaultAttribute],
+        values = _values;
 
-    if ((aValue === undefined) || (aValue === nil))
-        [_values removeObjectForKey:String(aState)];
-    else
-        [_values setObject:aValue forKey:String(aState)];
+    if (values != null)
+    {
+        values = [values copy];
+
+        if (shouldRemoveValue)
+            [values removeObjectForKey:String(aState)];
+        else
+            [values setObject:aValue forKey:String(aState)];
+
+        attribute._values = values;
+    }
+    else if (!shouldRemoveValue)
+    {
+        values = [[CPDictionary alloc] init];
+        [values setObject:aValue forKey:String(aState)];
+        attribute._values = values;
+    }
+
+    return attribute;
 }
 
 - (id)value
@@ -605,7 +674,7 @@ CPThemeStateControlSizeMini     = CPThemeState("controlSizeMini");
         if (aState._stateNameCount > 1)
         {
             var states = [_values allKeys],
-                count = states.length,
+                count = states ? states.length : 0,
                 largestThemeState = 0;
 
             while (count--)
@@ -643,27 +712,41 @@ CPThemeStateControlSizeMini     = CPThemeState("controlSizeMini");
     return value;
 }
 
-- (void)setParentAttribute:(_CPThemeAttribute)anAttribute
+- (_CPThemeAttribute)attributeBySettingParentAttribute:(_CPThemeAttribute)anAttribute
 {
     if (_themeDefaultAttribute === anAttribute)
-        return;
+        return self;
 
-    _cache = { };
-    _themeDefaultAttribute = anAttribute;
+    var attribute = [[_CPThemeAttribute alloc] initWithName:_name defaultValue:_defaultValue defaultAttribute:anAttribute];
+
+    attribute._values = [_values copy];
+
+    return attribute;
 }
 
 - (_CPThemeAttribute)attributeMergedWithAttribute:(_CPThemeAttribute)anAttribute
 {
-    var mergedAttribute = [[_CPThemeAttribute alloc] initWithName:_name defaultValue:_defaultValue];
+    var mergedAttribute = [[_CPThemeAttribute alloc] initWithName:_name defaultValue:_defaultValue defaultAttribute:_themeDefaultAttribute];
 
     mergedAttribute._values = [_values copy];
-    [mergedAttribute._values addEntriesFromDictionary:anAttribute._values];
+
+    if (anAttribute._values)
+        mergedAttribute._values ? [mergedAttribute._values addEntriesFromDictionary:anAttribute._values] : [anAttribute._values copy];
 
     return mergedAttribute;
 }
 
+- (CPString)description
+{
+    return [super description] + @" Name: " + _name + @", defaultAttribute: " + _themeDefaultAttribute + @", defaultValue: " + _defaultValue + @", values: " + _values;
+}
+
 @end
 
+
+// This is used to pass 'parrentAttribute' to the coder
+var ParentAttributeForCoder = nil;
+
 @implementation _CPThemeAttribute (CPCoding)
 
 - (id)initWithCoder:(CPCoder)aCoder
@@ -677,13 +760,16 @@ CPThemeStateControlSizeMini     = CPThemeState("controlSizeMini");
         _name = [aCoder decodeObjectForKey:@"name"];
         _defaultValue = [aCoder decodeObjectForKey:@"defaultValue"];
         _values = @{};
+        _themeDefaultAttribute = ParentAttributeForCoder;
 
         if ([aCoder containsValueForKey:@"value"])
         {
-            var state = String(CPThemeStateNormal);
+            var state;
 
             if ([aCoder containsValueForKey:@"state"])
                 state = [aCoder decodeObjectForKey:@"state"];
+            else
+                state = CPThemeStateNormalString
 
             [_values setObject:[aCoder decodeObjectForKey:"value"] forKey:state];
         }
@@ -711,7 +797,7 @@ CPThemeStateControlSizeMini     = CPThemeState("controlSizeMini");
     [aCoder encodeObject:_defaultValue forKey:@"defaultValue"];
 
     var keys = [_values allKeys],
-        count = keys.length;
+        count = keys ? keys.length : 0;
 
     if (count === 1)
     {
@@ -749,7 +835,7 @@ function CPThemeAttributeEncode(aCoder, aThemeAttribute)
     {
         var state = [values allKeys][0];
 
-        if (state === String(CPThemeStateNormal))
+        if (state === CPThemeStateNormalString)
         {
             [aCoder encodeObject:[values objectForKey:state] forKey:key];
 
@@ -767,30 +853,24 @@ function CPThemeAttributeEncode(aCoder, aThemeAttribute)
     return NO;
 }
 
-function CPThemeAttributeDecode(aCoder, anAttributeName, aDefaultValue, aTheme, aClass)
+function CPThemeAttributeDecode(aCoder, attribute)
 {
-    var key = "$a" + anAttributeName;
+    var key = "$a" + attribute._name;
 
-    if (![aCoder containsValueForKey:key])
-        var attribute = [[_CPThemeAttribute alloc] initWithName:anAttributeName defaultValue:aDefaultValue];
-
-    else
+    if ([aCoder containsValueForKey:key])
     {
-        var attribute = [aCoder decodeObjectForKey:key];
+        ParentAttributeForCoder = attribute._themeDefaultAttribute;
 
-        if (!attribute || !attribute.isa || ![attribute isKindOfClass:[_CPThemeAttribute class]])
-        {
-            var themeAttribute = [[_CPThemeAttribute alloc] initWithName:anAttributeName defaultValue:aDefaultValue];
+        var decodedAttribute = [aCoder decodeObjectForKey:key];
 
-            [themeAttribute setValue:attribute];
+        ParentAttributeForCoder = nil;
 
-            attribute = themeAttribute;
-        }
+        if (!decodedAttribute || !decodedAttribute.isa || ![decodedAttribute isKindOfClass:[_CPThemeAttribute class]])
+            attribute = [attribute attributeBySettingValue:decodedAttribute];
+        else
+            attribute = decodedAttribute;
     }
 
-    if (aTheme && aClass)
-        [attribute setParentAttribute:[aTheme attributeWithName:anAttributeName forClass:aClass]];
-
     return attribute;
 }
 

AppKit/CPTokenField.j

@@ -448,21 +448,27 @@ CPTokenFieldDeleteButtonType     = 1;
     element.style.width = CGRectGetWidth(contentRect) + "px";
     element.style.height = [font defaultLineHeightForFont] + "px";
 
-    window.setTimeout(function()
+    [[CPRunLoop mainRunLoop] performBlock:function()
     {
         [_tokenScrollView documentView]._DOMElement.appendChild(element);
 
         //post CPControlTextDidBeginEditingNotification
         [self textDidBeginEditing:[CPNotification notificationWithName:CPControlTextDidBeginEditingNotification object:self userInfo:nil]];
 
-        window.setTimeout(function()
+        [[CPRunLoop mainRunLoop] performBlock:function()
         {
+            // This will prevent to jump to the focused element
+            var previousScrollingOrigin = [self _scrollToVisibleRectAndReturnPreviousOrigin];
+
             element.focus();
+
+            [self _restorePreviousScrollingOrigin:previousScrollingOrigin];
+
             CPTokenFieldInputOwner = self;
-        }, 0.0);
+        } argument:nil order:0 modes:[CPDefaultRunLoopMode]];
 
         [self textDidFocus:[CPNotification notificationWithName:CPTextFieldDidFocusNotification object:self userInfo:nil]];
-    }, 0.0);
+    } argument:nil order:0 modes:[CPDefaultRunLoopMode]];
 
     [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];
 
@@ -1033,6 +1039,21 @@ CPTokenFieldDeleteButtonType     = 1;
     [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];
 }
 
+- (BOOL)performKeyEquivalent:(CPEvent)anEvent
+{
+    var characters = [anEvent characters];
+
+    // Here we handle the event when getting a CPNewlineCharacter or CPCarriageReturnCharacter when the menu is open
+    // We don't want that the application dispatches the event to the other controls
+    if ([self hasThemeState:CPThemeStateAutocompleting] && (characters === CPNewlineCharacter || characters === CPCarriageReturnCharacter))
+    {
+        [self keyDown:anEvent];
+        return YES;
+    }
+
+    return [super performKeyEquivalent:anEvent];
+}
+
 - (void)textDidChange:(CPNotification)aNotification
 {
     if ([aNotification object] !== self)
@@ -1454,9 +1475,6 @@ CPTokenFieldDeleteButtonType     = 1;
 
 - (BOOL)setThemeState:(ThemeState)aState
 {
-   if (aState.isa && [aState isKindOfClass:CPArray])
-        aState = CPThemeState.apply(null, aState);
-
     var r = [super setThemeState:aState];
 
     // Share hover state with the disclosure and delete buttons.
@@ -1471,9 +1489,6 @@ CPTokenFieldDeleteButtonType     = 1;
 
 - (BOOL)unsetThemeState:(ThemeState)aState
 {
-   if (aState.isa && [aState isKindOfClass:CPArray])
-        aState = CPThemeState.apply(null, aState);
-
     var r = [super unsetThemeState:aState];
 
     // Share hover state with the disclosure and delete button.

AppKit/CPTrackingArea.j

@@ -0,0 +1,164 @@
+/*
+ * CPTrackingArea.j
+ * AppKit
+ *
+ * Created by Didier Korthoudt.
+ * Copyright 2015, Cappuccino Project.
+ *
+ * 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/Foundation.j>
+
+@class CPView
+
+/* @group CPTrackingAreaOptions */
+@typedef CPTrackingAreaOptions
+CPTrackingMouseEnteredAndExited     = 1 << 1;
+CPTrackingMouseMoved                = 1 << 2;
+CPTrackingCursorUpdate              = 1 << 3;
+CPTrackingActiveWhenFirstResponder  = 1 << 4;
+CPTrackingActiveInKeyWindow         = 1 << 5;
+CPTrackingActiveInActiveApp         = 1 << 6;
+CPTrackingActiveAlways              = 1 << 7;
+CPTrackingAssumeInside              = 1 << 8;
+CPTrackingInVisibleRect             = 1 << 9;
+CPTrackingEnabledDuringMouseDrag    = 1 << 10;
+
+var CPTrackingAreaViewRectKey        = @"CPTrackinkAreaViewRectKey",
+    CPTrackingAreaOptionsKey         = @"CPTrackingAreaOptionsKey",
+    CPTrackingAreaOwnerKey           = @"CPTrackingAreaOwnerKey",
+    CPTrackingAreaUserInfoKey        = @"CPTrackingAreaUserInfoKey",
+    CPTrackingAreaReferencingViewKey = @"CPTrackingAreaReferencingViewKey",
+    CPTrackingAreaWindowRect         = @"CPTrackingAreaWindowRect";
+
+CPTrackingOwnerImplementsMouseEntered = 1 << 1;
+CPTrackingOwnerImplementsMouseExited  = 1 << 2;
+CPTrackingOwnerImplementsMouseMoved   = 1 << 3;
+CPTrackingOwnerImplementsCursorUpdate = 1 << 4;
+
+/*!
+ @ingroup appkit
+ 
+ A CPTrackingArea defines a region of view that generates mouse-tracking and
+ cursor-update events when the mouse is over that region.
+ */
+@implementation CPTrackingArea : CPObject
+{
+    CGRect                  _viewRect                   @accessors(getter=rect);
+    CPTrackingAreaOptions   _options                    @accessors(getter=options);
+    id                      _owner                      @accessors(getter=owner);
+    CPDictionary            _userInfo                   @accessors(getter=userInfo);
+    
+    CPView                  _referencingView            @accessors(property=view);
+    CGRect                  _windowRect                 @accessors(getter=windowRect);
+
+    unsigned                _implementedOwnerMethods    @accessors(getter=implementedOwnerMethods);
+}
+
+
+#pragma mark -
+#pragma mark Initialization
+
+/*! 
+ Initializes and returns an object defining a region of a view to receive mouse-tracking events, mouse-moved events, cursor-update events, or possibly 
+ all these events.
+ */
+- (CPTrackingArea)initWithRect:(CGRect)aRect options:(CPTrackingAreaOptions)options owner:(id)owner userInfo:(CPDictionary)userInfo
+{
+    if (owner === nil)
+        [CPException raise:CPInternalInconsistencyException reason:"No owner specified"];
+
+    if (options === 0)
+        [CPException raise:CPInternalInconsistencyException reason:"Invalid CPTrackingArea options"];
+
+    // Check options:
+    // - at least one of CPTrackingMouseEnteredAndExited, CPTrackingMouseMoved, CPTrackingCursorUpdate
+    // - exactly  one of CPTrackingActiveWhenFirstResponder, CPTrackingActiveInKeyWindow, CPTrackingActiveInActiveApp, CPTrackingActiveAlways
+    // - no check on CPTrackingAssumeInside, CPTrackingInVisibleRect, CPTrackingEnableDuringMouseDrag
+
+    if (!((options & CPTrackingMouseEnteredAndExited) || (options & CPTrackingMouseMoved) || (options & CPTrackingCursorUpdate)))
+        [CPException raise:CPInternalInconsistencyException reason:"Invalid CPTrackingAreaOptions: must use at least one of [CPTrackingMouseEnteredAndExited | CPTrackingMouseMoved | CPTrackingCursorUpdate]"];
+
+    if ((((options & CPTrackingActiveWhenFirstResponder) > 0) + ((options & CPTrackingActiveInKeyWindow) > 0) + ((options & CPTrackingActiveInActiveApp) > 0) + ((options & CPTrackingActiveAlways) > 0)) !== 1)
+        [CPException raise:CPInternalInconsistencyException reason:"Tracking area options may only specify one of [CPTrackingActiveWhenFirstResponder | CPTrackingActiveInKeyWindow | CPTrackingActiveInActiveApp | CPTrackingActiveAlways]."];
+
+    if (self = [super init])
+    {
+        _viewRect = aRect;
+        _options  = options;
+        _owner    = owner;
+        _userInfo = userInfo;
+
+        // Cache owner implemented methods
+
+        if ([_owner respondsToSelector:@selector(mouseEntered:)])
+            _implementedOwnerMethods |= CPTrackingOwnerImplementsMouseEntered;
+
+        if ([_owner respondsToSelector:@selector(mouseExited:)])
+            _implementedOwnerMethods |= CPTrackingOwnerImplementsMouseExited;
+
+        if ([_owner respondsToSelector:@selector(mouseMoved:)])
+            _implementedOwnerMethods |= CPTrackingOwnerImplementsMouseMoved;
+
+        if ([_owner respondsToSelector:@selector(cursorUpdate:)])
+            _implementedOwnerMethods |= CPTrackingOwnerImplementsCursorUpdate;
+    }
+    
+    return self;
+}
+
+
+#pragma mark -
+#pragma mark Implementation
+
+- (void)_updateWindowRect
+{
+    _windowRect = [_referencingView convertRect:((_options & CPTrackingInVisibleRect) ? [_referencingView visibleRect] : _viewRect) toView:[[_referencingView window] _windowView]];
+}
+
+@end
+
+#pragma mark -
+#pragma mark CPCoding
+
+@implementation CPTrackingArea (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    if (self = [super init])
+    {
+        _viewRect        = [aCoder decodeObjectForKey:CPTrackingAreaViewRectKey];
+        _options         = [aCoder decodeObjectForKey:CPTrackingAreaOptionsKey];
+        _owner           = [aCoder decodeObjectForKey:CPTrackingAreaOwnerKey];
+        _userInfo        = [aCoder decodeObjectForKey:CPTrackingAreaUserInfoKey];
+        _referencingView = [aCoder decodeObjectForKey:CPTrackingAreaReferencingViewKey];
+        _windowRect      = [aCoder decodeObjectForKey:CPTrackingAreaWindowRect];
+    }
+    
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [aCoder encodeObject:_viewRect        forKey:CPTrackingAreaViewRectKey];
+    [aCoder encodeObject:_options         forKey:CPTrackingAreaOptionsKey];
+    [aCoder encodeObject:_owner           forKey:CPTrackingAreaOwnerKey];
+    [aCoder encodeObject:_userInfo        forKey:CPTrackingAreaUserInfoKey];
+    [aCoder encodeObject:_referencingView forKey:CPTrackingAreaReferencingViewKey];
+    [aCoder encodeObject:_windowRect      forKey:CPTrackingAreaWindowRect];
+}
+
+@end

AppKit/CPVisualEffectView.j

@@ -0,0 +1,186 @@
+/*
+ * CPVisualEffectView.j
+ * AppKit
+ *
+ * Created by Antoine Mercadal.
+ * Copyright 2015, 280 Cappuccino Project.
+ *
+ * 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/Foundation.j>
+@import "CPAppearance.j"
+@import "CPView.j"
+
+@typedef CPVisualEffectMaterial
+CPVisualEffectMaterialAppearanceBased       = 0;
+CPVisualEffectMaterialLight                 = 1;
+CPVisualEffectMaterialDark                  = 2;
+CPVisualEffectMaterialTitlebar              = 3;
+
+@typedef CPVisualEffectBlendingMode
+CPVisualEffectBlendingModeBehindWindow      = 0;
+CPVisualEffectBlendingModeWithinWindow      = 1;
+
+@typedef CPVisualEffectState
+CPVisualEffectStateFollowsWindowActiveState = 0;
+CPVisualEffectStateActive                   = 1;
+CPVisualEffectStateInactive                 = 2;
+
+
+/*! @ingroup appkit
+
+    Very naive implementation of CPVisualEffectView. This view allows
+    to use vibrancy effect. This is only working with Safari 9+ and the
+    support in Chrome/ium should come quite soon.
+    Using this class with a browser that doesn't support backdrop-filter
+    While still work, but you will not get the blurry effect.
+*/
+@implementation CPVisualEffectView : CPView
+{
+    CPImage                     _maskImage                  @accessors(property=maskImage);
+    CPVisualEffectBlendingMode  _blendingMode               @accessors(property=blendingMode);
+    CPVisualEffectMaterial      _material                   @accessors(property=material);
+    CPVisualEffectState         _state                      @accessors(property=state);
+}
+
+
+#pragma mark -
+#pragma mark Initialization
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    if (self = [super initWithFrame:aFrame])
+    {
+        _material                = CPVisualEffectMaterialAppearanceBased;
+        _blendingMode            = CPVisualEffectBlendingModeWithinWindow;
+        _state                   = CPVisualEffectStateFollowsWindowActiveState;
+        _appearance              = [CPAppearance appearanceNamed:CPAppearanceNameVibrantDark];
+    }
+
+    return self;
+}
+
+
+#pragma mark -
+#pragma mark CPVisualEffectView API
+
+/*! Sets the appearance of the CPVisualEffectView.
+
+    Only CPAppearance named CPAppearanceNameVibrantDark or CPAppearanceNameVibrantLight are valid
+
+    @param anAppearance the CPAppearance.
+*/
+- (void)setAppearance:(CPAppearance)anAppearance
+{
+    if (![self _validAppearance:anAppearance])
+        [CPException raise:CPInvalidArgumentException reason:"Appearance can only be CPAppearanceNameVibrantDark or CPAppearanceNameVibrantLight in CPVisualEffectView, but is " + anAppearance];
+
+    [super setAppearance:anAppearance];
+
+    [self setNeedsLayout:YES];
+}
+
+/*! Sets the received effect state.
+    Possible values:
+    <pre>
+    CPVisualEffectStateFollowsWindowActiveState (default)
+    CPVisualEffectStateActive
+    CPVisualEffectStateInactive
+    </pre>
+*/
+- (void)setState:(CPVisualEffectState)aState
+{
+    if (_state == aState)
+        return;
+
+    [self willChangeValueForKey:"state"];
+    _state = aState;
+    [self didChangeValueForKey:"state"];
+
+    [self setNeedsLayout:YES];
+}
+
+
+#pragma mark -
+#pragma mark Utilities
+
+- (void)_setEffectEnabled:(BOOL)shouldEnable
+{
+    var dark       = [[self appearance] isEqual:[CPAppearance appearanceNamed:CPAppearanceNameVibrantDark]],
+        prop       = CPBrowserStyleProperty("backdrop-filter"),
+        color      = (dark ? [CPColor colorWithHexString:@"1e1e1e"] : [CPColor whiteColor]),
+        finalColor = shouldEnable ? [color colorWithAlphaComponent:0.6] : color;
+
+    [self setBackgroundColor:finalColor];
+
+#if PLATFORM(DOM)
+    self._DOMElement.style[prop] = shouldEnable ? "blur(30px)" : nil;
+#endif
+
+}
+
+- (void)layoutSubviews
+{
+    switch (_state)
+    {
+        case CPVisualEffectStateFollowsWindowActiveState:
+            [self _setEffectEnabled:[self hasThemeState:CPThemeStateKeyWindow]];
+            break;
+
+        case CPVisualEffectStateActive:
+            [self _setEffectEnabled:YES];
+            break;
+
+        case CPVisualEffectStateInactive:
+            [self _setEffectEnabled:NO];
+            break;
+    }
+}
+
+- (BOOL)_validAppearance:(CPAppearance)anAppearance
+{
+    return [anAppearance isEqual:[CPAppearance appearanceNamed:CPAppearanceNameVibrantDark]] || [anAppearance isEqual:[CPAppearance appearanceNamed:CPAppearanceNameVibrantLight]];
+}
+
+
+#pragma mark -
+#pragma mark CPCoding
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    if (self = [super initWithCoder:aCoder])
+    {
+        _blendingMode = [aCoder decodeIntForKey:@"_blendingMode"] || CPVisualEffectBlendingModeWithinWindow;
+        _maskImage    = [aCoder decodeObjectForKey:@"_maskImage"];
+        _material     = [aCoder decodeIntForKey:@"_material"] || CPVisualEffectMaterialAppearanceBased;
+        _state        = [aCoder decodeIntForKey:@"_state"] || CPVisualEffectStateFollowsWindowActiveState;
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [super encodeWithCoder:aCoder];
+
+    [aCoder encodeObject:_maskImage forKey:@"_maskImage"];
+    [aCoder encodeInt:_blendingMode forKey:@"_blendingMode"];
+    [aCoder encodeInt:_material forKey:@"_material"];
+    [aCoder encodeInt:_state forKey:@"_state"];
+}
+
+
+@end

AppKit/CPWindow/CPWindow.j

@@ -36,6 +36,7 @@
 @import "CPResponder.j"
 @import "CPScreen.j"
 @import "CPText.j"
+@import "CPTrackingArea.j"
 @import "CPView.j"
 @import "CPWindow_Constants.j"
 @import "_CPBorderlessBridgeWindowView.j"
@@ -55,6 +56,7 @@
 @class _CPWindowFrameAnimation
 
 @global CPApp
+@global _CPPlatformWindowWillCloseNotification
 
 @typedef _CPWindowFullPlatformWindowSession
 
@@ -63,22 +65,28 @@
 
 @optional
 - (BOOL)windowShouldClose:(CPWindow)aWindow;
+- (CGSize)windowWillResize:(CPWindow)sender toSize:(CGSize)aSize;
 - (CPUndoManager)windowWillReturnUndoManager:(CPWindow)window;
 - (void)windowDidBecomeKey:(CPNotification)aNotification;
 - (void)windowDidBecomeMain:(CPNotification)aNotification;
+- (void)windowDidDeminiaturize:(CPNotification)notification;
 - (void)windowDidEndSheet:(CPNotification)aNotification;
+- (void)windowDidMiniaturize:(CPNotification)notification;
 - (void)windowDidMove:(CPNotification)aNotification;
 - (void)windowDidResignKey:(CPNotification)aNotification;
 - (void)windowDidResignMain:(CPNotification)aNotification;
 - (void)windowDidResize:(CPNotification)aNotification;
+- (void)windowWillMiniaturize:(CPNotification)notification;
 - (void)windowWillBeginSheet:(CPNotification)aNotification;
 - (void)windowWillClose:(CPWindow)aWindow;
 
 @end
 
-var CPWindowDelegate_windowShouldClose_             = 1 << 1
+var CPWindowDelegate_windowShouldClose_             = 1 << 1,
     CPWindowDelegate_windowWillReturnUndoManager_   = 1 << 2,
-    CPWindowDelegate_windowWillClose_               = 1 << 3;
+    CPWindowDelegate_windowWillClose_               = 1 << 3,
+    CPWindowDelegate_windowWillResize_toSize_       = 1 << 4;
+
 
 var CPWindowSaveImage       = nil,
 
@@ -191,6 +199,10 @@ var CPWindowActionMessageKeys = [
     CPView                              _toolbarView;
 
     CPArray                             _mouseEnteredStack;
+    CPArray                             _cursorUpdateStack;
+    CPArray                             _trackingAreaViews;
+    id                                  _activeCursorTrackingArea;
+    CPArray                             _queuedTrackingEvents;
     CPView                              _leftMouseDownView;
     CPView                              _rightMouseDownView;
 
@@ -328,6 +340,12 @@ CPTexturedBackgroundWindowMask
 
         [self setLevel:CPNormalWindowLevel];
 
+        _trackingAreaViews = [];
+        _mouseEnteredStack = [];
+        _cursorUpdateStack = [];
+        _queuedTrackingEvents = [];
+        _activeCursorTrackingArea = nil;
+
         // Create our border view which is the actual root of our view hierarchy.
         _windowView = [[windowViewClass alloc] initWithFrame:CGRectMake(0.0, 0.0, CGRectGetWidth(_frame), CGRectGetHeight(_frame)) styleMask:aStyleMask];
 
@@ -550,6 +568,11 @@ CPTexturedBackgroundWindowMask
     }
 }
 
+- (CPView)_windowView
+{
+    return _windowView;
+}
+
 /*!
     Sets the receiver as a full platform window. If you pass YES the CPWindow instance will fill the entire browser content area,
     otherwise the CPWindow will be a window inside of your browser window which the user can drag around, and resize (if you allow).
@@ -575,6 +598,9 @@ CPTexturedBackgroundWindowMask
         var fullPlatformWindowViewClass = [[self class] _windowViewClassForFullPlatformWindowStyleMask:_styleMask],
             windowView = [[fullPlatformWindowViewClass alloc] initWithFrame:CGRectMakeZero() styleMask:_styleMask];
 
+        if (_platformWindow != [CPPlatformWindow primaryPlatformWindow] && [_platformWindow _hasInitializeInstanceWithWindow])
+            [_platformWindow setContentRect:[self frame]];
+
         [self _setWindowView:windowView];
 
         [self setLevel:CPBackgroundWindowLevel];
@@ -744,6 +770,9 @@ CPTexturedBackgroundWindowMask
             size.width = newSize.width;
             size.height = newSize.height;
 
+            if (!_isAnimating)
+                size = [self _sendDelegateWindowWillResizeToSize:size];
+
             [_windowView setFrameSize:size];
 
             if (_hasShadow)
@@ -759,6 +788,9 @@ CPTexturedBackgroundWindowMask
         if (originMoved)
             [self _moveChildWindows:delta];
     }
+
+    if ([_platformWindow _canUpdateContentRect] && _isFullPlatformWindow && _platformWindow != [CPPlatformWindow primaryPlatformWindow])
+        [_platformWindow setContentRect:aFrame];
 }
 
 /*
@@ -909,6 +941,10 @@ CPTexturedBackgroundWindowMask
 {
 
 #if PLATFORM(DOM)
+
+    if (!_isVisible)
+        [_platformWindow _setShouldUpdateContentRect:NO];
+
     // -dw- if a sheet is clicked, the parent window should come up too
     if (_isSheet)
         [_parentView orderFront:self];
@@ -932,6 +968,8 @@ CPTexturedBackgroundWindowMask
 
     if (!CPApp._mainWindow)
         [self makeMainWindow];
+
+    [_platformWindow _setShouldUpdateContentRect:YES];
 }
 
 /*
@@ -947,6 +985,11 @@ CPTexturedBackgroundWindowMask
 */
 - (void)_windowWillBeAddedToTheDOM
 {
+    [[CPNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(_didReceivePlatformWindowWillCloseNotification:)
+                                                 name:_CPPlatformWindowWillCloseNotification
+                                               object:_platformWindow];
+
     [[self contentView] _addObservers];
 }
 
@@ -955,7 +998,10 @@ CPTexturedBackgroundWindowMask
 */
 - (void)_windowWillBeRemovedFromTheDOM
 {
+    [[CPNotificationCenter defaultCenter] removeObserver:self name:_CPPlatformWindowWillCloseNotification object:nil];
+
     [[self contentView] _removeObservers];
+    _hasBecomeKeyWindow = NO;
 }
 
 
@@ -1002,6 +1048,9 @@ CPTexturedBackgroundWindowMask
     if ([self _sharesChromeWithPlatformWindow])
         [_platformWindow orderOut:self];
 
+    if (_isFullPlatformWindow && _platformWindow != [CPPlatformWindow primaryPlatformWindow])
+        [_platformWindow orderOut:self];
+
     [_platformWindow order:CPWindowOut window:self relativeTo:nil];
 #endif
 
@@ -1407,6 +1456,9 @@ CPTexturedBackgroundWindowMask
     [defaultCenter removeObserver:_delegate name:CPWindowDidResizeNotification object:self];
     [defaultCenter removeObserver:_delegate name:CPWindowWillBeginSheetNotification object:self];
     [defaultCenter removeObserver:_delegate name:CPWindowDidEndSheetNotification object:self];
+    [defaultCenter removeObserver:_delegate name:CPWindowDidMiniaturizeNotification object:self];
+    [defaultCenter removeObserver:_delegate name:CPWindowDidDeminiaturizeNotification object:self];
+    [defaultCenter removeObserver:_delegate name:CPWindowWillMiniaturizeNotification object:self];
 
     _delegate = aDelegate;
     _implementedDelegateMethods = 0;
@@ -1420,6 +1472,9 @@ CPTexturedBackgroundWindowMask
     if ([_delegate respondsToSelector:@selector(windowWillClose:)])
         _implementedDelegateMethods |= CPWindowDelegate_windowWillClose_;
 
+    if ([_delegate respondsToSelector:@selector(windowWillResize:toSize:)])
+        _implementedDelegateMethods |= CPWindowDelegate_windowWillResize_toSize_;
+
     if ([_delegate respondsToSelector:@selector(windowDidResignKey:)])
         [defaultCenter
             addObserver:_delegate
@@ -1475,6 +1530,27 @@ CPTexturedBackgroundWindowMask
                selector:@selector(windowDidEndSheet:)
                    name:CPWindowDidEndSheetNotification
                  object:self];
+
+    if ([_delegate respondsToSelector:@selector(windowDidMiniaturize:)])
+        [defaultCenter
+            addObserver:_delegate
+               selector:@selector(windowDidMiniaturize:)
+                   name:CPWindowDidMiniaturizeNotification
+                 object:self];
+
+    if ([_delegate respondsToSelector:@selector(windowWillMiniaturize:)])
+        [defaultCenter
+            addObserver:_delegate
+               selector:@selector(windowWillMiniaturize:)
+                   name:CPWindowWillMiniaturizeNotification
+                 object:self];
+
+    if ([_delegate respondsToSelector:@selector(windowDidDeminiaturize:)])
+        [defaultCenter
+            addObserver:_delegate
+               selector:@selector(windowDidDeminiaturize:)
+                   name:CPWindowDidDeminiaturizeNotification
+                 object:self];
 }
 
 /*!
@@ -1787,6 +1863,9 @@ CPTexturedBackgroundWindowMask
 
     switch (type)
     {
+        case CPAppKitDefined:
+            return [CPApp activateIgnoringOtherApps:YES];
+
         case CPFlagsChanged:
             return [[self firstResponder] flagsChanged:anEvent];
 
@@ -1860,6 +1939,9 @@ CPTexturedBackgroundWindowMask
 
             _leftMouseDownView = nil;
 
+            // If mouseUp ends a drag operation, send delayed events for tracking views under the mouse, then flush delayed events
+            [self _flushTrackingEventQueueForMouseAt:point];
+
             return;
 
         case CPLeftMouseDown:
@@ -1895,6 +1977,11 @@ CPTexturedBackgroundWindowMask
 
         case CPLeftMouseDragged:
         case CPRightMouseDragged:
+            // First, we search for any tracking area requesting CPTrackingEnabledDuringMouseDrag.
+            // At the same time, we update the entered stack.
+            [self _handleTrackingAreaEvent:anEvent];
+            
+            // Normal mouseDragged workflow
             if (!_leftMouseDownView)
                 return [[_windowView hitTest:point] mouseDragged:anEvent];
 
@@ -1913,61 +2000,12 @@ CPTexturedBackgroundWindowMask
             return [_leftMouseDownView performSelector:selector withObject:anEvent];
 
         case CPMouseMoved:
-            [_windowView setCursorForLocation:point resizing:NO];
 
             // Ignore mouse moves for parents of sheets
             if (!_acceptsMouseMovedEvents || sheet)
                 return;
-
-            if (!_mouseEnteredStack)
-                _mouseEnteredStack = [];
-
-            var hitTestView = [_windowView hitTest:point];
-
-            if ([_mouseEnteredStack count] && [_mouseEnteredStack lastObject] === hitTestView)
-                return [hitTestView mouseMoved:anEvent];
-
-            var view = hitTestView,
-                mouseEnteredStack = [];
-
-            while (view)
-            {
-                mouseEnteredStack.unshift(view);
-
-                view = [view superview];
-            }
-
-            var deviation = MIN(_mouseEnteredStack.length, mouseEnteredStack.length);
-
-            while (deviation--)
-                if (_mouseEnteredStack[deviation] === mouseEnteredStack[deviation])
-                    break;
-
-            var index = deviation + 1,
-                count = _mouseEnteredStack.length;
-
-            if (index < count)
-            {
-                var event = [CPEvent mouseEventWithType:CPMouseExited location:point modifierFlags:[anEvent modifierFlags] timestamp:[anEvent timestamp] windowNumber:_windowNumber context:nil eventNumber:-1 clickCount:1 pressure:0];
-
-                for (; index < count; ++index)
-                    [_mouseEnteredStack[index] mouseExited:event];
-            }
-
-            index = deviation + 1;
-            count = mouseEnteredStack.length;
-
-            if (index < count)
-            {
-                var event = [CPEvent mouseEventWithType:CPMouseEntered location:point modifierFlags:[anEvent modifierFlags] timestamp:[anEvent timestamp] windowNumber:_windowNumber context:nil eventNumber:-1 clickCount:1 pressure:0];
-
-                for (; index < count; ++index)
-                    [mouseEnteredStack[index] mouseEntered:event];
-            }
-
-            _mouseEnteredStack = mouseEnteredStack;
-
-            [hitTestView mouseMoved:anEvent];
+            
+            [self _handleTrackingAreaEvent:anEvent];
     }
 }
 
@@ -2001,6 +2039,7 @@ CPTexturedBackgroundWindowMask
 
     [self _setupFirstResponder];
     _hasBecomeKeyWindow = YES;
+    _platformWindow._currentKeyWindow = self;
 
     [_windowView noteKeyWindowStateChanged];
     [_contentView _notifyWindowDidBecomeKey];
@@ -2071,6 +2110,7 @@ CPTexturedBackgroundWindowMask
     if (CPApp._keyWindow === self)
         CPApp._keyWindow = nil;
 
+    _platformWindow._currentKeyWindow = nil;
     [_windowView noteKeyWindowStateChanged];
     [_contentView _notifyWindowDidResignKey];
 
@@ -2454,6 +2494,7 @@ CPTexturedBackgroundWindowMask
 - (void)becomeMainWindow
 {
     CPApp._mainWindow = self;
+    _platformWindow._currentMainWindow = self;
 
     [self _synchronizeSaveMenuWithDocumentSaving];
 
@@ -2476,6 +2517,7 @@ CPTexturedBackgroundWindowMask
     if (CPApp._mainWindow === self)
         CPApp._mainWindow = nil;
 
+    _platformWindow._currentMainWindow = nil;
     [_windowView noteMainWindowStateChanged];
 }
 
@@ -2714,7 +2756,7 @@ CPTexturedBackgroundWindowMask
     [[CPNotificationCenter defaultCenter] removeObserver:self name:CPWindowDidEndSheetNotification object:self];
 
     var sheet = _sheetContext[@"nextSheet"],
-        modalDelegate =_sheetContext[@"nextModalDelegate"],
+        modalDelegate = _sheetContext[@"nextModalDelegate"],
         endSelector = _sheetContext[@"nextEndSelector"],
         contextInfo = _sheetContext[@"nextContextInfo"];
 
@@ -2790,7 +2832,7 @@ CPTexturedBackgroundWindowMask
     if (delegate && endSelector)
     {
         if (_sheetContext["isAttached"])
-            objj_msgSend(delegate, endSelector, _sheetContext["sheet"], _sheetContext["returnCode"],
+            delegate.isa.objj_msgSend3(delegate, endSelector, _sheetContext["sheet"], _sheetContext["returnCode"],
                 _sheetContext["contextInfo"]);
         else
             _sheetContext["deferDidEndSelector"] = YES;
@@ -2854,7 +2896,8 @@ CPTexturedBackgroundWindowMask
         _sheetContext = nil;
         sheet._parentView = nil;
 
-        objj_msgSend(delegate, selector, sheet, returnCode, contextInfo);
+        if (delegate != null)
+            delegate.isa.objj_msgSend3(delegate, selector, sheet, returnCode, contextInfo);
     }
     else
     {
@@ -3353,6 +3396,14 @@ CPTexturedBackgroundWindowMask
         [super setValue:aValue forKey:aKey];
 }
 
+- (void)_didReceivePlatformWindowWillCloseNotification:(CPNotification)aNotification
+{
+    if ([aNotification object] != _platformWindow)
+        return;
+
+    [self close];
+}
+
 @end
 
 var keyViewComparator = function(lhs, rhs, context)
@@ -3443,6 +3494,18 @@ var keyViewComparator = function(lhs, rhs, context)
     [_delegate windowWillClose:self];
 }
 
+/*!
+    @ignore
+    Call the delegate windowWillResize:toSize:
+*/
+- (CGSize)_sendDelegateWindowWillResizeToSize:(CGSize)aSize
+{
+    if (!(_implementedDelegateMethods & CPWindowDelegate_windowWillResize_toSize_))
+        return aSize;
+
+    return [_delegate windowWillResize:self toSize:aSize];
+}
+
 @end
 
 
@@ -3756,6 +3819,384 @@ var interpolate = function(fromValue, toValue, progress)
 
 @end
 
+@implementation CPWindow (TrackingAreaAdditions)
+
+- (void)_addTrackingAreaView:(CPView)aView
+{
+    var trackingAreas = [aView trackingAreas];
+    
+    for (var i = 0; i < trackingAreas.length; i++)
+        [self _addTrackingArea:trackingAreas[i]];
+}
+
+- (void)_removeTrackingAreaView:(CPView)aView
+{
+    var trackingAreas = [aView trackingAreas];
+    
+    for (var i = 0; i < trackingAreas.length; i++)
+        [self _removeTrackingArea:trackingAreas[i]];
+}
+
+- (void)_addTrackingArea:(CPTrackingArea)trackingArea
+{
+    var trackingAreaView = [trackingArea view];
+    
+    if (![_trackingAreaViews containsObjectIdenticalTo:trackingAreaView])
+        [_trackingAreaViews addObject:trackingAreaView];
+    
+    // If CPTrackingAssumeInside option is set, put the tracking area in the _mouseEnteredStack
+    
+    if ([trackingArea options] & CPTrackingAssumeInside)
+        [_mouseEnteredStack addObject:trackingArea];
+}
+
+- (void)_removeTrackingArea:(CPTrackingArea)trackingArea
+{
+    // If mouse is in the tracking area, we remove it from the stack to avoid to fire a future mouseExited event
+    
+    [_mouseEnteredStack removeObjectIdenticalTo:trackingArea];
+    
+    var trackingAreaView = [trackingArea view];
+    
+    [_trackingAreaViews removeObjectIdenticalTo:trackingAreaView];
+}
+
+- (void)_handleTrackingAreaEvent:(CPEvent)anEvent
+{
+    var mouseEnteredStack = [],
+        cursorUpdateStack = [],
+        point             = [anEvent locationInWindow],
+        dragging          = ([anEvent type] !== CPMouseMoved);
+
+    // Handle mouse entering tracking areas (and calc mouseEnteredStack and cursorUpdateStack)
+    
+    [self _handleMouseMovedAndEnteredEventsForEvent:anEvent atPoint:point dragging:dragging mouseEnteredStack:mouseEnteredStack cursorUpdateStack:cursorUpdateStack];
+
+    // Handle mouse exiting tracking areas
+
+    [self _handleMouseExitedEventsForEvent:anEvent atPoint:point dragging:dragging mouseEnteredStack:mouseEnteredStack];
+
+    // Cursor update
+
+    if (cursorUpdateStack.length > 0)
+    {
+        [self _handleCursorUpdateEventsForEvent:anEvent atPoint:point dragging:dragging cursorUpdateStack:cursorUpdateStack];
+    }
+    else if (!dragging)
+    {
+        // Here, we are outsite the window content view tracking area, so let _windowView set the cursor (resize cursor, ...)
+
+        [_windowView setCursorForLocation:point resizing:NO];
+        _activeCursorTrackingArea = nil;
+    }
+
+    // Prepare for next call
+    
+    _mouseEnteredStack = mouseEnteredStack;
+    _cursorUpdateStack = cursorUpdateStack;
+}
+
+- (void)_handleMouseMovedAndEnteredEventsForEvent:(CPEvent)anEvent atPoint:(CGPoint)point dragging:(BOOL)dragging mouseEnteredStack:(CPArray)mouseEnteredStack cursorUpdateStack:(CPArray)cursorUpdateStack
+{
+    var isKeyWindow = [self isKeyWindow];
+
+    for (var i = 0; i < _trackingAreaViews.length; i++)
+    {
+        var aView         = _trackingAreaViews[i],
+            trackingAreas = [aView trackingAreas];
+
+        if ([aView isHidden])
+            continue;
+
+        for (var j = 0; j < trackingAreas.length; j++)
+        {
+            var aTrackingArea              = trackingAreas[j],
+                trackingOptions            = [aTrackingArea options],
+                trackingImplementedMethods = [aTrackingArea implementedOwnerMethods];
+
+            if (!(((trackingOptions & CPTrackingActiveAlways) ||
+                   (trackingOptions & CPTrackingActiveInActiveApp) ||
+                   ((trackingOptions & CPTrackingActiveInKeyWindow) && isKeyWindow) ||
+                   ((trackingOptions & CPTrackingActiveWhenFirstResponder) && isKeyWindow && (_firstResponder === aView))) &&
+                  (CGRectContainsPoint([aTrackingArea windowRect], point))))
+            {
+                continue;
+            }
+
+            [mouseEnteredStack addObject:aTrackingArea];
+
+            if ([_mouseEnteredStack containsObjectIdenticalTo:aTrackingArea])
+            {
+                // Mouse was already in this rect so it's a mouseMoved
+
+                if (!dragging && (trackingOptions & CPTrackingMouseMoved) && (trackingImplementedMethods & CPTrackingOwnerImplementsMouseMoved))
+                    [[aTrackingArea owner] mouseMoved:anEvent];
+            }
+            else if ((trackingOptions & CPTrackingMouseEnteredAndExited) && (trackingImplementedMethods & CPTrackingOwnerImplementsMouseEntered))
+            {
+                var mouseEnteredEvent = [CPEvent enterExitEventWithType:CPMouseEntered
+                                                               location:point
+                                                          modifierFlags:[anEvent modifierFlags]
+                                                              timestamp:[anEvent timestamp]
+                                                           windowNumber:_windowNumber
+                                                                context:nil
+                                                            eventNumber:-1
+                                                           trackingArea:aTrackingArea];
+
+                if (dragging && !(trackingOptions & CPTrackingEnabledDuringMouseDrag))
+                    [self _queueTrackingEvent:mouseEnteredEvent];
+                else
+                    [[aTrackingArea owner] mouseEntered:mouseEnteredEvent];
+            }
+
+            if ((trackingOptions & CPTrackingCursorUpdate) && (trackingImplementedMethods & CPTrackingOwnerImplementsCursorUpdate))
+                [cursorUpdateStack addObject:aTrackingArea];
+        }
+    }
+}
+
+- (void)_handleMouseExitedEventsForEvent:(CPEvent)anEvent atPoint:(CGPoint)point dragging:(BOOL)dragging mouseEnteredStack:(CPArray)mouseEnteredStack
+{
+    // Search for exited views (were in _mouseEnteredStack but no more in mouseEnteredStack)
+
+    for (var i = 0; i < _mouseEnteredStack.length; i++)
+    {
+        var aTrackingArea   = _mouseEnteredStack[i],
+            trackingOptions = [aTrackingArea options];
+
+        if ([mouseEnteredStack containsObjectIdenticalTo:aTrackingArea])
+            continue;
+
+        // Mouse is no more in this area so it's a mouseExited
+
+        if ((trackingOptions & CPTrackingMouseEnteredAndExited) && ([aTrackingArea implementedOwnerMethods] & CPTrackingOwnerImplementsMouseExited))
+        {
+            var mouseExitedEvent = [CPEvent enterExitEventWithType:CPMouseExited
+                                                          location:point
+                                                     modifierFlags:[anEvent modifierFlags]
+                                                         timestamp:[anEvent timestamp]
+                                                      windowNumber:_windowNumber
+                                                           context:nil
+                                                       eventNumber:-1
+                                                      trackingArea:aTrackingArea];
+
+            if (dragging && !(trackingOptions & CPTrackingEnabledDuringMouseDrag))
+                [self _queueTrackingEvent:mouseExitedEvent];
+            else
+                [[aTrackingArea owner] mouseExited:mouseExitedEvent];
+        }
+
+        // If this is the active cursor area, we reset _cursorUpdateStack so a new active area will be computed
+
+        if (aTrackingArea === _activeCursorTrackingArea)
+        {
+            _cursorUpdateStack = [];
+            _activeCursorTrackingArea = nil;
+        }
+    }
+}
+
+- (void)_handleCursorUpdateEventsForEvent:(CPEvent)anEvent atPoint:(CGPoint)point dragging:(BOOL)dragging cursorUpdateStack:(CPArray)cursorUpdateStack
+{
+    var overlappingTrackingAreas = [];
+
+    for (var i = 0; i < cursorUpdateStack.length; i++)
+    {
+        var aTrackingArea = cursorUpdateStack[i];
+
+        if ((![_cursorUpdateStack containsObjectIdenticalTo:aTrackingArea]) || (aTrackingArea === _activeCursorTrackingArea))
+            [overlappingTrackingAreas addObject:aTrackingArea];
+    }
+
+    var nbOverlappingTrackingAreas = overlappingTrackingAreas.length;
+
+    if (nbOverlappingTrackingAreas > 0)
+    {
+        var frontmostTrackingArea = overlappingTrackingAreas[0],
+            frontmostView         = [frontmostTrackingArea view];
+
+        for (var i = 1; i < nbOverlappingTrackingAreas; i++)
+        {
+            var aTrackingArea = overlappingTrackingAreas[i],
+                aView         = [aTrackingArea view];
+
+            // First, if aView is _windowView, skip to next overlapping tracking area
+            // as _windowView can't be the frontmost view if there's multiple overlapping tracking areas.
+
+            if (aView === _windowView)
+                continue;
+
+            // Then, if frontmostView is _windowView, aView must become frontmostView
+
+            if (frontmostView === _windowView)
+            {
+                frontmostTrackingArea = aTrackingArea;
+                frontmostView         = aView;
+
+                continue;
+            }
+
+            // Next verify if aView is a subview of frontmostView
+            // If so, it's our new frontmost view
+
+            var searchingView = aView;
+
+            while ((searchingView !== _contentView) && ([searchingView superview] !== frontmostView))
+                searchingView = [searchingView superview];
+
+            if (searchingView !== _contentView)
+            {
+                frontmostTrackingArea = aTrackingArea;
+                frontmostView         = aView;
+
+                continue;
+            }
+
+            // aView is not a subview of frontmostView
+            // Search in view hierarchy which one will be over the other
+            // (this is done by comparing their draw order)
+
+            var firstView      = frontmostView,
+                firstSuperview = [firstView superview];
+
+            while (firstView !== _contentView)
+            {
+                var secondView      = aView,
+                    secondSuperview = [secondView superview];
+
+                while ((secondSuperview !== _contentView) && (firstSuperview !== secondSuperview))
+                {
+                    secondView      = secondSuperview;
+                    secondSuperview = [secondView superview];
+                }
+
+                if (firstSuperview === secondSuperview)
+                    break;
+
+                firstView      = firstSuperview;
+                firstSuperview = [firstView superview];
+            }
+
+            if (firstSuperview !== secondSuperview)
+                [CPException raise:CPInternalInconsistencyException reason:"Problem with view hierarchy"];
+
+            var firstSuperviewSubviews = [firstSuperview subviews],
+                firstViewIndex         = [firstSuperviewSubviews indexOfObject:firstView],
+                secondViewIndex        = [firstSuperviewSubviews indexOfObject:secondView];
+
+            if (secondViewIndex > firstViewIndex)
+            {
+                frontmostTrackingArea = aTrackingArea;
+                frontmostView         = aView;
+            }
+        }
+
+        if (frontmostTrackingArea !== _activeCursorTrackingArea)
+        {
+            var cursorUpdateEvent = [CPEvent enterExitEventWithType:CPCursorUpdate
+                                                           location:point
+                                                      modifierFlags:[anEvent modifierFlags]
+                                                          timestamp:[anEvent timestamp]
+                                                       windowNumber:_windowNumber
+                                                            context:nil
+                                                        eventNumber:-1
+                                                       trackingArea:frontmostTrackingArea];
+
+            if (dragging)
+                [self _queueTrackingEvent:cursorUpdateEvent];
+            else
+                [[frontmostTrackingArea owner] cursorUpdate:cursorUpdateEvent];
+
+            _activeCursorTrackingArea = frontmostTrackingArea;
+        }
+    }
+}
+
+- (void)_queueTrackingEvent:(CPEvent)anEvent
+{
+    // This will put a tracking event in the _queuedTrackingEvents queue.
+    //
+    // We optimize this queue with this policy :
+    // - if mouseEntered, search if queue contains a previous mouseExited for the same tracking area. If so, discard both.
+    // - if mouseExited, search if queue contains a previous mouseEntered for the same tracking area. If so, discard both.
+    //
+    // This is not Cocoa way of doing as it would send every event.
+    // But final result should be the same.
+
+    var eventType    = [anEvent type],
+        trackingArea = [anEvent trackingArea];
+
+    switch ([anEvent type])
+    {
+        case CPMouseEntered:
+            for (var i = 0; i < _queuedTrackingEvents.length; i++)
+            {
+                var queuedEvent = _queuedTrackingEvents[i];
+
+                if (([queuedEvent trackingArea] === trackingArea) && ([queuedEvent type] === CPMouseExited))
+                {
+                    [_queuedTrackingEvents removeObjectAtIndex:i];
+                    return;
+                }
+            }
+
+            [_queuedTrackingEvents addObject:anEvent];
+            break;
+
+        case CPMouseExited:
+            for (var i = 0; i < _queuedTrackingEvents.length; i++)
+            {
+                var queuedEvent = _queuedTrackingEvents[i];
+
+                if (([queuedEvent trackingArea] === trackingArea) && ([queuedEvent type] === CPMouseEntered))
+                {
+                    [_queuedTrackingEvents removeObjectAtIndex:i];
+                    return;
+                }
+            }
+
+            [_queuedTrackingEvents addObject:anEvent];
+            break;
+
+        case CPCursorUpdate:
+            [_queuedTrackingEvents addObject:anEvent];
+            break;
+    }
+}
+
+- (void)_flushTrackingEventQueueForMouseAt:(CGPoint)point
+{
+    for (var i = 0; i < _queuedTrackingEvents.length; i++)
+    {
+        var queuedEvent   = _queuedTrackingEvents[i],
+            trackingArea  = [queuedEvent trackingArea],
+            trackingOwner = [trackingArea owner];
+
+        switch ([queuedEvent type])
+        {
+            case CPMouseEntered:
+                [trackingOwner mouseEntered:queuedEvent];
+                break;
+
+            case CPMouseExited:
+                [trackingOwner mouseExited:queuedEvent];
+                break;
+                
+            case CPCursorUpdate:
+                [trackingOwner updateTrackingAreas];
+
+                if (CGRectContainsPoint([trackingArea windowRect], point))
+                    [trackingOwner cursorUpdate:queuedEvent];
+
+                break;
+        }
+    }
+
+    _queuedTrackingEvents = [];
+}
+
+@end
+
 function _CPWindowFullPlatformWindowSessionMake(aWindowView, aContentRect, hasShadow, aLevel)
 {
     return { windowView:aWindowView, contentRect:aContentRect, hasShadow:hasShadow, level:aLevel };

AppKit/CPWindow/_CPHUDWindowView.j

@@ -27,7 +27,6 @@
 
 @implementation _CPHUDWindowView : _CPTitleableWindowView
 {
-    CPView              _toolbarView;
     CPButton            _closeButton;
 }
 

AppKit/CPWindow/_CPPopoverWindowView.j

@@ -26,7 +26,6 @@
 @import "CGGradient.j"
 @import "_CPWindowView.j"
 
-@global CPPopoverAppearanceMinimal
 
 var _CPPopoverWindowViewDefaultCursorSize = CGSizeMake(16, 10);
 
@@ -39,7 +38,6 @@ var _CPPopoverWindowViewDefaultCursorSize = CGSizeMake(16, 10);
 {
     float       _arrowOffsetX   @accessors(property=arrowOffsetX);
     float       _arrowOffsetY   @accessors(property=arrowOffsetY);
-    int         _appearance     @accessors(property=appearance);
     unsigned    _preferredEdge  @accessors(property=preferredEdge);
 
     CGSize      _cursorSize;
@@ -123,7 +121,7 @@ var _CPPopoverWindowViewDefaultCursorSize = CGSizeMake(16, 10);
     {
         _arrowOffsetX = 0.0;
         _arrowOffsetY = 0.0;
-        _appearance = CPPopoverAppearanceMinimal;
+        _appearance = [CPAppearance appearanceNamed:CPAppearanceNameVibrantLight];
         _cursorSize = CGSizeMakeCopy(_CPPopoverWindowViewDefaultCursorSize);
     }
 
@@ -168,7 +166,7 @@ var _CPPopoverWindowViewDefaultCursorSize = CGSizeMake(16, 10);
         gradient,
         frame = [self bounds];
 
-    if (_appearance == CPPopoverAppearanceMinimal)
+    if ([_appearance isEqual:[CPAppearance appearanceNamed:CPAppearanceNameVibrantLight]])
     {
         gradient = [self valueForThemeAttribute:@"background-gradient"];
         strokeColor = [self valueForThemeAttribute:@"stroke-color"];

AppKit/CPWindow/_CPStandardWindowView.j

@@ -94,7 +94,6 @@ var _CPStandardWindowViewDividerViewHeight = 1.0;
     _CPTexturedWindowHeadView   _headView;
     CPView                      _dividerView;
     CPView                      _bodyView;
-    CPView                      _toolbarView;
 
     CPButton                    _closeButton;
     CPButton                    _minimizeButton;

AppKit/CPWindow/_CPWindowView.j

@@ -353,7 +353,9 @@ _CPWindowViewResizeSlop = 3;
     if ([theWindow isFullPlatformWindow] ||
         !(_styleMask & CPResizableWindowMask) ||
         (CPWindowResizeStyle !== CPWindowResizeStyleModern))
+    {
         return;
+    }
 
     var globalPoint = [theWindow convertBaseToGlobal:aPoint],
         resizeRegion = isResizing ? _resizeRegion : [self resizeRegionForPoint:globalPoint],
@@ -969,3 +971,18 @@ _CPWindowViewResizeSlop = 3;
 }
 
 @end
+
+@implementation _CPWindowView (TrackingAreaAdditions)
+
+- (void)updateTrackingAreas
+{
+    [self removeAllTrackingAreas];
+
+    [self addTrackingArea:[[CPTrackingArea alloc] initWithRect:[self contentRectForFrameRect:[self frame]]
+                                                       options:CPTrackingCursorUpdate | CPTrackingActiveInActiveApp
+                                                         owner:self
+                                                      userInfo:nil]];
+}
+
+@end
+

AppKit/Cib/CPCib.j

@@ -32,6 +32,7 @@
 @import "_CPCibObjectData.j"
 @import "_CPCibProxyObject.j"
 @import "_CPCibWindowTemplate.j"
+@import "_CPLocalizableString.j"
 
 CPCibOwner              = @"CPCibOwner";
 CPCibTopLevelObjects    = @"CPCibTopLevelObjects";
@@ -46,10 +47,11 @@ var CPCibObjectDataKey  = @"CPCibObjectDataKey";
 
 @implementation CPCib : CPObject
 {
-    CPData      _data;
-    CPBundle    _bundle;
-    BOOL        _awakenCustomResources;
+    BOOL        _awakenCustomResources @accessors(property=_awakenCustomResources);
 
+    CPBundle    _bundle;
+    CPData      _data;
+    CPString    _cibName;
     id          _loadDelegate;
 }
 
@@ -59,6 +61,8 @@ var CPCibObjectDataKey  = @"CPCibObjectDataKey";
 
     if (self)
     {
+        _cibName = [aURL lastPathComponent];
+
         _data = [CPURLConnection sendSynchronousRequest:[CPURLRequest requestWithURL:aURL] returningResponse:nil];
 
         if (!_data)
@@ -76,6 +80,8 @@ var CPCibObjectDataKey  = @"CPCibObjectDataKey";
 
     if (self)
     {
+        _cibName = [aURL lastPathComponent];
+
         [CPURLConnection connectionWithRequest:[CPURLRequest requestWithURL:aURL] delegate:self];
 
         _awakenCustomResources = YES;
@@ -92,7 +98,9 @@ var CPCibObjectDataKey  = @"CPCibObjectDataKey";
         aName = [aName stringByAppendingString:@".cib"];
 
     // If aBundle is nil, use mainBundle, but ONLY for searching for the nib, not for resources later.
-    self = [self initWithContentsOfURL:[aBundle || [CPBundle mainBundle] pathForResource:aName]];
+    var bundle = aBundle || [CPBundle mainBundle];
+
+    self = [self initWithContentsOfURL:[bundle _cibPathForResource:aName]];
 
     if (self)
         _bundle = aBundle;
@@ -106,7 +114,9 @@ var CPCibObjectDataKey  = @"CPCibObjectDataKey";
         aName = [aName stringByAppendingString:@".cib"];
 
     // If aBundle is nil, use mainBundle, but ONLY for searching for the nib, not for resources later.
-    self = [self initWithContentsOfURL:[aBundle || [CPBundle mainBundle] pathForResource:aName] loadDelegate:aLoadDelegate];
+    var bundle = aBundle || [CPBundle mainBundle];
+
+    self = [self initWithContentsOfURL:[bundle _cibPathForResource:aName] loadDelegate:aLoadDelegate];
 
     if (self)
         _bundle = aBundle;
@@ -114,16 +124,6 @@ var CPCibObjectDataKey  = @"CPCibObjectDataKey";
     return self;
 }
 
-- (void)_setAwakenCustomResources:(BOOL)shouldAwakenCustomResources
-{
-    _awakenCustomResources = shouldAwakenCustomResources;
-}
-
-- (BOOL)_awakenCustomResources
-{
-    return _awakenCustomResources;
-}
-
 - (BOOL)instantiateCibWithExternalNameTable:(CPDictionary)anExternalNameTable
 {
     var bundle = _bundle,
@@ -132,7 +132,7 @@ var CPCibObjectDataKey  = @"CPCibObjectDataKey";
     if (!bundle && owner)
         bundle = [CPBundle bundleForClass:[owner class]];
 
-    var unarchiver = [[_CPCibKeyedUnarchiver alloc] initForReadingWithData:_data bundle:bundle awakenCustomResources:_awakenCustomResources],
+    var unarchiver = [[_CPCibKeyedUnarchiver alloc] initForReadingWithData:_data bundle:bundle awakenCustomResources:_awakenCustomResources cibName:_cibName],
         replacementClasses = [anExternalNameTable objectForKey:CPCibReplacementClasses];
 
     if (replacementClasses)
@@ -226,4 +226,4 @@ var CPCibDataFileKey = @"CPCibDataFileKey",
     [aCoder encodeObject:[_data base64] forKey:CPCibDataFileKey];
 }
 
-@end
+@end

AppKit/Cib/CPCibHelpConnector.j

@@ -24,7 +24,6 @@
 
 @implementation CPCibHelpConnector : CPCibConnector
 {
-    id _destination;
     id _file;
     id _marker;
 }

AppKit/Cib/CPCibLoading.j

@@ -26,7 +26,11 @@
 
 @import "CPCib.j"
 
-var CPCibOwner = @"CPCibOwner";
+var CPCibOwner = @"CPCibOwner",
+    CPBundleDefaultLanguage = @"CPBundleDefaultLanguage",
+    CPBundleTypeOfLocalization = @"CPBundleTypeOfLocalization",
+    CPBundleBaseLocalizationType = @"CPBundleBaseLocalizationType",
+    CPBundleInterfaceBuilderLocalizationType = @"CPBundleInterfaceBuilderLocalizationType";
 
 @implementation CPObject (CPCibLoading)
 
@@ -45,14 +49,7 @@ var CPCibOwner = @"CPCibOwner";
 
 + (CPCib)loadCibNamed:(CPString)aName owner:(id)anOwner
 {
-    if (![aName hasSuffix:@".cib"])
-        aName = [aName stringByAppendingString:@".cib"];
-
-    // Path is based solely on anOwner:
-    var bundle = anOwner ? [CPBundle bundleForClass:[anOwner class]] : [CPBundle mainBundle],
-        path = [bundle pathForResource:aName];
-
-    return [self loadCibFile:path externalNameTable:@{ CPCibOwner: anOwner }];
+    return [self loadCibFile:[self _cibPathForName:aName withOwner:anOwner] externalNameTable:@{ CPCibOwner: anOwner }];
 }
 
 - (CPCib)loadCibFile:(CPString)aFileName externalNameTable:(CPDictionary)aNameTable
@@ -71,14 +68,7 @@ var CPCibOwner = @"CPCibOwner";
 
 + (CPCib)loadCibNamed:(CPString)aName owner:(id)anOwner loadDelegate:(id)aDelegate
 {
-    if (![aName hasSuffix:@".cib"])
-        aName = [aName stringByAppendingString:@".cib"];
-
-    // Path is based solely on anOwner:
-    var bundle = anOwner ? [CPBundle bundleForClass:[anOwner class]] : [CPBundle mainBundle],
-        path = [bundle pathForResource:aName];
-
-    return [self loadCibFile:path externalNameTable:@{ CPCibOwner: anOwner } loadDelegate:aDelegate];
+    return [self loadCibFile:[self _cibPathForName:aName withOwner:anOwner] externalNameTable:@{ CPCibOwner: anOwner } loadDelegate:aDelegate];
 }
 
 - (CPCib)loadCibFile:(CPString)aFileName externalNameTable:(CPDictionary)aNameTable loadDelegate:(id)aDelegate
@@ -91,6 +81,30 @@ var CPCibOwner = @"CPCibOwner";
                    externalNameTable:aNameTable]]);
 }
 
+- (CPString)_cibPathForResource:(CPString)aName
+{
+    var defaultBundleLanguage = [self objectForInfoDictionaryKey:CPBundleDefaultLanguage],
+        typeOfLocalization = [self objectForInfoDictionaryKey:CPBundleTypeOfLocalization];
+
+    if (defaultBundleLanguage && (!typeOfLocalization || typeOfLocalization == CPBundleBaseLocalizationType))
+        aName = @"Base.lproj/" + aName;
+    else if (defaultBundleLanguage && typeOfLocalization == CPBundleInterfaceBuilderLocalizationType)
+        aName = _bundle.loadedLanguage() + ".lproj/" + aName;
+
+    return [self pathForResource:aName];
+}
+
++ (CPString)_cibPathForName:(CPString)aName withOwner:(id)anOwner
+{
+    if (![aName hasSuffix:@".cib"])
+        aName = [aName stringByAppendingString:@".cib"];
+
+    // Path is based solely on anOwner:
+    var bundle = anOwner ? [CPBundle bundleForClass:[anOwner class]] : [CPBundle mainBundle];
+
+    return [bundle _cibPathForResource:aName];
+}
+
 @end
 
 @implementation _CPCibLoadDelegate : CPObject

AppKit/Cib/_CPCibKeyedUnarchiver.j

@@ -21,16 +21,22 @@
  */
 
 @import <Foundation/CPKeyedUnarchiver.j>
-
+@import <Foundation/CPBundle.j>
 
 @implementation _CPCibKeyedUnarchiver : CPKeyedUnarchiver
 {
-    CPBundle        _bundle;
-    BOOL            _awakenCustomResources;
-    CPDictionary    _externalObjectsForProxyIdentifiers;
+    BOOL            _awakenCustomResources              @accessors(getter=awakenCustomResources);
+    CPBundle        _bundle                             @accessors(getter=bundle);
+    CPDictionary    _externalObjectsForProxyIdentifiers @accessors(setter=setExternalObjectsForProxyIdentifiers:);
+    CPString        _cibName                            @accessors(getter=cibName);
 }
 
 - (id)initForReadingWithData:(CPData)data bundle:(CPBundle)aBundle awakenCustomResources:(BOOL)shouldAwakenCustomResources
+{
+    return [self initForReadingWithData:data bundle:aBundle awakenCustomResources:shouldAwakenCustomResources cibName:@""];
+}
+
+- (id)initForReadingWithData:(CPData)data bundle:(CPBundle)aBundle awakenCustomResources:(BOOL)shouldAwakenCustomResources cibName:(CPString)aCibName
 {
     self = [super initForReadingWithData:data];
 
@@ -38,6 +44,7 @@
     {
         _bundle = aBundle;
         _awakenCustomResources = shouldAwakenCustomResources;
+        _cibName = aCibName;
 
         [self setDelegate:self];
     }
@@ -45,21 +52,6 @@
     return self;
 }
 
-- (CPBundle)bundle
-{
-    return _bundle;
-}
-
-- (BOOL)awakenCustomResources
-{
-    return _awakenCustomResources;
-}
-
-- (void)setExternalObjectsForProxyIdentifiers:(CPDictionary)externalObjectsForProxyIdentifiers
-{
-    _externalObjectsForProxyIdentifiers = externalObjectsForProxyIdentifiers;
-}
-
 - (id)externalObjectForProxyIdentifier:(CPString)anIdentifier
 {
     return [_externalObjectsForProxyIdentifiers objectForKey:anIdentifier];

AppKit/Cib/_CPLocalizableString.j

@@ -0,0 +1,62 @@
+/*
+ * _CPLocalizableString.j
+ * AppKit
+ *
+ * Created by Alexandre Wilhelm.
+ * Copyright 2015, Cappuccino Project
+ *
+ * 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/CPString.j>
+@import <Foundation/CPCharacterSet.j>
+
+@implementation _CPLocalizableString : CPObject
+{
+    CPString _dev   @accessors(property=dev);
+    CPString _key   @accessors(property=key);
+    CPString _value @accessors(property=value);
+}
+
+@end
+
+
+var CPLocalizableStringDev = @"CPLocalizableStringDev",
+    CPLocalizableStringKey = @"CPLocalizableStringKey",
+    CPLocalizableStringValue = @"CPLocalizableStringValue";
+
+@implementation _CPLocalizableString (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    [self init];
+
+    _dev = [aCoder decodeObjectForKey:CPLocalizableStringDev];
+    _key = [aCoder decodeObjectForKey:CPLocalizableStringKey];
+    _value = [aCoder decodeObjectForKey:CPLocalizableStringValue];
+
+    var tableName = [[aCoder cibName] stringByTrimmingCharactersInSet:[CPCharacterSet characterSetWithCharactersInString:@".cib"]];
+
+    return [[aCoder bundle] localizedStringForKey:_key value:_value table:tableName];
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [aCoder encodeObject:_dev forKey:CPLocalizableStringDev];
+    [aCoder encodeObject:_key forKey:CPLocalizableStringKey];
+    [aCoder encodeObject:_value forKey:CPLocalizableStringValue];
+}
+
+@end

AppKit/CoreAnimation/CALayer.j

@@ -27,7 +27,8 @@
 
 @import "CGContext.j"
 @import "CGGeometry.j"
-
+@import "CPColor.j"
+@import "CPView.j"
 
 #define DOM(aLayer) aLayer._DOMElement
 
@@ -494,11 +495,11 @@ var CALayerRegisteredRunLoopUpdates             = nil;
 */
 - (void)display
 {
+#if PLATFORM(DOM)
     if (!_context)
     {
         _context = CGBitmapGraphicsContextCreate();
 
-#if PLATFORM(DOM)
         _DOMContentsElement = _context.DOMElement;
 
         _DOMContentsElement.style.zIndex = -100;
@@ -516,7 +517,6 @@ var CALayerRegisteredRunLoopUpdates             = nil;
         _DOMContentsElement.style.height = ROUND(CGRectGetHeight(_backingStoreFrame)) + "px";
 
         _DOMElement.appendChild(_DOMContentsElement);
-#endif
     }
 
     if (USE_BUFFER)
@@ -534,6 +534,7 @@ var CALayerRegisteredRunLoopUpdates             = nil;
 
         [self drawInContext:CABackingStoreGetContext(_contents)];
     }
+#endif
 
     [self composite];
 }
@@ -796,7 +797,6 @@ if (_DOMContentsElement && aLayer._zPosition > _DOMContentsElement.style.zIndex)
 
         if (mask & CALayerDisplayUpdateMask)
             [layer display];
-
         else if (mask & CALayerFrameSizeUpdateMask || mask & CALayerCompositeUpdateMask)
             [layer composite];
 

AppKit/Jakefile

@@ -1,8 +1,6 @@
 
 require("../common.jake");
 
-checkUlimit();
-
 var framework = require("objective-j/jake").framework,
     BundleTask = require("objective-j/jake").BundleTask;
 
@@ -35,8 +33,9 @@ appKitTask = framework ("AppKit", function(appKitTask)
         return "--include \"" + aFilename + "\"";
     }).join(" ");
 
-    if ($CONFIGURATION === "Release")
-        appKitTask.setCompilerFlags("-O " + INCLUDES);
+    if ($CONFIGURATION === "Release") {
+        appKitTask.setCompilerFlags("-O2 " + INCLUDES);
+    }
     else
         appKitTask.setCompilerFlags("-DDEBUG -g " + INCLUDES);
 });

AppKit/Platform/CPPlatformWindow.j

@@ -43,6 +43,8 @@ var PrimaryPlatformWindow   = NULL;
     BOOL                    _hasShadow;
     unsigned                _shadowStyle;
     CPString                _title;
+    BOOL                    _shouldUpdateContentRect;
+    BOOL                    _hasInitializeInstanceWithWindow;
 
 #if PLATFORM(DOM)
     DOMWindow               _DOMWindow;
@@ -73,6 +75,12 @@ var PrimaryPlatformWindow   = NULL;
     CPPlatformPasteboard    _platformPasteboard;
 
     CPString                _overriddenEventType;
+
+    CPWindow                _currentKeyWindow;
+    CPWindow                _previousKeyWindow;
+
+    CPWindow                _currentMainWindow;
+    CPWindow                _previousMainWindow;
 #endif
 }
 
@@ -113,12 +121,25 @@ var PrimaryPlatformWindow   = NULL;
         _windowLayers = @{};
 
         _charCodes = {};
+
+        _platformPasteboard = [CPPlatformPasteboard new];
 #endif
     }
 
     return self;
 }
 
+- (id)initWithWindow:(CPWindow)aWindow
+{
+    self = [self initWithContentRect:CGRectMakeCopy([aWindow frame])];
+
+    _hasInitializeInstanceWithWindow = YES;
+    [aWindow setPlatformWindow:self];
+    [aWindow setFullPlatformWindow:YES];
+
+    return self;
+}
+
 - (id)init
 {
     return [self initWithContentRect:CGRectMake(0.0, 0.0, 400.0, 500.0)];
@@ -194,7 +215,7 @@ var PrimaryPlatformWindow   = NULL;
 - (BOOL)isVisible
 {
 #if PLATFORM(DOM)
-    return _DOMWindow !== NULL;
+    return _DOMWindow !== NULL && _DOMWindow !== undefined;
 #else
     return NO;
 #endif
@@ -284,6 +305,22 @@ var PrimaryPlatformWindow   = NULL;
     return _title;
 }
 
+- (BOOL)_canUpdateContentRect
+{
+    // We onyl update the contentRect with the frame of the bridgeless window if we have initialized the platform with the method initWithWindow:
+    return _shouldUpdateContentRect && _hasInitializeInstanceWithWindow;
+}
+
+- (BOOL)_hasInitializeInstanceWithWindow
+{
+    return _hasInitializeInstanceWithWindow;
+}
+
+- (void)_setShouldUpdateContentRect:(BOOL)aBoolean
+{
+    _shouldUpdateContentRect = aBoolean;
+}
+
 @end
 
 #if PLATFORM(BROWSER)

AppKit/Platform/DOM/CPDOMDisplayServer.h

@@ -20,34 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define DOM_OPTIMIZATION 0
-
-#define SetStyleOrigin      0
-#define SetStyleLeftTop     0
-#define SetStyleRightTop    1
-#define SetStyleLeftBottom  2
-#define SetStyleRightBottom 3
-#define SetStyleSize        4
-#define SetSize             5
-#define AppendChild         6
-#define InsertBefore        7
-#define RemoveChild         8
-
-#define CPDOMDisplayServerSetStyleOrigin(anInstruction, aDOMElement, aTransform, x, y)\
-    if (!aDOMElement.CPDOMDisplayContext)\
-        aDOMElement.CPDOMDisplayContext = [];\
-    var __index = aDOMElement.CPDOMDisplayContext[SetStyleOrigin];\
-    if (!(__index >= 0))\
-    {\
-        __index = aDOMElement.CPDOMDisplayContext[SetStyleOrigin] = CPDOMDisplayServerInstructionCount;\
-        CPDOMDisplayServerInstructionCount += 5;\
-    }\
-    CPDOMDisplayServerInstructions[__index] = anInstruction;\
-    CPDOMDisplayServerInstructions[__index + 1] = aDOMElement;\
-    CPDOMDisplayServerInstructions[__index + 2] = aTransform;\
-    CPDOMDisplayServerInstructions[__index + 3] = x;\
-    CPDOMDisplayServerInstructions[__index + 4] = y;
-#if !DOM_OPTIMIZATION
 #define CPDOMDisplayServerSetStyleLeftTop(aDOMElement, aTransform, aLeft, aTop) \
 if (aTransform) var ____p = CGPointApplyAffineTransform(CGPointMake(aLeft, aTop), aTransform); \
 else var ____p = CGPointMake(aLeft, aTop); \
@@ -83,136 +55,14 @@ aDOMElement.style.bottom = ROUND(____p.y) + "px";
 #define CPDOMDisplayServerSetStyleBackgroundSize(aDOMElement, aWidth, aHeight)\
     aDOMElement.style.backgroundSize = aWidth + ' ' + aHeight;
 
-#define CPDOMDisplayServerAppendChild(aParentElement, aChildElement) aParentElement.appendChild(aChildElement)
+#define CPDOMDisplayServerAppendChild(aParentElement, aChildElement) \
+    aParentElement.appendChild(aChildElement);
 
-#define CPDOMDisplayServerInsertBefore(aParentElement, aChildElement, aBeforeElement) aParentElement.insertBefore(aChildElement, aBeforeElement)
+#define CPDOMDisplayServerInsertBefore(aParentElement, aChildElement, aBeforeElement) \
+    aParentElement.insertBefore(aChildElement, aBeforeElement);
 
-#define CPDOMDisplayServerRemoveChild(aParentElement, aChildElement) aParentElement.removeChild(aChildElement)
+#define CPDOMDisplayServerRemoveChild(aParentElement, aChildElement) \
+    aParentElement.removeChild(aChildElement);
 
 #define PREPARE_DOM_OPTIMIZATION()
 #define EXECUTE_DOM_INSTRUCTIONS()
-
-#else
-#define CPDOMDisplayServerSetStyleLeftTop(aDOMElement, aTransform, aLeft, aTop) CPDOMDisplayServerSetStyleOrigin(SetStyleLeftTop, aDOMElement, aTransform, aLeft, aTop)
-
-#define CPDOMDisplayServerSetStyleRightTop(aDOMElement, aTransform, aRight, aTop) CPDOMDisplayServerSetStyleOrigin(SetStyleRightTop, aDOMElement, aTransform, aRight, aTop)
-
-#define CPDOMDisplayServerSetStyleLeftBottom(aDOMElement, aTransform, aLeft, aBottom) CPDOMDisplayServerSetStyleOrigin(SetStyleLeftBottom, aDOMElement, aTransform, aLeft, aBottom)
-
-#define CPDOMDisplayServerSetStyleRightBottom(aDOMElement, aTransform, aRight, aBottom) CPDOMDisplayServerSetStyleOrigin(SetStyleRightBottom, aDOMElement, aTransform, aRight, aBottom)
-
-#define CPDOMDisplayServerSetStyleSize(aDOMElement, aWidth, aHeight)\
-    if (!aDOMElement.CPDOMDisplayContext)\
-        aDOMElement.CPDOMDisplayContext = [];\
-    var __index = aDOMElement.CPDOMDisplayContext[SetStyleSize];\
-    if (!(__index >= 0))\
-    {\
-        __index = aDOMElement.CPDOMDisplayContext[SetStyleSize] = CPDOMDisplayServerInstructionCount;\
-        CPDOMDisplayServerInstructionCount += 4;\
-    }\
-    CPDOMDisplayServerInstructions[__index] = SetStyleSize;\
-    CPDOMDisplayServerInstructions[__index + 1] = aDOMElement;\
-    CPDOMDisplayServerInstructions[__index + 2] = aWidth;\
-    CPDOMDisplayServerInstructions[__index + 3] = aHeight;
-
-#define CPDOMDisplayServerSetSize(aDOMElement, aWidth, aHeight)\
-    if (!aDOMElement.CPDOMDisplayContext)\
-        aDOMElement.CPDOMDisplayContext = [];\
-    var __index = aDOMElement.CPDOMDisplayContext[SetSize];\
-    if (!(__index >= 0))\
-    {\
-        __index = aDOMElement.CPDOMDisplayContext[SetSize] = CPDOMDisplayServerInstructionCount;\
-        CPDOMDisplayServerInstructionCount += 4;\
-    }\
-    CPDOMDisplayServerInstructions[__index] = SetSize;\
-    CPDOMDisplayServerInstructions[__index + 1] = aDOMElement;\
-    CPDOMDisplayServerInstructions[__index + 2] = aWidth;\
-    CPDOMDisplayServerInstructions[__index + 3] = aHeight;
-
-#define CPDOMDisplayServerSetStyleBackgroundSize(aDOMElement, aWidth, aHeight)\
-    aDOMElement.style.backgroundSize = aWidth + ' ' + aHeight;
-
-#define CPDOMDisplayServerAppendChild(aParentElement, aChildElement)\
-    if (aChildElement.CPDOMDisplayContext) aChildElement.CPDOMDisplayContext[SetStyleOrigin] = -1;\
-    CPDOMDisplayServerInstructions[CPDOMDisplayServerInstructionCount++] = AppendChild;\
-    CPDOMDisplayServerInstructions[CPDOMDisplayServerInstructionCount++] = aParentElement;\
-    CPDOMDisplayServerInstructions[CPDOMDisplayServerInstructionCount++] = aChildElement;
-
-#define CPDOMDisplayServerInsertBefore(aParentElement, aChildElement, aBeforeElement)\
-    if (aChildElement.CPDOMDisplayContext) aChildElement.CPDOMDisplayContext[SetStyleOrigin] = -1;\
-    CPDOMDisplayServerInstructions[CPDOMDisplayServerInstructionCount++] = InsertBefore;\
-    CPDOMDisplayServerInstructions[CPDOMDisplayServerInstructionCount++] = aParentElement;\
-    CPDOMDisplayServerInstructions[CPDOMDisplayServerInstructionCount++] = aChildElement;\
-    CPDOMDisplayServerInstructions[CPDOMDisplayServerInstructionCount++] = aBeforeElement;
-
-#define CPDOMDisplayServerRemoveChild(aParentElement, aChildElement)\
-    CPDOMDisplayServerInstructions[CPDOMDisplayServerInstructionCount++] = RemoveChild;\
-    CPDOMDisplayServerInstructions[CPDOMDisplayServerInstructionCount++] = aParentElement;\
-    CPDOMDisplayServerInstructions[CPDOMDisplayServerInstructionCount++] = aChildElement;
-
-#define PREPARE_DOM_OPTIMIZATION()\
-CPDOMDisplayServerInstructions = [];\
-CPDOMDisplayServerInstructionCount = 0;
-#define EXECUTE_DOM_INSTRUCTIONS()\
-    var index = 0;\
-    while (index < CPDOMDisplayServerInstructionCount)\
-    {\
-        var instruction = CPDOMDisplayServerInstructions[index++];\
-        try{\
-            switch (instruction)\
-            {\
-                case SetStyleLeftTop:\
-                case SetStyleRightTop:\
-                case SetStyleLeftBottom:\
-                case SetStyleRightBottom:   var element = CPDOMDisplayServerInstructions[index],\
-                                                style = element.style,\
-                                                x = (instruction == SetStyleLeftTop || instruction == SetStyleLeftBottom) ? "left" : "right",\
-                                                y = (instruction == SetStyleLeftTop || instruction == SetStyleRightTop) ? "top" : "bottom";\
-                                            CPDOMDisplayServerInstructions[index++] = nil;\
-                                            var transform = CPDOMDisplayServerInstructions[index++];\
-                                            if (transform)\
-                                            {\
-                                                var point = CGPointMake(CPDOMDisplayServerInstructions[index++], CPDOMDisplayServerInstructions[index++]),\
-                                                    transformed = CGPointApplyAffineTransform(point, transform);\
-                                                style[x] = ROUND(transformed.x) + "px";\
-                                                style[y] = ROUND(transformed.y) + "px";\
-                                            }\
-                                            else\
-                                            {\
-                                                style[x] = ROUND(CPDOMDisplayServerInstructions[index++]) + "px";\
-                                                style[y] = ROUND(CPDOMDisplayServerInstructions[index++]) + "px";\
-                                            }\
-                                            element.CPDOMDisplayContext[SetStyleOrigin] = -1;\
-                                            break;\
-                case SetStyleSize:          var element = CPDOMDisplayServerInstructions[index],\
-                                                style = element.style;\
-                                            CPDOMDisplayServerInstructions[index++] = nil;\
-                                            element.CPDOMDisplayContext[SetStyleSize] = -1;\
-                                            style.width = MAX(0.0, ROUND(CPDOMDisplayServerInstructions[index++])) + "px";\
-                                            style.height = MAX(0.0, ROUND(CPDOMDisplayServerInstructions[index++])) + "px";\
-                                            break;\
-                case SetSize:               var element = CPDOMDisplayServerInstructions[index];\
-                                            CPDOMDisplayServerInstructions[index++] = nil;\
-                                            element.CPDOMDisplayContext[SetSize] = -1;\
-                                            element.width = MAX(0.0, ROUND(CPDOMDisplayServerInstructions[index++]));\
-                                            element.height = MAX(0.0, ROUND(CPDOMDisplayServerInstructions[index++]));\
-                                            break;\
-                case AppendChild:           CPDOMDisplayServerInstructions[index].appendChild(CPDOMDisplayServerInstructions[index + 1]);\
-                                            CPDOMDisplayServerInstructions[index++] = nil;\
-                                            CPDOMDisplayServerInstructions[index++] = nil;\
-                                            break;\
-                case InsertBefore:          CPDOMDisplayServerInstructions[index].insertBefore(CPDOMDisplayServerInstructions[index + 1], CPDOMDisplayServerInstructions[index + 2]);\
-                                            CPDOMDisplayServerInstructions[index++] = nil;\
-                                            CPDOMDisplayServerInstructions[index++] = nil;\
-                                            CPDOMDisplayServerInstructions[index++] = nil;\
-                                            break;\
-                case RemoveChild:           CPDOMDisplayServerInstructions[index].removeChild(CPDOMDisplayServerInstructions[index + 1]);\
-                                            CPDOMDisplayServerInstructions[index++] = nil;\
-                                            CPDOMDisplayServerInstructions[index++] = nil;\
-                                            break;\
-                }\
-            }\
-            catch(e) { CPLog("e " + e + " " + instruction); }\
-        }\
-        CPDOMDisplayServerInstructionCount = 0;
-#endif

AppKit/Platform/DOM/CPPlatform.j

@@ -48,10 +48,21 @@ var screenNeedsInitialization   = NO,
         document.documentElement.style.overflow = "hidden";
 
     if ([CPPlatform isBrowser])
+    {
+        // This differ from cocoa, where shouldTerminate is called in the method terminate of CPApp
+        // Cappuccino acts like this because we can not close a window openend by the user with a script (so not possible in terminate), and we can only prevent the action in the method onbeforeunload in js.
+        window.onbeforeunload = function()
+        {
+            if ([CPApp _sendDelegateApplicationShouldTerminate] != CPTerminateNow)
+                return [CPApp _sendDelegateApplicationShouldTerminateMessage];
+        };
+
         window.onunload = function()
         {
+            [self closeAllPlatformWindows];
             [CPApp terminate:nil];
         };
+    }
 }
 
 + (BOOL)isBrowser
@@ -138,4 +149,18 @@ var screenNeedsInitialization   = NO,
                       object:self];
 }
 
++ (void)closeAllPlatformWindows
+{
+    var platformWindows = [CPPlatformWindow visiblePlatformWindows],
+        primaryPlatformWindow = [CPPlatformWindow primaryPlatformWindow],
+        platformWindowEnumerator = [platformWindows objectEnumerator],
+        platformWindow = nil;
+
+    while ((platformWindow = [platformWindowEnumerator nextObject]) !== nil)
+    {
+        if (platformWindow != primaryPlatformWindow)
+            [platformWindow orderOut:self];
+    }
+}
+
 @end

AppKit/Platform/DOM/CPPlatformString.j

@@ -129,6 +129,33 @@ var DOMFixedWidthSpanElement    = nil,
     DOMMetricsDivElement.appendChild(DOMMetricsImgElement);
 }
 
++ (int)charPositionOfString:(CPString)aString withFont:(CPFont)aFont forPoint:(CGPoint)aPoint
+{
+    if (!aString)
+        return 0;
+
+    var position = 0,
+        stringLength = aString.length,
+        currentString = "";
+
+    for (var i = 0; i < stringLength; i++)
+    {
+        var lastChar = aString[i];
+
+        currentString += lastChar;
+
+        var sizeOfString = [self sizeOfString:currentString withFont:aFont forWidth:nil].width,
+            sizeLastChar = [self sizeOfString:lastChar withFont:aFont forWidth:nil].width;
+
+        if (sizeOfString - sizeLastChar / 2 < aPoint.x)
+            position++;
+        else
+            break;
+    }
+
+    return position;
+}
+
 + (CGSize)sizeOfString:(CPString)aString withFont:(CPFont)aFont forWidth:(float)aWidth
 {
     if (!DOMFixedWidthSpanElement)

AppKit/Platform/DOM/CPPlatformWindow+DOM.j

@@ -127,6 +127,7 @@
 @import "CPText.j"
 @import "CPWindow_Constants.j"
 
+@class CPApplication
 @class CPDragServer
 @class _CPToolTip
 
@@ -202,6 +203,10 @@ var ModifierKeyCodes = [
 
 var resizeTimer = nil;
 var PreventScroll = true;
+var blurTimer = nil;
+
+_CPPlatformWindowWillCloseNotification = @"_CPPlatformWindowWillCloseNotification";
+
 
 // When scrolling with an old-style scroll wheel with discete steps ('clicks'), the scroll amount can indicate how many "lines" to
 // scroll.
@@ -360,6 +365,7 @@ var PreventScroll = true;
         _DOMBodyElement.style["-khtml-user-select"] = "none";
 
     _DOMBodyElement.webkitTouchCallout = "none";
+    _DOMBodyElement.style[CPBrowserStyleProperty(@"user-select")] = @"none";
 
     [self createDOMElements];
     [self _addLayers];
@@ -393,7 +399,15 @@ var PreventScroll = true;
 
         touchEventSelector = @selector(touchEvent:),
         touchEventImplementation = class_getMethodImplementation(theClass, touchEventSelector),
-        touchEventCallback = function (anEvent) { touchEventImplementation(self, nil, anEvent); };
+        touchEventCallback = function (anEvent) { touchEventImplementation(self, nil, anEvent); },
+
+        onFocusEventSelector = @selector(focusEvent:),
+        onFocusEventImplementation = class_getMethodImplementation(theClass, onFocusEventSelector),
+        onFocusEventCallback = function (anEvent) { onFocusEventImplementation(self, nil, anEvent); },
+
+        onBlurEventSelector = @selector(blurEvent:),
+        onBlurEventImplementation = class_getMethodImplementation(theClass, onBlurEventSelector),
+        onBlurEventCallback = function (anEvent) { onBlurEventImplementation(self, nil, anEvent); };
 
     if (theDocument.addEventListener)
     {
@@ -427,8 +441,15 @@ var PreventScroll = true;
 
         _DOMWindow.addEventListener("resize", resizeEventCallback, NO);
 
+        _DOMWindow.addEventListener("blur", onBlurEventCallback, NO);
+        _DOMWindow.addEventListener("focus", onFocusEventCallback, NO);
+
         _DOMWindow.addEventListener("unload", function()
         {
+            _DOMWindow.removeEventListener("unload", arguments.callee, NO);
+
+            [self blurEvent:nil];
+            [self _notifyPlatformWindowWillClose];
             [self updateFromNativeContentRect];
             [self _removeLayers];
 
@@ -447,13 +468,14 @@ var PreventScroll = true;
 
             _DOMWindow.removeEventListener("resize", resizeEventCallback, NO);
 
+            _DOMWindow.removeEventListener("blur", onBlurEventCallback, NO);
+            _DOMWindow.removeEventListener("focus", onFocusEventCallback, NO);
+
             //FIXME: does firefox really need a different value?
             _DOMWindow.removeEventListener("DOMMouseScroll", scrollEventCallback, NO);
             _DOMWindow.removeEventListener("wheel", scrollEventCallback, NO);
             _DOMWindow.removeEventListener("mousewheel", scrollEventCallback, NO);
 
-            //_DOMWindow.removeEventListener("beforeunload", this, NO);
-
             [PlatformWindows removeObject:self];
 
             [_platformPasteboard setDOMWindow:nil];
@@ -475,6 +497,9 @@ var PreventScroll = true;
 
         _DOMWindow.attachEvent("onresize", resizeEventCallback);
 
+        _DOMWindow.attachEvent("onfocus", onFocusEventCallback);
+        _DOMWindow.attachEvent("onblur", onBlurEventCallback);
+
         _DOMWindow.onmousewheel = scrollEventCallback;
         theDocument.onmousewheel = scrollEventCallback;
 
@@ -483,6 +508,10 @@ var PreventScroll = true;
 
         _DOMWindow.attachEvent("onunload", function()
         {
+            _DOMWindow.detachEvent("unload", arguments.callee);
+
+            [self blurEvent:nil];
+            [self _notifyPlatformWindowWillClose];
             [self updateFromNativeContentRect];
             [self _removeLayers];
 
@@ -498,14 +527,16 @@ var PreventScroll = true;
 
             _DOMWindow.detachEvent("onresize", resizeEventCallback);
 
+            _DOMWindow.detachEvent("onfocus", onBlurEventCallback);
+            _DOMWindow.detachEvent("onblur", onFocusEventCallback);
+
             _DOMWindow.onmousewheel = NULL;
+
             theDocument.onmousewheel = NULL;
 
             _DOMBodyElement.ondrag = NULL;
             _DOMBodyElement.onselectstart = NULL;
 
-            //_DOMWindow.removeEvent("beforeunload", this);
-
             [PlatformWindows removeObject:self];
 
             [_platformPasteboard setDOMWindow:nil];
@@ -537,10 +568,13 @@ var PreventScroll = true;
 
     _DOMWindow = window.open("about:blank", "_blank", "menubar=no,location=no,resizable=yes,scrollbars=no,status=no,left=" + CGRectGetMinX(_contentRect) + ",top=" + CGRectGetMinY(_contentRect) + ",width=" + CGRectGetWidth(_contentRect) + ",height=" + CGRectGetHeight(_contentRect));
 
+    if (!_DOMWindow)
+        return;
+
     [PlatformWindows addObject:self];
 
     // FIXME: cpSetFrame?
-    _DOMWindow.document.write('<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"></head><body style="background-color:transparent;"></body></html>');
+    _DOMWindow.document.write('<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"></head><body style="background-color:transparent; overflow:hidden"></body></html>');
     _DOMWindow.document.close();
 
     if (self != [CPPlatformWindow primaryPlatformWindow])
@@ -988,6 +1022,7 @@ var PreventScroll = true;
 
 - (void)_actualResizeEvent
 {
+    _shouldUpdateContentRect = NO;
     resizeTimer = nil;
 
     // FIXME: This is not the right way to do this.
@@ -1021,8 +1056,100 @@ var PreventScroll = true;
     //window.liveResize = NO;
 
     [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
+
+    _shouldUpdateContentRect = YES;
 }
 
+/*!
+    @ignore
+*/
+- (void)blurEvent:(DOMEvent)aDOMEvent
+{
+    if ([CPApp keyWindow] == _currentKeyWindow)
+        [_currentKeyWindow resignKeyWindow];
+
+    if ([CPApp mainWindow] == _currentMainWindow)
+        [_currentMainWindow resignMainWindow];
+
+    _previousKeyWindow = aDOMEvent ? _currentKeyWindow : nil;
+    _previousMainWindow = aDOMEvent ? _currentMainWindow : nil;
+
+    [blurTimer invalidate];
+    blurTimer = [CPTimer scheduledTimerWithTimeInterval:0.2 target:self selector:@selector(_blurEventTimer:) userInfo:nil repeats:NO];
+}
+
+/*!
+    @ignore
+*/
+- (void)_blurEventTimer:(CPTimer)aTimer
+{
+    if (![CPApp mainWindow])
+        [[CPApplication sharedApplication] deactivate];
+
+    [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
+}
+
+/*!
+    @ignore
+*/
+- (void)focusEvent:(DOMEvent)aDOMEvent
+{
+    [blurTimer invalidate];
+    [CPApp activateIgnoringOtherApps:YES];
+
+    var keyWindow = _previousKeyWindow;
+
+    if (!keyWindow)
+       keyWindow = [[[_windowLayers objectForKey:[_windowLevels firstObject]] orderedWindows] firstObject];
+
+    if (!keyWindow)
+        return;
+
+    [self _makeKeyWindow:keyWindow];
+
+    if ([keyWindow isKeyWindow] && ([keyWindow firstResponder] === keyWindow || ![keyWindow firstResponder]))
+       [keyWindow makeFirstResponder:[keyWindow initialFirstResponder]];
+
+    [self _makeMainWindow:keyWindow];
+
+    [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
+
+    _previousKeyWindow = nil;
+    _previousMainWindow = nil;
+}
+
+/*!
+    @ignore
+*/
+- (void)_makeKeyWindow:(CPWindow)aWindow
+{
+    if ([CPApp keyWindow] === aWindow || ![aWindow canBecomeKeyWindow])
+        return;
+
+    [[CPApp keyWindow] resignKeyWindow];
+    [aWindow becomeKeyWindow];
+}
+
+/*!
+    @ignore
+*/
+- (void)_makeMainWindow:(CPWindow)aWindow
+{
+    // Sheets cannot be main. Their parent window becomes main.
+    if (aWindow._isSheet)
+    {
+        [self _makeMainWindow:aWindow._parentView];
+        return;
+    }
+
+    if ([CPApp mainWindow] === aWindow || ![aWindow canBecomeMainWindow])
+        return;
+
+    [[CPApp mainWindow] resignMainWindow];
+    [aWindow becomeMainWindow];
+}
+
+
 - (void)touchEvent:(DOMEvent)aDOMEvent
 {
     if (aDOMEvent.touches && (aDOMEvent.touches.length == 1 || (aDOMEvent.touches.length == 0 && aDOMEvent.changedTouches.length == 1)))
@@ -1290,6 +1417,9 @@ var PreventScroll = true;
 
 - (void)order:(CPWindowOrderingMode)orderingMode window:(CPWindow)aWindow relativeTo:(CPWindow)otherWindow
 {
+    if (!_DOMWindow)
+        return;
+
     [CPPlatform initializeScreenIfNecessary];
 
     // Grab the appropriate level for the layer, and create it if
@@ -1629,6 +1759,13 @@ var PreventScroll = true;
     KeyCodesToPrevent = {};
 }
 
+- (void)_notifyPlatformWindowWillClose
+{
+    [[CPNotificationCenter defaultCenter] postNotificationName:_CPPlatformWindowWillCloseNotification
+                                                        object:self
+                                                      userInfo:nil];
+}
+
 @end
 #endif
 

AppKit/Themes/Aristo/ThemeDescriptors.j

@@ -384,6 +384,19 @@ var themedButtonValues = nil,
             "themedTokenFieldTokenCloseButton"];
 }
 
++ (CPColor)themedColor
+{
+    var color = [CPColor blackColor],
+        themedColorValues =
+    [
+        [@"alternate-selected-control-color", [[CPColor alloc] _initWithRGBA:[0.22, 0.46, 0.84, 1.0]]],
+        [@"secondary-selected-control-color", [[CPColor alloc] _initWithRGBA:[0.83, 0.83, 0.83, 1.0]]]
+    ];
+
+    [self registerThemeValues:themedColorValues forObject:color];
+
+    return color;
+}
 
 + (CPButton)makeButton
 {
@@ -1186,13 +1199,28 @@ var themedButtonValues = nil,
             // The new bezel is one pixel shorter, so we add one extra empty pixel at the bottom
             // for size compatibility with an earlier version.
             [@"bezel-inset",    CGInsetMake(0.0, 0.0, 1.0, 0.0),    [CPTextFieldStateRounded, CPThemeStateBezeled]],
-            [@"content-inset",  CGInsetMake(8.0, 13.0, 7.0, 14.0),  [CPTextFieldStateRounded, CPThemeStateBezeled]],
+            [@"content-inset",  CGInsetMake(7.0, 13.0, 7.0, 14.0),  [CPTextFieldStateRounded, CPThemeStateBezeled]],
 
             [@"text-color",     textDisabledColor,      [CPTextFieldStateRounded, CPThemeStateDisabled]],
             [@"text-color",     placeholderColor,       [CPTextFieldStateRounded, CPTextFieldStatePlaceholder]],
 
             [@"min-size",       CGSizeMake(0.0, 30.0),  [CPTextFieldStateRounded, CPThemeStateBezeled]],
-            [@"max-size",       CGSizeMake(-1.0, 30.0), [CPTextFieldStateRounded, CPThemeStateBezeled]]
+            [@"max-size",       CGSizeMake(-1.0, 30.0), [CPTextFieldStateRounded, CPThemeStateBezeled]],
+            [@"nib2cib-adjustment-frame",   CGRectMake(-2.0, 7.0, 5.0, 10.0),                       [CPTextFieldStateRounded, CPThemeStateBezeled]],
+
+            // CPThemeStateControlSizeSmall
+            [@"content-inset",              CGInsetMake(8.0, 6.0, 4.0, 6.0),                        [CPThemeStateControlSizeSmall, CPTextFieldStateRounded, CPThemeStateBezeled]],
+            [@"bezel-inset",                CGInsetMake(2.0, 4.0, 2.0, 4.0),                        [CPThemeStateControlSizeSmall, CPTextFieldStateRounded, CPThemeStateBezeled]],
+            [@"min-size",                   CGSizeMake(0.0, 28.0),                                  [CPThemeStateControlSizeSmall, CPTextFieldStateRounded, CPThemeStateBezeled]],
+            [@"max-size",                   CGSizeMake(-1.0, 28.0),                                 [CPThemeStateControlSizeSmall, CPTextFieldStateRounded, CPThemeStateBezeled]],
+            [@"nib2cib-adjustment-frame",   CGRectMake(-6.0, 5.0, 13.0, 9.0),                       [CPThemeStateControlSizeSmall, CPTextFieldStateRounded, CPThemeStateBezeled]],
+
+            // CPThemeStateControlSizeMini
+            [@"content-inset",              CGInsetMake(8.0, 6.0, 4.0, 6.0),                        [CPThemeStateControlSizeMini, CPTextFieldStateRounded, CPThemeStateBezeled]],
+            [@"bezel-inset",                CGInsetMake(2.0, 4.0, 2.0, 4.0),                        [CPThemeStateControlSizeMini, CPTextFieldStateRounded, CPThemeStateBezeled]],
+            [@"min-size",                   CGSizeMake(0.0, 26.0),                                  [CPThemeStateControlSizeMini, CPTextFieldStateRounded, CPThemeStateBezeled]],
+            [@"max-size",                   CGSizeMake(-1.0, 26.0),                                 [CPThemeStateControlSizeMini, CPTextFieldStateRounded, CPThemeStateBezeled]],
+            [@"nib2cib-adjustment-frame",   CGRectMake(-6.0, 6.0, 13.0, 10.0),                      [CPThemeStateControlSizeMini, CPTextFieldStateRounded, CPThemeStateBezeled]]
         ];
 
     [self registerThemeValues:themedRoundedTextFieldValues forView:textfield];
@@ -1211,17 +1239,44 @@ var themedButtonValues = nil,
 {
     var searchField = [[CPSearchField alloc] initWithFrame:CGRectMake(0.0, 0.0, 160.0, 30.0)],
 
-        imageSearch = PatternImage("search-field-search.png", 25.0, 22.0),
-        imageFind = PatternImage("search-field-find.png", 25.0, 22.0),
-        imageCancel = PatternImage("search-field-cancel.png", 22.0, 22.0),
-        imageCancelPressed = PatternImage("search-field-cancel-pressed.png", 22.0, 22.0),
+        imageSearch             = PatternImage("search-field-search.png", 25.0, 22.0),
+        imageFind               = PatternImage("search-field-find.png", 25.0, 22.0),
+        imageCancel             = PatternImage("search-field-cancel.png", 22.0, 22.0),
+        imageCancelPressed      = PatternImage("search-field-cancel-pressed.png", 22.0, 22.0),
+
+        smallImageSearch        = PatternImage("search-field-search.png", 25.0, 20.0),
+        smallImageFind          = PatternImage("search-field-find.png", 25.0, 20.0),
+        smallImageCancel        = PatternImage("search-field-cancel.png", 22.0, 20.0),
+        smallImageCancelPressed = PatternImage("search-field-cancel-pressed.png", 22.0, 21.0),
+
+        miniImageSearch         = PatternImage("search-field-search.png", 25.0, 20.0),
+        miniImageFind           = PatternImage("search-field-find.png", 25.0, 20.0),
+        miniImageCancel         = PatternImage("search-field-cancel.png", 22.0, 21.0),
+        miniImageCancelPressed  = PatternImage("search-field-cancel-pressed.png", 22.0, 21.0),
 
         overrides =
         [
-            [@"image-search", imageSearch],
-            [@"image-find", imageFind],
-            [@"image-cancel", imageCancel],
-            [@"image-cancel-pressed", imageCancelPressed]
+            [@"image-search-inset",  CGInsetMake(0, 0, 0, 5)],
+            [@"image-cancel-inset",  CGInsetMake(0, 5, 0, 0)],
+
+            [@"image-search",           imageSearch],
+            [@"image-find",             imageFind],
+            [@"image-cancel",           imageCancel],
+            [@"image-cancel-pressed",   imageCancelPressed],
+
+            [@"image-search",               smallImageSearch,               CPThemeStateControlSizeSmall],
+            [@"image-find",                 smallImageFind,                 CPThemeStateControlSizeSmall],
+            [@"image-cancel",               smallImageCancel,               CPThemeStateControlSizeSmall],
+            [@"image-cancel-pressed",       smallImageCancelPressed,        CPThemeStateControlSizeSmall],
+            [@"image-search-inset",         CGInsetMake(0, 0, 0, 8),        CPThemeStateControlSizeSmall],
+            [@"image-cancel-inset",         CGInsetMake(0, 8, 0, 0),        CPThemeStateControlSizeSmall],
+
+            [@"image-search",               miniImageSearch,                CPThemeStateControlSizeMini],
+            [@"image-find",                 miniImageFind,                  CPThemeStateControlSizeMini],
+            [@"image-cancel",               miniImageCancel,                CPThemeStateControlSizeMini],
+            [@"image-cancel-pressed",       miniImageCancelPressed,         CPThemeStateControlSizeMini],
+            [@"image-search-inset",         CGInsetMake(0, 0, 0, 8),        CPThemeStateControlSizeMini],
+            [@"image-cancel-inset",         CGInsetMake(0, 8, 0, 0),        CPThemeStateControlSizeMini],
         ];
 
     [self registerThemeValues:overrides forView:searchField inherit:themedRoundedTextFieldValues];
@@ -1763,7 +1818,7 @@ var themedButtonValues = nil,
             {
                 width: 8.0,
                 height: 26.0,
-                rightWidth: 23.0,
+                rightWidth: 19.0,
                 orientation: PatternIsHorizontal
             }),
 
@@ -1801,7 +1856,7 @@ var themedButtonValues = nil,
             {
                 width: 6.0,
                 height: 22.0,
-                rightWidth: 19.0,
+                rightWidth: 17.0,
                 orientation: PatternIsHorizontal
             }),
 
@@ -1836,7 +1891,9 @@ var themedButtonValues = nil,
 
             [@"border-inset",               CGInsetMake(3.0, 3.0, 3.0, 3.0),            CPThemeStateBezeled],
 
+            [@"bezel-inset",                CGInsetMake(0.0, 1.0, 1.0, 1.0),            [CPThemeStateBezeled, CPComboBoxStateButtonBordered]],
             [@"bezel-inset",                CGInsetMake(0.0, 1.0, 1.0, 1.0),            [CPThemeStateBezeled, CPThemeStateEditing]],
+            [@"bezel-inset",                CGInsetMake(0.0, 1.0, 1.0, 1.0),            [CPThemeStateBezeled, CPThemeStateDisabled]],
 
             // The right border inset has to make room for the focus ring and popup button
             [@"content-inset",              CGInsetMake(8.0, 27.0, 7.0, 8.0),           [CPThemeStateBezeled, CPComboBoxStateButtonBordered]],
@@ -1860,6 +1917,12 @@ var themedButtonValues = nil,
             [@"bezel-color",                smallBezelNoBorderFocusedColor,             [CPThemeStateControlSizeSmall, CPThemeStateBezeled, CPThemeStateEditing]],
             [@"bezel-color",                smallBezelNoBorderColor["disabled"],        [CPThemeStateControlSizeSmall, CPThemeStateBezeled, CPThemeStateDisabled]],
 
+            [@"bezel-inset",                CGInsetMake(1.0, 2.0, 1.0, 2.0),            [CPThemeStateBezeled, CPComboBoxStateButtonBordered, CPThemeStateControlSizeSmall]],
+            [@"bezel-inset",                CGInsetMake(1.0, 2.0, 1.0, 0.0),            [CPThemeStateBezeled, CPThemeStateEditing, CPComboBoxStateButtonBordered, CPThemeStateControlSizeSmall]],
+            [@"bezel-inset",                CGInsetMake(1.0, 2.0, 1.0, 2.0),            [CPThemeStateBezeled, CPThemeStateDisabled, CPThemeStateControlSizeSmall]],
+
+            [@"content-inset",              CGInsetMake(6.0, 27.0, 7.0, 8.0),           [CPThemeStateBezeled, CPComboBoxStateButtonBordered, CPThemeStateControlSizeSmall]],
+
             [@"min-size",                   CGSizeMake(0, 26.0),                        CPThemeStateControlSizeSmall],
             [@"max-size",                   CGSizeMake(-1, 26.0),                       CPThemeStateControlSizeSmall],
             [@"nib2cib-adjustment-frame",   CGRectMake(-2.0, -1.0, 1.0, 0.0),           CPThemeStateControlSizeSmall],
@@ -1873,6 +1936,12 @@ var themedButtonValues = nil,
             [@"bezel-color",                miniBezelNoBorderFocusedColor,              [CPThemeStateControlSizeMini, CPThemeStateBezeled, CPThemeStateEditing]],
             [@"bezel-color",                miniBezelNoBorderColor["disabled"],         [CPThemeStateControlSizeMini, CPThemeStateBezeled, CPThemeStateDisabled]],
 
+            [@"bezel-inset",                CGInsetMake(1.0, 2.0, 1.0, 2.0),            [CPThemeStateBezeled, CPComboBoxStateButtonBordered, CPThemeStateControlSizeMini]],
+            [@"bezel-inset",                CGInsetMake(1.0, 2.0, 1.0, 1.0),            [CPThemeStateBezeled, CPThemeStateEditing, CPComboBoxStateButtonBordered, CPThemeStateControlSizeMini]],
+            [@"bezel-inset",                CGInsetMake(1.0, 2.0, 1.0, 2.0),            [CPThemeStateBezeled, CPThemeStateDisabled, CPThemeStateControlSizeMini]],
+
+            [@"content-inset",              CGInsetMake(6.0, 27.0, 7.0, 8.0),           [CPThemeStateBezeled, CPComboBoxStateButtonBordered, CPThemeStateControlSizeMini]],
+
             [@"min-size",                   CGSizeMake(0, 22.0),                        CPThemeStateControlSizeMini],
             [@"max-size",                   CGSizeMake(-1, 22.0),                       CPThemeStateControlSizeMini],
             [@"nib2cib-adjustment-frame",   CGRectMake(-2.0, -1.0, 2.0, 0.0),           CPThemeStateControlSizeMini],
@@ -2943,6 +3012,24 @@ var themedButtonValues = nil,
     return progressBar;
 }
 
++ (CPProgressIndicator)themedCircularProgressIndicator
+{
+    var progressBar = [[CPProgressIndicator alloc] initWithFrame:CGRectMake(0, 0, 32, 32)];
+    [progressBar setStyle:CPProgressIndicatorSpinningStyle];
+    [progressBar setIndeterminate:NO];
+
+    var themeValues =
+        [
+            [@"circular-border-color", [CPColor colorWithHexString:@"C7C7C7"]],
+            [@"circular-border-size", 1],
+            [@"circular-color", [CPColor colorWithHexString:@"89B5CD"]]
+        ];
+
+    [self registerThemeValues:themeValues forView:progressBar];
+
+    return progressBar;
+}
+
 + (CPBox)themedBox
 {
     var box = [[CPBox alloc] initWithFrame:CGRectMake(0,0,100,100)],

AppKit/Themes/Aristo2/ThemeDescriptors.j

@@ -28,6 +28,7 @@
 @import <AppKit/CPButtonBar.j>
 @import <AppKit/CPCheckBox.j>
 @import <AppKit/CPComboBox.j>
+@import <AppKit/CPColor.j>
 @import <AppKit/CPColorWell.j>
 @import <AppKit/CPDatePicker.j>
 @import <AppKit/CPLevelIndicator.j>
@@ -96,7 +97,22 @@ var themedButtonValues = nil,
             "themedRuleEditor",
             "themedTableDataView",
             "themedCornerview",
-            "themedTokenFieldTokenCloseButton"];
+            "themedTokenFieldTokenCloseButton",
+            "themedColor"];
+}
+
++ (CPColor)themedColor
+{
+    var color = [CPColor redColor],
+        themedColorValues =
+    [
+        [@"alternate-selected-control-color", [[CPColor alloc] _initWithRGBA:[0.22, 0.46, 0.84, 1.0]]],
+        [@"secondary-selected-control-color", [[CPColor alloc] _initWithRGBA:[0.83, 0.83, 0.83, 1.0]]]
+    ];
+
+    [self registerThemeValues:themedColorValues forObject:color];
+
+    return color;
 }
 
 + (CPButton)makeButton
@@ -310,7 +326,7 @@ var themedButtonValues = nil,
     var button = [self button];
 
     [button setTitle:@"OK"];
-    [button setThemeState:[CPButtonStateBezelStyleRounded, CPThemeStateDefault]];
+    [button setThemeStates:[CPButtonStateBezelStyleRounded, CPThemeStateDefault]];
 
     return button;
 }
@@ -688,7 +704,8 @@ var themedButtonValues = nil,
         [@"text-color",         [CPColor blackColor],                                       [CPThemeStateTableDataView, CPThemeStateSelectedDataView, CPThemeStateEditable, CPThemeStateFirstResponder, CPThemeStateKeyWindow]],
         [@"content-inset",      CGInsetMake(7.0, 7.0, 5.0, 10.0),                           [CPThemeStateTableDataView, CPThemeStateEditable]],
         [@"font",               [CPFont systemFontOfSize:CPFontCurrentSystemSize],          [CPThemeStateTableDataView, CPThemeStateEditing]],
-        [@"bezel-inset",        CGInsetMake(-2.0, -2.0, -2.0, -2.0),                        [CPThemeStateTableDataView, CPThemeStateEditing]],
+        [@"bezel-inset",        CGInsetMake(-2.0, -2.0, -2.0, -2.0),                        [CPThemeStateTableDataView, CPThemeStateEditable, CPThemeStateEditing]],
+        [@"bezel-inset",        CGInsetMake(1.0, 1.0, 1.0, 1.0),                            [CPThemeStateTableDataView, CPThemeStateEditable]],
 
         [@"text-color",         [CPColor colorWithCalibratedWhite:125.0 / 255.0 alpha:1.0], [CPThemeStateTableDataView, CPThemeStateGroupRow]],
         [@"text-color",         [CPColor whiteColor],                                       [CPThemeStateTableDataView, CPThemeStateGroupRow, CPThemeStateSelectedDataView, CPThemeStateFirstResponder, CPThemeStateKeyWindow]],
@@ -760,8 +777,8 @@ var themedButtonValues = nil,
 
             [@"font",                       [CPFont systemFontOfSize:CPFontCurrentSystemSize]],
 
-            [@"content-inset",              CGInsetMake(8.0, 14.0, 6.0, 14.0),                      [CPTextFieldStateRounded, CPThemeStateBezeled]],
-            [@"content-inset",              CGInsetMake(8.0, 14.0, 6.0, 14.0),                      [CPTextFieldStateRounded, CPThemeStateBezeled, CPThemeStateEditing]],
+            [@"content-inset",              CGInsetMake(7.0, 10.0, 4.0, 10.0),                      [CPTextFieldStateRounded, CPThemeStateBezeled]],
+            [@"content-inset",              CGInsetMake(7.0, 10.0, 4.0, 10.0),                      [CPTextFieldStateRounded, CPThemeStateBezeled, CPThemeStateEditing]],
 
             [@"bezel-inset",                CGInsetMake(3.0, 4.0, 3.0, 4.0),                        [CPTextFieldStateRounded, CPThemeStateBezeled]],
             [@"bezel-inset",                CGInsetMake(0.0, 1.0, 0.0, 1.0),                        [CPTextFieldStateRounded, CPThemeStateBezeled, CPThemeStateEditing]],
@@ -772,9 +789,23 @@ var themedButtonValues = nil,
 
             [@"min-size",                   CGSizeMake(0.0, 29.0),                                  [CPTextFieldStateRounded, CPThemeStateBezeled]],
             [@"max-size",                   CGSizeMake(-1.0, 29.0),                                 [CPTextFieldStateRounded, CPThemeStateBezeled]],
+            [@"nib2cib-adjustment-frame",   CGRectMake(-4.0, 7.0, 8.0, 10.0),                       [CPTextFieldStateRounded, CPThemeStateBezeled]],
 
-            [@"min-size",                   CGSizeMake(0.0, 20.0),                                  [CPThemeStateControlSizeMini, CPTextFieldStateRounded, CPThemeStateBezeled]],
-            [@"max-size",                   CGSizeMake(-1.0, 20.0),                                 [CPThemeStateControlSizeMini, CPTextFieldStateRounded, CPThemeStateBezeled]]
+            // CPThemeStateControlSizeSmall
+            [@"content-inset",              CGInsetMake(7.0, 6.0, 4.0, 6.0),                        [CPThemeStateControlSizeSmall, CPTextFieldStateRounded, CPThemeStateBezeled]],
+            [@"bezel-inset",                CGInsetMake(2.0, 4.0, 2.0, 4.0),                        [CPThemeStateControlSizeSmall, CPTextFieldStateRounded, CPThemeStateBezeled]],
+            [@"bezel-inset",                CGInsetMake(0.0, 1.0, 0.0, 1.0),                        [CPThemeStateControlSizeSmall, CPTextFieldStateRounded, CPThemeStateBezeled, CPThemeStateEditing]],
+            [@"min-size",                   CGSizeMake(0.0, 25.0),                                  [CPThemeStateControlSizeSmall, CPTextFieldStateRounded, CPThemeStateBezeled]],
+            [@"max-size",                   CGSizeMake(-1.0, 25.0),                                 [CPThemeStateControlSizeSmall, CPTextFieldStateRounded, CPThemeStateBezeled]],
+            [@"nib2cib-adjustment-frame",   CGRectMake(-4.0, 7.0, 8.0, 9.0),                        [CPThemeStateControlSizeSmall, CPTextFieldStateRounded, CPThemeStateBezeled]],
+
+            // CPThemeStateControlSizeMini
+            [@"content-inset",              CGInsetMake(7.0, 6.0, 4.0, 6.0),                        [CPThemeStateControlSizeMini, CPTextFieldStateRounded, CPThemeStateBezeled]],
+            [@"bezel-inset",                CGInsetMake(2.0, 4.0, 2.0, 4.0),                        [CPThemeStateControlSizeMini, CPTextFieldStateRounded, CPThemeStateBezeled]],
+            [@"bezel-inset",                CGInsetMake(0.0, 1.0, 0.0, 1.0),                        [CPThemeStateControlSizeMini, CPTextFieldStateRounded, CPThemeStateBezeled, CPThemeStateEditing]],
+            [@"min-size",                   CGSizeMake(0.0, 22.0),                                  [CPThemeStateControlSizeMini, CPTextFieldStateRounded, CPThemeStateBezeled]],
+            [@"max-size",                   CGSizeMake(-1.0, 22.0),                                 [CPThemeStateControlSizeMini, CPTextFieldStateRounded, CPThemeStateBezeled]],
+            [@"nib2cib-adjustment-frame",   CGRectMake(-4.0, 2.0, 8.0, 4.0),                        [CPThemeStateControlSizeMini, CPTextFieldStateRounded, CPThemeStateBezeled]],
         ];
 
     [self registerThemeValues:themedRoundedTextFieldValues forView:textfield];
@@ -793,17 +824,40 @@ var themedButtonValues = nil,
 {
     var searchField = [[CPSearchField alloc] initWithFrame:CGRectMake(0.0, 0.0, 160.0, 29.0)],
 
-        imageSearch = PatternImage("search-field-search.png", 25.0, 22.0),
-        imageFind = PatternImage("search-field-find.png", 25.0, 22.0),
-        imageCancel = PatternImage("search-field-cancel.png", 22.0, 22.0),
-        imageCancelPressed = PatternImage("search-field-cancel-pressed.png", 22.0, 22.0),
+        imageSearch         = PatternImage("search-field-search.png", 25.0, 22.0),
+        imageFind           = PatternImage("search-field-find.png", 25.0, 22.0),
+        imageCancel         = PatternImage("search-field-cancel.png", 22.0, 22.0),
+        imageCancelPressed  = PatternImage("search-field-cancel-pressed.png", 22.0, 22.0),
+
+        smallImageSearch         = PatternImage("search-field-search.png", 25.0, 22.0),
+        smallImageFind           = PatternImage("search-field-find.png", 25.0, 22.0),
+        smallImageCancel         = PatternImage("search-field-cancel.png", 22.0, 22.0),
+        smallImageCancelPressed  = PatternImage("search-field-cancel-pressed.png", 22.0, 22.0),
+
+        miniImageSearch         = PatternImage("search-field-search.png", 25.0, 22.0),
+        miniImageFind           = PatternImage("search-field-find.png", 25.0, 22.0),
+        miniImageCancel         = PatternImage("search-field-cancel.png", 22.0, 22.0),
+        miniImageCancelPressed  = PatternImage("search-field-cancel-pressed.png", 22.0, 22.0),
 
         overrides =
         [
-            [@"image-search", imageSearch],
-            [@"image-find", imageFind],
-            [@"image-cancel", imageCancel],
-            [@"image-cancel-pressed", imageCancelPressed]
+            [@"image-search-inset",  CGInsetMake(0, 0, 0, 5)],
+            [@"image-cancel-inset",  CGInsetMake(0, 5, 0, 0)],
+
+            [@"image-search",           imageSearch],
+            [@"image-find",             imageFind],
+            [@"image-cancel",           imageCancel],
+            [@"image-cancel-pressed",   imageCancelPressed],
+
+            [@"image-search",           smallImageSearch,               CPThemeStateControlSizeSmall],
+            [@"image-find",             smallImageFind,                 CPThemeStateControlSizeSmall],
+            [@"image-cancel",           smallImageCancel,               CPThemeStateControlSizeSmall],
+            [@"image-cancel-pressed",   smallImageCancelPressed,        CPThemeStateControlSizeSmall],
+
+            [@"image-search",           miniImageSearch,                CPThemeStateControlSizeMini],
+            [@"image-find",             miniImageFind,                  CPThemeStateControlSizeMini],
+            [@"image-cancel",           miniImageCancel,                CPThemeStateControlSizeMini],
+            [@"image-cancel-pressed",   miniImageCancelPressed,         CPThemeStateControlSizeMini],
         ];
 
     [self registerThemeValues:overrides forView:searchField inherit:themedRoundedTextFieldValues];
@@ -1248,7 +1302,7 @@ var themedButtonValues = nil,
             {
                 width: 8.0,
                 height: 26.0,
-                rightWidth: 23.0,
+                rightWidth: 21.0,
                 orientation: PatternIsHorizontal
             }),
 
@@ -1352,6 +1406,10 @@ var themedButtonValues = nil,
             [@"bezel-color",        smallBezelNoBorderFocusedColor,             [CPThemeStateControlSizeSmall, CPThemeStateBezeled, CPThemeStateEditing]],
             [@"bezel-color",        smallBezelNoBorderColor["disabled"],        [CPThemeStateControlSizeSmall, CPThemeStateBezeled, CPThemeStateDisabled]],
 
+            [@"bezel-inset",        CGInsetMake(1.0, 2.0, 1.0, 2.0),            [CPThemeStateBezeled, CPThemeStateEditing, CPComboBoxStateButtonBordered, CPThemeStateControlSizeSmall]],
+            [@"content-inset",      CGInsetMake(7.0, 28.0, 7.0, 8.0),           [CPThemeStateBezeled, CPComboBoxStateButtonBordered, CPThemeStateControlSizeSmall]],
+            [@"content-inset",      CGInsetMake(7.0, 28.0, 7.0, 8.0),           [CPThemeStateBezeled, CPThemeStateControlSizeSmall]],
+
             [@"min-size",           CGSizeMake(0, 26.0),                        CPThemeStateControlSizeSmall],
             [@"max-size",           CGSizeMake(-1, 26.0),                       CPThemeStateControlSizeSmall],
             [@"nib2cib-adjustment-frame",   CGRectMake(-4.0, -1.0, 5.0, 0.0),   CPThemeStateControlSizeSmall],
@@ -1365,6 +1423,10 @@ var themedButtonValues = nil,
             [@"bezel-color",        miniBezelNoBorderFocusedColor,              [CPThemeStateControlSizeMini, CPThemeStateBezeled, CPThemeStateEditing]],
             [@"bezel-color",        miniBezelNoBorderColor["disabled"],         [CPThemeStateControlSizeMini, CPThemeStateBezeled, CPThemeStateDisabled]],
 
+            [@"bezel-inset",        CGInsetMake(1.0, 2.0, 1.0, 2.0),            [CPThemeStateBezeled, CPThemeStateEditing, CPComboBoxStateButtonBordered, CPThemeStateControlSizeMini]],
+            [@"content-inset",      CGInsetMake(7.0, 26.0, 7.0, 8.0),           [CPThemeStateBezeled, CPComboBoxStateButtonBordered, CPThemeStateControlSizeMini]],
+            [@"content-inset",      CGInsetMake(7.0, 26.0, 7.0, 8.0),           [CPThemeStateBezeled, CPThemeStateControlSizeMini]],
+
             [@"min-size",           CGSizeMake(0, 22.0),                        CPThemeStateControlSizeMini],
             [@"max-size",           CGSizeMake(-1, 22.0),                       CPThemeStateControlSizeMini],
             [@"nib2cib-adjustment-frame",   CGRectMake(-4.0, -2.0, 6.0, 0.0),   CPThemeStateControlSizeMini],
@@ -1482,6 +1544,8 @@ var themedButtonValues = nil,
 
         [@"font",                       [CPFont systemFontOfSize:CPFontCurrentSystemSize],  CPThemeStateNormal],
         [@"text-color",                 regularDisabledTextColor,                           CPThemeStateDisabled],
+        [@"text-color",         [CPColor colorWithCalibratedWhite:51.0 / 255.0 alpha:1.0],  CPThemeStateTableDataView],
+        [@"text-color",         [CPColor whiteColor],                                       [CPThemeStateTableDataView, CPThemeStateSelectedDataView, CPThemeStateFirstResponder, CPThemeStateKeyWindow]],
         [@"image-offset",               CPCheckBoxImageOffset],
 
         // CPThemeStateControlSizeRegular
@@ -2452,6 +2516,24 @@ var themedButtonValues = nil,
     return progressBar;
 }
 
++ (CPProgressIndicator)themedCircularProgressIndicator
+{
+    var progressBar = [[CPProgressIndicator alloc] initWithFrame:CGRectMake(0, 0, 32, 32)];
+    [progressBar setStyle:CPProgressIndicatorSpinningStyle];
+    [progressBar setIndeterminate:NO];
+
+    var themeValues =
+        [
+            [@"circular-border-color", [CPColor colorWithHexString:@"A0A0A0"]],
+            [@"circular-border-size", 1],
+            [@"circular-color", [CPColor colorWithHexString:@"5982DA"]]
+        ];
+
+    [self registerThemeValues:themeValues forView:progressBar];
+
+    return progressBar;
+}
+
 + (CPBox)themedBox
 {
     var box = [[CPBox alloc] initWithFrame:CGRectMake(0, 0, 100, 100)],

AppKit/Themes/BlendKit/BKThemeDescriptor.j

@@ -217,6 +217,11 @@ var ItemSizes               = { },
     return [[self themeName] compare:[aThemeDescriptor themeName]];
 }
 
++ (void)registerThemeValues:(CPArray)themeValues forObject:(id)anObject
+{
+    [self registerThemeValues:themeValues forView:anObject];
+}
+
 + (void)registerThemeValues:(CPArray)themeValues forView:(CPView)aView
 {
     for (var i = 0; i < themeValues.length; ++i)
@@ -227,12 +232,22 @@ var ItemSizes               = { },
             state = attributeValueState[2];
 
         if (state)
-            [aView setValue:value forThemeAttribute:attribute inState:state];
+        {
+            if (state.isa && [state isKindOfClass:CPArray])
+                [aView setValue:value forThemeAttribute:attribute inStates:state];
+            else
+                [aView setValue:value forThemeAttribute:attribute inState:state];
+        }
         else
             [aView setValue:value forThemeAttribute:attribute];
     }
 }
 
++ (void)registerThemeValues:(CPArray)themeValues forObject:(id)anObject inherit:(CPArray)inheritedValues
+{
+    [self registerThemeValues:themeValues forView:anObject inherit:inheritedValues];
+}
+
 + (void)registerThemeValues:(CPArray)themeValues forView:(CPView)aView inherit:(CPArray)inheritedValues
 {
     // Register inherited values first, then override those with the subtheme values.
@@ -294,7 +309,12 @@ var ItemSizes               = { },
                 }
 
                 if (state)
-                    [aView setValue:value forThemeAttribute:attribute inState:state];
+                {
+                    if (state.isa && [state isKindOfClass:CPArray])
+                        [aView setValue:value forThemeAttribute:attribute inStates:state];
+                    else
+                        [aView setValue:value forThemeAttribute:attribute inState:state];
+                }
                 else
                     [aView setValue:value forThemeAttribute:attribute];
             }

AppKit/Themes/BlendKit/Jakefile

@@ -20,7 +20,7 @@ blendKitTask = framework ("BlendKit", function(blendKitTask)
     blendKitTask.setFlattensSources(true); // FIXME: how do we non flatten?
 
     if ($CONFIGURATION === "Release")
-        blendKitTask.setCompilerFlags("-O");
+        blendKitTask.setCompilerFlags("-O2");
     else
         blendKitTask.setCompilerFlags("-DDEBUG -g");
 });

AppKit/_CPAutocompleteMenu.j

@@ -171,9 +171,9 @@ var _CPAutocompleteMenuMaximumHeight = 307;
 
         var dataView = [tableColumn dataView],
             fontNormal = [dataView valueForThemeAttribute:@"font" inState:CPThemeStateTableDataView],
-            fontSelected = [dataView valueForThemeAttribute:@"font" inState:[CPThemeStateTableDataView, CPThemeStateSelectedDataView]],
+            fontSelected = [dataView valueForThemeAttribute:@"font" inStates:[CPThemeStateTableDataView, CPThemeStateSelectedDataView]],
             contentInsetNormal = [dataView valueForThemeAttribute:@"content-inset" inState:CPThemeStateTableDataView],
-            contentInsetSelected = [dataView valueForThemeAttribute:@"content-inset" inState:[CPThemeStateTableDataView, CPThemeStateSelectedDataView]];
+            contentInsetSelected = [dataView valueForThemeAttribute:@"content-inset" inStates:[CPThemeStateTableDataView, CPThemeStateSelectedDataView]];
 
         var mergedString = contentArray.join("\n");
 

AppKit/_CPObject+Theme.j

@@ -0,0 +1,480 @@
+/*
+ * AppKit.j
+ * AppKit
+ *
+ * Created by Alexandre Wilhelm.
+ *
+ * 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/Foundation.j>
+
+@import "CPTheme.j"
+
+var CPViewThemeClassKey             = @"CPViewThemeClassKey",
+    CPViewThemeStateKey             = @"CPViewThemeStateKey";
+
+@protocol CPTheme
+
+- (CPString)themeClass;
+- (void)setThemeClass:(CPString)theClass;
+
+- (CPTheme)theme;
+- (void)setTheme:(CPTheme)aTheme;
+
+- (unsigned)themeState;
+- (BOOL)hasThemeState:(ThemeState)aState;
+- (BOOL)hasThemeStates:(CPArray)states;
+- (BOOL)setThemeState:(ThemeState)aState;
+- (BOOL)setThemeStates:(CPArray)aState;
+- (BOOL)unsetThemeState:(ThemeState)aState;
+- (BOOL)unsetThemeStates:(CPArray)aState;
+- (BOOL)hasThemeAttribute:(CPString)aName;
+
+- (void)objectDidChangeTheme;
+
+- (void)setValue:(id)aValue forThemeAttribute:(CPString)aName inState:(ThemeState)aState;
+- (void)setValue:(id)aValue forThemeAttribute:(CPString)aName;
+- (id)valueForThemeAttribute:(CPString)aName inState:(ThemeState)aState;
+- (id)valueForThemeAttribute:(CPString)aName;
+- (id)currentValueForThemeAttribute:(CPString)aName;
+- (void)registerThemeValues:(CPArray)themeValues;
+- (void)registerThemeValues:(CPArray)themeValues inherit:(CPArray)inheritedValues;
+
+@end
+
+@implementation CPObject (ObjectTheming)
+{
+    // Theming Support
+    CPTheme             _theme;
+    CPString            _themeClass;
+    JSObject            _themeAttributes;
+    unsigned            _themeState;
+}
+
+
+#pragma mark -
+#pragma mark Theme State
+
+- (unsigned)themeState
+{
+    return _themeState;
+}
+
+- (BOOL)hasThemeState:(ThemeState)aState
+{
+#if DEBUG
+// TODO: To allow aState to be an array is now deprecated. An exception is thrown only in Debug version as
+// the preformance cost for this check is to high. We should remove this check in a future release.
+    if (aState && aState.isa && [aState isKindOfClass:CPArray])
+        [CPException raise:CPInvalidArgumentException reason:@"aState can't be an array. Please use 'hasThemeStates: instead: " + aState];
+#endif
+
+    return _themeState.hasThemeState(aState);
+}
+
+- (BOOL)hasThemeStates:(CPArray)states
+{
+    var i = [states count],
+        aState = [states objectAtIndex:--i];
+
+    while (i > 0)
+        aState = aState.and([states objectAtIndex:--i]);
+
+    return _themeState.hasThemeState(aState);
+}
+
+- (BOOL)setThemeState:(ThemeState)aState
+{
+#if DEBUG
+// TODO: To allow aState to be an array is now deprecated. An exception is thrown only in Debug version as
+// the preformance cost for this check is to high. We should remove this check in a future release.
+    if (aState && aState.isa && [aState isKindOfClass:CPArray])
+        [CPException raise:CPInvalidArgumentException reason:@"aState can't be an array. Please use 'setThemeStates: instead: " + aState];
+#endif
+
+    if (_themeState.hasThemeState(aState))
+        return NO;
+
+    _themeState = _themeState.and(aState);
+
+    return YES;
+}
+
+- (BOOL)unsetThemeState:(ThemeState)aState
+{
+#if DEBUG
+// TODO: To allow aState to be an array is now deprecated. An exception is thrown only in Debug version as
+// the preformance cost for this check is to high. We should remove this check in a future release.
+    if (aState && aState.isa && [aState isKindOfClass:CPArray])
+        [CPException raise:CPInvalidArgumentException reason:@"aState can't be an array. Please use 'unsetThemeStates: instead: " + aState];
+#endif
+
+    var oldThemeState = _themeState;
+
+    _themeState = _themeState.without(aState);
+
+    if (oldThemeState === _themeState)
+        return NO;
+
+    return YES;
+}
+
+- (BOOL)setThemeStates:(CPArray)states
+{
+    var i = [states count],
+        aState = [states objectAtIndex:--i];
+
+    while (i > 0)
+        aState = aState.and([states objectAtIndex:--i]);
+
+    return [self setThemeState:aState];
+}
+
+- (BOOL)unsetThemeStates:(CPArray)states
+{
+    var i = [states count],
+        aState = [states objectAtIndex:--i];
+
+    while (i > 0)
+        aState = aState.and([states objectAtIndex:--i]);
+
+    return [self unsetThemeState:aState];
+}
+
+#pragma mark Theme Attributes
+
++ (CPString)defaultThemeClass
+{
+    return nil;
+}
+
++ (CPDictionary)themeAttributes
+{
+    return nil;
+}
+
+- (CPString)themeClass
+{
+    if (_themeClass)
+        return _themeClass;
+
+    return [[self class] defaultThemeClass];
+}
+
+- (void)setThemeClass:(CPString)theClass
+{
+    _themeClass = theClass;
+
+    [self _loadThemeAttributes];
+}
+
+var NULL_THEME = {};
+
++ (CPArray)_themeAttributesForTheme:(CPTheme)theme andThemeClass:(CPString)themeClassName
+{
+    var theClass = [self class],
+        theClassName = class_getName(theClass),
+        themeClassNameCache = theme != nil ? theme._cachedThemeAttributes || (theme._cachedThemeAttributes = {}) : NULL_THEME,
+        themedCacheAttributes = themeClassNameCache[themeClassName] || (themeClassNameCache[themeClassName] = {}),
+        attributes = themedCacheAttributes[theClassName];
+
+    if (attributes)
+        return attributes;
+    else
+        attributes = [];
+
+    var CPObjectClass = [CPObject class];
+
+    for (; theClass && theClass !== CPObjectClass; theClass = [theClass superclass])
+    {
+        var cachedAttributes = themedCacheAttributes[class_getName(theClass)];
+
+        if (cachedAttributes)
+        {
+            attributes = attributes.length ? attributes.concat(cachedAttributes) : attributes;
+            break;
+        }
+
+        var attributeDictionary = [theClass themeAttributes];
+
+        if (!attributeDictionary)
+            continue;
+
+        var attributeKeys = [attributeDictionary allKeys],
+            attributeCount = attributeKeys.length;
+
+        while (attributeCount--)
+        {
+            var attributeName = attributeKeys[attributeCount],
+                attributeValue = [attributeDictionary objectForKey:attributeName],
+                themeAttribute = [[_CPThemeAttribute alloc] initWithName:attributeName defaultValue:attributeValue defaultAttribute:[theme attributeWithName:attributeName forClass:themeClassName]];
+
+            attributes.push(themeAttribute);
+        }
+    }
+
+    themedCacheAttributes[theClassName] = attributes;
+
+    return attributes;
+}
+
+- (void)_loadThemeAttributes
+{
+    var theClass = [self class],
+        attributes = [theClass _themeAttributesForTheme:[self theme] andThemeClass:[self themeClass]],
+        count = attributes.length;
+
+    if (!count)
+        return;
+
+    _themeAttributes = {};
+
+    while (count--)
+    {
+        var attribute = attributes[count];
+
+        _themeAttributes[attribute._name] = attribute;
+    }
+}
+
+- (CPTheme)theme
+{
+    return _theme;
+}
+
+- (void)setTheme:(CPTheme)aTheme
+{
+    if (_theme === aTheme)
+        return;
+
+    _theme = aTheme;
+
+    [self objectDidChangeTheme];
+}
+
+- (void)objectDidChangeTheme
+{
+    if (!_themeAttributes)
+        return;
+
+    var theme = [self theme],
+        themeClass = [self themeClass];
+
+    for (var attributeName in _themeAttributes)
+    {
+        if (_themeAttributes.hasOwnProperty(attributeName))
+            _themeAttributes[attributeName] = [_themeAttributes[attributeName] attributeBySettingParentAttribute:[theme attributeWithName:attributeName forClass:themeClass]];
+    }
+
+}
+
+- (CPDictionary)_themeAttributeDictionary
+{
+    var dictionary = @{};
+
+    if (_themeAttributes)
+    {
+        var theme = [self theme];
+
+        for (var attributeName in _themeAttributes)
+        {
+            if (_themeAttributes.hasOwnProperty(attributeName))
+                [dictionary setObject:_themeAttributes[attributeName] forKey:attributeName];
+        }
+    }
+
+    return dictionary;
+}
+
+- (void)setValue:(id)aValue forThemeAttribute:(CPString)aName inState:(ThemeState)aState
+{
+#if DEBUG
+// TODO: To allow aState to be an array is now deprecated. An exception is thrown only in Debug version as
+// the preformance cost for this check is to high. We should remove this check in a future release.
+    if (aState.isa && [aState isKindOfClass:CPArray])
+        [CPException raise:CPInvalidArgumentException reason:self + @": aState can't be an array. Please use 'setValue:forThemeAttribute:inStates:' instead: " + aState];
+#endif
+
+    var themeAttr = _themeAttributes && _themeAttributes[aName];
+
+    if (!themeAttr)
+        [CPException raise:CPInvalidArgumentException reason:[self className] + " does not contain theme attribute '" + aName + "'"];
+
+    _themeAttributes[aName] = [themeAttr attributeBySettingValue:aValue forState:aState];
+}
+
+- (void)setValue:(id)aValue forThemeAttribute:(CPString)aName inStates:(CPArray)states
+{
+    var i = [states count],
+        aState = [states objectAtIndex:--i];
+
+    while (i > 0)
+        aState = aState.and([states objectAtIndex:--i]);
+
+    var themeAttr = _themeAttributes && _themeAttributes[aName];
+
+    if (!themeAttr)
+        [CPException raise:CPInvalidArgumentException reason:[self className] + " does not contain theme attribute '" + aName + "'"];
+
+    _themeAttributes[aName] = [themeAttr attributeBySettingValue:aValue forState:aState];
+}
+
+- (void)setValue:(id)aValue forThemeAttribute:(CPString)aName
+{
+    var themeAttr = _themeAttributes && _themeAttributes[aName];
+
+    if (!themeAttr)
+        [CPException raise:CPInvalidArgumentException reason:[self className] + " does not contain theme attribute '" + aName + "'"];
+
+    _themeAttributes[aName] = [themeAttr attributeBySettingValue:aValue];
+}
+
+- (id)valueForThemeAttribute:(CPString)aName inState:(ThemeState)aState
+{
+#if DEBUG
+   if (aState.isa && [aState isKindOfClass:CPArray])
+        [CPException raise:CPInvalidArgumentException reason:@"aState can't be an array. Please use 'valueForThemeAttribute:inStates:' instead: " + aState];
+#endif
+
+    var themeAttr = _themeAttributes && _themeAttributes[aName];
+
+    if (!themeAttr)
+        [CPException raise:CPInvalidArgumentException reason:[self className] + " does not contain theme attribute '" + aName + "'"];
+
+    return [themeAttr valueForState:aState];
+}
+
+- (id)valueForThemeAttribute:(CPString)aName inStates:(CPArray)states
+{
+    var i = [states count],
+        aState = [states objectAtIndex:--i];
+
+    while (i > 0)
+        aState = aState.and([states objectAtIndex:--i]);
+
+    var themeAttr = _themeAttributes && _themeAttributes[aName];
+
+    if (!themeAttr)
+        [CPException raise:CPInvalidArgumentException reason:[self className] + " does not contain theme attribute '" + aName + "'"];
+
+    return [themeAttr valueForState:aState];
+}
+
+- (id)valueForThemeAttribute:(CPString)aName
+{
+    var themeAttr = _themeAttributes && _themeAttributes[aName];
+
+    if (!themeAttr)
+        [CPException raise:CPInvalidArgumentException reason:[self className] + " does not contain theme attribute '" + aName + "'"];
+
+    return [themeAttr value];
+}
+
+- (id)currentValueForThemeAttribute:(CPString)aName
+{
+    var themeAttr = _themeAttributes && _themeAttributes[aName];
+
+    if (!themeAttr)
+        [CPException raise:CPInvalidArgumentException reason:[self className] + " does not contain theme attribute '" + aName + "'"];
+
+    return [themeAttr valueForState:_themeState];
+}
+
+- (BOOL)hasThemeAttribute:(CPString)aName
+{
+    return (_themeAttributes && _themeAttributes[aName] !== undefined);
+}
+
+/*!
+    Registers theme values encoded in an array at runtime. The format of the data in the array
+    is the same as that used by ThemeDescriptors.j, with the exception that you need to use
+    CPColorWithImages() in place of PatternColor(). For more information see the comments
+    at the top of ThemeDescriptors.j.
+
+    @param themeValues array of theme values
+*/
+- (void)registerThemeValues:(CPArray)themeValues
+{
+    for (var i = 0; i < themeValues.length; ++i)
+    {
+        var attributeValueState = themeValues[i],
+            attribute = attributeValueState[0],
+            value = attributeValueState[1],
+            state = attributeValueState[2];
+
+        if (state)
+            if (state.isa && [state isKindOfClass:CPArray])
+                [self setValue:value forThemeAttribute:attribute inStates:state];
+            else
+                [self setValue:value forThemeAttribute:attribute inState:state];
+        else
+            [self setValue:value forThemeAttribute:attribute];
+    }
+}
+
+/*!
+    Registers theme values encoded in an array at runtime. The format of the data in the array
+    is the same as that used by ThemeDescriptors.j, with the exception that you need to use
+    CPColorWithImages() in place of PatternColor(). The values in \c inheritedValues are
+    registered first, then those in \c themeValues override/augment the inherited values.
+    For more information see the comments at the top of ThemeDescriptors.j.
+
+    @param themeValues array of base theme values
+    @param inheritedValues array of overridden/additional theme values
+*/
+- (void)registerThemeValues:(CPArray)themeValues inherit:(CPArray)inheritedValues
+{
+    // Register inherited values first, then override those with the subtheme values.
+    if (inheritedValues)
+        [self registerThemeValues:inheritedValues];
+
+    if (themeValues)
+        [self registerThemeValues:themeValues];
+}
+
+- (void)_encodeThemeObjectsWithCoder:(CPCoder)aCoder
+{
+    [aCoder encodeObject:[self themeClass] forKey:CPViewThemeClassKey];
+    [aCoder encodeObject:String(_themeState) forKey:CPViewThemeStateKey];
+
+    for (var attributeName in _themeAttributes)
+    {
+        if (_themeAttributes.hasOwnProperty(attributeName))
+            CPThemeAttributeEncode(aCoder, _themeAttributes[attributeName]);
+    }
+}
+
+- (void)_decodeThemeObjectsWithCoder:(CPCoder)aCoder
+{
+    _theme = [CPTheme defaultTheme];
+    _themeClass = [aCoder decodeObjectForKey:CPViewThemeClassKey];
+    _themeState = CPThemeState([aCoder decodeObjectForKey:CPViewThemeStateKey]);
+    _themeAttributes = {};
+
+    var theClass = [self class],
+        themeClass = [self themeClass],
+        attributes = [theClass _themeAttributesForTheme:_theme andThemeClass:themeClass],
+        count = attributes.length;
+
+    while (count--)
+    {
+        var attribute = attributes[count];
+
+        _themeAttributes[attribute._name] = CPThemeAttributeDecode(aCoder, attribute);
+    }
+}
+
+@end

AppKit/_CPPopoverWindow.j

@@ -63,7 +63,6 @@ var _CPPopoverWindow_shouldClose_    = 1 << 4,
     BOOL            _browserAnimates;
     BOOL            _isObservingFrame;
     BOOL            _shouldPerformAnimation;
-    CPInteger       _implementedDelegateMethods;
     CGRect          _targetRect;
     CPWindow        _targetWindow;
     JSObject        _orderOutTransitionFunction;
@@ -142,7 +141,12 @@ var _CPPopoverWindow_shouldClose_    = 1 << 4,
     if (_appearance === anAppearance)
         return;
 
-    [_windowView setAppearance:anAppearance];
+    _appearance = anAppearance;
+
+    var appearanceName = _appearance == CPPopoverAppearanceMinimal ? CPAppearanceNameVibrantLight : CPAppearanceNameVibrantDark,
+        viewAppearance = [CPAppearance appearanceNamed:appearanceName];
+
+    [_windowView setAppearance:viewAppearance];
 }
 
 - (void)setStyleMask:(unsigned)aStyleMask
@@ -181,7 +185,14 @@ var _CPPopoverWindow_shouldClose_    = 1 << 4,
         return;
 
     _isObservingFrame = YES;
-    [_targetView addObserver:self forKeyPath:@"frame" options:0 context:nil];
+
+    var view = _targetView;
+
+    while (view)
+    {
+        [view addObserver:self forKeyPath:@"frame" options:0 context:nil];
+        view = [view superview];
+    }
 }
 
 /*!
@@ -194,7 +205,14 @@ var _CPPopoverWindow_shouldClose_    = 1 << 4,
         return;
 
     _isObservingFrame = NO;
-    [_targetView removeObserver:self forKeyPath:@"frame"];
+
+    var view = _targetView;
+
+    while (view)
+    {
+        [view removeObserver:self forKeyPath:@"frame"];
+        view = [view superview];
+    }
 }
 
 /*!
@@ -535,29 +553,36 @@ var _CPPopoverWindow_shouldClose_    = 1 << 4,
 
                     // Now set up the pop-in to normal size transition.
                     // Because we are watching the -webkit-transform, it will occur now.
-                    [self setCSS3Property:@"Transform" value:@"scale(1)"];
-                    [self setCSS3Property:@"Transition" value:CPBrowserCSSProperty('transform') + @" 50ms linear"];
 
-                    _transitionCompleteFunction = function()
+                    window.setTimeout(function()
                     {
+                        [self setCSS3Property:@"Transform" value:@"scale(1)"];
+                        [self setCSS3Property:@"Transition" value:CPBrowserCSSProperty('transform') + @" 50ms linear"];
+
+                        _transitionCompleteFunction = function()
+                        {
 #if PLATFORM(DOM)
-                        _DOMElement.removeEventListener(CPBrowserStyleProperty('transitionend'), _transitionCompleteFunction, YES);
+                            _DOMElement.removeEventListener(CPBrowserStyleProperty('transitionend'), _transitionCompleteFunction, YES);
 
-                        // Make sure to clear these properties when the animation is done. Without this,
-                        // the window becomes blurry in Chrome, presumably because the browser composits
-                        // a layer with a transform differently even when it's an identity transform.
-                        [self setCSS3Property:@"Transform" value:nil];
-                        [self setCSS3Property:@"TransformOrigin" value:nil];
-                        [self setCSS3Property:@"Transition" value:nil];
+                            // Make sure to clear these properties when the animation is done. Without this,
+                            // the window becomes blurry in Chrome, presumably because the browser composits
+                            // a layer with a transform differently even when it's an identity transform.
+                            [self setCSS3Property:@"Transform" value:nil];
+                            [self setCSS3Property:@"TransformOrigin" value:nil];
+                            [self setCSS3Property:@"Transition" value:nil];
 #endif
-                        _isOpening = NO;
+                            _isOpening = NO;
 
-                        [_delegate _popoverWindowDidShow];
-                    }
+                            [_delegate _popoverWindowDidShow];
+                        }
 
 #if PLATFORM(DOM)
-                    _DOMElement.addEventListener(CPBrowserStyleProperty('transitionend'), _transitionCompleteFunction, YES);
+                        _DOMElement.addEventListener(CPBrowserStyleProperty('transitionend'), _transitionCompleteFunction, YES);
 #endif
+                    }, 0);  // There are some weird random conditions happening in Chrome 44. If we don't put a timeout to 0 for the end of
+                            // the transition, the popover is blinking. It happens on Opera as well...
+                            // When the condition is met, the popover will lag a bit when opening...nothing crazy ;)
+                            // An issue has been opened here : https://code.google.com/p/chromium/issues/detail?id=523044&thanks=523044&ts=1440095724
                 };
 
 #if PLATFORM(DOM)
@@ -655,6 +680,17 @@ var _CPPopoverWindow_shouldClose_    = 1 << 4,
     [_delegate _popoverWindowDidClose];
 }
 
+/*!
+    @ignore
+    Needed to be ignored to close a popover when a platform is closed.
+    Because the animation, the popover is not properly closed.
+*/
+- (void)_didReceivePlatformWindowWillCloseNotification:(CPNotification)aNotification
+{
+    [super _didReceivePlatformWindowWillCloseNotification:aNotification];
+    [self _orderOutRecursively:YES];
+}
+
 
 #pragma mark -
 #pragma mark Private
@@ -702,7 +738,7 @@ var _CPPopoverWindow_shouldClose_    = 1 << 4,
 
     // Consider clicks in child windows to be "inside". This keeps a transient popover from
     // closing if e.g. the window containing the menu of a token field is clicked.
-    if (mouseWindow === self || [mouseWindow _hasAncestorWindow:self] || ![self _hasOnlyTransientChild:self])
+    if (mouseWindow === self || [mouseWindow _hasAncestorWindow:self] || ![self _hasOnlyTransientChild:self] || [mouseWindow platformWindow] != [self platformWindow])
     {
         [self _trapNextMouseDown];
     }

AppKit/_CPToolTip.j

@@ -176,6 +176,8 @@ var _CPToolTipHeight = 24.0,
         _toolTipWindow = aWindow;
         _constrainsToUsableScreen = NO;
 
+        [self setPlatformWindow:[_toolTipWindow platformWindow]];
+
         textFrameSize.height += 4;
 
         _content = [CPTextField labelWithTitle:aString];
@@ -193,6 +195,7 @@ var _CPToolTipHeight = 24.0,
         [self setAlphaValue:0.9];
 
         [_windowView setNeedsDisplay:YES];
+
     }
 
     return self;

CommonJS/bin/press

@@ -366,23 +366,38 @@ function pressEnvironment(rootPath, outputFiles, environment, options) {
     return {executable:includedBytes, data:dataBytes, mhtml:mhtmlBytes};
 }
 
-function pngcrushDirectory(directory) {
-    var directoryPath = FILE.path(directory);
-    var pngs = directoryPath.glob("**/*.png");
+function pngcrushDirectory(directory)
+{
+    var directoryPath = FILE.path(directory),
+        pngs = directoryPath.glob("**/*.png");
 
     system.stderr.print("Running pngcrush on " + pngs.length + " pngs:");
-    pngs.forEach(function(dstPath) {
+    pngs.forEach(function(dstPath)
+    {
         var tmpPath = FILE.path(dstPath+".tmp");
 
-        var p = OS.popen(["pngcrush", "-rem", "alla", "-reduce", /*"-brute",*/ dstPath, tmpPath]);
-        if (p.wait()) {
-            CPLog.warn("pngcrush failed. Ensure it's installed and on your PATH.");
+        try
+        {
+            var p = OS.popen(["pngcrush", "-rem", "alla", "-reduce", /*"-brute",*/ dstPath, tmpPath]);
+
+            if (p.wait())
+            {
+                CPLog.warn("pngcrush failed. Ensure it's installed and on your PATH.");
+            }
+            else
+            {
+                FILE.move(tmpPath, dstPath);
+                system.stderr.write(".").flush();
+            }
         }
-        else {
-            FILE.move(tmpPath, dstPath);
-            system.stderr.write(".").flush();
+        finally
+        {
+            p.stdin.close();
+            p.stdout.close();
+            p.stderr.close();
         }
     });
+
     system.stderr.print("");
 }
 

CommonJS/lib/cappuccino/fontinfo.j

@@ -3,10 +3,20 @@ var OS = require("os");
 
 exports.fontinfo = function(name, size)
 {
-    var p = OS.popen(["fontinfo", "-n", name, size || 12]);
+    var result;
 
-    if (p.wait() === 0)
-        return JSON.parse(p.stdout.read());
-    else
-        return null;
+    try
+    {
+        var p = OS.popen(["fontinfo", "-n", name, size || 12]);
+        if (p.wait() === 0)
+            result = p.stdout.read();
+    }
+    finally
+    {
+        p.stdin.close();
+        p.stdout.close();
+        p.stderr.close();
+    }
+
+    return result ? JSON.parse(result) : null;
 };

CommonJS/lib/cappuccino/imagesize.j

@@ -3,10 +3,20 @@ var OS = require("os");
 
 exports.imagesize = function(path)
 {
-    var p = OS.popen(["imagesize", "-n", path]);
+    var result;
 
-    if (p.wait() === 0)
-        return JSON.parse(p.stdout.read());
-    else
-        return null;
+    try
+    {
+        var p = OS.popen(["imagesize", "-n", path]);
+        if (p.wait() === 0)
+            result = p.stdout.read();
+    }
+    finally
+    {
+        p.stdin.close();
+        p.stdout.close();
+        p.stderr.close();
+    }
+
+    return result ? JSON.parse(result) : null;
 };

Foundation/CPArray/_CPArray.j

@@ -208,6 +208,14 @@ var concat = Array.prototype.concat,
     _CPRaiseInvalidAbstractInvocation(self, _cmd);
 }
 
+/*!
+Returns a hash for the object. Unlike Cocoa, the hash value does not take content into account, so two arrays with the same content (\c isEqual: === YES) will not generate the same hash.
+*/
+- (unsigned)hash
+{
+    return [self UID];
+}
+
 /*!
     Returns the first object in the array. If the array is empty, returns \c nil
 */
@@ -872,6 +880,25 @@ var concat = Array.prototype.concat,
     return join.call([self _javaScriptArrayCopy], aString);
 }
 
+/*!
+    Returns an Array formed by applying a function to the objects in the receiver.
+    @param aFunction a function taking two arguments: (element, index).
+    @return an Array containing the transformed elements.
+*/
+- (CPArray)arrayByApplyingBlock:(Function/*element, index*/)aFunction
+{
+	var result = [],
+	    count = [self count];
+
+	for (var idx = 0; idx < count; idx++)
+	{
+	    var obj = aFunction([self objectAtIndex:idx], idx);
+		[result addObject:obj];
+	}
+
+	return result;
+}
+
 // Creating a description of the array
 
 /*!

Foundation/CPArray/_CPJavaScriptArray.j

@@ -91,7 +91,7 @@ var concat = Array.prototype.concat,
 - (id)initWithObjects:(CPArray)objects count:(CPUInteger)aCount
 {
     if ([objects isKindOfClass:_CPJavaScriptArray])
-        return slice.call(objects, 0);
+        return slice.call(objects, 0, aCount);
 
     var array = [],
         index = 0;
@@ -196,7 +196,8 @@ var concat = Array.prototype.concat,
     }
 
     else
-        for (; index < count; ++index) {
+        for (; index < count; ++index)
+        {
             var receiver = self[index];
             receiver == nil ? nil : receiver.isa.objj_msgSend0(receiver, aSelector);
         }
@@ -232,6 +233,19 @@ var concat = Array.prototype.concat,
     return join.call(self, aString);
 }
 
+- (CPArray)arrayByApplyingBlock:(Function/*element, index*/)aFunction
+{
+	var result = [];
+
+	for (var idx = 0; idx < self.length; idx++)
+	{
+	    var obj = aFunction(self[idx], idx);
+		result.push(obj);
+	}
+
+	return result;
+}
+
 - (void)insertObject:(id)anObject atIndex:(CPUInteger)anIndex
 {
     if (anIndex > self.length || anIndex < 0)
@@ -334,7 +348,6 @@ var concat = Array.prototype.concat,
         [super addObjectsFromArray:anArray];
 }
 
-
 - (id)copy
 {
     return slice.call(self, 0);

Foundation/CPBundle.j

@@ -25,8 +25,18 @@
 @import "CPNotificationCenter.j"
 @import "CPObject.j"
 
+@global CFBundleCopyBundleLocalizations
+@global CFBundleCopyLocalizedString
+
 CPBundleDidLoadNotification = @"CPBundleDidLoadNotification";
 
+@protocol CPBundleDelegate <CPObject>
+
+@required
+- (void)bundleDidFinishLoading:(CPBundle)aBundle;
+
+@end
+
 /*!
     @class CPBundle
     @ingroup foundation
@@ -37,8 +47,8 @@ var CPBundlesForURLStrings = { };
 
 @implementation CPBundle : CPObject
 {
-    CFBundle    _bundle;
-    id          _delegate;
+    CFBundle                _bundle;
+    id <CPBundleDelegate>   _delegate;
 }
 
 + (CPBundle)bundleWithURL:(CPURL)aURL
@@ -94,6 +104,7 @@ var CPBundlesForURLStrings = { };
     if (self)
     {
         _bundle = new CFBundle(aURL);
+
         CPBundlesForURLStrings[URLString] = self;
     }
 
@@ -154,6 +165,21 @@ var CPBundlesForURLStrings = { };
     return _bundle.pathForResource(aFilename);
 }
 
+- (CPString)pathForResource:(CPString)aFilename ofType:(CPString)extension
+{
+    return _bundle.pathForResource(aFilename, extension);
+}
+
+- (CPString)pathForResource:(CPString)aFilename ofType:(CPString)extension inDirectory:(CPString)subpath
+{
+    return _bundle.pathForResource(aFilename, extension, subpath);
+}
+
+- (CPString)pathForResource:(CPString)aFilename ofType:(CPString)extension inDirectory:(CPString)subpath forLocalization:(CPString)localizationName
+{
+    return _bundle.pathForResource(aFilename, extension, subpath, localizationName);
+}
+
 - (CPDictionary)infoDictionary
 {
     return _bundle.infoDictionary();
@@ -164,7 +190,7 @@ var CPBundlesForURLStrings = { };
     return _bundle.valueForInfoDictionaryKey(aKey);
 }
 
-- (void)loadWithDelegate:(id)aDelegate
+- (void)loadWithDelegate:(id <CPBundleDelegate>)aDelegate
 {
     _delegate = aDelegate;
 
@@ -212,4 +238,33 @@ var CPBundlesForURLStrings = { };
     return [super description] + "(" + [self bundlePath] + ")";
 }
 
+
+#pragma mark -
+#pragma mark Localization
+
+- (CPArray)localizations
+{
+    return CFBundleCopyBundleLocalizations(_bundle);
+}
+
+- (CPString)localizedStringForKey:(CPString)aKey value:(CPString)aValue table:(CPString)aTable
+{
+    return CFBundleCopyLocalizedString(_bundle, aKey, aValue, aTable);
+}
+
 @end
+
+function CPLocalizedString(key, comment)
+{
+    return CFCopyLocalizedString(key, comment);
+}
+
+function CPLocalizedStringFromTable(key, table, comment)
+{
+    return CFCopyLocalizedStringFromTable(key, table, comment);
+}
+
+function CPCopyLocalizedStringFromTableInBundle(key, table, bundle, comment)
+{
+    return CFCopyLocalizedStringFromTableInBundle(key, table, bundle._bundle, comment);
+}

Foundation/CPCache.j

@@ -0,0 +1,371 @@
+/*
+ * CPCache.j
+ * Foundation
+ *
+ * Created by William Mura.
+ * Copyright 2015, William Mura.
+ *
+ * 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 "CPObject.j"
+@import "CPDictionary.j"
+@import "CPString.j"
+
+@class _CPCacheItem;
+
+
+/*
+ * Delegate CPCacheDelegate
+ *
+ * - cache:willEvictObject: is called when a object is going to be removed
+ * When the total cost or the count exceeds the total cost limit or the count limit
+ * And also when removeObjectForKey or removeAllObjects are called
+ */
+@protocol CPCacheDelegate <CPObject>
+
+@optional
+- (void)cache:(CPCache)cache willEvictObject:(id)obj;
+
+@end
+
+var CPCacheDelegate_cache_willEvictObject_ = 1 << 1;
+
+
+/*!
+    @class CPCache
+    @ingroup foundation
+    @brief A collection-like container with discardable objects
+
+    https://developer.apple.com/library/mac/documentation/Cocoa/Reference/NSCache_Class/index.html#//apple_ref/occ/instp/NSCache/delegate
+
+    A CPCache object is a collection-like container, or cache, that stores key-value pairs,
+    similar to the CPDictionary class. Developers often incorporate caches to temporarily
+    store objects with transient data that are expensive to create.
+
+    Reusing these objects can provide performance benefits, because their values do not have to be recalculated.
+    However, the objects are not critical to the application and can be discarded if memory is tight.
+    If discarded, their values will have to be recomputed again when needed.
+ */
+@implementation CPCache : CPObject
+{
+    CPDictionary            _items;
+    int                     _currentPosition;
+    BOOL                    _totalCostCache;
+    unsigned                _implementedDelegateMethods;
+
+    CPString                _name               @accessors(property=name);
+    int                     _countLimit         @accessors(property=countLimit);
+    int                     _totalCostLimit     @accessors(property=totalCostLimit);
+    id <CPCacheDelegate>    _delegate           @accessors(property=delegate);
+}
+
+
+#pragma mark -
+#pragma mark Initialization
+
+/*!
+    Initializes the cache with default values
+    @return the initialized cache
+*/
+- (id)init
+{
+    if (self = [super init])
+    {
+        _items = [[CPDictionary alloc] init];
+        _currentPosition = 0;
+        _totalCostCache = -1;
+        _implementedDelegateMethods = 0;
+
+        _name = @"";
+        _countLimit = 0;
+        _totalCostLimit = 0;
+        _delegate = nil;
+    }
+
+    return self;
+}
+
+
+#pragma mark -
+#pragma mark Managing cache
+
+/*!
+    Returns the object which correspond to the given key
+    @param aKey the key for the object's entry
+    @return the object for the entry
+*/
+- (id)objectForKey:(id)aKey
+{
+    return [[_items objectForKey:aKey] object];
+}
+
+/*!
+    Adds an object with default cost into the cache.
+    @param anObject the object to add in the cache
+    @param aKey the object's key
+*/
+- (void)setObject:(id)anObject forKey:(id)aKey
+{
+    [self setObject:anObject forKey:aKey cost:0];
+}
+
+/*!
+    Adds an object with a cost into the cache.
+    @param anObject the object to add in the cache
+    @param aKey the object's key
+    @param aCost the object's cost
+*/
+- (void)setObject:(id)anObject forKey:(id)aKey cost:(int)aCost
+{
+    // Check if the key already exist
+    if ([_items objectForKey:aKey])
+        [self removeObjectForKey:aKey];
+
+    // Add object
+    [_items setObject:[_CPCacheItem cacheItemWithObject:anObject cost:aCost position:++_currentPosition] forKey:aKey];
+
+    // Invalid cost cache
+    _totalCostCache = -1;
+
+    // Clean cache to satisfy condition (< totalCostLimit & < countLimit) if necessary
+    [self _cleanCache];
+}
+
+/*!
+    Removes the object from the cache for the given key.
+    @param aKey the key of the object to be removed
+*/
+- (void)removeObjectForKey:(id)aKey
+{
+    // Call delegate method to warn that the object is going to be removed
+    [self _sendDelegateWillEvictObjectForKey:aKey];
+
+    // Remove object
+    [_items removeObjectForKey:aKey];
+
+    // Invalid cost cache
+    _totalCostCache = -1;
+}
+
+/*!
+    Removes all the objects from the cache.
+*/
+- (void)removeAllObjects
+{
+    // Call delegate method to warn that the objects are going to be removed
+    var enumerator = [_items keyEnumerator],
+        key;
+
+    while (key = [enumerator nextObject])
+        [self _sendDelegateWillEvictObjectForKey:key]
+
+    // Remove all objects
+    [_items removeAllObjects];
+
+    // Invalid cost cache and reset position counter
+    _totalCostCache = -1;
+    _currentPosition = 0;
+}
+
+
+#pragma mark -
+#pragma mark Setters
+
+/*!
+    Sets the count limit of the cache.
+    Remove objects if not enough place to keep all of them
+    @param aCountLimit the new count limit
+*/
+- (void)setCountLimit:(int)aCountLimit
+{
+    _countLimit = aCountLimit;
+    [self _cleanCache];
+}
+
+/*!
+    Sets the total cost limit of the cache.
+    Remove objects if not enough place to keep all of them
+    @param aTotalCostLimit the new total cost limit
+*/
+- (void)setTotalCostLimit:(int)aTotalCostLimit
+{
+    _totalCostLimit = aTotalCostLimit;
+    [self _cleanCache];
+}
+
+/*!
+    Sets the cache's delegate.
+    @param aDelegate the new delegate
+*/
+- (void)setDelegate:(id)aDelegate
+{
+    if (_delegate === aDelegate)
+        return;
+
+    _delegate = aDelegate;
+    _implementedDelegateMethods = 0;
+
+    if ([_delegate respondsToSelector:@selector(cache:willEvictObject:)])
+        _implementedDelegateMethods |= CPCacheDelegate_cache_willEvictObject_
+}
+
+
+#pragma mark -
+#pragma mark Privates
+
+/*
+ * This method return the number of objects in the cache
+ */
+- (int)_count
+{
+    return [_items count];
+}
+
+/*
+ * This method return the total cost (addition of all object's cost in the cache)
+ */
+- (int)_totalCost
+{
+    if (_totalCostCache >= 0)
+        return _totalCostCache;
+
+    var enumerator = [_items objectEnumerator],
+        value;
+
+    _totalCostCache = 0;
+
+    while (value = [enumerator nextObject])
+        _totalCostCache += [value cost];
+
+    return _totalCostCache;
+}
+
+/*
+ * This method resequence the position of objects
+ * Otherwise the position value could rise until to cause problem
+ */
+- (void)_resequencePosition
+{
+    _currentPosition = 1;
+
+    // Sort keys by position
+    var sortedKeys = [[_items allKeys] sortedArrayUsingFunction:
+        function(k1, k2) {
+            return [[[_items objectForKey:k1] position] compare:[[_items objectForKey:k2] position]]; }];
+
+    // Affect new positions
+    for (var i = 0; i < sortedKeys.length; ++i)
+        [[_items objectForKey:sortedKeys[i]] setPosition:_currentPosition++];
+}
+
+/*
+ * Check if the totalCostLimit is exceeded
+ */
+- (BOOL)_isTotalCostLimitExceeded
+{
+    return ([self _totalCost] > _totalCostLimit && _totalCostLimit > 0);
+}
+
+/*
+ * Check if the countLimit is exceeded
+ */
+- (BOOL)_isCountLimitExceeded
+{
+    return ([self _count] > _countLimit && _countLimit > 0);
+}
+
+/*
+ * This method clean the cache if the totalCost or the count exceeds the totalCostLimit or the countLimit
+ * until to satisfy condition (totalCost < totalCostLimit and count < countLimit)
+ */
+- (void)_cleanCache
+{
+    // Check if the condition is satisfied
+    if (![self _isTotalCostLimitExceeded] && ![self _isCountLimitExceeded])
+        return;
+
+    // Sort keys by position
+    var sortedKeys = [[_items allKeys] sortedArrayUsingFunction:
+        function(k1, k2) {
+            return [[[_items objectForKey:k1] position] compare:[[_items objectForKey:k2] position]]; }];
+
+    // Remove oldest objects until to satisfy the break condition
+    for (var i = 0; i < sortedKeys.length; ++i)
+    {
+        if (![self _isTotalCostLimitExceeded] && ![self _isCountLimitExceeded])
+            break;
+
+        // Call delegate method to warn that the object is going to be removed
+        [self _sendDelegateWillEvictObjectForKey:sortedKeys[i]];
+
+        // Remove object
+        [_items removeObjectForKey: sortedKeys[i]];
+
+        // Invalid cost cache
+        _totalCostCache = -1;
+    }
+
+    // Resequence position of all objects
+    [self _resequencePosition];
+}
+
+@end
+
+
+@implementation CPCache (CPCacheDelegate)
+
+- (void)_sendDelegateWillEvictObjectForKey:(id)aKey
+{
+    if (_implementedDelegateMethods & CPCacheDelegate_cache_willEvictObject_)
+        [_delegate cache:self willEvictObject:[[_items objectForKey:aKey] object]];
+}
+
+@end
+
+
+/*
+ * Class _CPCacheItem
+ * Represent an item of CPCache
+ * This class allow to associate a cost and a position to an object
+ *
+ * Attributes:
+ * - object: the stored object
+ * - cost: represent the cost (of memory) of the object
+ * - position: represent the insertion order to determine the oldest object
+ */
+@implementation _CPCacheItem : CPObject
+{
+    CPObject    _object      @accessors(property=object);
+    int         _cost        @accessors(property=cost);
+    int         _position    @accessors(property=position);
+}
+
++ (id)cacheItemWithObject:(CPObject)anObject cost:(int)aCost position:(int)aPosition
+{
+    var cacheItem = [[self alloc] init];
+
+    if (cacheItem)
+    {
+        [cacheItem setObject:anObject];
+        [cacheItem setCost:aCost];
+        [cacheItem setPosition:aPosition];
+    }
+
+    return cacheItem;
+}
+
+@end

Foundation/CPDateFormatter.j

@@ -1552,7 +1552,7 @@ var defaultDateFormatterBehavior = CPDateFormatterBehavior10_4,
                     month = [[self monthSymbols] indexOfObject:dateComponent] + 1;
                 }
 
-                if (month > 11 || length >= 5)
+                if (month > 12 || length >= 5)
                     return nil;
 
                 dateArray[1] = month;
@@ -1580,7 +1580,7 @@ var defaultDateFormatterBehavior = CPDateFormatterBehavior10_4,
                     month = [[self standaloneMonthSymbols] indexOfObject:dateComponent] + 1;
                 }
 
-                if (month > 11 || length >= 5)
+                if (month > 12 || length >= 5)
                     return nil;
 
                 dateArray[1] = month;

Foundation/CPDecimalNumber.j

@@ -26,7 +26,8 @@
 @import "CPString.j"
 
 // The default global behavior class, created lazily
-var CPDefaultDcmHandler = nil;
+var CPDefaultDcmHandler = nil,
+    CPDecimalNumberUIDs = new CFMutableDictionary();
 
 /*!
     @class CPDecimalNumberHandler
@@ -531,6 +532,20 @@ var CPDecimalNumberHandlerRoundingModeKey       = @"CPDecimalNumberHandlerRoundi
 }
 
 // instance methods
+
+- (CPString)UID
+{
+    var UID = CPDecimalNumberUIDs.valueForKey(self);
+
+    if (!UID)
+    {
+        UID = objj_generateObjectUID();
+        CPDecimalNumberUIDs.setValueForKey(self, UID);
+    }
+
+    return UID + "";
+}
+
 /*!
     Returns a new CPDecimalNumber object with the result of the summation of
     the receiver object and \c decimalNumber. If overflow occurs then the

Foundation/CPDictionary.j

@@ -222,13 +222,13 @@ var CPDictionaryMaxDescriptionRecursion = 10;
 {
     self = [super init];
 
-    if ([objects count] != [keyArray count])
+    var i = [keyArray count];
+
+    if ([objects count] != i)
         [CPException raise:CPInvalidArgumentException reason:[CPString stringWithFormat:@"Counts are different.(%d != %d)", [objects count], [keyArray count]]];
 
     if (self)
     {
-        var i = [keyArray count];
-
         while (i--)
         {
             var value = objects[i],
@@ -273,18 +273,16 @@ var CPDictionaryMaxDescriptionRecursion = 10;
     if (self)
     {
         // The arguments array contains self and _cmd, so the first object is at position 2.
-        var index = 2;
-
-        for (; index < argCount; index += 2)
+        while (argCount-- > 2)
         {
-            var value = arguments[index],
-                key = arguments[index + 1];
+            var key = arguments[argCount--],
+                value = arguments[argCount]
 
             if (value === nil)
-                [CPException raise:CPInvalidArgumentException reason:@"Attempt to insert nil object from objects[" + ((index / 2) - 1) + @"]"];
+                [CPException raise:CPInvalidArgumentException reason:@"Attempt to insert nil object from objects[" + ((argCount / 2) - 1) + @"]"];
 
             if (key === nil)
-                [CPException raise:CPInvalidArgumentException reason:@"Attempt to insert nil key from keys[" + ((index / 2) - 1) + @"]"];
+                [CPException raise:CPInvalidArgumentException reason:@"Attempt to insert nil key from keys[" + ((argCount / 2) - 1) + @"]"];
 
             [self setObject:value forKey:key];
         }

Foundation/CPException.j

@@ -24,6 +24,8 @@
 @import "CPObject.j"
 @import "CPString.j"
 
+@class CPString
+
 CPInvalidArgumentException          = @"CPInvalidArgumentException";
 CPUnsupportedMethodException        = @"CPUnsupportedMethodException";
 CPRangeException                    = @"CPRangeException";

Foundation/CPKeyValueObserving.j

@@ -164,10 +164,11 @@
 + (BOOL)automaticallyNotifiesObserversForKey:(CPString)aKey
 {
     var capitalizedKey = aKey.charAt(0).toUpperCase() + aKey.substring(1),
-        selector = "automaticallyNotifiesObserversOf" + capitalizedKey;
+        selector = "automaticallyNotifiesObserversOf" + capitalizedKey,
+        aClass = [self class];
 
-    if ([[self class] respondsToSelector:selector])
-        return objj_msgSend([self class], selector);
+    if ([aClass respondsToSelector:selector])
+        return aClass.isa.objj_msgSend0(aClass, selector);
 
     return YES;
 }
@@ -175,10 +176,11 @@
 + (CPSet)keyPathsForValuesAffectingValueForKey:(CPString)aKey
 {
     var capitalizedKey = aKey.charAt(0).toUpperCase() + aKey.substring(1),
-        selector = "keyPathsForValuesAffecting" + capitalizedKey;
+        selector = "keyPathsForValuesAffecting" + capitalizedKey,
+        aClass = [self class];
 
-    if ([[self class] respondsToSelector:selector])
-        return objj_msgSend([self class], selector);
+    if ([aClass respondsToSelector:selector])
+        return aClass.isa.objj_msgSend0(aClass, selector);
 
     return [CPSet set];
 }
@@ -421,7 +423,7 @@ var kvoNewAndOld        = CPKeyValueObservingOptionNew | CPKeyValueObservingOpti
             setKey_method_imp(self, _cmd, anObject);
 
             [self didChangeValueForKey:aKey];
-        }, "");
+        }, setKey_method.method_types);
     }
 
     // FIXME: Deprecated.
@@ -439,7 +441,7 @@ var kvoNewAndOld        = CPKeyValueObservingOptionNew | CPKeyValueObservingOpti
             _setKey_method_imp(self, _cmd, anObject);
 
             [self didChangeValueForKey:aKey];
-        }, "");
+        }, _setKey_method.method_types);
     }
 
     // Ordered To-Many Relationships
@@ -476,7 +478,7 @@ var kvoNewAndOld        = CPKeyValueObservingOptionNew | CPKeyValueObservingOpti
                 [self didChange:CPKeyValueChangeInsertion
                 valuesAtIndexes:[CPIndexSet indexSetWithIndex:anIndex]
                          forKey:aKey];
-            }, "");
+            }, insertObject_inKeyAtIndex_method.method_types);
         }
 
         if (insertKey_atIndexes_method)
@@ -494,7 +496,7 @@ var kvoNewAndOld        = CPKeyValueObservingOptionNew | CPKeyValueObservingOpti
                 [self didChange:CPKeyValueChangeInsertion
                 valuesAtIndexes:[indexes copy]
                          forKey:aKey];
-            }, "");
+            }, insertKey_atIndexes_method.method_types);
         }
 
         if (removeObjectFromKeyAtIndex_method)
@@ -512,7 +514,7 @@ var kvoNewAndOld        = CPKeyValueObservingOptionNew | CPKeyValueObservingOpti
                 [self didChange:CPKeyValueChangeRemoval
                 valuesAtIndexes:[CPIndexSet indexSetWithIndex:anIndex]
                          forKey:aKey];
-            }, "");
+            }, removeObjectFromKeyAtIndex_method.method_types);
         }
 
         if (removeKeyAtIndexes_method)
@@ -530,7 +532,7 @@ var kvoNewAndOld        = CPKeyValueObservingOptionNew | CPKeyValueObservingOpti
                 [self didChange:CPKeyValueChangeRemoval
                 valuesAtIndexes:[indexes copy]
                          forKey:aKey];
-            }, "");
+            }, removeKeyAtIndexes_method.method_types);
         }
 
         // These are optional.
@@ -556,7 +558,7 @@ var kvoNewAndOld        = CPKeyValueObservingOptionNew | CPKeyValueObservingOpti
                 [self didChange:CPKeyValueChangeReplacement
                 valuesAtIndexes:[CPIndexSet indexSetWithIndex:anIndex]
                          forKey:aKey];
-            }, "");
+            }, replaceObjectInKeyAtIndex_withObject_method.method_types);
         }
 
         var replaceKeyAtIndexes_withKey_selector =
@@ -579,7 +581,7 @@ var kvoNewAndOld        = CPKeyValueObservingOptionNew | CPKeyValueObservingOpti
                 [self didChange:CPKeyValueChangeReplacement
                 valuesAtIndexes:[indexes copy]
                          forKey:aKey];
-            }, "");
+            }, replaceKeyAtIndexes_withKey_method.method_types);
         }
     }
 
@@ -613,7 +615,7 @@ var kvoNewAndOld        = CPKeyValueObservingOptionNew | CPKeyValueObservingOpti
                 [self didChangeValueForKey:aKey
                            withSetMutation:CPKeyValueUnionSetMutation
                               usingObjects:[CPSet setWithObject:anObject]];
-            }, "");
+            }, addKeyObject_method.method_types);
         }
 
         if (addKey_method)
@@ -631,7 +633,7 @@ var kvoNewAndOld        = CPKeyValueObservingOptionNew | CPKeyValueObservingOpti
                 [self didChangeValueForKey:aKey
                            withSetMutation:CPKeyValueUnionSetMutation
                               usingObjects:[objects copy]];
-            }, "");
+            }, addKey_method.method_types);
         }
 
         if (removeKeyObject_method)
@@ -649,7 +651,7 @@ var kvoNewAndOld        = CPKeyValueObservingOptionNew | CPKeyValueObservingOpti
                 [self didChangeValueForKey:aKey
                            withSetMutation:CPKeyValueMinusSetMutation
                               usingObjects:[CPSet setWithObject:anObject]];
-            }, "");
+            }, removeKeyObject_method.method_types);
         }
 
         if (removeKey_method)
@@ -667,7 +669,7 @@ var kvoNewAndOld        = CPKeyValueObservingOptionNew | CPKeyValueObservingOpti
                 [self didChangeValueForKey:aKey
                            withSetMutation:CPKeyValueMinusSetMutation
                               usingObjects:[objects copy]];
-            }, "");
+            }, removeKey_method.method_types);
         }
 
         // intersect<Key>: is optional.
@@ -689,7 +691,7 @@ var kvoNewAndOld        = CPKeyValueObservingOptionNew | CPKeyValueObservingOpti
                 [self didChangeValueForKey:aKey
                            withSetMutation:CPKeyValueIntersectSetMutation
                               usingObjects:[aSet copy]];
-            }, "");
+            }, intersectKey_method.method_types);
         }
     }
 

Foundation/CPNotificationCenter.j

@@ -25,6 +25,8 @@
 @import "CPException.j"
 @import "CPNotification.j"
 @import "CPNull.j"
+@import "CPOperationQueue.j"
+@import "CPOperation.j"
 @import "CPSet.j"
 
 @class _CPNotificationRegistry
@@ -94,13 +96,13 @@ var CPNotificationDefaultCenter = nil;
     Adds an entry to the receiver’s dispatch table with a block, and optional criteria: notification name and sender.
     @param aNotificationName the name of the notification the observer wants to watch
     @param anObject the object in the notification the observer wants to watch
-    @param queue is ignored for the moment
+    @param The operation queue to which block should be added. If you pass nil, the block is run synchronously on the posting thread.
     @param block the block to be executed when the notification is received.
 */
-- (id <CPObject>)addObserverForName:(CPString)aNotificationName object:(id)anObject queue:(id)queue usingBlock:(Function)block
+- (id <CPObject>)addObserverForName:(CPString)aNotificationName object:(id)anObject queue:(CPOperationQueue)queue usingBlock:(Function)block
 {
     var registry = [self _registryForNotificationName:aNotificationName],
-        observer = [[_CPNotificationObserver alloc] initWithBlock:block];
+        observer = [[_CPNotificationObserver alloc] initWithBlock:block queue:queue];
 
     [registry addObserver:observer object:anObject];
 
@@ -344,9 +346,10 @@ var _CPNotificationCenterPostNotification = function(/* CPNotificationCenter */
 /* @ignore */
 @implementation _CPNotificationObserver : CPObject
 {
-    id          _observer;
-    Function    _block;
-    SEL         _selector;
+    CPOperationQueue    _operationQueue;
+    id                  _observer;
+    Function            _block;
+    SEL                 _selector;
 }
 
 - (id)initWithObserver:(id)anObserver selector:(SEL)aSelector
@@ -360,11 +363,12 @@ var _CPNotificationCenterPostNotification = function(/* CPNotificationCenter */
    return self;
 }
 
-- (id)initWithBlock:(Function)aBlock
+- (id)initWithBlock:(Function)aBlock queue:(CPOperationQueue)aQueue
 {
     if (self)
     {
         _block = aBlock;
+        _operationQueue = aQueue;
     }
 
     return self;
@@ -384,7 +388,11 @@ var _CPNotificationCenterPostNotification = function(/* CPNotificationCenter */
 {
     if (_block)
     {
-        _block(aNotification);
+        if (!_operationQueue)
+            _block(aNotification);
+        else
+            [_operationQueue addOperation:[[_CPNotificationObserverOperation alloc] initWithBlock:_block notification:aNotification]];
+
         return;
     }
 
@@ -392,3 +400,38 @@ var _CPNotificationCenterPostNotification = function(/* CPNotificationCenter */
 }
 
 @end
+
+/* @ignore */
+@implementation _CPNotificationObserverOperation : CPOperation
+{
+    CPNotification      _notification;
+    Function            _block;
+}
+
+/* @ignore */
+- (id)initWithBlock:(Function)aBlock notification:(CPNotification)aNotification
+{
+    self = [super init];
+
+    if (self)
+    {
+        _block = aBlock;
+        _notification = aNotification;
+    }
+
+    return self;
+}
+
+/* @ignore */
+- (void)main
+{
+    _block(_notification);
+}
+
+/* @ignore */
+- (BOOL)isReady
+{
+    return YES;
+}
+
+@end

Foundation/CPNotificationQueue.j

@@ -0,0 +1,328 @@
+/*
+ * CPNotificationQueue.j
+ * Foundation
+ *
+ * Created by Alexandre Wilhelm.
+ * Copyright 2015 <alexandre.wilhelmfr@gmail.com>
+ *
+ * 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 "CPObject.j"
+@import "CPNotification.j"
+@import "CPNotificationCenter.j"
+
+@typedef CPPostingStyle
+
+/*
+    @global
+    @group CPViewAutoresizingMasks
+    The default resizingMask, the view will not resize or reposition itself.
+*/
+CPPostWhenIdle = 1;
+/*
+    @global
+    @group CPPostingStyle
+    The notification is posted at the end of the current notification callout or timer.
+*/
+CPPostASAP = 2;
+/*
+    @global
+    @group CPPostingStyle
+    The notification is posted immediately after coalescing.
+*/
+CPPostNow = 3;
+
+
+@typedef CPNotificationCoalescing
+
+/*
+    @global
+    @group CPNotificationCoalescing
+    Do not coalesce notifications in the queue.
+*/
+CPNotificationNoCoalescing = 1 << 0;
+/*
+    @global
+    @group CPNotificationCoalescing
+    Coalesce notifications with the same name.
+*/
+CPNotificationCoalescingOnName = 1 << 1;
+/*
+    @global
+    @group CPNotificationCoalescing
+    Coalesce notifications with the same object.
+*/
+CPNotificationCoalescingOnSender = 1 << 2;
+
+
+var CPNotificationDefaultQueue;
+
+var runLoop = [CPRunLoop mainRunLoop];
+
+/*!
+    @class CPPostingStyle
+    @ingroup foundation
+    @brief CPNotificationQueue objects act as buffers for notification centers (instances of CPNotificationCenter).
+
+    Cappuccino provides a framework for sending messages between objects within
+    a process called notifications. CPNotificationQueue objects (or simply notification queues)
+    act as buffers for notification centers (instances of CPNotificationCenter).
+    Whereas a notification center distributes notifications when posted,
+    notifications placed into the queue can be delayed until the end of the current pass through the run loop
+    or until the run loop is idle. Duplicate notifications can also be coalesced so that only one notification
+    is sent although multiple notifications are posted. A notification queue maintains notifications
+    (instances of C¨Notification) generally in a first in first out (FIFO) order.
+    When a notification rises to the front of the queue, the queue posts it to the notification center,
+    which in turn dispatches the notification to all objects registered as observers.
+*/
+@implementation CPNotificationQueue : CPObject
+{
+    BOOL                 _runLoopLaunched;
+    CPMutableArray       _postNowNotifications;
+    CPMutableArray       _postIdleNotifications;
+    CPMutableArray       _postASAPNotifications;
+    CPNotificationCenter _notificationCenter;
+}
+
+
+#pragma mark -
+#pragma mark Class methods
+
+/*!
+    Returns the application's notification queue. This notification queue uses the default notification center
+*/
++ (id)defaultQueue
+{
+    if (!CPNotificationDefaultQueue)
+        CPNotificationDefaultQueue = [[CPNotificationQueue alloc] initWithNotificationCenter:[CPNotificationCenter defaultCenter]];
+
+    return CPNotificationDefaultQueue;
+}
+
+
+#pragma mark -
+#pragma mark Init methods
+
+/*!
+    Initializes and returns a notification queue for the specified notification center.
+    @param anObserver the specified notification center
+    @return a new CPNotificationQueue
+*/
+- (id)initWithNotificationCenter:(CPNotificationCenter)aNotificationCenter
+{
+    if (self = [super init])
+    {
+        _notificationCenter     = aNotificationCenter;
+        _postNowNotifications   = [CPMutableArray new];
+        _postIdleNotifications  = [CPMutableArray new];
+        _postASAPNotifications  = [CPMutableArray new];
+    }
+
+    return self;
+}
+
+
+#pragma mark -
+#pragma mark Enqueue methods
+
+/*!
+    Adds a notification to the notification queue with a specified posting style.
+    @param notification the notification to add to the queue
+    @param postingStyle the posting style for the notification
+*/
+- (void)enqueueNotification:(CPNotification)notification postingStyle:(CPPostingStyle)postingStyle
+{
+    [self enqueueNotification:notification postingStyle:postingStyle coalesceMask:CPNotificationCoalescingOnName|CPNotificationCoalescingOnSender forModes:[CPDefaultRunLoopMode]];
+}
+
+/*!
+    Adds a notification to the notification queue with a specified posting style, criteria for coalescing, and runloop mode.
+    @param notification the notification to add to the queue
+    @param postingStyle the posting style for the notification
+    @param coalesceMask a mask indicating what criteria to use when matching attributes of notification to attributes notifications in the queue.
+    @modes modes the list of modes the notification may be posted in.
+*/
+- (void)enqueueNotification:(CPNotification)notification postingStyle:(CPPostingStyle)postingStyle coalesceMask:(CPNotificationCoalescing)coalesceMask forModes:(CPArray)modes
+{
+    [self _removeNotification:notification coalesceMask:coalesceMask];
+
+    switch (postingStyle)
+    {
+        case CPPostWhenIdle:
+            [_postIdleNotifications addObject:notification];
+            break;
+
+        case CPPostASAP:
+            [_postASAPNotifications addObject:notification];
+            break;
+
+        case CPPostNow:
+            [_postNowNotifications addObject:notification];
+            break;
+    }
+
+    if ([_postIdleNotifications count] || [_postASAPNotifications count] || [_postNowNotifications count])
+        [self _runRunLoop];
+
+    if (postingStyle == CPPostNow)
+    {
+        for (var i = [modes count] - 1; i >= 0; i--)
+            [[CPRunLoop currentRunLoop] limitDateForMode:modes[i]];
+    }
+}
+
+
+#pragma mark -
+#pragma mark Dequeue methods
+
+/*!
+    Removes all notifications from the queue that match a provided notification using provided matching criteria.
+    @param notification the notification to add to the queue
+    @param coalesceMask mask indicating what criteria to use when matching attributes of notification to remove notifications in the queue.
+*/
+- (void)dequeueNotificationsMatching:(CPNotification)notification coalesceMask:(CPUInteger)coalesceMask
+{
+    [self _removeNotification:notification coalesceMask:coalesceMask];
+}
+
+
+#pragma mark -
+#pragma mark RunLoop methods
+
+/*!
+    @ignore
+*/
+- (void)_runRunLoop
+{
+    if (!_runLoopLaunched)
+    {
+        [runLoop performSelector:@selector(_launchNotificationsInQueue) target:self argument:nil order:0 modes:[CPDefaultRunLoopMode]];
+        _runLoopLaunched = YES;
+    }
+}
+
+/*!
+    @ignore
+*/
+- (void)_launchNotificationsInQueue
+{
+    _runLoopLaunched = NO;
+
+    if ([_postNowNotifications count])
+    {
+        [self _launchNotificationsForArray:_postNowNotifications];
+        [self _runRunLoop];
+        return;
+    }
+
+    if ([_postASAPNotifications count])
+    {
+        [self _launchNotificationsForArray:_postASAPNotifications];
+        [self _runRunLoop];
+        return;
+    }
+
+    if ([_postIdleNotifications count])
+    {
+        [self _launchNotificationsForArray:_postIdleNotifications];
+        [self _runRunLoop];
+        return;
+    }
+}
+
+
+#pragma mark -
+#pragma mark Posting methods
+
+/*!
+    @ignore
+*/
+- (void)_launchNotificationsForArray:(CPArray)anArray
+{
+    for (var i = [anArray count] - 1; i >= 0; i--)
+    {
+        var notification = anArray[i];
+        [_notificationCenter postNotification:notification];
+    }
+
+    [anArray removeAllObjects];
+}
+
+
+#pragma mark -
+#pragma mark Remove methods
+
+/*!
+    @ignore
+*/
+- (void)_removeNotification:(CPNotification)notification coalesceMask:(CPUInteger)coalesceMask
+{
+    [self _removeNotification:notification coalesceMask:coalesceMask inNotifications:_postNowNotifications];
+    [self _removeNotification:notification coalesceMask:coalesceMask inNotifications:_postASAPNotifications];
+    [self _removeNotification:notification coalesceMask:coalesceMask inNotifications:_postIdleNotifications];
+}
+
+/*!
+    @ignore
+*/
+- (void)_removeNotification:(CPNotification)aNotification coalesceMask:(CPUInteger)coalesceMask inNotifications:(CPArray)notifications
+{
+    var notificationsToRemove = [],
+        name = [aNotification name],
+        sender = [aNotification object];
+
+    for (var i = [notifications count] - 1; i >= 0; i--)
+    {
+        var notification = notifications[i];
+
+        if (notification == aNotification)
+        {
+            [notificationsToRemove addObject:notification];
+            continue;
+        }
+
+        if (coalesceMask & CPNotificationNoCoalescing)
+            continue;
+
+        if (coalesceMask & CPNotificationCoalescingOnName && coalesceMask & CPNotificationCoalescingOnSender)
+        {
+            if ([notification object] == sender && [notification name] == name)
+                [notificationsToRemove addObject:notification]
+
+            continue;
+        }
+
+        if (coalesceMask & CPNotificationCoalescingOnName)
+        {
+            if ([notification name] == name)
+                [notificationsToRemove addObject:notification]
+
+            continue;
+        }
+
+        if (coalesceMask & CPNotificationCoalescingOnSender)
+        {
+            if ([notification object] == sender)
+                [notificationsToRemove addObject:notification]
+
+            continue;
+        }
+    }
+
+    [notifications removeObjectsInArray:notificationsToRemove];
+}
+
+@end

Foundation/CPPredicate/_CPConstantValueExpression.j

@@ -66,6 +66,9 @@
     if ([_value isKindOfClass:[CPString class]])
         return @"\"" + _value + @"\"";
 
+    if (_value === [CPNull null])
+        return @"nil";
+
     return [_value description];
 }
 

Foundation/CPPredicate/_CPPredicate.j

@@ -605,11 +605,11 @@
     }
     if ([self scanPredicateKeyword:@"TRUE"] || [self scanPredicateKeyword:@"YES"])
     {
-        return [CPExpression expressionForConstantValue:[CPNumber numberWithBool:YES]];
+        return [CPExpression expressionForConstantValue:YES];
     }
     if ([self scanPredicateKeyword:@"FALSE"] || [self scanPredicateKeyword:@"NO"])
     {
-        return [CPExpression expressionForConstantValue:[CPNumber numberWithBool:NO]];
+        return [CPExpression expressionForConstantValue:NO];
     }
     if ([self scanPredicateKeyword:@"SELF"])
     {

Foundation/CPPredicate/_CPSubqueryExpression.j

@@ -47,23 +47,25 @@
         _collection = collection;
         _variableExpression = variableExpression;
     }
+
     return self;
 }
 
-- (id)expressionValueWithObject:(id)object context:(id)context
+- (id)expressionValueWithObject:(id)object context:(id)aContext
 {
-    var collection = [_collection expressionValueWithObject:object context:context],
-        count = [collection count],
+    var collection = [_collection expressionValueWithObject:object context:aContext],
         result = [CPArray array],
-        bindings = @{ [self variable]: [CPExpression expressionForEvaluatedObject] },
-        i = 0;
+        variable = [self variable],
+        context = aContext || @{};
 
-    for (; i < count; i++)
+    if ([context objectForKey:variable] == nil)
+        [context setObject:[CPExpression expressionForEvaluatedObject] forKey:variable];
+
+    [collection enumerateObjectsUsingBlock:function(exp, idx, stop)
     {
-        var item = [collection objectAtIndex:i];
-        if ([_subpredicate evaluateWithObject:item substitutionVariables:bindings])
-            [result addObject:item];
-    }
+        if ([_subpredicate evaluateWithObject:exp substitutionVariables:context])
+            [result addObject:exp];
+    }];
 
     return result;
 }

Foundation/CPRunLoop.j

@@ -42,6 +42,7 @@ var _CPRunLoopPerformPool           = [],
 /* @ignore */
 @implementation _CPRunLoopPerform : CPObject
 {
+    Function    _block;
     id          _target;
     SEL         _selector;
     id          _argument;
@@ -64,6 +65,7 @@ var _CPRunLoopPerformPool           = [],
     {
         var perform = _CPRunLoopPerformPool.pop();
 
+        perform._block = nil;
         perform._target = aTarget;
         perform._selector = aSelector;
         perform._argument = anArgument;
@@ -77,6 +79,26 @@ var _CPRunLoopPerformPool           = [],
     return [[self alloc] initWithSelector:aSelector target:aTarget argument:anArgument order:anOrder modes:modes];
 }
 
++ (_CPRunLoopPerform)performWithBlock:(Function)aBlock argument:(id)anArgument order:(unsigned)anOrder modes:(CPArray)modes
+{
+    if (_CPRunLoopPerformPool.length)
+    {
+        var perform = _CPRunLoopPerformPool.pop();
+
+        perform._target = nil;
+        perform._selector = nil;
+        perform._block = aBlock;
+        perform._argument = anArgument;
+        perform._order = anOrder;
+        perform._runLoopModes = modes;
+        perform._isValid = YES;
+
+        return perform;
+    }
+
+    return [[self alloc] initWithBlock:aBlock argument:anArgument order:anOrder modes:modes];
+}
+
 - (id)initWithSelector:(SEL)aSelector target:(SEL)aTarget argument:(id)anArgument order:(unsigned)anOrder modes:(CPArray)modes
 {
     self = [super init];
@@ -94,6 +116,22 @@ var _CPRunLoopPerformPool           = [],
     return self;
 }
 
+- (id)initWithBlock:(Function)aBlock argument:(id)anArgument order:(unsigned)anOrder modes:(CPArray)modes
+{
+    self = [super init];
+
+    if (self)
+    {
+        _block = aBlock;
+        _argument = anArgument;
+        _order = anOrder;
+        _runLoopModes = modes;
+        _isValid = YES;
+    }
+
+    return self;
+}
+
 - (SEL)selector
 {
     return _selector;
@@ -121,7 +159,10 @@ var _CPRunLoopPerformPool           = [],
 
     if ([_runLoopModes containsObject:aRunLoopMode])
     {
-        [_target performSelector:_selector withObject:_argument];
+        if (_block)
+            _block(_argument);
+        else
+            [_target performSelector:_selector withObject:_argument];
 
         return YES;
     }
@@ -225,6 +266,23 @@ var CPRunLoopLastNativeRunLoop = 0;
     _orderedPerforms.splice(count + 1, 0, perform);
 }
 
+
+/*!
+    @ignore
+*/
+- (void)performBlock:(Function)aBlock argument:(id)anArgument order:(int)anOrder modes:(CPArray)modes
+{
+    var perform = [_CPRunLoopPerform performWithBlock:aBlock argument:anArgument order:anOrder modes:modes],
+        count = _orderedPerforms.length;
+
+    // We sort ourselves in reverse because we iterate this list backwards.
+    while (count--)
+        if (anOrder < [_orderedPerforms[count] order])
+            break;
+
+    _orderedPerforms.splice(count + 1, 0, perform);
+}
+
 /*!
     Cancels the specified selector and target.
     @param aSelector the selector of the method to invoke

Foundation/CPTimeZone.j

@@ -266,7 +266,7 @@ var abbreviationDictionary,
         @"MST" :    [@"Mountain Standard Time", @"MST", @"Mountain Daylight Time", @"MDT", @"Mountain Time", @"MT"],
         @"PHT" :    [@"Philippine Standard Time", @"GMT+08:00", @"Philippine Summer Time", @"GMT+08:00", @"Philippine Standard Time", @"Philippines Time"],
         @"WET" :    [@"Western European Standard Time", @"GMT", @"Western European Summer Time", @"GMT+01:00", @"Western European Time", @"Portugal Time (Lisbon)"]
-    };
+        };
 
     var date = [CPDate date],
         abbreviation = String(String(date).split("(")[1]).split(")")[0];

Foundation/CPURLConnection.j

@@ -25,6 +25,18 @@
 @import "CPRunLoop.j"
 @import "CPURLRequest.j"
 @import "CPURLResponse.j"
+@import "CPOperationQueue.j"
+@import "CPOperation.j"
+
+@protocol CPURLConnectionDelegate <CPObject>
+
+- (void)connection:(CPURLConnection)anURLConnection didFailWithError:(CPException)anError;
+- (void)connection:(CPURLConnection)anURLConnection didReceiveData:(CPString)aData;
+- (void)connection:(CPURLConnection)anURLConnection didReceiveResponse:(CPString)aResponse;
+- (void)connectionDidFinishLoading:(CPURLConnection)anURLConnection;
+- (void)connectionDidReceiveAuthenticationChallenge:(CPURLConnection)anURLConnection;
+
+@end
 
 @typedef HTTPRequest
 
@@ -76,16 +88,19 @@ var CPURLConnectionDelegate = nil;
 */
 @implementation CPURLConnection : CPObject
 {
-    CPURLRequest    _originalRequest        @accessors(readonly, getter=originalRequest);
-    CPURLRequest    _request                @accessors(readonly, getter=currentRequest);
-    id              _delegate;
-    BOOL            _isCanceled;
-    BOOL            _isLocalFileConnection;
+    CPURLRequest                    _originalRequest        @accessors(readonly, getter=originalRequest);
+    CPURLRequest                    _request                @accessors(readonly, getter=currentRequest);
+    id  <CPURLConnectionDelegate>   _delegate;
+    BOOL                            _isCanceled;
+    BOOL                            _isLocalFileConnection;
 
-    HTTPRequest     _HTTPRequest;
+    HTTPRequest                     _HTTPRequest;
+
+    CPOperationQueue                _operationQueue;
+    CPOperation                     _connectionOperation @accessors(readonly, getter=operation);
 }
 
-+ (void)setClassDelegate:(id)delegate
++ (void)setClassDelegate:(id <CPURLConnectionDelegate>)delegate
 {
     CPURLConnectionDelegate = delegate;
 }
@@ -127,6 +142,18 @@ var CPURLConnectionDelegate = nil;
     return nil;
 }
 
+/*
+    Loads the data for a URL request and executes a function on an operation queue when the request completes or fails.
+    @param aRequest contains the URL to obtain data from.
+    @param aQueue The operation queue to which the function is dispatched when the request completes or failed.
+    @param aHandler The function to execute.
+    @discussion If the request completes successfully, the data parameter of the function contains the resource data, and the error parameter is nil. If the request fails, the data parameter is nil and the error parameter contain information about the failure.
+*/
++ (CPURLConnection)sendAsynchronousRequest:(CPURLRequest)aRequest queue:(CPOperationQueue)aQueue completionHandler:(Function)aHandler
+{
+    return [[self alloc] _initWithRequest:aRequest queue:aQueue completionHandler:aHandler];
+}
+
 /*
     Creates a url connection with a delegate to monitor the request progress.
     @param aRequest contains the URL to obtain data from
@@ -145,37 +172,63 @@ var CPURLConnectionDelegate = nil;
     @param shouldStartImmediately whether the \c -start method should be called from here
     @return the initialized url connection
 */
-- (id)initWithRequest:(CPURLRequest)aRequest delegate:(id)aDelegate startImmediately:(BOOL)shouldStartImmediately
+- (id)initWithRequest:(CPURLRequest)aRequest delegate:(id <CPURLConnectionDelegate>)aDelegate startImmediately:(BOOL)shouldStartImmediately
 {
     self = [super init];
 
     if (self)
     {
-        _request = aRequest;
-        _originalRequest = [aRequest copy];
         _delegate = aDelegate;
-        _isCanceled = NO;
+        _operationQueue = nil;
+        _connectionOperation = nil;
 
-        var URL = [_request URL],
-            scheme = [URL scheme];
+        [self _initWithRequest:aRequest];
+    }
 
-        // Browsers use "file:", Titanium uses "app:"
-        _isLocalFileConnection =    scheme === "file" ||
-                                    ((scheme === "http" || scheme === "https") &&
-                                     window.location &&
-                                     (window.location.protocol === "file:" || window.location.protocol === "app:"));
+    if (shouldStartImmediately)
+        [self start];
 
-        _HTTPRequest = new CFHTTPRequest();
-        _HTTPRequest.setWithCredentials([aRequest withCredentials]);
+    return self;
+}
 
-        if (shouldStartImmediately)
-            [self start];
+- (void)_initWithRequest:(CPURLRequest)aRequest
+{
+	_request = aRequest;
+    _originalRequest = [aRequest copy];
+	_isCanceled = NO;
+
+	var URL = [_request URL],
+	    scheme = [URL scheme];
+
+	// Browsers use "file:", Titanium uses "app:"
+	_isLocalFileConnection =    scheme === "file" ||
+                                ((scheme === "http" || scheme === "https") &&
+                                 window.location &&
+                                 (window.location.protocol === "file:" || window.location.protocol === "app:"));
+
+    _HTTPRequest = new CFHTTPRequest();
+    _HTTPRequest.setTimeout([aRequest timeoutInterval] * 1000);
+    _HTTPRequest.setWithCredentials([aRequest withCredentials]);
+}
+
+- (id)_initWithRequest:(CPURLRequest)aRequest queue:(CPOperationQueue)aQueue completionHandler:(Function)aHandler
+{
+    self = [super init];
+
+    if (self)
+    {
+        _delegate = nil;
+        _operationQueue = aQueue;
+        _connectionOperation = [[_AsynchronousConnectionOperation alloc] initWithFunction:aHandler];
+
+        [self _initWithRequest:aRequest];
+        [self start];
     }
 
     return self;
 }
 
-- (id)initWithRequest:(CPURLRequest)aRequest delegate:(id)aDelegate
+- (id)initWithRequest:(CPURLRequest)aRequest delegate:(id <CPURLConnectionDelegate>)aDelegate
 {
     return [self initWithRequest:aRequest delegate:aDelegate startImmediately:YES];
 }
@@ -200,6 +253,7 @@ var CPURLConnectionDelegate = nil;
         _HTTPRequest.open([_request HTTPMethod], [[_request URL] absoluteString], YES);
 
         _HTTPRequest.onreadystatechange = function() { [self _readyStateDidChange]; };
+        _HTTPRequest.ontimeout = function() { [self _didTimeout]; };
 
         var fields = [_request allHTTPHeaderFields],
             key = nil,
@@ -212,11 +266,18 @@ var CPURLConnectionDelegate = nil;
     }
     catch (anException)
     {
-        if ([_delegate respondsToSelector:@selector(connection:didFailWithError:)])
-            [_delegate connection:self didFailWithError:anException];
+        [self _sendDelegateDidFailWithError:anException];
     }
 }
 
+- (void)_sendDelegateDidFailWithError:(CPException)anException
+{
+    if ([_delegate respondsToSelector:@selector(connection:didFailWithError:)])
+        [_delegate connection:self didFailWithError:anException];
+    else if (_connectionOperation !== nil)
+        [self _connectionOperationDidReceiveResponse:nil data:nil error:anException];
+}
+
 /*
     Cancels the current request.
 */
@@ -227,6 +288,9 @@ var CPURLConnectionDelegate = nil;
     try
     {
         _HTTPRequest.abort();
+
+        if (_connectionOperation)
+            [_connectionOperation cancel];
     }
     // We expect an exception in some browsers like FireFox.
     catch (anException)
@@ -239,10 +303,21 @@ var CPURLConnectionDelegate = nil;
     return _isLocalFileConnection;
 }
 
+/*!
+    @ignore
+*/
+- (void)_didTimeout
+{
+    var exception = [CPException exceptionWithName:@"Timeout exception"
+                                            reason:"The request timed out."
+                                          userInfo:@{}];
+
+    [self _sendDelegateDidFailWithError:exception];
+}
 /* @ignore */
 - (void)_readyStateDidChange
 {
-    if (_HTTPRequest.readyState() === CFHTTPRequest.CompleteState)
+    if (_HTTPRequest.readyState() === CFHTTPRequest.CompleteState && !_HTTPRequest.isTimeoutRequest())
     {
         var statusCode = _HTTPRequest.status(),
             URL = [_request URL];
@@ -251,23 +326,27 @@ var CPURLConnectionDelegate = nil;
             [CPURLConnectionDelegate connectionDidReceiveAuthenticationChallenge:self];
         else
         {
-            if ([_delegate respondsToSelector:@selector(connection:didReceiveResponse:)])
+            var response;
+
+            if (_isLocalFileConnection)
+                response = [[CPURLResponse alloc] initWithURL:URL];
+            else
             {
-                if (_isLocalFileConnection)
-                    [_delegate connection:self didReceiveResponse:[[CPURLResponse alloc] initWithURL:URL]];
-                else
-                {
-                    var response = [[CPHTTPURLResponse alloc] initWithURL:URL];
-                    [response _setStatusCode:statusCode];
-                    [response _setAllResponseHeaders:_HTTPRequest.getAllResponseHeaders()];
-                    [_delegate connection:self didReceiveResponse:response];
-                }
+                response = [[CPHTTPURLResponse alloc] initWithURL:URL];
+                [response _setStatusCode:statusCode];
+                [response _setAllResponseHeaders:_HTTPRequest.getAllResponseHeaders()];
             }
 
+            if ([_delegate respondsToSelector:@selector(connection:didReceiveResponse:)])
+                [_delegate connection:self didReceiveResponse:response];
+
             if (!_isCanceled)
             {
                 if ([_delegate respondsToSelector:@selector(connection:didReceiveData:)])
                     [_delegate connection:self didReceiveData:_HTTPRequest.responseText()];
+                else if (_connectionOperation !== nil)
+                    [self _connectionOperationDidReceiveResponse:response data:_HTTPRequest.responseText() error:nil];
+
                 if ([_delegate respondsToSelector:@selector(connectionDidFinishLoading:)])
                     [_delegate connectionDidFinishLoading:self];
             }
@@ -283,6 +362,69 @@ var CPURLConnectionDelegate = nil;
     return _HTTPRequest;
 }
 
+- (void)_connectionOperationDidReceiveResponse:(CPURLResponse)aResponse data:(CPData)aData error:(CPError)anError
+{
+    [_connectionOperation _setResponse:aResponse data:aData error:anError];
+
+    if (_operationQueue)
+        [_operationQueue addOperation:_connectionOperation];
+    else
+    {
+        // Do we need to send CPOperation KVO notifications ?
+        [_connectionOperation main];
+    }
+}
+
+@end
+
+/* @ignore */
+@implementation _AsynchronousConnectionOperation : CPOperation
+{
+    BOOL          _didReceiveResponse;
+
+    CPURLResponse _response;
+    CPData        _data;
+    CPError       _error;
+    Function      _operationFunction;
+}
+
+/* @ignore */
+- (id)initWithFunction:(Function)aFunction
+{
+    self = [super init];
+
+    if (self)
+    {
+        _didReceiveResponse = NO;
+        _response = nil;
+        _data = nil;
+        _error = nil;
+        _operationFunction = aFunction;
+    }
+
+    return self;
+}
+
+- (void)_setResponse:(CPURLResponse)aResponse data:(CPData)aData error:(CPError)anError
+{
+    _didReceiveResponse = YES;
+    _response = aResponse;
+    _data = aData;
+    _error = anError;
+}
+
+/* @ignore */
+- (void)main
+{
+    _operationFunction(_response, _data, _error);
+}
+
+/* @ignore */
+- (BOOL)isReady
+{
+    return (_didReceiveResponse && [super isReady]);
+}
+
 @end
 
 @implementation CPURLConnection (Deprecated)

Foundation/CPURLRequest.j

@@ -25,6 +25,12 @@
 @import "CPString.j"
 @import "CPURL.j"
 
+@typedef CPURLRequestCachePolicy
+CPURLRequestUseProtocolCachePolicy = 0;
+CPURLRequestReloadIgnoringLocalCacheData = 1;
+CPURLRequestReturnCacheDataElseLoad = 2;
+CPURLRequestReturnCacheDataDontLoad = 3;
+
 /*!
     @class CPURLRequest
     @ingroup foundation
@@ -35,14 +41,16 @@
 */
 @implementation CPURLRequest : CPObject
 {
-    CPURL           _URL                @accessors(property=URL);
+    CPURL                       _URL                @accessors(property=URL);
 
     // FIXME: this should be CPData
-    CPString        _HTTPBody           @accessors(property=HTTPBody);
-    CPString        _HTTPMethod         @accessors(property=HTTPMethod);
-    BOOL            _withCredentials    @accessors(property=withCredentials);
+    CPString                    _HTTPBody           @accessors(property=HTTPBody);
+    CPString                    _HTTPMethod         @accessors(property=HTTPMethod);
+    BOOL                        _withCredentials    @accessors(property=withCredentials);
 
-    CPDictionary    _HTTPHeaderFields   @accessors(readonly, getter=allHTTPHeaderFields);
+    CPDictionary                _HTTPHeaderFields   @accessors(readonly, getter=allHTTPHeaderFields);
+    CPTimeInterval              _timeoutInterval    @accessors(readonly, getter=timeoutInterval);
+    CPURLRequestCachePolicy     _cachePolicy        @accessors(readonly, getter=cachePolicy);
 }
 
 /*!
@@ -55,6 +63,18 @@
     return [[CPURLRequest alloc] initWithURL:aURL];
 }
 
+/*!
+    Creates a request with a specified URL, cachePolicy and timeoutInterval
+    @param aURL the URL of the request
+    @param aCachePolicy the cache policy of the request
+    @param aTimeoutInterval the timeoutInterval of the request
+    @return a CPURLRequest
+*/
++ (id)requestWithURL:(CPURL)anURL cachePolicy:(CPURLRequestCachePolicy)aCachePolicy timeoutInterval:(CPTimeInterval)aTimeoutInterval
+{
+    return [[CPURLRequest alloc] initWithURL:anURL cachePolicy:aCachePolicy timeoutInterval:aTimeoutInterval];
+}
+
 /*!
     Equal to `[receiver initWithURL:nil]`.
 */
@@ -63,6 +83,25 @@
     return [self initWithURL:nil];
 }
 
+/*!
+    Initializes the request with a URL. This is the designated initializer.
+
+    @param aURL the url to set
+    @param aCachePolicy the cache policy of the request
+    @param aTimeoutInterval the timeoutInterval of the request
+    @return the initialized CPURLRequest
+*/
+- (id)initWithURL:(CPURL)anURL cachePolicy:(CPURLRequestCachePolicy)aCachePolicy timeoutInterval:(CPTimeInterval)aTimeoutInterval
+{
+    if (self = [self initWithURL:anURL])
+    {
+        _cachePolicy = aCachePolicy;
+        _timeoutInterval = aTimeoutInterval;
+    }
+
+    return self;
+}
+
 /*!
     Initializes the request with a URL. This is the designated initializer.
 
@@ -71,9 +110,7 @@
 */
 - (id)initWithURL:(CPURL)aURL
 {
-    self = [super init];
-
-    if (self)
+    if (self = [super init])
     {
         [self setURL:aURL];
 
@@ -81,9 +118,34 @@
         _HTTPMethod = @"GET";
         _HTTPHeaderFields = @{};
         _withCredentials = NO;
+        _timeoutInterval = 60.0;
+        _cachePolicy = CPURLRequestUseProtocolCachePolicy;
 
         [self setValue:"Thu, 01 Jan 1970 00:00:00 GMT" forHTTPHeaderField:"If-Modified-Since"];
-        [self setValue:"no-cache" forHTTPHeaderField:"Cache-Control"];
+
+        switch (_cachePolicy)
+        {
+            case CPURLRequestUseProtocolCachePolicy:
+                // TODO: implement everything about cache...
+                [self setValue:"no-cache" forHTTPHeaderField:"Cache-Control"];
+                break;
+
+            case CPURLRequestReturnCacheDataElseLoad:
+                [self setValue:"max-stale=31536000" forHTTPHeaderField:"Cache-Control"];
+                break;
+
+            case CPURLRequestReturnCacheDataDontLoad:
+                [self setValue:"only-if-cached" forHTTPHeaderField:"Cache-Control"];
+                break;
+
+            case CPURLRequestReloadIgnoringLocalCacheData:
+                [self setValue:"no-cache" forHTTPHeaderField:"Cache-Control"];
+                break;
+
+            default:
+                [self setValue:"no-cache" forHTTPHeaderField:"Cache-Control"];
+        }
+
         [self setValue:"XMLHttpRequest" forHTTPHeaderField:"X-Requested-With"];
     }
 

Foundation/CPUserNotification.j

@@ -0,0 +1,109 @@
+/*
+ * CPUserNotification.j
+ * Foundation
+ *
+ * Created by Alexandre Wilhelm.
+ * Copyright 2015, 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 "CPAttributedString.j"
+@import "CPArray.j"
+@import "CPDate.j"
+@import "CPDictionary.j"
+@import "CPObject.j"
+@import "CPTimeZone.j"
+
+// We need something from the AppKit in Foundation ???
+@class CPImage
+
+@typedef CPUserNotificationAction
+@typedef CPUserNotificationActivationType
+
+/*!
+    @global CPUserNotificationActivationType
+    @group CPUserNotificationActivationType
+    The user did not interact with the notification alert.
+*/
+CPUserNotificationActivationTypeNone = 0;
+
+/*!
+    @global CPUserNotificationActivationType
+    @group CPUserNotificationActivationType
+    The user clicked on the contents of the notification alert.
+*/
+CPUserNotificationActivationTypeContentsClicked = 1;
+
+/*!
+    @global CPUserNotificationActivationType
+    @group CPUserNotificationActivationType
+    The user clicked on the action button of the notification alert.
+*/
+CPUserNotificationActivationTypeActionButtonClicked = 2;
+
+/*!
+    @global CPUserNotificationActivationType
+    @group CPUserNotificationActivationType
+    The user replied to the notification.
+*/
+CPUserNotificationActivationTypeReplied = 3,
+
+/*!
+    @global CPUserNotificationActivationType
+    @group CPUserNotificationActivationType
+    The user clicked on the additional action button of the notification alert.
+*/
+CPUserNotificationActivationTypeAdditionalActionClicked = 4;
+
+/*!
+    @class CPUserNotification
+    @ingroup foundation
+
+    @brief The CPUserNotification class is used to configure a notification that is scheduled for display by the UserNotificationCenter class.
+*/
+@implementation CPUserNotification : CPObject
+{
+    BOOL                                _presented                  @accessors(getter=isPresented);
+    BOOL                                _remote                     @accessors(getter=isRemote);
+    CPDate                              _actualDeliveryDate         @accessors(getter=actualDeliveryDate);
+    CPDate                              _deliveryDate               @accessors(property=deliveryDate);
+    CPDictionary                        _userInfo                   @accessors(property=userInfo);
+    CPImage                             _contentImage               @accessors(property=contentImage);
+    CPString                            _identifier                 @accessors(property=identifier);
+    CPString                            _informativeText            @accessors(property=informativeText);
+    CPString                            _title                      @accessors(property=title);
+    CPTimeInterval                      _deliveryRepeatInterval     @accessors(property=deliveryRepeatInterval);
+    CPTimeZone                          _deliveryTimeZone           @accessors(property=deliveryTimeZone);
+    CPUserNotificationActivationType    _activationType             @accessors(getter=activationType);
+}
+
+
+#pragma mark -
+#pragma mark Creating an user notification
+
+- (id)init
+{
+    self = [super init];
+
+    if (self)
+    {
+        _identifier = [self UID];
+    }
+
+    return self
+}
+
+@end

Foundation/CPUserNotificationCenter.j

@@ -0,0 +1,293 @@
+/*
+ * CPUserNotificationCenter.j
+ * Foundation
+ *
+ * Created by Alexandre Wilhelm.
+ * Copyright 2015, 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 "CPArray.j"
+@import "CPObject.j"
+@import "CPTimer.j"
+@import "CPUserNotification.j"
+
+@protocol CPUserNotificationCenterDelegate <CPObject>
+
+@optional
+- (BOOL)userNotificationCenter:(CPUserNotificationCenter)center shouldPresentNotification:(CPUserNotification)notification;
+- (void)userNotificationCenter:(CPUserNotificationCenter)center didDeliverNotification:(CPUserNotification)notification;
+- (void)userNotificationCenter:(CPUserNotificationCenter)center didActivateNotification:(CPUserNotification)notification;
+
+@end
+
+// Remove compiling warnings
+@class Notification
+
+@global CPApp
+
+var CPUserNotificationCenterDelegate_userNotificationCenter_shouldPresentNotification_  = 1 << 0,
+    CPUserNotificationCenterDelegate_userNotificationCenter_didDeliverNotification_     = 1 << 1,
+    CPUserNotificationCenterDelegate_userNotificationCenter_didActivateNotification_    = 1 << 2;
+
+var CPUserNotificationDefaultCenter = nil;
+
+/*!
+    @class CPUserNotificationCenter
+    @ingroup foundation
+
+    @brief The CPUserNotificationCenter class delivers user notifications to the user from applications or helper applications.
+*/
+@implementation CPUserNotificationCenter : CPObject
+{
+    CPArray                                 _deliveredNotifications @accessors(property=deliveredNotifications);
+    CPArray                                 _scheduledNotifications @accessors(property=scheduledNotifications);
+    id <CPUserNotificationCenterDelegate>   _delegate;
+
+    CPInteger                               _implementedDelegateMethods;
+    CPMutableDictionary                     _timersForUserNotification;
+}
+
+
+#pragma mark -
+#pragma mark Creating Default User Notification Center
+
+/*!
+    Returns the user's notification center
+*/
++ (CPNotificationCenter)defaultUserNotificationCenter
+{
+    if (!CPUserNotificationDefaultCenter)
+        CPUserNotificationDefaultCenter = [[CPUserNotificationCenter alloc] init];
+
+    return CPUserNotificationDefaultCenter;
+}
+
+- (id)init
+{
+    self = [super init];
+
+    if (self)
+    {
+        _deliveredNotifications = [];
+        _scheduledNotifications = [];
+        _timersForUserNotification = @{};
+    }
+
+    return self;
+}
+
+
+#pragma mark -
+#pragma mark Getting and Setting the Delegate
+
+- (void)setDelegate:(id <CPUserNotificationCenterDelegate>)aDelegate
+{
+    if (_delegate === aDelegate)
+        return;
+
+    _delegate = aDelegate;
+    _implementedDelegateMethods = 0;
+
+    if ([_delegate respondsToSelector:@selector(userNotificationCenter:shouldPresentNotification:)])
+        _implementedDelegateMethods |= CPUserNotificationCenterDelegate_userNotificationCenter_shouldPresentNotification_;
+
+    if ([_delegate respondsToSelector:@selector(userNotificationCenter:didDeliverNotification:)])
+        _implementedDelegateMethods |= CPUserNotificationCenterDelegate_userNotificationCenter_didDeliverNotification_;
+
+    if ([_delegate respondsToSelector:@selector(userNotificationCenter:didActivateNotification:)])
+        _implementedDelegateMethods |= CPUserNotificationCenterDelegate_userNotificationCenter_didActivateNotification_;
+}
+
+
+#pragma mark -
+#pragma mark Managing the Scheduled Notification Queue
+
+/*!
+    Schedules the given user notification
+    @param anUserNotification the user notification
+*/
+- (void)scheduleNotification:(CPUserNotification)anUserNotification
+{
+    var scheduledDate = [[anUserNotification deliveryDate] copy];
+    [scheduledDate _dateWithTimeZone:[anUserNotification deliveryTimeZone]];
+
+    var timer = [[CPTimer alloc] initWithFireDate:scheduledDate
+                                         interval:[anUserNotification deliveryRepeatInterval]
+                                           target:self
+                                         selector:@selector(_scheduledUserNotificationTimerDidFire:)
+                                         userInfo:anUserNotification
+                                          repeats:([anUserNotification deliveryRepeatInterval] ? YES : NO)];
+
+    [_scheduledNotifications addObject:anUserNotification];
+    _timersForUserNotification[[anUserNotification UID]] = timer;
+
+    [[CPRunLoop currentRunLoop] addTimer:timer forMode:CPDefaultRunLoopMode];
+}
+
+- (void)_scheduledUserNotificationTimerDidFire:(CPTimer)aTimer
+{
+    [self deliverNotification:[aTimer userInfo]];
+}
+
+/*!
+    Removes the given user notification for the scheduled notifications.
+    @param anUserNotification the user notification
+*/
+- (void)removeScheduledNotification:(CPUserNotification)anUserNotification
+{
+    if ([_scheduledNotifications indexOfObject:anUserNotification] != CPNotFound)
+    {
+         [_scheduledNotifications removeObject:anUserNotification];
+         [_timersForUserNotification[[anUserNotification UID]] invalidate];
+         delete _timersForUserNotification[[anUserNotification UID]];
+    }
+}
+
+
+#pragma mark -
+#pragma mark Managing the Delivered Notifications
+
+/*!
+    Deliver the given user notification
+    @param aNotification the user notification
+*/
+- (void)deliverNotification:(CPUserNotification)aNotification
+{
+    [self _launchUserNotification:aNotification];
+}
+
+/*!
+    Remove a delivered user notification from the user notification center.
+    @param aNotification the user notification
+*/
+- (void)removeDeliveredNotification:(CPUserNotification)aNotification
+{
+    [_deliveredNotifications removeObject:aNotification];
+}
+
+/*!
+    Remove all delivered user notifications from the user notification center.
+*/
+- (void)removeAllDeliveredNotifications
+{
+    [_deliveredNotifications removeAllObjects];
+}
+
+
+#pragma mark -
+#pragma mark Permission Utilities
+
+- (void)_askPermissionForUserNotification:(CPUserNotification)anUserNotification
+{
+    Notification.requestPermission(function (permission) {
+        if (permission == "granted")
+            // We need to relaunch the notification if the permission are granted
+            [self _launchUserNotification:anUserNotification];
+    });
+}
+
+
+#pragma mark -
+#pragma mark Notification Utilities
+
+- (void)_launchUserNotification:(CPUserNotification)anUserNotification
+{
+    // If the browser version is unsupported, remain silent.
+    if (!window || !'Notification' in window)
+        return;
+
+    if (Notification.permission === 'default')
+        [self _askPermissionForUserNotification:anUserNotification];
+
+    if (Notification.permission === 'granted')
+    {
+        if (([self _delegateRespondsToShouldPresentNotification] && [self _sendDelegateShouldPresentNotification:anUserNotification])
+            || ![CPApp isActive])
+        {
+            var notification = new Notification(
+                        [anUserNotification title],
+                        {
+                          'body': [anUserNotification informativeText],
+                          'icon': [[anUserNotification contentImage] filename],
+                          // ...prevent duplicate notifications
+                          'tag' : [anUserNotification identifier]
+                        }
+                    );
+
+            anUserNotification._presented = YES;
+
+            notification.onclick = function () {
+                anUserNotification._activationType = CPUserNotificationActivationTypeContentsClicked;
+                [self _sendDelegateDidActivateNotification:anUserNotification];
+
+                // Remove the notification from Notification Center when clicked.
+                this.close();
+            };
+
+            // Callback function when the notification is closed.
+            notification.onclose = function () {
+
+            };
+        }
+        else
+        {
+            anUserNotification._presented = NO;
+        }
+
+        anUserNotification._activationType = CPUserNotificationActivationTypeNone;
+        anUserNotification._actualDeliveryDate = [CPDate date];
+        [_deliveredNotifications addObject:anUserNotification];
+
+        if (![anUserNotification deliveryRepeatInterval])
+            [self removeScheduledNotification:anUserNotification];
+
+        [self _sendDelegateDidDeliverNotification:anUserNotification];
+    }
+}
+
+@end
+
+
+@implementation CPUserNotificationCenter (CPUserNotificationCenterDelegate)
+
+- (BOOL)_delegateRespondsToShouldPresentNotification
+{
+    return _implementedDelegateMethods & CPUserNotificationCenterDelegate_userNotificationCenter_shouldPresentNotification_;
+}
+
+- (BOOL)_sendDelegateShouldPresentNotification:(CPUserNotification)aNotification
+{
+    return [_delegate userNotificationCenter:self shouldPresentNotification:aNotification];
+}
+
+- (void)_sendDelegateDidActivateNotification:(CPUserNotification)aNotification
+{
+    if (!(_implementedDelegateMethods & CPUserNotificationCenterDelegate_userNotificationCenter_didActivateNotification_))
+        return;
+
+    [_delegate userNotificationCenter:self didActivateNotification:aNotification];
+}
+
+- (void)_sendDelegateDidDeliverNotification:(CPUserNotification)aNotification
+{
+    if (!(_implementedDelegateMethods & CPUserNotificationCenterDelegate_userNotificationCenter_didDeliverNotification_))
+        return;
+
+    [_delegate userNotificationCenter:self didDeliverNotification:aNotification];
+}
+
+@end