Typo in the new platform window code for cursors

Reviewed by me.

.gitignore

@@ -0,0 +1,6 @@
+.DS_Store
+Frameworks
+Build
+Demos
+./Aristo
+WebSite

AppKit/AppKit.j

@@ -0,0 +1,84 @@
+/*
+ * AppKit.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 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 "CALayer.j"
+@import "CPAlert.j"
+@import "CPAnimation.j"
+@import "CPApplication.j"
+@import "CPBezierPath.j"
+@import "CPBox.j"
+@import "CPButton.j"
+@import "CPButtonBar.j"
+@import "CPCheckBox.j"
+@import "CPCib.j"
+@import "CPCibConnector.j"
+@import "CPCibControlConnector.j"
+@import "CPCibLoading.j"
+@import "CPCibOutletConnector.j"
+@import "CPClipView.j"
+@import "CPCollectionViewItem.j"
+@import "CPCollectionView.j"
+@import "CPColor.j"
+@import "CPColorPanel.j"
+@import "CPColorWell.j"
+@import "CPCompatibility.j"
+@import "CPControl.j"
+@import "CPCookie.j"
+@import "CPCursor.j"
+@import "CPDocument.j"
+@import "CPDocumentController.j"
+@import "CPEvent.j"
+@import "CPFlashMovie.j"
+@import "CPFlashView.j"
+@import "CPFont.j"
+@import "CPFontManager.j"
+@import "CPGeometry.j"
+@import "CPImage.j"
+@import "CPImageView.j"
+@import "CPMenu.j"
+@import "CPMenuItem.j"
+@import "CPOpenPanel.j"
+@import "CPPanel.j"
+@import "CPPasteboard.j"
+@import "CPPopUpButton.j"
+@import "CPProgressIndicator.j"
+@import "CPRadio.j"
+@import "CPResponder.j"
+@import "CPSearchField.j"
+@import "CPScrollView.j"
+@import "CPScroller.j"
+@import "CPSecureTextField.j"
+@import "CPSegmentedControl.j"
+@import "CPShadow.j"
+@import "CPSlider.j"
+@import "CPSplitView.j"
+@import "CPTabView.j"
+@import "CPTableColumn.j"
+@import "CPTableView.j"
+@import "CPTextField.j"
+@import "CPToolbar.j"
+@import "CPToolbarItem.j"
+@import "CPView.j"
+@import "CPViewController.j"
+@import "CPWebView.j"
+@import "CPWindow.j"
+@import "CPWindowController.j"

AppKit/CPAccordionView.j

@@ -0,0 +1,361 @@
+/*
+ * CPAccordionView.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2009, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPArray.j>
+@import <Foundation/CPObject.j>
+@import <Foundation/CPKeyValueObserving.j>
+@import <Foundation/CPIndexSet.j>
+@import <Foundation/CPString.j>
+
+@import <AppKit/CPView.j>
+
+#import "CoreGraphics/CGGeometry.h"
+
+
+@implementation CPAccordionViewItem : CPObject
+{
+    CPString    _identifier @accessors(property=identifier);
+    CPView      _view @accessors(property=view);
+    CPString    _label @accessors(property=label);
+}
+
+- (id)init
+{
+    return [self initWithIdentifier:@""];
+}
+
+- (id)initWithIdentifier:(CPString)anIdentifier
+{
+    self = [super init];
+
+    if (self)
+        [self setIdentifier:anIdentifier];
+
+    return self;
+}
+
+@end
+
+@implementation CPAccordionView : CPView
+{
+    CPInteger       _dirtyItemIndex;
+    CPView          _itemHeaderPrototype;
+
+    CPMutableArray  _items;
+    CPMutableArray  _itemViews;
+    CPIndexSet      _expandedItemIndexes;
+}
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    self = [super initWithFrame:aFrame];
+
+    if (self)
+    {
+        _items = [];
+        _itemViews = [];
+        _expandedItemIndexes = [CPIndexSet indexSet];
+
+        [self setItemHeaderPrototype:[[CPButton alloc] initWithFrame:_CGRectMake(0.0, 0.0, 100.0, 24.0)]];
+    }
+
+    return self;
+}
+
+- (void)setItemHeaderPrototype:(CPView)aView
+{
+    _itemHeaderPrototype = aView;
+}
+
+- (CPView)itemHeaderPrototype
+{
+    return _itemHeaderPrototype;
+}
+
+- (CPArray)items
+{
+    return _items;
+}
+
+- (void)addItem:(CPAccordionItem)anItem
+{
+    [self insertItem:anItem atIndex:_items.length];
+}
+
+- (void)insertItem:(CPAccordionItem)anItem atIndex:(CPInteger)anIndex
+{
+    // FIXME: SHIFT ITEMS RIGHT
+    [_expandedItemIndexes addIndex:anIndex];
+
+    var itemView = [[_CPAccordionItemView alloc] initWithAccordionView:self];
+
+    [itemView setIndex:anIndex];
+    [itemView setLabel:[anItem label]];
+    [itemView setContentView:[anItem view]];
+
+    [self addSubview:itemView];
+
+    [_items insertObject:anItem atIndex:anIndex];
+    [_itemViews insertObject:itemView atIndex:anIndex];
+
+    [self _invalidateItemsStartingAtIndex:anIndex];
+
+    [self setNeedsLayout];
+}
+
+- (void)removeItem:(CPAccordionItem)anItem
+{
+    [self removeItemAtIndex:[_items indexOfObjectIdenticalTo:anItem]];
+}
+
+- (void)removeItemAtIndex:(CPInteger)anIndex
+{
+    // SHIFT ITEMS LEFT
+    [_expandedItemIndexes removeIndex:anIndex];
+
+    [_itemViews[anIndex] removeFromSuperview];
+
+    [_items removeObjectAtIndex:anIndex];
+    [_itemViews removeObjectAtIndex:anIndex];
+
+    [self _invalidateItemsStartingAtIndex:anIndex];
+
+    [self setNeedsLayout];
+}
+
+- (void)removeAllItems
+{
+    var count = _items.length;
+
+    while (count--)
+        [self removeItemAtIndex:count];
+}
+
+- (void)expandItemAtIndex:(CPInteger)anIndex
+{
+    if (![_itemViews[anIndex] isCollapsed])
+        return;
+
+    [_expandedItemIndexes addIndex:anIndex];
+    [_itemViews[anIndex] setCollapsed:NO];
+
+    [self _invalidateItemsStartingAtIndex:anIndex];
+}
+
+- (void)collapseItemAtIndex:(CPInteger)anIndex
+{
+    if ([_itemViews[anIndex] isCollapsed])
+        return;
+
+    [_expandedItemIndexes removeIndex:anIndex];
+    [_itemViews[anIndex] setCollapsed:YES];
+
+    [self _invalidateItemsStartingAtIndex:anIndex];
+}
+
+- (void)toggleItemAtIndex:(CPInteger)anIndex
+{
+    var itemView = _itemViews[anIndex];
+
+    if ([itemView isCollapsed])
+        [self expandItemAtIndex:anIndex];
+    
+    else
+        [self collapseItemAtIndex:anIndex];
+}
+
+- (CPIndexSet)expandedItemIndexes
+{
+    return _expandedItemIndexes;
+}
+
+- (CPIndexSet)collapsedItemIndexes
+{
+    var indexSet = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(0, _items.length)];
+
+    [indexSet removeIndexes:_expandedIndexes];
+
+    return indexSet;
+}
+
+- (void)_invalidateItemsStartingAtIndex:(CPInteger)anIndex
+{
+    if (_dirtyItemIndex === CPNotFound)
+        _dirtyItemIndex = anIndex;
+
+    _dirtyItemIndex = MIN(_dirtyItemIndex, anIndex);
+
+    [self setNeedsLayout];
+}
+
+- (void)setFrameSize:(CGSize)aSize
+{
+    var width = _CGRectGetWidth([self frame]);
+
+    [super setFrameSize:aSize];
+
+    if (width !== _CGRectGetWidth([self frame]))
+        [self _invalidateItemsStartingAtIndex:0];
+}
+
+- (void)layoutSubviews
+{
+    if (_items.length <= 0)
+        return [self setFrameSize:_CGSizeMake(_CGRectGetWidth([self frame]), 0.0)];
+    
+    if (_dirtyItemIndex === CPNotFound)
+        return;
+
+    _dirtyItemIndex = MIN(_dirtyItemIndex, _items.length - 1);
+
+    var index = _dirtyItemIndex,
+        count = _itemViews.length,
+        width = _CGRectGetWidth([self bounds]),
+        y = index > 0 ? CGRectGetMaxY([_itemViews[index - 1] frame]) : 0.0;
+
+    // Do this now (instead of after looping), so that if we are made dirty again in the middle we don't blow this value away.
+    _dirtyItemIndex = CPNotFound;
+
+    for (; index < count; ++index)
+    {
+        var itemView = _itemViews[index];
+
+        [itemView setFrameY:y width:width];
+
+        y = CGRectGetMaxY([itemView frame]);
+    }
+
+    [self setFrameSize:_CGSizeMake(_CGRectGetWidth([self frame]), y)];
+}
+
+@end
+
+@implementation _CPAccordionItemView : CPView
+{
+    CPAccordionView _accordionView;
+
+    BOOL            _isCollapsed @accessors(getter=isCollapsed, setter=setCollapsed:);
+    CPInteger       _index @accessors(property=index);
+    CPView          _headerView;
+    CPView          _contentView;
+}
+
+- (id)initWithAccordionView:(CPAccordionView)anAccordionView
+{
+    self = [super initWithFrame:_CGRectMakeZero()];
+
+    if (self)
+    {
+        _accordionView = anAccordionView;
+        _isCollapsed = NO;
+
+        var bounds = [self bounds];
+
+        _headerView = [CPKeyedUnarchiver unarchiveObjectWithData:[CPKeyedArchiver archivedDataWithRootObject:[_accordionView itemHeaderPrototype]]];
+
+        if ([_headerView respondsToSelector:@selector(setTarget:)] && [_headerView respondsToSelector:@selector(setAction:)])
+        {
+            [_headerView setTarget:self];
+            [_headerView setAction:@selector(toggle:)];
+        }
+
+        [self addSubview:_headerView];
+    }
+
+    return self;
+}
+
+- (void)toggle:(id)aSender
+{
+    [_accordionView toggleItemAtIndex:[self index]];
+}
+
+- (void)setLabel:(CPString)aLabel
+{
+    if ([_headerView respondsToSelector:@selector(setTitle:)])
+        [_headerView setTitle:aLabel];
+
+    else if ([_headerView respondsToSelector:@selector(setLabel:)])
+        [_headerView setLabel:aLabel];
+
+    else if ([_headerView respondsToSelector:@selector(setStringValue:)])
+        [_headerView setStringValue:aLabel];
+}
+
+- (void)setContentView:(CPView)aView
+{
+    if (_contentView === aView)
+        return;
+
+    [_contentView removeObserver:self forKeyPath:@"frame"];
+
+    [_contentView removeFromSuperview];
+
+    _contentView = aView;
+
+    [_contentView addObserver:self forKeyPath:@"frame" options:0 context:NULL];
+
+    [self addSubview:_contentView];
+
+    [_accordionView _invalidateItemsStartingAtIndex:[self index]];
+}
+
+- (void)setFrameY:(float)aY width:(float)aWidth
+{
+    var headerHeight = _CGRectGetHeight([_headerView frame]);
+
+    // Size to fit or something?
+    [_headerView setFrameSize:_CGSizeMake(aWidth, headerHeight)];
+    [_contentView setFrameOrigin:_CGPointMake(0.0, headerHeight)];
+
+    if ([self isCollapsed])
+        [self setFrame:_CGRectMake(0.0, aY, aWidth, headerHeight)];
+
+    else
+    {
+        var contentHeight = _CGRectGetHeight([_contentView frame]);
+
+        [_contentView setFrameSize:_CGSizeMake(aWidth, contentHeight)];
+        [self setFrame:_CGRectMake(0.0, aY, aWidth, contentHeight + headerHeight)];
+    }    
+}
+
+- (void)resizeSubviewsWithOldSize:(CGSize)aSize
+{
+}
+
+- (void)observeValueForKeyPath:(CPString)aKeyPath
+                      ofObject:(id)anObject
+                        change:(CPDictionary)aChange
+                       context:(id)aContext
+{
+    if (aKeyPath === "frame" && !CGRectEqualToRect([aChange objectForKey:CPKeyValueChangeOldKey], [aChange objectForKey:CPKeyValueChangeNewKey]))
+        [_accordionView _invalidateItemsStartingAtIndex:[self index]];
+/*
+    else if (aKeyPath === "itemHeaderPrototype")
+    {
+        
+    }
+*/
+}
+
+@end

AppKit/CPAlert.j

@@ -0,0 +1,315 @@
+/*
+ * CPAlert.j
+ * AppKit
+ *
+ * Created by Jake MacMullin.
+ * Copyright 2008, Jake MacMullin.
+ *
+ * 11/10/2008 Ross Boucher
+ *     - Make it conform to style guidelines, general cleanup and ehancements
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPObject.j>
+@import <Foundation/CPString.j>
+
+@import <AppKit/CPApplication.j>
+@import <AppKit/CPButton.j>
+@import <AppKit/CPColor.j>
+@import <AppKit/CPFont.j>
+@import <AppKit/CPImage.j>
+@import <AppKit/CPImageView.j>
+@import <AppKit/CPPanel.j>
+@import <AppKit/CPTextField.j>
+
+/*
+    @global
+    @group CPAlertStyle
+*/
+CPWarningAlertStyle =        0;
+/*
+    @global
+    @group CPAlertStyle
+*/
+CPInformationalAlertStyle =  1;
+/*
+    @global
+    @group CPAlertStyle
+*/
+CPCriticalAlertStyle =       2;
+
+
+var CPAlertWarningImage,
+    CPAlertInformationImage,
+    CPAlertErrorImage;
+
+/*!
+    @ingroup appkit
+    
+    CPAlert is an alert panel that can be displayed modally to present the
+    user with a message and one or more options.
+
+    It can be used to display an information message \c CPInformationalAlertStyle,
+    a warning message \c CPWarningAlertStyle (the default), or a critical
+    alert \c CPCriticalAlertStyle. In each case the user can be presented with one
+    or more options by adding buttons using the \c -addButtonWithTitle: method.
+
+    The panel is displayed modally by calling \c -runModal and once the user has
+    dismissed the panel, a message will be sent to the panel's delegate (if set), informing
+    it which button was clicked (see delegate methods).
+
+    @delegate -(void)alertDidEnd:(CPAlert)theAlert returnCode:(int)returnCode;
+    Called when the user dismisses the alert by clicking one of the buttons.
+    @param theAlert the alert panel that the user dismissed
+    @param returnCode the index of the button that the user clicked (starting from 0, 
+           representing the first button added to the alert which appears on the
+           right, 1 representing the next button to the left and so on)
+*/
+@implementation CPAlert : CPObject
+{
+    CPPanel         _alertPanel;
+
+    CPTextField     _messageLabel;
+    CPImageView     _alertImageView;
+
+    CPAlertStyle    _alertStyle;
+    CPString        _windowTitle;
+    int             _windowStyle;
+    int             _buttonCount;
+    CPArray         _buttons;
+
+    id              _delegate;
+}
+
++ (void)initialize
+{
+    if (self != CPAlert)
+        return;
+
+    var bundle = [CPBundle bundleForClass:[self class]];   
+
+    CPAlertWarningImage     = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPAlert/dialog-warning.png"] 
+                                                                 size:CGSizeMake(32.0, 32.0)];
+                                                             
+    CPAlertInformationImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPAlert/dialog-information.png"] 
+                                                                 size:CGSizeMake(32.0, 32.0)];
+                                                                 
+    CPAlertErrorImage       = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPAlert/dialog-error.png"] 
+                                                                 size:CGSizeMake(32.0, 32.0)];
+}
+
+/*!
+    Initializes a \c CPAlert panel with the default alert style \c CPWarningAlertStyle.
+*/
+- (id)init
+{
+    if (self = [super init])
+    {
+        _buttonCount = 0;
+        _buttons = [CPArray array];
+        _alertStyle = CPWarningAlertStyle;
+
+        [self setWindowStyle:nil];
+    }
+    
+    return self;
+}
+
+/*!
+    Sets the window appearance.
+    @param styleMask - Either CPHUDBackgroundWindowMask or nil for standard.
+*/
+- (void)setWindowStyle:(int)styleMask
+{
+    _windowStyle = styleMask;
+    
+    _alertPanel = [[CPPanel alloc] initWithContentRect:CGRectMake(0.0, 0.0, 400.0, 110.0) styleMask:styleMask ? styleMask | CPTitledWindowMask : CPTitledWindowMask];
+    [_alertPanel setFloatingPanel:YES];
+    [_alertPanel center];
+
+    [_messageLabel setTextColor:(styleMask & CPHUDBackgroundWindowMask) ? [CPColor whiteColor] : [CPColor blackColor]];
+
+    var count = [_buttons count];
+    for(var i=0; i < count; i++)
+    {
+        var button = _buttons[i];
+        
+        [button setFrameSize:CGSizeMake([button frame].size.width, (styleMask == CPHUDBackgroundWindowMask) ? 20.0 : 24.0)];
+        [button setTheme:[CPTheme themeNamed: _windowStyle === CPHUDBackgroundWindowMask ? "Aristo-HUD" : "Aristo"]];
+
+        [[_alertPanel contentView] addSubview:button];
+    }
+    
+    if (!_messageLabel)
+    {
+        var bounds = [[_alertPanel contentView] bounds];
+
+        _messageLabel = [[CPTextField alloc] initWithFrame:CGRectMake(57.0, 10.0, CGRectGetWidth(bounds) - 73.0, 62.0)];
+        [_messageLabel setFont:[CPFont boldSystemFontOfSize:13.0]];
+        [_messageLabel setLineBreakMode:CPLineBreakByWordWrapping];
+        [_messageLabel setAlignment:CPJustifiedTextAlignment];
+        [_messageLabel setAutoresizingMask:CPViewWidthSizable|CPViewHeightSizable];
+
+        _alertImageView = [[CPImageView alloc] initWithFrame:CGRectMake(15.0, 12.0, 32.0, 32.0)];
+    }
+
+    [[_alertPanel contentView] addSubview:_messageLabel];
+    [[_alertPanel contentView] addSubview:_alertImageView];
+}
+
+/*!
+    Sets the window's title. If this is not defined, a default title based on your warning level will be used.
+    @param aTitle the title to use in place of the default. Set to nil to use default.
+*/
+- (void)setTitle:(CPString)aTitle
+{
+    _windowTitle = aTitle;
+}
+
+/*!
+    Gets the window's title.
+*/
+- (CPString)title
+{
+    return _windowTitle;
+}
+
+/*!
+    Gets the window's style.
+*/
+- (int)windowStyle
+{
+    return _windowStyle;
+}
+
+/*!
+    Sets the receiver’s delegate.
+    @param delegate - Delegate for the alert. nil removes the delegate.
+*/
+- (void)setDelegate:(id)delegate
+{
+    _delegate = delegate;
+}
+
+/*!
+    Gets the receiver's delegate.
+*/
+- (void)delegate
+{
+    return _delegate;
+}
+
+/*!
+    Sets the alert style of the receiver.
+    @param style - Alert style for the alert.
+*/
+- (void)setAlertStyle:(CPAlertStyle)style
+{
+    _alertStyle = style;
+}
+
+/*!
+    Gets the alert style.
+*/
+- (CPAlertStyle)alertStyle
+{
+    return _alertStyle;
+}
+
+/*!
+    Set’s the receiver’s message text, or title, to a given text.
+    @param messageText - Message text for the alert.
+*/
+- (void)setMessageText:(CPString)messageText
+{
+    [_messageLabel setStringValue:messageText];
+}
+
+/*! 
+    Return's the receiver's message text body.
+*/
+- (CPString)messageText
+{
+    return [_messageLabel stringValue];
+}
+
+/*!
+    Adds a button with a given title to the receiver.
+    Buttons will be added starting from the right hand side of the \c CPAlert panel.
+    The first button will have the index 0, the second button 1 and so on.
+
+    You really shouldn't need more than 3 buttons.
+*/
+- (void)addButtonWithTitle:(CPString)title
+{
+    var bounds = [[_alertPanel contentView] bounds],
+        button = [[CPButton alloc] initWithFrame:CGRectMake(CGRectGetWidth(bounds) - ((_buttonCount + 1) * 90.0), CGRectGetHeight(bounds) - 34.0, 80.0, (_windowStyle == CPHUDBackgroundWindowMask) ? 20.0 : 24.0)];
+    
+    [button setTitle:title];
+    [button setTarget:self];
+    [button setTag:_buttonCount];
+    [button setAction:@selector(_notifyDelegate:)];
+    
+    [button setTheme:[CPTheme themeNamed: _windowStyle === CPHUDBackgroundWindowMask ? "Aristo-HUD" : "Aristo"]];
+    [button setAutoresizingMask:CPViewMinXMargin|CPViewMinYMargin];
+
+    [[_alertPanel contentView] addSubview:button];
+    
+    if (_buttonCount == 0)
+        [_alertPanel setDefaultButton:button];
+
+    _buttonCount++;
+    [_buttons addObject:button];
+}
+
+/*!
+    Displays the \c CPAlert panel as a modal dialog. The user will not be
+    able to interact with any other controls until s/he has dismissed the alert
+    by clicking on one of the buttons.
+*/
+- (void)runModal
+{
+    var theTitle;
+    
+    switch (_alertStyle)
+    {
+        case CPWarningAlertStyle:       [_alertImageView setImage:CPAlertWarningImage];
+                                        theTitle = @"Warning";
+                                        break;
+        case CPInformationalAlertStyle: [_alertImageView setImage:CPAlertInformationImage];
+                                        theTitle = @"Information";
+                                        break;
+        case CPCriticalAlertStyle:      [_alertImageView setImage:CPAlertErrorImage];
+                                        theTitle = @"Error";
+                                        break;
+    }
+    
+    [_alertPanel setTitle:_windowTitle ? _windowTitle : theTitle];
+    
+    [CPApp runModalForWindow:_alertPanel];
+}
+
+/* @ignore */
+- (void)_notifyDelegate:(id)button
+{
+    [CPApp abortModal];
+    [_alertPanel close];
+
+    if (_delegate && [_delegate respondsToSelector:@selector(alertDidEnd:returnCode:)])
+        [_delegate alertDidEnd:self returnCode:[button tag]];
+}
+
+@end

AppKit/CPAnimation.j

@@ -0,0 +1,347 @@
+/*
+ * CPAnimation.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPObject.j>
+
+@import "CAMediaTimingFunction.j"
+
+
+/*
+    @global
+    @group CPAnimationCurve
+*/
+CPAnimationEaseInOut    = 0;
+/*
+    @global
+    @group CPAnimationCurve
+*/
+CPAnimationEaseIn       = 1;
+/*
+    @global
+    @group CPAnimationCurve
+*/
+CPAnimationEaseOut      = 2;
+/*
+    @global
+    @group CPAnimationCurve
+*/
+CPAnimationLinear       = 3;
+
+ACTUAL_FRAME_RATE = 0;
+
+/*! 
+    @ingroup appkit
+    @class CPAnimation
+
+    Manages an animation. Contains timing and progress information.
+
+    @par Delegate Methods
+    
+    @delegate -(BOOL)animationShouldStart:(CPAnimation)animation;
+    Called at the beginning of \c -startAnimation.
+    @param animation the animation that will start
+    @return \c YES allows the animation to start.
+    \c NO stops the animation.
+
+    @delegate -(void)animationDidEnd:(CPAnimation)animation;
+    Called when an animation has completed.
+    @param animation the animation that completed
+
+    @delegate -(void)animationDidStop:(CPAnimation)animation;
+    Called when the animation was stopped (before completing).
+    @param animation the animation that was stopped
+
+    @delegate - (float)animation:(CPAnimation)animation valueForProgress:(float)progress;
+    The value from this method will be returned when CPAnimation's
+    \c currentValue method is called.
+    @param animation the animation to obtain the curve value for
+    @param progress the current animation progress
+    @return the curve value
+*/
+@implementation CPAnimation : CPObject
+{
+    CPTimeInterval          _lastTime;
+    CPTimeInterval          _duration;
+    
+    CPAnimationCurve        _animationCurve;
+    CAMediaTimingFunction   _timingFunction;
+    
+    float                   _frameRate;
+    float                   _progress;
+    
+    id                      _delegate;
+    CPTimer                 _timer;
+}
+
+/*!
+    Initializes the animation with a duration and animation curve.
+    @param aDuration the length of the animation
+    @param anAnimationCurve defines the animation's pace
+    @throws CPInvalidArgumentException if an invalid animation curve is specified
+*/
+- (id)initWithDuration:(float)aDuration animationCurve:(CPAnimationCurve)anAnimationCurve
+{
+    self = [super init];
+    
+    if (self)
+    {
+        _progress = 0.0;
+        _duration = MAX(0.0, aDuration);
+        _frameRate = 60.0;
+
+        [self setAnimationCurve:anAnimationCurve];
+    }
+    
+    return self;
+}
+
+/*!
+    Sets the animation's pace.
+    @param anAnimationCurve the animation's pace
+    @throws CPInvalidArgumentException if an invalid animation curve is specified 
+*/
+- (void)setAnimationCurve:(CPAnimationCurve)anAnimationCurve
+{
+    switch (anAnimationCurve)
+    {
+        case CPAnimationEaseInOut:  timingFunctionName = kCAMediaTimingFunctionEaseInEaseOut;
+                                    break;
+                                    
+        case CPAnimationEaseIn:     timingFunctionName = kCAMediaTimingFunctionEaseIn;
+                                    break;
+                                    
+        case CPAnimationEaseOut:    timingFunctionName = kCAMediaTimingFunctionEaseOut;
+                                    break;
+                                    
+        case CPAnimationLinear:     timingFunctionName = kCAMediaTimingFunctionLinear;
+                                    break;
+
+        default:                    [CPException raise:CPInvalidArgumentException
+                                                reason:"Invalid value provided for animation curve"];
+                                    break;
+    }
+    
+    _animationCurve = anAnimationCurve;
+    _timingFunction = [CAMediaTimingFunction functionWithName:timingFunctionName];
+}
+
+/*!
+    Returns the animation's pace
+*/
+- (CPAnimationCurve)animationCurve
+{
+    return _animationCurve;
+}
+
+/*!
+    Sets the animation's length.
+    @param aDuration the new animation length
+    @throws CPInvalidArgumentException if \c aDuration is negative
+*/
+- (void)setDuration:(CPTimeInterval)aDuration
+{
+    if (aDuration < 0)
+        [CPException raise:CPInvalidArgumentException reason:"aDuration can't be negative"];
+        
+    _duration = aDuration;
+}
+
+/*!
+    Returns the length of the animation.
+*/
+- (CPTimeInterval)duration
+{
+    return _duration;
+}
+
+/*!
+    Sets the animation frame rate. This is not a guaranteed frame rate. 0 means to go as fast as possible.
+    @param frameRate the new desired frame rate
+    @throws CPInvalidArgumentException if \c frameRate is negative
+*/
+- (void)setFrameRate:(float)frameRate
+{
+    if (frameRate < 0)
+        [CPException raise:CPInvalidArgumentException reason:"frameRate can't be negative"];
+        
+    _frameRate = frameRate;
+}
+
+/*!
+    Returns the desired frame rate.
+*/
+- (float)frameRate
+{
+    return _frameRate;
+}
+
+/*!
+    Returns the animation's delegate
+*/
+- (id)delegate
+{
+    return _delegate;
+}
+
+/*!
+    Sets the animation's delegate.
+    @param aDelegate the new delegate
+*/
+- (void)setDelegate:(id)aDelegate
+{
+    _delegate = aDelegate;
+}
+
+/*!
+    Starts the animation. The method calls \c -animationShouldStart:
+    on the delegate (if it implements it) to see if the animation
+    should begin.
+*/
+- (void)startAnimation
+{
+    // If we're already animating, or our delegate stops us, animate.
+    if (_timer || _delegate && [_delegate respondsToSelector:@selector(animationShouldStart:)] && ![_delegate animationShouldStart:self])
+        return;
+    
+    if (_progress === 1.0)
+        _progress = 0.0;
+    
+    ACTUAL_FRAME_RATE = 0;
+    _lastTime = new Date();
+    
+    _timer = [CPTimer scheduledTimerWithTimeInterval:0.0 target:self selector:@selector(animationTimerDidFire:) userInfo:nil repeats:YES];
+}
+
+/*
+    @ignore
+*/
+- (void)animationTimerDidFire:(CPTimer)aTimer
+{
+    var currentTime = new Date(),
+        progress = MIN(1.0, [self currentProgress] + (currentTime - _lastTime) / (_duration * 1000.0));
+
+    _lastTime = currentTime;
+
+    ++ACTUAL_FRAME_RATE;
+    
+    [self setCurrentProgress:progress];
+    
+    if (progress === 1.0)
+    {
+        [_timer invalidate];
+        _timer = nil;
+        
+        if ([_delegate respondsToSelector:@selector(animationDidEnd:)])
+            [_delegate animationDidEnd:self];
+    }
+}
+
+/*!
+    Stops the animation before it has completed.
+*/
+- (void)stopAnimation
+{
+    if (!_timer)
+        return;
+    
+    [_timer invalidate];
+    _timer = nil;
+    
+    if ([_delegate respondsToSelector:@selector(animationDidStop:)])
+        [_delegate animationDidStop:self];
+}
+
+/*!
+    Returns \c YES if the animation
+    is running.
+*/
+- (BOOL)isAnimating
+{
+    return _timer;
+}
+
+/*!
+    Sets the animation's progress.
+    @param aProgress the animation's progress
+*/
+- (void)setCurrentProgress:(float)aProgress
+{
+    _progress = aProgress;
+}
+
+/*!
+    Returns the animation's progress
+*/
+- (float)currentProgress
+{
+    return _progress;
+}
+
+/*!
+    Returns the animation's timing progress.
+*/
+- (float)currentValue
+{
+    var t = [self currentProgress];
+    
+    if ([_delegate respondsToSelector:@selector(animation:valueForProgress:)])
+        return [_delegate animation:self valueForProgress:t];
+    
+    var c1 = [],
+        c2 = [];
+  
+    [_timingFunction getControlPointAtIndex:1 values:c1];
+    [_timingFunction getControlPointAtIndex:2 values:c2];
+ 
+    return CubicBezierAtTime(t,c1[0],c1[1],c2[0],c2[1],_duration);
+}
+
+@end
+
+// currently used function to determine time
+// 1:1 conversion to js from webkit source files
+// UnitBezier.h, WebCore_animation_AnimationBase.cpp
+var CubicBezierAtTime = function CubicBezierAtTime(t,p1x,p1y,p2x,p2y,duration)
+{
+    var ax=0,bx=0,cx=0,ay=0,by=0,cy=0;
+    // `ax t^3 + bx t^2 + cx t' expanded using Horner's rule.
+    function sampleCurveX(t) {return ((ax*t+bx)*t+cx)*t;};
+    function sampleCurveY(t) {return ((ay*t+by)*t+cy)*t;};
+    function sampleCurveDerivativeX(t) {return (3.0*ax*t+2.0*bx)*t+cx;};
+    // The epsilon value to pass given that the animation is going to run over |duration| seconds. The longer the animation, the more precision is needed in the timing function result to avoid ugly discontinuities.
+    function solveEpsilon(duration) {return 1.0/(200.0*duration);};
+    function solve(x,epsilon) {return sampleCurveY(solveCurveX(x,epsilon));};
+    // Given an x value, find a parametric value it came from.
+    function solveCurveX(x,epsilon) {var t0,t1,t2,x2,d2,i;
+        function fabs(n) {if(n>=0) {return n;}else {return 0-n;}}; 
+        // First try a few iterations of Newton's method -- normally very fast.
+        for(t2=x, i=0; i<8; i++) {x2=sampleCurveX(t2)-x; if(fabs(x2)<epsilon) {return t2;} d2=sampleCurveDerivativeX(t2); if(fabs(d2)<1e-6) {break;} t2=t2-x2/d2;}
+        // Fall back to the bisection method for reliability.
+        t0=0.0; t1=1.0; t2=x; if(t2<t0) {return t0;} if(t2>t1) {return t1;}
+        while(t0<t1) {x2=sampleCurveX(t2); if(fabs(x2-x)<epsilon) {return t2;} if(x>x2) {t0=t2;}else {t1=t2;} t2=(t1-t0)*.5+t0;}
+        return t2; // Failure.
+    };
+    // Calculate the polynomial coefficients, implicit first and last control points are (0,0) and (1,1).
+    cx=3.0*p1x; bx=3.0*(p2x-p1x)-cx; ax=1.0-cx-bx; cy=3.0*p1y; by=3.0*(p2y-p1y)-cy; ay=1.0-cy-by;
+    // Convert from input time to parametric value in curve, then from that to output time.
+    return solve(t, solveEpsilon(duration));
+};

AppKit/CPBezierPath.j

@@ -0,0 +1,291 @@
+/*
+ * CPBezierPath.j
+ *
+ * Created by Ross Boucher.
+ * Copyright 2009, 280 North, Inc.
+ *
+ * Adapted from Kevin Wojniak, portions Copyright 2009 Kevin Wojniak. 
+ *
+ * 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
+ * Copyright 2009 280 North, Inc.
+ 
+ */
+
+@import <AppKit/CPGraphicsContext.j>
+@import <Foundation/CPObject.j>
+
+
+// Class defaults
+
+var DefaultLineWidth = 1.0;
+
+
+/*! 
+    @ingroup appkit
+    @class CPBezierPath
+
+    A CPBezierPath allows you to create paths for drawing to the screen using a simpler API than CoreGraphics.
+    Paths can form any shape, including regular polgyons like squares and triangles; circles, arcs; or complex
+    line segments. 
+    
+    A path can be stroked and filled using the relevant method. The currently active fill and stroke color will
+    be used, which can be set by calling setFill: and setStroke: on any CPColor object (or set: for both).
+*/
+
+@implementation CPBezierPath : CPObject
+{
+    CGPath  _path;
+    float   _lineWidth;
+}
+
+/*!
+    Create a new CPBezierPath object.
+*/
++ (CPBezierPath)bezierPath
+{
+    return [[self alloc] init];
+}
+
+/*!
+    Create a new CPBezierPath object initialized with an oval path drawn within a rectangular path.
+*/
++ (CPBezierPath)bezierPathWithOvalInRect:(CGRect)rect
+{
+    var path = [self bezierPath];
+    
+    [path appendBezierPathWithOvalInRect:rect];
+    
+    return path;
+}
+
+/*!
+    Create a new CPBezierPath object initialized with a rectangular path.
+*/
++ (CPBezierPath)bezierPathWithRect:(CGRect)rect
+{
+    var path = [self bezierPath];
+    
+    [path appendBezierPathWithRect:rect];
+    
+    return path;
+}
+
+/*!
+    Get default line width.
+*/
++ (float)defaultLineWidth
+{
+    return DefaultLineWidth;
+}
+
+/*!
+    Set default line width.
+*/
++ (void)setDefaultLineWidth:(float)width
+{
+    DefaultLineWidth = width;
+}
+
+/*!
+    Fill rectangular path with current fill color.
+*/
++ (void)fillRect:(CGRect)aRect
+{
+    [[self bezierPathWithRect:aRect] fill];
+}
+
+/*!
+    Using the current stroke color and default drawing attributes, strokes a counterclockwise path beginning at the rectangle's origin.
+*/
++ (void)strokeRect:(CGRect)aRect
+{
+    [[self bezierPathWithRect:aRect] stroke];
+}
+
+/*!
+    Using the current stroke color and default drawing attributes, strokes a line between two points.
+*/
++ (void)strokeLineFromPoint:(CGPoint)point1 toPoint:(CGPoint)point2
+{
+    var path = [self bezierPath];
+
+    [path moveToPoint:point1];
+    [path lineToPoint:point2];
+
+    [path stroke];
+}
+
+/*!
+    Create a new CPBezierPath object using the default line width.
+*/
+- (id)init
+{
+    if (self = [super init])
+    {
+        _path = CGPathCreateMutable();
+        _lineWidth = [[self class] defaultLineWidth];
+    }
+
+    return self;
+}
+
+/*!
+    Moves the current point to another location.
+*/
+- (void)moveToPoint:(CGPoint)point
+{
+    CGPathMoveToPoint(_path, nil, point.x, point.y);
+}
+
+/*!
+    Append a straight line to the path.
+*/
+- (void)lineToPoint:(CGPoint)point
+{
+    CGPathAddLineToPoint(_path, nil, point.x, point.y);
+}
+
+/*!
+    Add a cubic Bezier curve to the path.
+*/
+- (void)curveToPoint:(CGPoint)endPoint controlPoint1:(CGPoint)controlPoint1 controlPoint2:(CGPoint)controlPoint2
+{
+    CGPathAddCurveToPoint(_path, nil, controlPoint1.x, controlPoint1.y, controlPoint2.x, controlPoint2.y, endPoint.x, endPoint.y);
+}
+
+/*!
+    Create a line segment between the first and last points in the subpath, closing it.
+*/
+- (void)closePath
+{
+    CGPathCloseSubpath(_path);
+}
+
+/*!
+    Draw a line along the path with the current stroke color and default drawing attributes.
+*/
+- (void)stroke
+{
+    var ctx = [[CPGraphicsContext currentContext] graphicsPort];
+
+    CGContextBeginPath(ctx);
+    CGContextAddPath(ctx, _path);
+    CGContextSetLineWidth(ctx, [self lineWidth]);
+    CGContextClosePath(ctx);
+    CGContextStrokePath(ctx);
+}
+
+/*!
+    Fill the path with the current fill color.
+*/
+- (void)fill
+{
+    var ctx = [[CPGraphicsContext currentContext] graphicsPort];
+
+    CGContextBeginPath(ctx);
+    CGContextAddPath(ctx, _path);
+    CGContextSetLineWidth(ctx, [self lineWidth]);
+    CGContextClosePath(ctx);
+    CGContextFillPath(ctx);
+}
+
+/*!
+    Get the line width.
+*/
+- (float)lineWidth
+{
+    return _lineWidth;
+}
+
+/*!
+    Set the line width.
+*/
+- (void)setLineWidth:(float)lineWidth
+{
+    _lineWidth = lineWidth;
+}
+
+/*!
+    Get the total number of elements.
+*/
+- (unsigned)elementCount
+{
+    return _path.count;
+}
+
+/*!
+    Check if receiver is empty, returns appropriate Boolean value.
+*/
+- (BOOL)isEmpty
+{
+    return CGPathIsEmpty(_path);
+}
+
+/*!
+    Get the current point.
+*/
+- (CGPoint)currentPoint
+{
+    return CGPathGetCurrentPoint(_path);
+}
+
+/*!
+    Append a series of line segments.
+*/
+- (void)appendBezierPathWithPoints:(CPArray)points count:(unsigned)count
+{
+    CGPathAddLines(_path, nil, points, count);
+}
+
+/*!
+    Append a rectangular path.
+*/
+- (void)appendBezierPathWithRect:(CGRect)rect
+{
+    CGPathAddRect(_path, nil, rect);
+}
+
+/*!
+    Append an oval path; oval is drawn within the rectangular path.
+*/
+- (void)appendBezierPathWithOvalInRect:(CGRect)rect
+{
+    CGPathAddPath(_path, nil, CGPathWithEllipseInRect(rect));
+}
+
+/*!
+    Append a rounded rectangular path.
+*/
+- (void)appendBezierPathWithRoundedRect:(CGRect)rect xRadius:(float)xRadius yRadius:(float)yRadius
+{
+    CGPathAddPath(_path, nil, CGPathWithRoundedRectangleInRect(rect, xRadius, yRadius, YES, YES, YES, YES));
+}
+
+/*!
+    Append the contents of a CPBezierPath object.
+*/
+- (void)appendBezierPath:(NSBezierPath *)other
+{
+    CGPathAddPath(_path, nil, other._path);
+}
+/*!
+    Remove all path elements; clears path.
+*/
+- (void)removeAllPoints
+{
+    _path = CGPathCreateMutable();
+}
+
+@end

AppKit/CPBox.j

@@ -0,0 +1,244 @@
+/*
+ * CPBox.j
+ * AppKit
+ *
+ * Created by Ross Boucher.
+ * Copyright 2009, 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 "CPView.j"
+
+// CPBorderType
+CPNoBorder      = 0;
+CPLineBorder    = 1;    
+CPBezelBorder   = 2;
+CPGrooveBorder  = 3;
+
+@implementation CPBox : CPView
+{
+    CPBorderType    _borderType;
+    
+    CPColor         _borderColor;
+    CPColor         _fillColor;
+    
+    float           _cornerRadius;
+    float           _borderWidth;
+    
+    CPSize          _contentMargin;
+    CPView          _contentView;
+}
+
++ (id)boxEnclosingView:(CPView)aView
+{
+    var box = [[self alloc] initWithFrame:CGRectMakeZero()],
+        enclosingView = [aView superview];
+
+    [box setFrameFromContentFrame:[aView frame]];
+
+    [enclosingView replaceSubview:aView with:box];
+    
+    [box setContentView:aView];
+    
+    return box;
+}
+
+- (id)initWithFrame:(CPRect)frameRect
+{
+    self = [super initWithFrame:frameRect];
+    
+    if (self)
+    {
+        _fillColor = [CPColor clearColor];
+        _borderColor = [CPColor blackColor];
+
+        _borderWidth = 1.0;
+        _contentMargin = CGSizeMake(0.0, 0.0);
+
+        _contentView = [[CPView alloc] initWithFrame:[self bounds]];
+
+        [self addSubview:_contentView];
+    }
+
+    return self;
+}
+
+// Configuring Boxes
+
+- (CPRect)borderRect
+{
+    return [self bounds];
+}
+
+- (CPBorderType)borderType
+{
+    return _borderType;
+}
+
+- (void)setBorderType:(CPBorderType)value
+{
+    _borderType = value;
+    [self setNeedsDisplay:YES];
+}
+
+- (CPColor)borderColor
+{
+    return _borderColor;
+}
+
+- (void)setBorderColor:(CPColor)color
+{
+    if ([color isEqual:_borderColor])
+        return;
+
+    _borderColor = color;
+    [self setNeedsDisplay:YES];
+}
+
+- (float)borderWidth
+{
+    return _borderWidth;
+}
+
+- (void)setBorderWidth:(float)width
+{
+    if (width === _borderWidth)
+        return;
+
+    _borderWidth = width;
+    [self setNeedsDisplay:YES];
+}
+
+- (float)cornerRadius
+{
+    return _cornerRadius;
+}
+
+- (void)setCornerRadius:(float)radius
+{
+    if (radius === _cornerRadius)
+        return;
+
+    _cornerRadius = radius;
+    [self setNeedsDisplay:YES];
+}
+
+- (CPColor)fillColor
+{
+    return _fillColor;
+}
+
+- (void)setFillColor:(CPColor)color
+{
+    if ([color isEqual:_fillColor])
+        return;
+
+    _fillColor = color;
+    [self setNeedsDisplay:YES];
+}
+
+- (CPView)contentView
+{
+    return _contentView;
+}
+
+- (void)setContentView:(CPView)aView
+{
+    if (aView === _contentView)
+        return;
+
+    [aView setFrame:CGRectInset([self bounds], _contentMargin.width + _borderWidth, _contentMargin.height + _borderWidth)];
+    [self replaceSubview:_contentView with:aView];
+    
+    _contentView = aView;    
+}
+
+- (CPSize)contentViewMargins
+{
+    return _contentMargin;
+}
+
+- (void)setContentViewMargins:(CPSize)size
+{
+     if(size.width < 0 || size.height < 0)
+         [CPException raise:CPGenericException reason:@"Margins must be positive"];
+         
+    _contentMargin = CGSizeMakeCopy(size);
+    [self setNeedsDisplay:YES];
+}
+
+- (void)setFrameFromContentFrame:(CPRect)aRect
+{
+    [self setFrame:CGRectInset(aRect, -(_contentMargin.width + _borderWidth), -(_contentMargin.height + _borderWidth))];
+    [self setNeedsDisplay:YES];
+}
+
+- (void)sizeToFit
+{
+    var contentFrame = [_contentView frame];
+    
+    [self setFrameSize:CGSizeMake(contentFrame.size.width + _contentMargin.width * 2, 
+                                  contentFrame.size.height + _contentMargin.height * 2)];
+    
+    [_contentView setFrameOrigin:CGPointMake(_contentMargin.width, _contentMargin.height)];
+}
+
+- (void)drawRect:(CPRect)rect
+{
+    var bounds = [self bounds],
+        aContext = [[CPGraphicsContext currentContext] graphicsPort],
+        border2 = _borderWidth/2,
+
+        strokeRect = CGRectMake(bounds.origin.x + border2, 
+                                bounds.origin.y + border2, 
+                                bounds.size.width - _borderWidth, 
+                                bounds.size.height - _borderWidth),
+                                
+        fillRect = CGRectMake(bounds.origin.x + border2, 
+                              bounds.origin.y + border2, 
+                              bounds.size.width - _borderWidth, 
+                              bounds.size.height - _borderWidth);
+
+    CGContextSetFillColor(aContext, [self fillColor]);
+    CGContextSetStrokeColor(aContext, [self borderColor]);
+    CGContextSetLineWidth(aContext, _borderWidth);
+
+    switch(_borderType)
+    {
+        case CPLineBorder:  CGContextFillRoundedRectangleInRect(aContext, fillRect, _cornerRadius, YES, YES, YES, YES);
+                            CGContextStrokeRoundedRectangleInRect(aContext, strokeRect, _cornerRadius, YES, YES, YES, YES);
+                            break;
+
+        case CPBezelBorder: CGContextFillRoundedRectangleInRect(aContext, fillRect, _cornerRadius, YES, YES, YES, YES);
+                            CGContextSetStrokeColor(aContext, [CPColor colorWithWhite:190.0/255.0 alpha:1.0]);
+                            CGContextBeginPath(aContext);
+                            CGContextMoveToPoint(aContext, strokeRect.origin.x, strokeRect.origin.y);
+                            CGContextAddLineToPoint(aContext, CGRectGetMinX(strokeRect), CGRectGetMaxY(strokeRect)),
+                            CGContextAddLineToPoint(aContext, CGRectGetMaxX(strokeRect), CGRectGetMaxY(strokeRect)),
+                            CGContextAddLineToPoint(aContext, CGRectGetMaxX(strokeRect), CGRectGetMinY(strokeRect)),
+                            CGContextStrokePath(aContext);
+                            CGContextSetStrokeColor(aContext, [CPColor colorWithWhite:142.0/255.0 alpha:1.0]);
+                            CGContextBeginPath(aContext);
+                            CGContextMoveToPoint(aContext, bounds.origin.x, strokeRect.origin.y);
+                            CGContextAddLineToPoint(aContext, CGRectGetMaxX(bounds), CGRectGetMinY(strokeRect));
+                            CGContextStrokePath(aContext);
+                            break;
+
+        default:            break;
+    }
+}
+
+@end

AppKit/CPButton.j

@@ -0,0 +1,647 @@
+/*
+ * CPButton.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 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 "_CPImageAndTextView.j"
+@import "CGGeometry.j"
+
+@import "CPControl.j"
+
+#include "CoreGraphics/CGGeometry.h"
+
+
+CPScaleProportionally   = 0;
+CPScaleToFit            = 1;
+CPScaleNone             = 2;
+
+
+/* @group CPCellImagePosition */
+
+CPNoImage       = 0;
+CPImageOnly     = 1;
+CPImageLeft     = 2;
+CPImageRight    = 3;
+CPImageBelow    = 4;
+CPImageAbove    = 5;
+CPImageOverlaps = 6;
+
+
+/*  @group CPButtonState */
+
+CPOnState                       = 1;
+CPOffState                      = 0;
+CPMixedState                    = -1;
+
+/* @group CPBezelStyle */
+
+CPRoundedBezelStyle             = 1;
+CPRegularSquareBezelStyle       = 2;
+CPThickSquareBezelStyle         = 3;
+CPThickerSquareBezelStyle       = 4;
+CPDisclosureBezelStyle          = 5;
+CPShadowlessSquareBezelStyle    = 6;
+CPCircularBezelStyle            = 7;
+CPTexturedSquareBezelStyle      = 8;
+CPHelpButtonBezelStyle          = 9;
+CPSmallSquareBezelStyle         = 10;
+CPTexturedRoundedBezelStyle     = 11;
+CPRoundRectBezelStyle           = 12;
+CPRecessedBezelStyle            = 13;
+CPRoundedDisclosureBezelStyle   = 14;
+CPHUDBezelStyle                 = -1;
+
+
+/* @group CPButtonType */
+CPMomentaryLightButton  = 0;
+CPPushOnPushOffButton   = 1;
+CPToggleButton          = 2;
+CPSwitchButton          = 3; // Deprecated, use CPCheckBox instead.
+CPRadioButton           = 4; // Deprecated, use CPRadio instead.
+CPMomentaryChangeButton = 5;
+CPOnOffButton           = 6;
+CPMomentaryPushInButton = 7;
+CPMomentaryPushButton   = 0;
+CPMomentaryLight        = 7;
+
+CPNoButtonMask              = 0;
+CPContentsButtonMask        = 1;
+CPPushInButtonMask          = 2;
+CPGrayButtonMask            = 4;
+CPBackgroundButtonMask      = 8;
+
+CPNoCellMask                = CPNoButtonMask;
+CPContentsCellMask          = CPContentsButtonMask;
+CPPushInCellMask            = CPPushInButtonMask;
+CPChangeGrayCellMask        = CPGrayButtonMask;
+CPChangeBackgroundCellMask  = CPBackgroundButtonMask;
+
+CPButtonStateMixed  = CPThemeState("mixed");
+
+/*! 
+    @ingroup appkit
+    @class CPButton
+
+    CPButton is a subclass of CPControl that
+    intercepts mouse-down events and sends an action message to a
+    target object when it's clicked or pressed.
+*/
+@implementation CPButton : CPControl
+{
+    BOOL                _allowsMixedState;
+    
+    CPString            _title;
+    CPString            _alternateTitle;
+    
+    CPImage             _image;
+    CPImage             _alternateImage;
+
+    CPInteger           _showsStateBy;
+    CPInteger           _highlightsBy;
+    BOOL                _imageDimsWhenDisabled;
+
+    // NS-style Display Properties
+    CPBezelStyle        _bezelStyle;
+    CPControlSize       _controlSize;
+}
+
++ (id)buttonWithTitle:(CPString)aTitle
+{
+    return [self buttonWithTitle:aTitle theme:[CPTheme defaultTheme]];
+}
+
++ (id)buttonWithTitle:(CPString)aTitle theme:(CPTheme)aTheme
+{
+    var button = [[self alloc] init];
+
+    [button setTheme:aTheme];
+    [button setTitle:aTitle];
+    [button sizeToFit];
+
+    return button;
+}
+
++ (CPString)themeClass
+{
+    return @"button";
+}
+
++ (id)themeAttributes
+{
+    return [CPDictionary dictionaryWithObjects:[_CGInsetMakeZero(), _CGInsetMakeZero(), nil]
+                                       forKeys:[@"bezel-inset", @"content-inset", @"bezel-color"]];
+}
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    self = [super initWithFrame:aFrame];
+    
+    if (self)
+    {
+        // Should we instead override the defaults?
+        [self setValue:CPCenterTextAlignment forThemeAttribute:@"alignment"];
+        [self setValue:CPCenterVerticalTextAlignment forThemeAttribute:@"vertical-alignment"];
+        [self setValue:CPImageLeft forThemeAttribute:@"image-position"];
+        [self setValue:CPScaleNone forThemeAttribute:@"image-scaling"];
+        
+        _controlSize = CPRegularControlSize;
+        
+//        [self setBezelStyle:CPRoundRectBezelStyle];
+        [self setBordered:YES];
+    }
+    
+    return self;
+}
+
+// Setting the state
+/*!
+    Returns \c YES if the button has a 'mixed' state in addition to on and off.
+*/
+- (BOOL)allowsMixedState
+{
+    return _allowsMixedState;
+}
+
+/*!
+    Sets whether the button can have a 'mixed' state.
+    @param aFlag specifies whether a 'mixed' state is allowed or not
+*/
+- (void)setAllowsMixedState:(BOOL)aFlag
+{
+    aFlag = !!aFlag;
+
+    if (_allowsMixedState === aFlag)
+        return;
+
+    _allowsMixedState = aFlag;
+
+    if (!_allowsMixedState && [self state] === CPMixedState)
+        [self setState:CPOnState];
+}
+
+- (void)setObjectValue:(id)anObjectValue
+{
+    if (!anObjectValue || anObjectValue === @"" || ([anObjectValue intValue] === 0))
+        anObjectValue = CPOffState;
+
+    else if (![anObjectValue isKindOfClass:[CPNumber class]])
+        anObjectValue = CPOnState;
+
+    else if (anObjectValue > CPOnState)
+        anObjectValue = CPOnState
+
+    else if (anObjectValue < CPOffState)
+        if ([self allowsMixedState])
+            anObjectValue = CPMixedState;
+
+        else
+            anObjectValue = CPOnState;
+
+    [super setObjectValue:anObjectValue];
+
+    switch ([self objectValue])
+    {
+        case CPMixedState:  [self unsetThemeState:CPThemeStateSelected];
+                            [self setThemeState:CPButtonStateMixed];
+                            break;
+
+        case CPOnState:     [self unsetThemeState:CPButtonStateMixed];
+                            [self setThemeState:CPThemeStateSelected];
+                            break;
+
+        case CPOffState:    [self unsetThemeState:CPThemeStateSelected | CPButtonStateMixed];
+    }
+}
+
+- (CPInteger)nextState
+{
+   if ([self allowsMixedState])
+   {
+      var value = [self state];
+
+      return value - ((value === -1) ? -2 : 1);
+   }
+
+    return 1 - [self state];
+}
+
+- (void)setNextState
+{
+    [self setState:[self nextState]];
+}
+
+/*!
+    Sets the button's state to \c aState.
+    @param aState Possible states are any of the CPButton globals:
+    \c CPOffState, \c CPOnState, \c CPMixedState
+*/
+- (void)setState:(CPInteger)aState
+{
+    [self setIntValue:aState];
+}
+
+/*!
+    Returns the button's current state
+*/
+- (CPInteger)state
+{
+    return [self intValue];
+}
+
+- (void)setTitle:(CPString)aTitle
+{
+    if (_title === aTitle)
+        return;
+    
+    _title = aTitle;
+    
+    [self setNeedsLayout];
+    [self setNeedsDisplay:YES];
+}
+
+- (CPString)title
+{
+    return _title;
+}
+
+- (void)setAlternateTitle:(CPString)aTitle
+{
+    if (_alternateTitle === aTitle)
+        return;
+    
+    _alternateTitle = aTitle;
+
+    [self setNeedsLayout];
+    [self setNeedsDisplay:YES];
+}
+
+- (CPString)alternateTitle
+{
+    return _alternateTitle;
+}
+
+- (void)setImage:(CPImage)anImage
+{
+    if (_image === anImage)
+        return;
+    
+    _image = anImage;
+    
+    [self setNeedsLayout];
+    [self setNeedsDisplay:YES];
+}
+
+- (CPImage)image
+{
+    return _image;
+}
+
+/*!
+    Sets the button's image which is used in its alternate state.
+    @param anImage the image to be used while the button is in an alternate state
+*/
+- (void)setAlternateImage:(CPImage)anImage
+{
+    if (_alternateImage === anImage)
+        return;
+    
+    _alternateImage = anImage;
+    
+    [self setNeedsLayout];
+    [self setNeedsDisplay:YES];
+}
+
+/*!
+    Returns the image used when the button is in an alternate state.
+*/
+- (CPImage)alternateImage
+{
+    return _alternateImage;
+}
+
+- (void)setShowsStateBy:(CPInteger)aMask
+{
+    if (_showsStateBy === aMask)
+        return;
+
+    _showsStateBy = aMask;
+
+    [self setNeedsDisplay:YES];
+    [self setNeedsLayout];
+}
+
+- (CPInteger)showsStateBy
+{
+    return _showsStateBy;
+}
+
+- (void)setHighlightsBy:(CPInteger)aMask
+{
+    if (_highlightsBy === aMask)
+        return;
+
+    _highlightsBy = aMask;
+
+    if ([self hasThemeState:CPThemeStateHighlighted])
+    {
+        [self setNeedsDisplay:YES];
+        [self setNeedsLayout];
+    }
+}
+
+- (void)setButtonType:(CPButtonType)aButtonType
+{
+    switch (aButtonType)
+    {
+        case CPMomentaryLightButton:    [self setHighlightsBy:CPChangeBackgroundCellMask];
+                                        [self setShowsStateBy:CPNoCellMask];
+                                        break;
+
+        case CPMomentaryPushInButton:   [self setHighlightsBy:CPPushInCellMask | CPChangeGrayCellMask];
+                                        [self setShowsStateBy:CPNoCellMask];
+                                        break;
+
+        case CPMomentaryChangeButton:   [self setHighlightsBy:CPContentsCellMask];
+                                        [self setShowsStateBy:CPNoCellMask];
+                                        break;
+
+        case CPPushOnPushOffButton:     [self setHighlightsBy:CPPushInCellMask | CPChangeGrayCellMask];
+                                        [self setShowsStateBy:CPChangeBackgroundCellMask];
+                                        break;
+
+        case CPOnOffButton:             [self setHighlightsBy:CPChangeBackgroundCellMask];
+                                        [self setShowsStateBy:CPChangeBackgroundCellMask];
+                                        break;
+
+        case CPToggleButton:            [self setHighlightsBy:CPPushInCellMask | CPContentsCellMask];
+                                        [self setShowsStateBy:CPContentsCellMask];
+                                        break;
+
+        case CPSwitchButton:            [CPException raise:CPInvalidArgumentException 
+                                                    reason:"The CPSwitchButton type is not supported in Cappuccino, use the CPCheckBox class instead."];
+
+        case CPRadioButton:             [CPException raise:CPInvalidArgumentException 
+                                                    reason:"The CPRadioButton type is not supported in Cappuccino, use the CPRadio class instead."];
+
+        default:                        [CPException raise:CPInvalidArgumentException 
+                                                    reason:"Unknown button type."];
+    }
+
+    [self setImageDimsWhenDisabled:YES];
+}
+
+- (void)setImageDimsWhenDisabled:(BOOL)imageShouldDimWhenDisabled
+{
+    imageShouldDimWhenDisabled = !!imageShouldDimWhenDisabled;
+
+    if (_imageDimsWhenDisabled === imageShouldDimWhenDisabled)
+        return;
+
+    _imageDimsWhenDisabled = imageShouldDimWhenDisabled;
+
+    if (_imageDimsWhenDisabled)
+    {
+        [self setNeedsDisplay:YES];
+        [self setNeedsLayout];
+    }
+}
+
+- (BOOL)imageDimsWhenDisabled
+{
+    return _imageDimsWhenDisabled;
+}
+
+- (BOOL)startTrackingAt:(CGPoint)aPoint
+{
+    [self highlight:YES];
+    
+    return [super startTrackingAt:aPoint];
+}
+
+- (void)stopTracking:(CGPoint)lastPoint at:(CGPoint)aPoint mouseIsUp:(BOOL)mouseIsUp
+{
+    [self highlight:NO];
+
+    [super stopTracking:lastPoint at:aPoint mouseIsUp:mouseIsUp];
+
+    if (mouseIsUp && CGRectContainsPoint([self bounds], aPoint))
+        [self setNextState];
+}
+
+- (CGRect)contentRectForBounds:(CGRect)bounds
+{
+    var contentInset = [self currentValueForThemeAttribute:@"content-inset"];
+
+    if (_CGInsetIsEmpty(contentInset))
+        return bounds;
+
+    bounds.origin.x += contentInset.left;
+    bounds.origin.y += contentInset.top;
+    bounds.size.width -= contentInset.left + contentInset.right;
+    bounds.size.height -= contentInset.top + contentInset.bottom;
+    
+    return bounds;
+}
+
+- (CGRect)bezelRectForBounds:(CFRect)bounds
+{
+    if (![self isBordered])
+        return _CGRectMakeZero();
+
+    var bezelInset = [self currentValueForThemeAttribute:@"bezel-inset"];
+
+    if (_CGInsetIsEmpty(bezelInset))
+        return bounds;
+
+    bounds.origin.x += bezelInset.left;
+    bounds.origin.y += bezelInset.top;
+    bounds.size.width -= bezelInset.left + bezelInset.right;
+    bounds.size.height -= bezelInset.top + bezelInset.bottom;
+
+    return bounds;
+}
+
+/*!
+    Adjust the size of the button to fit the title and surrounding button image.
+*/
+- (void)sizeToFit
+{
+    var size = [([self title] || " ") sizeWithFont:[self currentValueForThemeAttribute:@"font"]],
+        contentInset = [self currentValueForThemeAttribute:@"content-inset"],
+        minSize = [self currentValueForThemeAttribute:@"min-size"],
+        maxSize = [self currentValueForThemeAttribute:@"max-size"];
+
+    size.width = MAX(size.width + contentInset.left + contentInset.right, minSize.width);
+    size.height = MAX(size.height + contentInset.top + contentInset.bottom, minSize.height);
+
+    if (maxSize.width >= 0.0)
+        size.width = MIN(size.width, maxSize.width);
+
+    if (maxSize.height >= 0.0)
+        size.height = MIN(size.height, maxSize.height);
+
+    [self setFrameSize:size];
+}
+
+- (CGRect)rectForEphemeralSubviewNamed:(CPString)aName
+{
+    if (aName === "bezel-view")
+        return [self bezelRectForBounds:[self bounds]];
+    
+    else if (aName === "content-view")
+        return [self contentRectForBounds:[self bounds]];
+    
+    return [super rectForEphemeralSubviewNamed:aName];
+}
+
+- (CPView)createEphemeralSubviewNamed:(CPString)aName
+{
+    if (aName === "bezel-view")
+    {
+        var view = [[CPView alloc] initWithFrame:_CGRectMakeZero()];
+
+        [view setHitTests:NO];
+        
+        return view;
+    }
+    else
+        return [[_CPImageAndTextView alloc] initWithFrame:_CGRectMakeZero()];
+
+    return [super createEphemeralSubviewNamed:aName];
+}
+
+- (void)layoutSubviews
+{
+    var bezelView = [self layoutEphemeralSubviewNamed:@"bezel-view"
+                                           positioned:CPWindowBelow
+                      relativeToEphemeralSubviewNamed:@"content-view"];
+      
+    if (bezelView)
+        [bezelView setBackgroundColor:[self currentValueForThemeAttribute:@"bezel-color"]];
+
+    var contentView = [self layoutEphemeralSubviewNamed:@"content-view"
+                                             positioned:CPWindowAbove
+                        relativeToEphemeralSubviewNamed:@"bezel-view"];
+
+    if (contentView)
+    {
+        [contentView setText:([self hasThemeState:CPThemeStateHighlighted] && _alternateTitle) ? _alternateTitle : _title];
+        [contentView setImage:([self hasThemeState:CPThemeStateHighlighted] && _alternateImage) ? _alternateImage : _image];
+
+        [contentView setFont:[self currentValueForThemeAttribute:@"font"]];
+        [contentView setTextColor:[self currentValueForThemeAttribute:@"text-color"]];
+        [contentView setAlignment:[self currentValueForThemeAttribute:@"alignment"]];
+        [contentView setVerticalAlignment:[self currentValueForThemeAttribute:@"vertical-alignment"]];
+        [contentView setLineBreakMode:[self currentValueForThemeAttribute:@"line-break-mode"]];
+        [contentView setTextShadowColor:[self currentValueForThemeAttribute:@"text-shadow-color"]];
+        [contentView setTextShadowOffset:[self currentValueForThemeAttribute:@"text-shadow-offset"]];
+        [contentView setImagePosition:[self currentValueForThemeAttribute:@"image-position"]];
+        [contentView setImageScaling:[self currentValueForThemeAttribute:@"image-scaling"]];
+    }
+}
+
+- (void)setDefaultButton:(BOOL)shouldBeDefaultButton
+{
+    if (shouldBeDefaultButton)
+        [self setThemeState:CPThemeStateDefault];
+    else
+        [self unsetThemeState:CPThemeStateDefault];
+}
+
+- (void)setBordered:(BOOL)shouldBeBordered
+{
+    if (shouldBeBordered)
+        [self setThemeState:CPThemeStateBordered];
+    else
+        [self unsetThemeState:CPThemeStateBordered];
+}
+
+- (BOOL)isBordered
+{
+    return [self hasThemeState:CPThemeStateBordered];
+}
+
+@end
+
+@implementation CPButton (NS)
+
+- (void)setBezelStyle:(unsigned)aBezelStyle
+{
+}
+
+- (unsigned)bezelStyle
+{
+}
+
+@end
+
+
+var CPButtonImageKey                = @"CPButtonImageKey",
+    CPButtonAlternateImageKey       = @"CPButtonAlternateImageKey",
+    CPButtonTitleKey                = @"CPButtonTitleKey",
+    CPButtonAlternateTitleKey       = @"CPButtonAlternateTitleKey",
+    CPButtonIsBorderedKey           = @"CPButtonIsBorderedKey";
+
+@implementation CPButton (CPCoding)
+
+/*!
+    Initializes the button by unarchiving data from \c aCoder.
+    @param aCoder the coder containing the archived CPButton.
+*/
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super initWithCoder:aCoder];
+    
+    if (self)
+    {
+        _controlSize = CPRegularControlSize;
+
+        [self setImage:[aCoder decodeObjectForKey:CPButtonImageKey]];
+        [self setAlternateImage:[aCoder decodeObjectForKey:CPButtonAlternateImageKey]];
+        
+        [self setTitle:[aCoder decodeObjectForKey:CPButtonTitleKey]];
+        [self setAlternateTitle:[aCoder decodeObjectForKey:CPButtonAlternateTitleKey]];
+        
+        [self setNeedsLayout];
+        [self setNeedsDisplay:YES];
+    }
+    
+    return self;
+}
+
+/*!
+    Archives this button into the provided coder.
+    @param aCoder the coder to which the button's instance data will be written.
+*/
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [super encodeWithCoder:aCoder];
+
+    [aCoder encodeObject:_image forKey:CPButtonImageKey];
+    [aCoder encodeObject:_alternateImage forKey:CPButtonAlternateImageKey];
+
+    [aCoder encodeObject:_title forKey:CPButtonTitleKey];
+    [aCoder encodeObject:_alternateTitle forKey:CPButtonAlternateTitleKey];
+}
+
+@end
+
+@import "CPCheckBox.j"
+@import "CPRadio.j"

AppKit/CPButtonBar.j

@@ -0,0 +1,61 @@
+
+@import <AppKit/CPView.j>
+
+#include "CoreGraphics/CGGeometry.h"
+
+
+@implementation CPButtonBar : CPControl
+{
+}
+
++ (CPString)themeClass
+{
+    return @"button-bar";
+}
+
++ (id)themeAttributes
+{
+    return [CPDictionary dictionaryWithObjects:[nil]
+                                       forKeys:[@"bezel-color"]];
+}
+
+- (CGRect)rectForEphemeralSubviewNamed:(CPString)aName
+{
+    if (aName === "bezel-view")
+        return [self bounds];
+    
+    return [super rectForEphemeralSubviewNamed:aName];
+}
+
+- (CPView)createEphemeralSubviewNamed:(CPString)aName
+{
+    if (aName === "bezel-view")
+    {
+        var view = [[CPView alloc] initWithFrame:_CGRectMakeZero()];
+
+        [view setHitTests:NO];
+        
+        return view;
+    }
+    
+    return [super createEphemeralSubviewNamed:aName];
+}
+
+- (void)layoutSubviews
+{
+    var bezelView = [self layoutEphemeralSubviewNamed:@"bezel-view"
+                                           positioned:CPWindowBelow
+                      relativeToEphemeralSubviewNamed:@""];
+      
+    if (bezelView)
+        [bezelView setBackgroundColor:[self currentValueForThemeAttribute:@"bezel-color"]];
+}
+
+- (void)addSubview:(CPView)aSubview
+{
+    [super addSubview:aSubview];
+
+    [aSubview setAutoresizingMask:CPViewMinXMargin];
+}
+
+@end

AppKit/CPCheckBox.j

@@ -0,0 +1,64 @@
+/*
+ * CPCheckBox.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2009, 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 "CPButton.j"
+
+
+@implementation CPCheckBox : CPButton
+{
+}
+
++ (id)checkBoxWithTitle:(CPString)aTitle theme:(CPTheme)aTheme
+{
+    return [self buttonWithTitle:aTitle theme:aTheme];
+}
+
++ (id)checkBoxWithTitle:(CPString)aTitle
+{
+    return [self buttonWithTitle:aTitle];
+}
+
++ (CPString)themeClass
+{
+    return @"check-box";
+}
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    self = [super initWithFrame:aFrame];
+
+    if (self)
+    {
+        [self setHighlightsBy:CPContentsCellMask];
+        [self setShowsStateBy:CPContentsCellMask];
+
+        // Defaults?
+        [self setImagePosition:CPImageLeft];
+        [self setAlignment:CPLeftTextAlignment];
+
+        [self setBordered:YES];
+    }
+
+    return self;
+}
+
+@end

AppKit/CPClipView.j

@@ -0,0 +1,220 @@
+/*
+ * CPClipView.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 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 "CPView.j"
+
+#include "CoreGraphics/CGGeometry.h"
+
+
+/*! 
+    @ingroup appkit
+    @class CPClipView
+
+    CPClipView allows you to define a clip rect and display only that portion of its containing view.  
+    It is used to hold the document view in a CPScrollView.
+*/
+@implementation CPClipView : CPView
+{
+    CPView  _documentView;
+}
+
+/*!
+    Sets the document view to be \c aView.
+    @param aView the new document view. It's frame origin will be changed to \c (0,0) after calling this method.
+*/
+- (void)setDocumentView:(CPView)aView
+{
+    if (_documentView == aView)
+        return;
+
+    var defaultCenter = [CPNotificationCenter defaultCenter];
+    
+    if (_documentView)
+    {
+        [defaultCenter
+            removeObserver:self
+                      name:CPViewFrameDidChangeNotification
+                    object:_documentView];
+
+        [defaultCenter
+            removeObserver:self
+                      name:CPViewBoundsDidChangeNotification
+                    object:_documentView];
+        
+        [_documentView removeFromSuperview];
+    }
+    
+    _documentView = aView;
+    
+    if (_documentView)
+    {
+        [self addSubview:_documentView];
+        
+		[_documentView setPostsFrameChangedNotifications:YES];
+		[_documentView setPostsBoundsChangedNotifications:YES];
+
+		[defaultCenter
+            addObserver:self
+               selector:@selector(viewFrameChanged:)
+                   name:CPViewFrameDidChangeNotification 
+                 object:_documentView];
+
+		[defaultCenter
+            addObserver:self
+               selector:@selector(viewBoundsChanged:)
+                   name:CPViewBoundsDidChangeNotification 
+                 object:_documentView];
+    }
+}
+
+/*!
+    Returns the document view.
+*/
+- (id)documentView
+{
+    return _documentView;
+}
+
+/*!
+    Returns a new point that may be adjusted from \c aPoint
+    to make sure it lies within the document view.
+    @param aPoint
+    @return the adjusted point
+*/
+- (CGPoint)constrainScrollPoint:(CGPoint)aPoint
+{
+    if (!_documentView)
+        return _CGPointMakeZero();
+
+    var documentFrame = [_documentView frame];
+    
+    aPoint.x = MAX(0.0, MIN(aPoint.x, MAX(_CGRectGetWidth(documentFrame) - _CGRectGetWidth(_bounds), 0.0)));
+    aPoint.y = MAX(0.0, MIN(aPoint.y, MAX(_CGRectGetHeight(documentFrame) - _CGRectGetHeight(_bounds), 0.0)));
+
+    return aPoint;
+}
+
+- (void)setBoundsOrigin:(CGPoint)aPoint
+{
+    if (_CGPointEqualToPoint(_bounds.origin, aPoint))
+        return;
+        
+    [super setBoundsOrigin:aPoint];
+
+    var superview = [self superview];
+    
+    if([superview isKindOfClass:[CPScrollView class]])
+        [superview reflectScrolledClipView:self];
+}
+
+/*!
+    Scrolls the clip view to the specified point. The method
+    sets its bounds origin to \c aPoint.
+*/
+- (void)scrollToPoint:(CGPoint)aPoint
+{
+    [self setBoundsOrigin:[self constrainScrollPoint:aPoint]];
+}
+
+/*!
+    Handles a CPViewBoundsDidChangeNotification.
+    @param aNotification the notification event
+*/
+- (void)viewBoundsChanged:(CPNotification)aNotification
+{
+    [self _constrainScrollPoint];
+}
+
+/*!
+    Handles a CPViewFrameDidChangeNotification.
+    @param aNotification the notification event
+*/
+- (void)viewFrameChanged:(CPNotification)aNotification
+{
+    [self _constrainScrollPoint];
+}
+
+- (void)resizeSubviewsWithOldSize:(CGSize)aSize
+{
+    [super resizeSubviewsWithOldSize:aSize];
+    [self _constrainScrollPoint];
+}
+
+- (void)_constrainScrollPoint
+{
+    var oldScrollPoint = [self bounds].origin;
+    
+    // Call scrollToPoint: because the current scroll point may no longer make 
+    // sense given the new frame of the document view.
+    [self scrollToPoint:oldScrollPoint];
+    
+    // scrollToPoint: takes care of reflectScrollClipView: for us, so bail if 
+    // the scroll points are not equal (meaning scrollToPoint: didn't early bail).
+    if (!CGPointEqualToPoint(oldScrollPoint, [self bounds].origin))
+        return;
+
+    // ... and we're in a scroll view of course.
+    var superview = [self superview];
+        
+    if ([superview isKindOfClass:[CPScrollView class]])
+        [superview reflectScrolledClipView:self];
+}
+
+- (BOOL)autoscroll:(CPEvent)anEvent 
+{
+    var bounds = [self bounds],
+        eventLocation = [self convertPoint:[anEvent locationInWindow] fromView:nil];
+
+    if (CPRectContainsPoint(bounds, eventLocation))
+        return NO;
+
+    var newRect = CGRectMakeZero();
+
+    newRect.origin = eventLocation;
+    newRect.size = CPSizeMake(10, 10);
+
+	return [_documentView scrollRectToVisible:newRect];
+}
+
+@end
+
+
+var CPClipViewDocumentViewKey = @"CPScrollViewDocumentView";
+
+@implementation CPClipView (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    if (self = [super initWithCoder:aCoder])
+        [self setDocumentView:[aCoder decodeObjectForKey:CPClipViewDocumentViewKey]];
+    
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [super encodeWithCoder:aCoder];
+    
+    [aCoder encodeObject:_documentView forKey:CPClipViewDocumentViewKey];
+}
+
+@end

AppKit/CPCollectionView.j

@@ -0,0 +1,733 @@
+/*
+ * CPCollectionView.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPArray.j>
+@import <Foundation/CPData.j>
+@import <Foundation/CPIndexSet.j>
+@import <Foundation/CPKeyedArchiver.j>
+@import <Foundation/CPKeyedUnarchiver.j>
+
+@import "CPView.j"
+@import "CPCollectionViewItem.j"
+
+
+/*! 
+    @ingroup appkit
+    @class CPCollectionView
+
+    This class displays an array as a grid of objects, where each object is represented by a view. 
+    The view is controlled by creating a CPCollectionViewItem and specifying its view, then 
+    setting that item as the collection view prototype.
+    
+    @par Delegate Methods
+    
+    @delegate -(void)collectionViewDidChangeSelection:(CPCollectionView)collectionView;
+    Called when the selection in the collection view has changed.
+    @param collectionView the collection view who's selection changed
+
+    @delegate -(void)collectionView:(CPCollectionView)collectionView didDoubleClickOnItemAtIndex:(int)index;
+    Called when the user double-clicks on an item in the collection view.
+    @param collectionView the collection view that received the double-click
+    @param index the index of the item that received the double-click
+
+    @delegate -(CPData)collectionView:(CPCollectionView)collectionView dataForItemsAtIndexes:(CPIndexSet)indices forType:(CPString)aType;
+    Invoked to obtain data for a set of indices.
+    @param collectionView the collection view to obtain data for
+    @param indices the indices to return data for
+    @param aType the data type
+    @return a data object containing the index items
+
+    @delegate -(CPArray)collectionView:(CPCollectionView)collectionView dragTypesForItemsAtIndexes:(CPIndexSet)indices;
+    Invoked to obtain the data types supported by the specified indices for placement on the pasteboard.
+    @param collectionView the collection view the items reside in
+    @param indices the indices to obtain drag types
+    @return an array of drag types (CPString)
+*/
+
+@implementation CPCollectionView : CPView
+{
+    CPArray                 _content;
+    CPArray                 _items;
+    
+    CPData                  _itemData;
+    CPCollectionViewItem    _itemPrototype;
+    CPCollectionViewItem    _itemForDragging;
+    CPMutableArray          _cachedItems;
+    
+    unsigned                _maxNumberOfRows;
+    unsigned                _maxNumberOfColumns;
+    
+    CGSize                  _minItemSize;
+    CGSize                  _maxItemSize;
+
+    CPArray                 _backgroundColors;
+
+    float                   _tileWidth;
+    
+    BOOL                    _isSelectable;
+    BOOL                    _allowsMultipleSelection;
+    BOOL                    _allowsEmptySelection;
+    CPIndexSet              _selectionIndexes;
+    
+    CGSize                  _itemSize;
+    
+    float                   _horizontalMargin;
+    float                   _verticalMargin;
+    
+    unsigned                _numberOfRows;
+    unsigned                _numberOfColumns;
+    
+    id                      _delegate;
+
+    CPEvent                 _mouseDownEvent;
+}
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    self = [super initWithFrame:aFrame];
+    
+    if (self)
+    {
+        _items = [];
+        _content = [];
+        
+        _cachedItems = [];
+        
+        _itemSize = CGSizeMakeZero();
+        _minItemSize = CGSizeMakeZero();
+        _maxItemSize = CGSizeMakeZero();
+
+        [self setBackgroundColors:nil];
+
+        _verticalMargin = 5.0;
+        _tileWidth = -1.0;
+        
+        _selectionIndexes = [CPIndexSet indexSet];
+        _allowsEmptySelection = YES;
+        _isSelectable = YES;
+    }
+    
+    return self;
+}
+
+/*!
+    Sets the item prototype to \c anItem
+    @param anItem the new item prototype
+*/
+- (void)setItemPrototype:(CPCollectionViewItem)anItem
+{
+    _cachedItems = [];
+    _itemData = nil;
+    _itemForDragging = nil;
+    _itemPrototype = anItem;
+
+    [self reloadContent];
+}
+
+/*!
+    Returns the current item prototype
+*/
+- (CPCollectionViewItem)itemPrototype
+{
+    return _itemPrototype;
+}
+
+/*!
+    Returns a collection view item for \c anObject.
+    @param anObject the object to be represented.
+*/
+- (CPCollectionViewItem)newItemForRepresentedObject:(id)anObject
+{
+    var item = nil;
+
+    if (_cachedItems.length)
+        item = _cachedItems.pop();
+
+    else
+    {
+        if (!_itemData)
+            if (_itemPrototype)
+                _itemData = [CPKeyedArchiver archivedDataWithRootObject:_itemPrototype];
+
+        item = [CPKeyedUnarchiver unarchiveObjectWithData:_itemData];
+    }
+
+    [item setRepresentedObject:anObject];
+    [[item view] setFrameSize:_itemSize];
+
+    return item;
+}
+
+// Working with the Responder Chain
+/*!
+    Returns \c YES by default.
+*/
+- (BOOL)acceptsFirstResponder
+{
+    return YES;
+}
+
+/*!
+    Returns whether the receiver is currently the first responder.
+*/
+- (BOOL)isFirstResponder
+{
+    return [[self window] firstResponder] === self;
+}
+
+// Setting the Content
+/*!
+    Sets the content of the collection view to the content in \c anArray. 
+    This array can be of any type, and each element will be passed to the \c -setRepresentedObject: method.  
+    It's the responsibility of your custom collection view item to interpret the object.
+    @param anArray the content array
+*/
+- (void)setContent:(CPArray)anArray
+{
+    if (_content == anArray)
+        return;
+    
+    _content = anArray;
+    
+    [self reloadContent];
+}
+
+/*!
+    Returns the collection view content array
+*/
+- (CPArray)content
+{
+    return _content;
+}
+
+/*!
+    Returns the collection view items.
+*/
+- (CPArray)items
+{
+    return _items;
+}
+
+// Setting the Selection Mode
+/*!
+    Sets whether the user is allowed to select items
+    @param isSelectable \c YES allows the user to select items.
+*/
+- (void)setSelectable:(BOOL)isSelectable
+{
+    if (_isSelectable == isSelectable)
+        return;
+    
+    _isSelectable = isSelectable;
+    
+    if (!_isSelectable)
+    {
+        var index = CPNotFound;
+        
+        while ((index = [_selectionIndexes indexGreaterThanIndex:index]) != CPNotFound)
+            [_items[index] setSelected:NO];
+    }
+}
+
+/*!
+    Returns \c YES if the collection view is
+    selectable, and \c NO otherwise.
+*/
+- (BOOL)isSelectable
+{
+    return _isSelectable;
+}
+
+/*!
+    Sets whether the user may have no items selected. If YES, mouse clicks not on any item will empty the current selection. The first item will also start off as selected.
+    @param shouldAllowMultipleSelection \c YES allows the user to select multiple items
+*/
+- (void)setAllowsEmptySelection:(BOOL)shouldAllowEmptySelection
+{
+    _allowsEmptySelection = shouldAllowEmptySelection;
+}
+
+/*!
+    Returns \c YES if the user can select no items, \c NO otherwise.
+*/
+- (BOOL)allowsEmptySelection
+{
+    return _allowsEmptySelection;
+}
+
+/*!
+    Sets whether the user can select multiple items.
+    @param shouldAllowMultipleSelection \c YES allows the user to select multiple items
+*/
+- (void)setAllowsMultipleSelection:(BOOL)shouldAllowMultipleSelection
+{
+    _allowsMultipleSelection = shouldAllowMultipleSelection;
+}
+
+/*!
+    Returns \c YES if the user can select multiple items, \c NO otherwise.
+*/
+- (BOOL)allowsMultipleSelection
+{
+    return _allowsMultipleSelection;
+}
+
+/*!
+    Sets the selected items based on the provided indices.
+    @param anIndexSet the set of items to be selected
+*/
+- (void)setSelectionIndexes:(CPIndexSet)anIndexSet
+{
+    if (_selectionIndexes == anIndexSet || !_isSelectable)
+        return;
+    
+    var index = CPNotFound;
+    
+    while ((index = [_selectionIndexes indexGreaterThanIndex:index]) != CPNotFound)
+        [_items[index] setSelected:NO];
+    
+    _selectionIndexes = anIndexSet;
+    
+    var index = CPNotFound;
+    
+    while ((index = [_selectionIndexes indexGreaterThanIndex:index]) != CPNotFound)
+        [_items[index] setSelected:YES];
+    
+    if ([_delegate respondsToSelector:@selector(collectionViewDidChangeSelection:)])
+        [_delegate collectionViewDidChangeSelection:self]
+}
+
+/*!
+    Returns a set of the selected indices.
+*/
+- (CPIndexSet)selectionIndexes
+{
+    return _selectionIndexes;
+}
+
+/* @ignore */
+- (void)reloadContent
+{   
+    // Remove current views
+    var count = _items.length;
+    
+    while (count--)
+    {
+        [[_items[count] view] removeFromSuperview];
+        _cachedItems.push(_items[count]);
+    }
+    
+    _items = [];
+
+    if (!_itemPrototype || !_content)
+        return;
+
+    var index = 0;
+
+    count = _content.length;
+
+    for (; index < count; ++index)
+    {
+        _items.push([self newItemForRepresentedObject:_content[index]]);
+    
+        [self addSubview:[_items[index] view]];
+    }
+    
+    [self tile];
+}
+
+/* @ignore */
+- (void)tile
+{
+    var width = CGRectGetWidth([self bounds]);
+        
+    if (![_content count] || width == _tileWidth)
+        return;
+        
+    // We try to fit as many views per row as possible.  Any remaining space is then 
+    // either proportioned out to the views (if their minSize != maxSize) or used as
+    // margin
+    var itemSize = CGSizeMakeCopy(_minItemSize);
+    
+    _numberOfColumns = MAX(1.0, FLOOR(width / itemSize.width));
+    
+    if (_maxNumberOfColumns > 0)
+        _numberOfColumns = MIN(_maxNumberOfColumns, _numberOfColumns);
+            
+    var remaining = width - _numberOfColumns * itemSize.width,
+        itemsNeedSizeUpdate = NO;
+        
+    if (remaining > 0 && itemSize.width < _maxItemSize.width)
+        itemSize.width = MIN(_maxItemSize.width, itemSize.width + FLOOR(remaining / _numberOfColumns));
+    
+    // When we ONE column and a non-integral width, the FLOORing above can cause the item width to be smaller than the total width.
+    if (_maxNumberOfColumns == 1 && itemSize.width < _maxItemSize.width && itemSize.width < width)
+        itemSize.width = MIN(_maxItemSize.width, width);
+    
+    if (!CGSizeEqualToSize(_itemSize, itemSize))
+    {
+        _itemSize = itemSize;
+        itemsNeedSizeUpdate = YES;
+    }
+    
+    var index = 0,
+        count = _items.length;
+    
+    if (_maxNumberOfColumns > 0 && _maxNumberOfRows > 0)
+        count = MIN(count, _maxNumberOfColumns * _maxNumberOfRows);
+    
+    _numberOfRows = CEIL(count / _numberOfColumns);
+
+    _horizontalMargin = FLOOR((width - _numberOfColumns * itemSize.width) / (_numberOfColumns + 1));
+        
+    var x = _horizontalMargin,
+        y = -itemSize.height;
+    
+    for (; index < count; ++index)
+    {
+        if (index % _numberOfColumns == 0)
+        {
+            x = _horizontalMargin;
+            y += _verticalMargin + itemSize.height;
+        }
+        
+        var view = [_items[index] view];
+        
+        [view setFrameOrigin:CGPointMake(x, y)];
+        
+        if (itemsNeedSizeUpdate)
+            [view setFrameSize:_itemSize];
+            
+        x += itemSize.width + _horizontalMargin;
+    }
+    
+    _tileWidth = width;
+    [self setFrameSize:CGSizeMake(width, y + itemSize.height + _verticalMargin)];
+    _tileWidth = -1.0;
+}
+
+- (void)resizeSubviewsWithOldSize:(CGSize)aSize
+{
+    [self tile];
+}
+
+// Laying Out the Collection View
+/*!
+    Sets the maximum number of rows.
+    @param aMaxNumberOfRows the new maximum number of rows
+*/
+- (void)setMaxNumberOfRows:(unsigned)aMaxNumberOfRows
+{
+    if (_maxNumberOfRows == aMaxNumberOfRows)
+        return;
+    
+    _maxNumberOfRows = aMaxNumberOfRows;
+    
+    [self tile];
+}
+
+/*!
+    Returns the maximum number of rows.
+*/
+- (unsigned)maxNumberOfRows
+{
+    return _maxNumberOfRows;
+}
+
+/*!
+    Sets the maximum number of columns.
+    @param aMaxNumberOfColumns the new maximum number of columns
+*/
+- (void)setMaxNumberOfColumns:(unsigned)aMaxNumberOfColumns
+{
+    if (_maxNumberOfColumns == aMaxNumberOfColumns)
+        return;
+    
+    _maxNumberOfColumns = aMaxNumberOfColumns;
+    
+    [self tile];
+}
+
+/*!
+    Returns the maximum number of columns
+*/
+- (unsigned)maxNumberOfColumns
+{
+    return _maxNumberOfColumns;
+}
+
+/*!
+    Returns the current number of rows
+*/
+- (unsigned)numberOfRows
+{
+    return _numberOfRows;
+}
+
+/*!
+    Returns the current number of columns
+*/
+
+- (unsigned)numberOfColumns
+{
+    return _numberOfColumns;
+}
+
+/*!
+    Sets the minimum size for an item
+    @param aSize the new minimum item size
+*/
+- (void)setMinItemSize:(CGSize)aSize
+{
+    if (CGSizeEqualToSize(_minItemSize, aSize))
+        return;
+    
+    _minItemSize = CGSizeMakeCopy(aSize);
+    
+    [self tile];
+}
+
+/*!
+    Returns the current minimum item size
+*/
+- (CGSize)minItemSize
+{
+    return _minItemSize;
+}
+
+/*!
+    Sets the maximum item size.
+    @param aSize the new maximum item size
+*/
+- (void)setMaxItemSize:(CGSize)aSize
+{
+    if (CGSizeEqualToSize(_maxItemSize, aSize))
+        return;
+    
+    _maxItemSize = CGSizeMakeCopy(aSize);
+    
+    [self tile];
+}
+
+/*!
+    Returns the current maximum item size.
+*/
+- (CGSize)maxItemSize
+{
+    return _maxItemSize;
+}
+
+- (void)setBackgroundColors:(CPArray)backgroundColors
+{
+    if (_backgroundColors === backgroundColors)
+        return;
+
+    _backgroundColors = backgroundColors;
+
+    if (!_backgroundColors)
+        _backgroundColors = [CPColor whiteColor];
+
+    if ([_backgroundColors count] === 1)
+        [self setBackgroundColor:_backgroundColors[0]];
+
+    else
+        [self setBackgroundColor:nil];
+
+    [self setNeedsDisplay:YES];
+}
+
+- (CPArray)backgroundColors
+{
+    return _backgroundColors;
+}
+
+- (void)mouseUp:(CPEvent)anEvent
+{
+    if ([_selectionIndexes count] && [anEvent clickCount] == 2 && [_delegate respondsToSelector:@selector(collectionView:didDoubleClickOnItemAtIndex:)])
+        [_delegate collectionView:self didDoubleClickOnItemAtIndex:[_selectionIndexes firstIndex]];
+}
+
+- (void)mouseDown:(CPEvent)anEvent
+{
+    _mouseDownEvent = anEvent;
+
+    var location = [self convertPoint:[anEvent locationInWindow] fromView:nil],
+        row = FLOOR(location.y / (_itemSize.height + _verticalMargin)),
+        column = FLOOR(location.x / (_itemSize.width + _horizontalMargin)),
+        index = row * _numberOfColumns + column;
+
+    if (index >= 0 && index < _items.length)
+        [self setSelectionIndexes:[CPIndexSet indexSetWithIndex:index]];
+
+    else if (_allowsEmptySelection)
+        [self setSelectionIndexes:[CPIndexSet indexSet]];
+}
+
+- (void)mouseDragged:(CPEvent)anEvent
+{
+    if (![_delegate respondsToSelector:@selector(collectionView:dragTypesForItemsAtIndexes:)])
+        return;
+
+    // If we don't have any selected items, we've clicked away, and thus the drag is meaningless.
+    if (![_selectionIndexes count])
+        return;
+
+    // Set up the pasteboard
+    var dragTypes = [_delegate collectionView:self dragTypesForItemsAtIndexes:_selectionIndexes];
+
+    [[CPPasteboard pasteboardWithName:CPDragPboard] declareTypes:dragTypes owner:self];
+
+    var point = [self convertPoint:[anEvent locationInWindow] fromView:nil];
+
+    if (!_itemForDragging)
+        _itemForDragging = [self newItemForRepresentedObject:_content[[_selectionIndexes firstIndex]]];
+    else
+        [_itemForDragging setRepresentedObject:_content[[_selectionIndexes firstIndex]]];
+
+    var view = [_itemForDragging view];
+
+    [view setFrameSize:_itemSize];
+    [view setAlphaValue:0.7];
+
+    [self dragView:view
+        at:[[_items[[_selectionIndexes firstIndex]] view] frame].origin
+        offset:CGSizeMakeZero()
+        event:_mouseDownEvent
+        pasteboard:nil
+        source:self
+        slideBack:YES];
+}
+
+/*!
+    Places the selected items on the specified pasteboard. The items are requested from the collection's delegate.
+    @param aPasteboard the pasteboard to put the items on
+    @param aType the format the pasteboard data
+*/
+- (void)pasteboard:(CPPasteboard)aPasteboard provideDataForType:(CPString)aType
+{
+    [aPasteboard setData:[_delegate collectionView:self dataForItemsAtIndexes:_selectionIndexes forType:aType] forType:aType];
+}
+
+// Cappuccino Additions
+
+/*!
+    Sets the collection view's vertical spacing between elements.
+    @param aVerticalMargin the number of pixels to place between elements
+*/
+
+- (void)setVerticalMargin:(float)aVerticalMargin
+{
+    if (_verticalMargin == aVerticalMargin)
+        return;
+    
+    _verticalMargin = aVerticalMargin;
+    
+    [self tile];
+}
+
+/*!
+    Gets the collection view's current vertical spacing between elements.
+*/
+
+- (float)verticalMargin
+{
+    return _verticalMargin;
+}
+
+/*!
+    Sets the collection view's delegate
+    @param aDelegate the new delegate
+*/
+- (void)setDelegate:(id)aDelegate
+{
+    _delegate = aDelegate;
+}
+
+/*!
+    Returns the collection view's delegate
+*/
+- (id)delegate
+{
+    return _delegate;
+}
+
+@end
+
+var CPCollectionViewMinItemSizeKey      = @"CPCollectionViewMinItemSizeKey",
+    CPCollectionViewMaxItemSizeKey      = @"CPCollectionViewMaxItemSizeKey",
+    CPCollectionViewVerticalMarginKey   = @"CPCollectionViewVerticalMarginKey",
+    CPCollectionViewSelectableKey       = @"CPCollectionViewSelectableKey",
+    CPCollectionViewBackgroundColorsKey = @"CPCollectionViewBackgroundColorsKey";
+
+
+@implementation CPCollectionView (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super initWithCoder:aCoder];
+
+    if (self)
+    {
+        _items = [];
+        _content = [];
+
+        _cachedItems = [];
+
+        _itemSize = CGSizeMakeZero();
+        
+        _minItemSize = [aCoder decodeSizeForKey:CPCollectionViewMinItemSizeKey] || CGSizeMakeZero();
+        _maxItemSize = [aCoder decodeSizeForKey:CPCollectionViewMaxItemSizeKey] || CGSizeMakeZero();
+        
+        _verticalMargin = [aCoder decodeFloatForKey:CPCollectionViewVerticalMarginKey];
+        
+        _isSelectable = [aCoder decodeBoolForKey:CPCollectionViewSelectableKey];
+
+        [self setBackgroundColors:[aCoder decodeObjectForKey:CPCollectionViewBackgroundColorsKey]];
+          
+        _tileWidth = -1.0;
+
+        _selectionIndexes = [CPIndexSet indexSet];
+        
+        _allowsEmptySelection = YES;
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [super encodeWithCoder:aCoder];
+
+    if (!CGSizeEqualToSize(_minItemSize, CGSizeMakeZero()))
+      [aCoder encodeSize:_minItemSize forKey:CPCollectionViewMinItemSizeKey];
+    
+    if (!CGSizeEqualToSize(_maxItemSize, CGSizeMakeZero()))
+      [aCoder encodeSize:_maxItemSize forKey:CPCollectionViewMaxItemSizeKey];
+    
+    [aCoder encodeBool:_isSelectable forKey:CPCollectionViewSelectableKey];
+    
+    [aCoder encodeFloat:_verticalMargin forKey:CPCollectionViewVerticalMarginKey];
+
+    [aCoder encodeObject:_backgroundColors forKey:CPCollectionViewBackgroundColorsKey];
+}
+
+@end

AppKit/CPCollectionViewItem.j

@@ -0,0 +1,85 @@
+/*
+ * CPCollectionViewItem.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2009, 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 "CPViewController.j"
+
+/*!
+    Represents an object inside a CPCollectionView.
+*/
+@implementation CPCollectionViewItem : CPViewController
+{
+    BOOL    _isSelected;
+}
+
+// Setting the Represented Object
+/*!
+    Sets the object to be represented by this item.
+    @param anObject the object to be represented
+*/
+- (void)setRepresentedObject:(id)anObject
+{
+    [super setRepresentedObject:anObject];
+
+    var view = [self view];
+
+    if ([view respondsToSelector:@selector(setRepresentedObject:)])
+        [view setRepresentedObject:[self representedObject]];
+}
+
+// Modifying the Selection
+/*!
+    Sets whether this view item should be selected.
+    @param shouldBeSelected \c YES makes the item selected. \c NO deselects it.
+*/
+- (void)setSelected:(BOOL)shouldBeSelected
+{
+    shouldBeSelected = !!shouldBeSelected;
+
+    if (_isSelected === shouldBeSelected)
+        return;
+
+    _isSelected = shouldBeSelected;
+
+    var view = [self view];
+
+    if ([view respondsToSelector:@selector(setSelected:)])
+        [view setSelected:[self isSelected]];
+}
+
+/*!
+    Returns \c YES if the item is currently selected. \c NO if the item is not selected.
+*/
+- (BOOL)isSelected
+{
+    return _isSelected;
+}
+
+// Parent Collection View
+/*!
+    Returns the collection view of which this item is a part.
+*/
+- (CPCollectionView)collectionView
+{
+    return [_view superview];
+}
+
+@end

AppKit/CPColor.j

@@ -0,0 +1,791 @@
+/*
+ * CPColor.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPObject.j>
+
+@import "CGColor.j"
+
+@import "CPCompatibility.j"
+@import "CPImage.j"
+
+
+var _redComponent        = 0,
+    _greenComponent      = 1,
+    _blueComponent       = 2,
+    _alphaCompnent       = 3;
+    
+var _hueComponent        = 0,
+    _saturationComponent = 1,
+    _brightnessComponent = 2;
+
+var cachedBlackColor,
+    cachedRedColor,
+    cachedGreenColor,
+    cachedBlueColor,
+    cachedYellowColor,
+    cachedGrayColor,
+    cachedLightGrayColor,
+    cachedDarkGrayColor,
+    cachedWhiteColor,
+    cachedBrownColor,
+    cachedCyanColor,
+    cachedMagentaColor,
+    cachedOrangeColor,
+    cachedPurpleColor,
+    cachedShadowColor,
+    cachedClearColor;
+
+/*! 
+    @ingroup appkit
+    @code CPColor
+
+    \c CPColor can be used to represent color
+    in an RGB or HSB model with an optional transparency value.</p>
+
+    <p>It also provides some class helper methods that
+    returns instances of commonly used colors.</p>
+
+    <p>The class does not have a \c -set: method
+    like NextStep based frameworks to change the color of
+    the current context. To change the color of the current
+    context, use CGContextSetFillColor().
+*/
+@implementation CPColor : CPObject
+{
+    CPArray     _components;
+
+    CPImage     _patternImage;
+    CPString    _cssString;    
+}
+
+/*!
+    Creates a color in the RGB color space, with an alpha value.
+    Each component should be between the range of 0.0 to 1.0. For
+    the alpha component, a value of 1.0 is opaque, and 0.0 means
+    completely transparent.
+    
+    @param red the red component of the color
+    @param green the green component of the color
+    @param blue the blue component of the color
+    @param alpha the alpha component
+    
+    @return a color initialized to the values specified
+*/
++ (CPColor)colorWithRed:(float)red green:(float)green blue:(float)blue alpha:(float)alpha
+{
+    return [[CPColor alloc] _initWithRGBA:[red, green, blue, alpha]];
+}
+
+/*!
+    @deprecated in favor of colorWithRed:green:blue:alpha:
+    
+    Creates a color in the RGB color space, with an alpha value.
+    Each component should be between the range of 0.0 to 1.0. For
+    the alpha component, a value of 1.0 is opaque, and 0.0 means
+    completely transparent.
+    
+    @param red the red component of the color
+    @param green the green component of the color
+    @param blue the blue component of the color
+    @param alpha the alpha component
+    
+    @return a color initialized to the values specified
+*/
++ (CPColor)colorWithCalibratedRed:(float)red green:(float)green blue:(float)blue alpha:(float)alpha
+{
+    return [self colorWithRed:red green:green blue:blue alpha:alpha];
+}
+
+
+/*!
+    Creates a new color object with \c white for the RGB components.
+    For the alpha component, a value of 1.0 is opaque, and 0.0 means completely transparent.
+    
+    @param white a float between 0.0 and 1.0
+    @param alpha the alpha component between 0.0 and 1.0
+    
+    @return a color initialized to the values specified
+*/
++ (CPColor)colorWithWhite:(float)white alpha:(float)alpha
+{
+    return [[CPColor alloc] _initWithRGBA:[white, white, white, alpha]];
+}
+
+/*!
+    @deprecated in favor of colorWithWhite:apha:
+    
+    Creates a new color object with \c white for the RGB components.
+    For the alpha component, a value of 1.0 is opaque, and 0.0 means completely transparent.
+    
+    @param white a float between 0.0 and 1.0
+    @param alpha the alpha component between 0.0 and 1.0
+    
+    @return a color initialized to the values specified
+*/
++ (CPColor)colorWithCalibratedWhite:(float)white alpha:(float)alpha
+{
+    return [self colorWithWhite:white alpha:alpha];
+}
+
+/*!
+    Creates a new color in HSB space.
+    
+    @param hue the hue value
+    @param saturation the saturation value
+    @param brightness the brightness value
+    
+    @return the initialized color
+*/
++ (CPColor)colorWithHue:(float)hue saturation:(float)saturation brightness:(float)brightness
+{
+    return [self colorWithHue:hue saturation:saturation brightness:brightness alpha:1.0];
+}
+
++ (CPColor)colorWithHue:(float)hue saturation:(float)saturation brightness:(float)brightness alpha:(float)alpha
+{
+    if(saturation === 0.0)
+        return [CPColor colorWithCalibratedWhite:brightness / 100.0 alpha:alpha];
+    
+    var f = hue % 60,
+        p = (brightness * (100 - saturation)) / 10000,
+        q = (brightness * (6000 - saturation * f)) / 600000,
+        t = (brightness * (6000 - saturation * (60 -f))) / 600000,
+        b =  brightness / 100.0;
+        
+    switch(FLOOR(hue / 60))
+    {
+        case 0: return [CPColor colorWithCalibratedRed: b green: t blue: p alpha: alpha];
+        case 1: return [CPColor colorWithCalibratedRed: q green: b blue: p alpha: alpha];
+        case 2: return [CPColor colorWithCalibratedRed: p green: b blue: t alpha: alpha];
+        case 3: return [CPColor colorWithCalibratedRed: p green: q blue: b alpha: alpha];
+        case 4: return [CPColor colorWithCalibratedRed: t green: p blue: b alpha: alpha];
+        case 5: return [CPColor colorWithCalibratedRed: b green: p blue: q alpha: alpha];
+    }
+}
+
+/*!
+    Creates an RGB color from a hexadecimal string. For example,
+    the a string of "FFFFFF" would return a white CPColor.
+    "FF0000" would return a pure red, "00FF00" would return a
+    pure blue, and "0000FF" would return a pure green. 
+
+    @param hex a 6 character long string of hex
+
+    @return an initialized RGB color
+*/
++ (CPColor)colorWithHexString:(string)hex
+{
+    return [[CPColor alloc] _initWithRGBA: hexToRGB(hex)];
+}
+
+/*!
+    Returns a black color object. (RGBA=[0.0, 0.0, 0.0, 1.0])
+*/
++ (CPColor)blackColor
+{
+    if (!cachedBlackColor)
+        cachedBlackColor = [[CPColor alloc] _initWithRGBA:[0.0, 0.0, 0.0, 1.0]];
+
+    return cachedBlackColor;
+}
+
+/*!
+    Returns a blue color object. (RGBA=[0.0, 0.0, 1.0, 1.0])
+*/
++ (CPColor)blueColor
+{
+    if (!cachedBlueColor)
+        cachedBlueColor = [[CPColor alloc] _initWithRGBA:[0.0, 0.0, 1.0, 1.0]];
+
+    return cachedBlueColor;
+}
+
+/*!
+    Returns a dark gray color object. (RGBA=[0.33 ,0.33, 0.33, 1.0])
+*/
++ (CPColor)darkGrayColor
+{
+    if (!cachedDarkGrayColor)
+        cachedDarkGrayColor = [CPColor colorWithCalibratedWhite:1.0 / 3.0 alpha:1.0];
+
+    return cachedDarkGrayColor;
+}
+
+/*!
+    Returns a gray color object. (RGBA=[0.5, 0.5, 0.5, 1.0])
+*/
++ (CPColor)grayColor
+{
+    if (!cachedGrayColor)
+        cachedGrayColor = [CPColor colorWithCalibratedWhite:0.5 alpha: 1.0];
+
+    return cachedGrayColor;
+}
+
+/*!
+    Returns a green color object. (RGBA=[0.0, 1.0, 0.0, 1.0])
+*/
++ (CPColor)greenColor
+{
+    if (!cachedGreenColor)
+        cachedGreenColor = [[CPColor alloc] _initWithRGBA:[0.0, 1.0, 0.0, 1.0]];
+
+    return cachedGreenColor;
+}
+
+/*!
+    Returns a light gray color object (RGBA=[0.66, 0.66, 0.66, 1.0])
+*/
++ (CPColor)lightGrayColor
+{
+    if (!cachedLightGrayColor)
+        cachedLightGrayColor = [CPColor colorWithCalibratedWhite:2.0 / 3.0 alpha:1.0];
+
+    return cachedLightGrayColor;
+}
+
+/*!
+    Returns a red color object (RGBA=[1.0, 0.0, 0.0, 1.0])
+*/
++ (CPColor)redColor
+{
+    if (!cachedRedColor)
+        cachedRedColor = [[CPColor alloc] _initWithRGBA:[1.0, 0.0, 0.0, 1.0]];
+
+    return cachedRedColor;
+}
+
+/*!
+    Returns a white color object (RGBA=[1.0, 1.0, 1.0, 1.0])
+*/
++ (CPColor)whiteColor
+{
+    if (!cachedWhiteColor)
+        cachedWhiteColor = [[CPColor alloc] _initWithRGBA:[1.0, 1.0, 1.0, 1.0]];
+
+    return cachedWhiteColor;
+}
+
+/*!
+    Returns a yellow color object (RGBA=[1.0, 1.0, 0.0, 1.0])
+*/
++ (CPColor)yellowColor
+{
+    if (!cachedYellowColor)
+        cachedYellowColor = [[CPColor alloc] _initWithRGBA:[1.0, 1.0, 0.0, 1.0]];
+
+    return cachedYellowColor;
+}
+
+/*!
+    Returns a brown color object (RGBA=[0.6, 0.4, 0.2, 1.0])
+*/
++ (CPColor)brownColor
+{
+    if (!cachedBrownColor)
+        cachedBrownColor = [[CPColor alloc] _initWithRGBA:[0.6, 0.4, 0.2, 1.0]];
+
+    return cachedBrownColor;
+}
+
+/*!
+    Returns a cyan color object (RGBA=[0.0, 1.0, 1.0, 1.0])
+*/
++ (CPColor)cyanColor
+{
+    if (!cachedCyanColor)
+        cachedCyanColor = [[CPColor alloc] _initWithRGBA:[0.0, 1.0, 1.0, 1.0]];
+
+    return cachedCyanColor;
+}
+
+/*!
+    Returns a magenta color object (RGBA=[1.0, 0.0, 1.0, 1.0])
+*/
++ (CPColor)magentaColor
+{
+    if (!cachedMagentaColor)
+        cachedMagentaColor = [[CPColor alloc] _initWithRGBA:[1.0, 0.0, 1.0, 1.0]];
+
+    return cachedMagentaColor;
+}
+
+/*!
+    Returns a orange color object (RGBA=[1.0, 0.5, 0.0, 1.0])
+*/
++ (CPColor)orangeColor
+{
+    if (!cachedOrangeColor)
+        cachedOrangeColor = [[CPColor alloc] _initWithRGBA:[1.0, 0.5, 0.0, 1.0]];
+
+    return cachedOrangeColor;
+}
+
+/*!
+    Returns a purple color object (RGBA=[0.5, 0.0, 0.5, 1.0])
+*/
++ (CPColor)purpleColor
+{
+    if (!cachedPurpleColor)
+        cachedPurpleColor = [[CPColor alloc] _initWithRGBA:[0.5, 0.0, 0.5, 1.0]];
+
+    return cachedPurpleColor;
+}
+
+/*!
+    Returns a shadow looking color (RGBA=[0.0, 0.0, 0.0, 0.33])
+*/
+
++ (CPColor)shadowColor
+{
+    if (!cachedShadowColor)
+        cachedShadowColor = [[CPColor alloc] _initWithRGBA:[0.0, 0.0, 0.0, 1.0 / 3.0]];
+
+    return cachedShadowColor;
+}
+
+/*!
+    Returns a clear color (RGBA=[0.0, 0.0, 0.0, 0.0])
+*/
+
++ (CPColor)clearColor
+{
+    if (!cachedClearColor)
+        cachedClearColor = [self colorWithCalibratedWhite:0.0 alpha:0.0];
+
+    return cachedClearColor;
+}
+
++ (CPColor)alternateSelectedControlColor
+{
+    return [[CPColor alloc] _initWithRGBA:[0.22, 0.46, 0.84, 1.0]];
+}
+
++ (CPColor)secondarySelectedControlColor
+{
+    return [[CPColor alloc] _initWithRGBA:[0.83, 0.83, 0.83, 1.0]];
+}
+
+/*!
+    Creates a color using a tile pattern with \c anImage
+    @param the image to tile
+    @return a tiled image color object
+*/
++ (CPColor)colorWithPatternImage:(CPImage)anImage
+{
+    return [[CPColor alloc] _initWithPatternImage:anImage];
+}
+
+/*!
+    Creates a CPColor from a valid CSS RGB string. Example, "rgb(32,64,129)".
+    
+    @param aString a CSS color string
+    @return a color initialized to the value in the css string
+*/
++ (CPColor)colorWithCSSString:(CPString)aString
+{
+    return [[CPColor alloc] _initWithCSSString: aString];
+}
+
+/* @ignore */
+- (id)_initWithCSSString:(CPString)aString
+{
+    if(aString.indexOf("rgb") == CPNotFound)
+        return nil;
+        
+    self = [super init];
+    
+    var startingIndex = aString.indexOf("(");
+    var parts = aString.substring(startingIndex+1).split(',');
+    
+    _components = [
+        parseInt(parts[0], 10) / 255.0,
+        parseInt(parts[1], 10) / 255.0,
+        parseInt(parts[2], 10) / 255.0,
+        parts[3] ? parseInt(parts[3], 10) / 255.0 : 1.0        
+    ]
+    
+    _cssString = aString;
+    
+    return self;
+}
+
+/* @ignore */
+- (id)_initWithRGBA:(CPArray)components
+{
+    self = [super init];
+    
+    if (self)
+    {
+        _components = components;
+        
+		if (!CPFeatureIsCompatible(CPCSSRGBAFeature) && _components[3] != 1.0 && window.Base64 && window.CRC32)
+		{
+			var bytes = [0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x1,0x8,0x3,0x0,0x0,0x0,0x28,0xcb,0x34,0xbb,0x0,0x0,0x3,0x0,0x50,0x4c,0x54,0x45,0xff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x17,0x89,0x99,0x55,0x0,0x0,0x0,0x1,0x74,0x52,0x4e,0x53,0x0,0x40,0xe6,0xd8,0x66,0x0,0x0,0x0,0x10,0x49,0x44,0x41,0x54,0x78,0xda,0x62,0x60,0x0,0x0,0x0,0x0,0xff,0xff,0x3,0x0,0x0,0x2,0x0,0x1,0x24,0x7f,0x24,0xf1,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,0xff];
+			var r_off = 41;
+			var g_off = 42;
+			var b_off = 43;
+			var a_off = 821;
+			var plte_crc_off = 809;
+			var trns_crc_off = 822;
+			var plte_type_off = 37;
+			var trns_type_off = 817;
+			
+			bytes[r_off] = Math.round(_components[0]*255);
+			bytes[g_off] = Math.round(_components[1]*255);
+			bytes[b_off] = Math.round(_components[2]*255);
+			bytes[a_off] = Math.round(_components[3]*255);
+            
+			// calculate new CRCs
+			var new_plte_crc = integerToBytes(CRC32.getCRC(bytes, plte_type_off, 4+768), 4);
+			var new_trns_crc = integerToBytes(CRC32.getCRC(bytes, trns_type_off, 4+1), 4);
+            
+			// overwrite old CRCs with new ones
+			for (var i = 0; i < 4; i++)
+			{
+				bytes[plte_crc_off+i] = new_plte_crc[i];
+				bytes[trns_crc_off+i] = new_trns_crc[i];
+			}
+            
+			// Base64 encode, strip whitespace and build data URL
+			var base64image = Base64.encode(bytes); //.replace(/[\s]/g, "");
+			
+			_cssString = "url(\"data:image/png;base64," + base64image + "\")";
+		}
+		else
+		{
+        	var hasAlpha = CPFeatureIsCompatible(CPCSSRGBAFeature) && _components[3] != 1.0;
+        		
+        	_cssString = (hasAlpha ? "rgba(" : "rgb(") + 
+        	    parseInt(_components[0] * 255.0) + ", " + 
+        	    parseInt(_components[1] * 255.0) + ", " + 
+        	    parseInt(_components[2] * 255.0) + 
+        	    (hasAlpha ?  (", " + _components[3]) : "") + ")";
+		}
+    }
+    return self;
+}
+
+/* @ignore */
+- (id)_initWithPatternImage:(CPImage)anImage
+{
+    self = [super init];
+    
+    if (self)
+    {
+        _patternImage = anImage;
+        _cssString = "url(\"" + [_patternImage filename] + "\")";
+    }
+       
+    return self;
+}
+
+/*!
+    Returns the image being used as the pattern for the tile in this color.
+*/
+- (CPImage)patternImage
+{
+    return _patternImage;
+}
+
+/*!
+    Returns the alpha component of this color.
+*/
+- (float)alphaComponent
+{
+    return _components[3];
+}
+
+/*!
+    Returns the blue component of this color.
+*/
+- (float)blueComponent
+{
+    return _components[2];
+}
+
+/*!
+    Returns the green component of this color.
+*/
+- (float)greenComponent
+{
+    return _components[1];
+}
+
+/*!
+    Return the red component of this color.
+*/
+- (float)redComponent
+{
+    return _components[0];
+}
+
+/*!
+    Returns the RGBA components of this color in an array.
+    The index values are ordered as:
+<pre>
+<b>Index</b>   <b>Component</b>
+0       Red
+1       Green
+2       Blue
+3       Alpha
+</pre>
+*/
+- (CPArray)components
+{
+    return _components;
+}
+
+/*!
+    Returns a new color with the same RGB as the receiver but a new alpha component.
+    
+    @param anAlphaComponent the alpha component for the new color
+    
+    @return a new color object
+*/
+- (CPColor)colorWithAlphaComponent:(float)anAlphaComponent
+{
+    var components = _components.slice();
+    
+    components[components.length - 1] = anAlphaComponent;
+    
+    return [[[self class] alloc] _initWithRGBA:components];
+}
+
+/*!
+    Returns an array with the HSB values for this color.
+    The index values are ordered as:
+<pre>
+<b>Index</b>   <b>Component</b>
+0       Hue
+1       Saturation
+2       Brightness
+</pre>
+*/
+- (CPArray)hsbComponents
+{
+    var red   = ROUND(_components[_redComponent] * 255.0),
+        green = ROUND(_components[_greenComponent] * 255.0),
+        blue  = ROUND(_components[_blueComponent] * 255.0);
+        
+    var max   = MAX(red, green, blue),
+        min   = MIN(red, green, blue),
+        delta = max - min;
+        
+    var brightness = max / 255.0,
+        saturation = (max != 0) ? delta / max : 0;
+        
+    var hue;
+    if(saturation == 0)
+        hue = 0;
+    else
+    {
+        var rr = (max - red) / delta;
+        var gr = (max - green) / delta;
+        var br = (max - blue) / delta;
+        
+        if (red == max) 
+            hue = br - gr;
+        else if (green == max) 
+            hue = 2 + rr - br;
+        else 
+            hue = 4 + gr - rr;
+            
+        hue /= 6;
+        if (hue < 0) 
+            hue++;
+    }
+    
+    return [
+        ROUND(hue * 360.0), 
+        ROUND(saturation * 100.0),
+        ROUND(brightness * 100.0)
+    ];
+}
+
+/*!
+    Returns the CSS representation of this color. The color will
+    be in one of the following forms:
+<pre>
+rgb(22,44,88)
+rgba(22,44,88,0.5)  // if there is an alpha
+url("data:image/png;base64,BASE64ENCODEDDATA")  // if there is a pattern image
+</pre>
+*/
+- (CPString)cssString
+{
+    return _cssString;
+}
+
+/*!
+    Returns a 6 character long hex string of this color.
+*/
+- (CPString)hexString
+{
+    return rgbToHex([self redComponent], [self greenComponent], [self blueComponent])
+}
+
+- (BOOL)isEqual:(CPColor)aColor
+{
+    if (!aColor)
+        return NO;
+
+    if (aColor === self)
+        return YES;
+
+    return [aColor isKindOfClass:CPColor] && [aColor cssString] === [self cssString];
+}
+
+- (CPString)description
+{
+    return [super description]+" "+[self cssString];
+}
+
+@end
+
+@implementation CPColor (CoreGraphicsExtensions)
+
+/*! 
+    Set's the receiver to be the fill and stroke color in the current graphics context
+*/
+- (void)set
+{
+    [self setFill];
+    [self setStroke];
+}
+
+/*! 
+    Set's the receiver to be the fill color in the current graphics context
+*/
+- (void)setFill
+{
+    var ctx = [[CPGraphicsContext currentContext] graphicsPort];
+    CGContextSetFillColor(ctx, self);   
+}
+
+/*! 
+    Set's the receiver to be the stroke color in the current graphics context
+*/
+- (void)setStroke
+{
+    var ctx = [[CPGraphicsContext currentContext] graphicsPort];
+    CGContextSetStrokeColor(ctx, self);
+}
+
+@end
+
+@implementation CPColor (Debugging)
+
++ (CPColor)randomColor
+{
+    return [CPColor colorWithRed:RAND() green:RAND() blue:RAND() alpha:1.0];
+}
+
+@end
+
+var CPColorComponentsKey    = @"CPColorComponentsKey",
+    CPColorPatternImageKey  = @"CPColorPatternImageKey";
+
+@implementation CPColor (CPCoding)
+
+/*!
+    Initializes this color from the data archived in a coder.
+    @param aCoder the coder from which the color will be loaded
+*/
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    if ([aCoder containsValueForKey:CPColorPatternImageKey])
+        return [self _initWithPatternImage:[aCoder decodeObjectForKey:CPColorPatternImageKey]];
+    
+    return [self _initWithRGBA:[aCoder decodeObjectForKey:CPColorComponentsKey]];
+}
+
+/*!
+    Archives this color into a coder.
+    @param aCoder the coder into which the color will be archived.
+*/
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    if (_patternImage)
+        [aCoder encodeObject:_patternImage forKey:CPColorPatternImageKey];
+    else
+        [aCoder encodeObject:_components forKey:CPColorComponentsKey];
+}
+
+@end
+
+var hexCharacters = "0123456789ABCDEF";
+
+/*!
+    Used for the CPColor \c +colorWithHexString: implementation
+    @ignore
+    @class CPColor
+    @return an array of rgb components
+*/
+function hexToRGB(hex) 
+{
+    if ( hex.length == 3 )
+        hex = hex.charAt(0) + hex.charAt(0) + hex.charAt(1) + hex.charAt(1) + hex.charAt(2) + hex.charAt(2);
+    if(hex.length != 6)
+        return null;
+
+    hex = hex.toUpperCase();
+
+    for(var i=0; i<hex.length; i++)
+        if(hexCharacters.indexOf(hex.charAt(i)) == -1)
+            return null;
+            
+    var red   = (hexCharacters.indexOf(hex.charAt(0)) * 16 + hexCharacters.indexOf(hex.charAt(1))) / 255.0;
+    var green = (hexCharacters.indexOf(hex.charAt(2)) * 16 + hexCharacters.indexOf(hex.charAt(3))) / 255.0;
+    var blue  = (hexCharacters.indexOf(hex.charAt(4)) * 16 + hexCharacters.indexOf(hex.charAt(5))) / 255.0;
+    
+    return [red, green, blue, 1.0];
+}
+
+function integerToBytes(integer, length) {
+	if (!length)
+		length = (integer == 0) ? 1 : Math.round((Math.log(integer)/Math.log(2))/8+0.5);
+		
+	var bytes = new Array(length);
+	for (var i = length-1; i >= 0; i--) {
+		bytes[i] = integer & 255;
+		integer = integer >> 8
+	}
+	return bytes;
+}
+
+function rgbToHex(r,g,b) {
+    return byteToHex(r) + byteToHex(g) + byteToHex(b);
+}
+
+function byteToHex(n) {
+    if (!n || isNaN(n)) return "00";
+    n = ROUND(MIN(255,MAX(0,256*n)));
+    return  hexCharacters.charAt((n - n % 16) / 16) +
+            hexCharacters.charAt(n % 16);
+}
+
+// Toll-Free bridge CPColor to CGColor.
+//CGColor.prototype.isa = CPColor;
+//[CPColor initialize];
+
+//http://dev.mootools.net/browser/trunk/Source/Utilities/Color.js?rev=1184

AppKit/CPColorPanel.j

@@ -0,0 +1,662 @@
+/*
+ * CPColorPanel.j
+ * AppKit
+ *
+ * Created by Ross Boucher.
+ * Copyright 2008, 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 "CPButton.j"
+@import "CPCookie.j"
+@import "CPPanel.j"
+@import "CPView.j"
+
+CPColorPanelColorDidChangeNotification = @"CPColorPanelColorDidChangeNotification";
+
+var PREVIEW_HEIGHT = 20.0,
+    TOOLBAR_HEIGHT = 32.0,
+    SWATCH_HEIGHT  = 14.0,
+    ICON_WIDTH     = 32.0,
+    ICON_PADDING   = 12.0;
+
+var SharedColorPanel = nil,
+    ColorPickerClasses = [];
+    
+/*
+    A color wheel
+    @global
+    @group CPColorPanelMode
+*/
+CPWheelColorPickerMode = 1;
+/*
+    Slider based picker
+    @global
+    @group CPColorPanelMode
+*/
+CPSliderColorPickerMode = 2;
+
+CPColorPickerViewWidth  = 265,
+CPColorPickerViewHeight = 370;
+
+/*! 
+    @ingroup appkit
+    @class CPColorPanel
+
+    CPColorPanel provides a reusable panel that can be used
+    displayed on screen to prompt the user for a color selection. To
+    obtain the panel, call the \c +sharedColorPanel method.
+*/
+@implementation CPColorPanel : CPPanel
+{    
+    _CPColorPanelToolbar    _toolbar;
+    _CPColorPanelSwatches   _swatchView;
+    _CPColorPanelPreview    _previewView;
+
+    CPSlider        _opacitySlider;
+
+    CPArray         _colorPickers;
+    CPView          _currentView;
+    id              _activePicker;
+
+    CPColor         _color;
+
+    id              _target;
+    SEL             _action;
+
+    int             _mode;
+}
+
+/*! 
+    A list of color pickers is collected here, and any color panel created will contain 
+    any picker in this list up to this point. In other words, call before creating a color panel.
+*/
++ (void)provideColorPickerClass:(Class)aColorPickerSubclass
+{
+    ColorPickerClasses.push(aColorPickerSubclass);
+}
+
+/*!
+    Returns (and if necessary, creates) the shared color panel.
+*/
++ (CPColorPanel)sharedColorPanel
+{
+    if (!SharedColorPanel)
+        SharedColorPanel = [[CPColorPanel alloc] init];
+    
+    return SharedColorPanel;
+}
+
+/*!
+    Sets the mode for the shared color panel.
+    @param mode the mode to which the color panel will be set
+*/
++ (void)setPickerMode:(CPColorPanelMode)mode
+{
+    var panel = [CPColorPanel sharedColorPanel];
+    [panel setMode: mode];
+}
+
+/*
+    To obtain the color panel, use \c +sharedColorPanel.
+    @ignore
+*/
+- (id)init
+{
+    self = [super initWithContentRect:CGRectMake(500.0, 50.0, 219.0, 370.0) 
+                            styleMask:(CPTitledWindowMask | CPClosableWindowMask | CPResizableWindowMask)];
+
+    if (self)
+    {
+        [[self contentView] setBackgroundColor:[CPColor colorWithWhite:0.95 alpha:1.0]];
+
+        [self setTitle:@"Color Panel"];
+        [self setLevel:CPFloatingWindowLevel];
+        
+        [self setFloatingPanel:YES];
+        [self setBecomesKeyOnlyIfNeeded:YES];
+        
+        [self setMinSize:CGSizeMake(219.0, 342.0)];
+        [self setMaxSize:CGSizeMake(323.0, 537.0)];
+    }
+    
+    return self;
+}
+
+/*!
+    Sets the color of the panel, and updates the picker. Also posts a \c CPColorPanelDidChangeNotification.
+*/
+- (void)setColor:(CPColor)aColor
+{    
+    _color = aColor;
+    [_previewView setBackgroundColor: _color];
+    
+    [CPApp sendAction:@selector(changeColor:) to:nil from:self];
+
+    if (_target && _action)
+        [CPApp sendAction:_action to:_target from:self];
+        
+    [[CPNotificationCenter defaultCenter]
+        postNotificationName:CPColorPanelColorDidChangeNotification
+                      object:self];
+
+    [_activePicker setColor:_color];
+    [_opacitySlider setFloatValue:[_color alphaComponent]];
+}
+
+/*!
+    Sets the selected color of the panel and optionally updates the picker.
+    @param bool whether or not to update the picker
+    @ignore
+*/
+- (void)setColor:(CPColor)aColor updatePicker:(BOOL)bool
+{
+    [self setColor:aColor];
+    
+    if (bool)
+        [_activePicker setColor:_color];
+}
+
+/*!
+    Returns the panel's currently selected color.
+*/
+- (CPColor)color
+{
+    return _color;
+}
+
+- (float)opacity
+{
+    return [_opacitySlider floatValue];
+}
+
+/*!
+    Sets the target for the color panel. Messages are sent
+    to the target when colors are selected in the panel.
+*/
+- (void)setTarget:(id)aTarget
+{
+    _target = aTarget;
+}
+
+/*!
+    Returns the current target. The target receives messages
+    when colors are selected in the panel.
+*/
+- (id)target
+{
+    return _target;
+}
+
+/*!
+    Sets the action that gets sent to the target.
+    This action is sent whenever a color is selected in the panel.
+    @param anAction the action that will be sent
+*/
+- (void)setAction:(selector)anAction
+{
+    _action = anAction;
+}
+
+/*!
+    Returns the current target action.
+*/
+- (selector)action
+{
+    return _action;
+}
+
+/*!
+    Sets the mode (look) of the color panel.
+    @param mode the mode in which to display the color panel
+*/
+- (void)setMode:(CPColorPanelMode)mode
+{
+    _mode = mode;
+}
+
+- (void)_setPicker:(id)sender
+{
+    var picker = _colorPickers[[sender tag]],
+        view = [picker provideNewView:NO];
+    
+    if (!view)
+        view = [picker provideNewView:YES];
+        
+    if (view == _currentView)
+        return;
+        
+    if (_currentView)
+        [view setFrame:[_currentView frame]];
+    else
+    {
+        var height = (TOOLBAR_HEIGHT+10+PREVIEW_HEIGHT+5+SWATCH_HEIGHT+32),
+            bounds = [[self contentView] bounds];
+
+        [view setFrameSize: CPSizeMake(bounds.size.width - 10, bounds.size.height - height)];
+        [view setFrameOrigin: CPPointMake(5, height)];
+    }
+    
+    [_currentView removeFromSuperview];
+    [[self contentView] addSubview:view];
+    
+    _currentView = view;
+    _activePicker = picker;
+    
+    [picker setColor:[self color]];
+}
+
+/*!
+    Returns the color panel's current display mode.
+*/
+- (CPColorPanelMode)mode
+{
+    return _mode;
+}
+
+- (void)orderFront:(id)aSender
+{
+    [self _loadContentsIfNecessary];
+    [super orderFront:aSender];
+}
+
+/* @ignore */
+- (void)_loadContentsIfNecessary
+{
+    if (_toolbar)
+        return;
+
+    if (!_color)
+        _color = [CPColor whiteColor];
+
+    _colorPickers = [];
+
+    var count = [ColorPickerClasses count];
+    for (var i=0; i<count; i++)
+    {
+        var currentPickerClass = ColorPickerClasses[i],
+            currentPicker = [[currentPickerClass alloc] initWithPickerMask:0 colorPanel:self];
+
+        _colorPickers.push(currentPicker);
+    }
+
+    var contentView = [self contentView],
+        bounds = [contentView bounds];
+
+    _toolbar = [[CPView alloc] initWithFrame:CGRectMake(0, 6, CGRectGetWidth(bounds), TOOLBAR_HEIGHT)];
+    [_toolbar setAutoresizingMask: CPViewWidthSizable];  
+
+    var totalToolbarWidth = count * ICON_WIDTH + (count - 1) * ICON_PADDING,
+        leftOffset = (CGRectGetWidth(bounds) - totalToolbarWidth) / 2.0,
+        buttonForLater = nil;
+
+    for (var i=0; i<count; i++)
+    {
+        var image = [_colorPickers[i] provideNewButtonImage],
+            highlightImage = [_colorPickers[i] provideNewAlternateButtonImage],
+            button = [[CPButton alloc] initWithFrame:CGRectMake(leftOffset + i*(ICON_WIDTH+ICON_PADDING), 0, ICON_WIDTH, ICON_WIDTH)];
+            
+        [button setTag:i];
+        [button setTarget:self];
+        [button setAction:@selector(_setPicker:)];
+        [button setBordered:NO];
+        [button setAutoresizingMask:CPViewMinXMargin|CPViewMaxXMargin];
+        
+        [button setImage:image];
+        [button setAlternateImage:highlightImage];
+        
+        [_toolbar addSubview:button];
+        
+        if (!buttonForLater)
+            buttonForLater = button;
+    }
+
+    // FIXME: http://280north.lighthouseapp.com/projects/13294-cappuccino/tickets/25-implement-cpbox
+    var previewBox = [[CPView alloc] initWithFrame:CGRectMake(76, TOOLBAR_HEIGHT + 10, CGRectGetWidth(bounds) - 86, PREVIEW_HEIGHT)];
+
+    _previewView = [[_CPColorPanelPreview alloc] initWithFrame:CGRectInset([previewBox bounds], 2.0, 2.0)];
+
+    [_previewView setColorPanel:self];
+    [_previewView setAutoresizingMask:CPViewWidthSizable];  
+
+    [previewBox setBackgroundColor:[CPColor colorWithWhite:0.8 alpha:1.0]];
+    [previewBox setAutoresizingMask:CPViewWidthSizable];
+
+    [previewBox addSubview:_previewView];
+
+    var _previewLabel = [[CPTextField alloc] initWithFrame: CPRectMake(10, TOOLBAR_HEIGHT + 10, 60, 15)];
+    [_previewLabel setStringValue: "Preview:"];
+    [_previewLabel setTextColor:[CPColor blackColor]];
+    [_previewLabel setAlignment:CPRightTextAlignment];
+
+    // FIXME: http://280north.lighthouseapp.com/projects/13294-cappuccino/tickets/25-implement-cpbox
+    var swatchBox = [[CPView alloc] initWithFrame:CGRectMake(76, TOOLBAR_HEIGHT + 10 + PREVIEW_HEIGHT + 5, CGRectGetWidth(bounds) - 86, SWATCH_HEIGHT + 2.0)];
+
+    [swatchBox setBackgroundColor:[CPColor colorWithWhite:0.8 alpha:1.0]];
+    [swatchBox setAutoresizingMask:CPViewWidthSizable];
+
+    _swatchView = [[_CPColorPanelSwatches alloc] initWithFrame:CGRectInset([swatchBox bounds], 1.0, 1.0)];
+
+    [_swatchView setColorPanel: self];
+    [_swatchView setAutoresizingMask: CPViewWidthSizable];  
+
+    [swatchBox addSubview:_swatchView];
+
+    var _swatchLabel = [[CPTextField alloc] initWithFrame: CPRectMake(10, TOOLBAR_HEIGHT + 8 + PREVIEW_HEIGHT + 6, 60, 15)];
+    [_swatchLabel setStringValue: "Swatches:"];
+    [_swatchLabel setTextColor:[CPColor blackColor]];
+    [_swatchLabel setAlignment:CPRightTextAlignment];
+
+
+    var opacityLabel = [[CPTextField alloc] initWithFrame: CPRectMake(10, TOOLBAR_HEIGHT + PREVIEW_HEIGHT + 35, 60, 20)];
+    [opacityLabel setStringValue: "Opacity:"];
+    [opacityLabel setTextColor:[CPColor blackColor]];
+    [opacityLabel setAlignment:CPRightTextAlignment];
+
+    _opacitySlider = [[CPSlider alloc] initWithFrame:CGRectMake(76, TOOLBAR_HEIGHT + PREVIEW_HEIGHT + 34, CGRectGetWidth(bounds) - 86, 20.0)];
+    
+    [_opacitySlider setMinValue:0.0];
+    [_opacitySlider setMaxValue:1.0];
+
+    [_opacitySlider setTarget:self];
+    [_opacitySlider setAction:@selector(setOpacity:)];
+
+    [contentView addSubview:_toolbar];
+    [contentView addSubview:previewBox];
+    [contentView addSubview:_previewLabel];
+    [contentView addSubview:swatchBox];
+    [contentView addSubview:_swatchLabel];
+    [contentView addSubview:opacityLabel];
+    [contentView addSubview:_opacitySlider];
+
+    _target = nil;
+    _action = nil;
+    _activePicker = nil;
+
+    [_previewView setBackgroundColor: _color];
+
+    if (buttonForLater)
+        [self _setPicker:buttonForLater];
+}
+
+- (void)setOpacity:(id)sender
+{
+    var components = [[self color] components],
+        alpha = [sender floatValue];
+
+    [self setColor:[_color colorWithAlphaComponent:alpha] updatePicker:YES];
+}
+
+@end
+
+
+CPColorDragType = "CPColorDragType";
+var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
+
+/* @ignore */
+@implementation _CPColorPanelSwatches : CPView
+{
+    CPView[]        _swatches;
+    CPColor         _dragColor;
+    CPColorPanel    _colorPanel;
+    CPCookie        _swatchCookie;
+}
+
+-(id)initWithFrame:(CPRect)aFrame
+{
+    self = [super initWithFrame:aFrame];
+    
+    [self setBackgroundColor: [CPColor grayColor]];
+    
+    [self registerForDraggedTypes:[CPArray arrayWithObjects:CPColorDragType]];
+
+    var whiteColor = [CPColor whiteColor];
+
+    _swatchCookie = [[CPCookie alloc] initWithName: CPColorPanelSwatchesCookie];
+    var colorList = [self startingColorList];
+        
+    _swatches = [];
+    
+    for(var i=0; i < 50; i++)
+    {
+        // FIXME: http://280north.lighthouseapp.com/projects/13294-cappuccino/tickets/25-implement-cpbox
+        var view = [[CPView alloc] initWithFrame: CPRectMake(13*i+1, 1, 12, 12)],
+            fillView = [[CPView alloc] initWithFrame:CGRectInset([view bounds], 1.0, 1.0)];
+        
+        [view setBackgroundColor:whiteColor];
+        [fillView setBackgroundColor: (i < colorList.length) ? colorList[i] : whiteColor];
+
+        [view addSubview:fillView];
+
+        [self addSubview: view];
+        
+        _swatches.push(view);
+    }
+        
+    return self;
+}
+
+- (BOOL)isOpaque
+{
+    return YES;
+}
+
+- (CPArray)startingColorList
+{
+    var cookieValue = [_swatchCookie value];
+    if(cookieValue == "")
+    {
+        return [
+            [CPColor blackColor],
+            [CPColor darkGrayColor],
+            [CPColor grayColor],
+            [CPColor lightGrayColor],
+            [CPColor whiteColor],
+            [CPColor redColor],
+            [CPColor greenColor],
+            [CPColor blueColor],
+            [CPColor yellowColor]
+        ];
+    }
+    
+    var cookieValue = eval(cookieValue);
+    var result = [];
+    
+    for(var i=0; i<cookieValue.length; i++)
+        result.push([CPColor colorWithHexString: cookieValue[i]]);
+
+    return result;
+}
+
+- (CPArray)saveColorList
+{
+    var result = [];
+    // FIXME: http://280north.lighthouseapp.com/projects/13294-cappuccino/tickets/25-implement-cpbox
+    for(var i=0; i<_swatches.length; i++)
+        result.push([[[_swatches[i] subviews][0] backgroundColor] hexString]);
+        
+    var future = new Date();
+    future.setYear(2019);
+    
+    [_swatchCookie setValue: JSON.stringify(result) expires:future domain: nil];
+}
+
+- (void)setColorPanel:(CPColorPanel)panel
+{
+    _colorPanel = panel;
+}
+
+- (CPColorPanel)colorPanel
+{
+    return _colorPanel;
+}
+
+- (CPColor)colorAtIndex:(int)index
+{
+    return [[_swatches[index] subviews][0] backgroundColor];
+}
+
+- (void)setColor:(CPColor)aColor atIndex:(int)index
+{
+    // FIXME: http://280north.lighthouseapp.com/projects/13294-cappuccino/tickets/25-implement-cpbox
+    [[_swatches[index] subviews][0] setBackgroundColor:aColor];
+    [self saveColorList];
+}
+
+- (void)mouseUp:(CPEvent)anEvent
+{
+    var point = [self convertPoint:[anEvent locationInWindow] fromView:nil];
+    
+    if(point.x > [self bounds].size.width - 1 || point.x < 1)
+        return NO;
+
+    [_colorPanel setColor: [self colorAtIndex:FLOOR(point.x / 13)] updatePicker: YES];
+}
+
+- (void)mouseDragged:(CPEvent)anEvent
+{
+    var point = [self convertPoint:[anEvent locationInWindow] fromView:nil];
+
+     if(point.x > [self bounds].size.width - 1 || point.x < 1)
+        return NO;
+
+    [[CPPasteboard pasteboardWithName:CPDragPboard] declareTypes:[CPArray arrayWithObject:CPColorDragType] owner:self];
+ 
+    var swatch = _swatches[FLOOR(point.x / 13)];
+    
+    // FIXME: http://280north.lighthouseapp.com/projects/13294-cappuccino/tickets/25-implement-cpbox
+    _dragColor = [[swatch subviews][0] backgroundColor];
+    
+    var bounds = CPRectCreateCopy([swatch bounds]);
+
+    // FIXME: http://280north.lighthouseapp.com/projects/13294-cappuccino/tickets/25-implement-cpbox
+    var dragView = [[CPView alloc] initWithFrame: bounds];
+        dragFillView = [[CPView alloc] initWithFrame:CGRectInset(bounds, 1.0, 1.0)];
+    
+    [dragView setBackgroundColor:[CPColor blackColor]];
+    [dragFillView setBackgroundColor:_dragColor];
+    
+    [dragView addSubview:dragFillView];
+
+    [self dragView: dragView
+                at: CPPointMake(point.x - bounds.size.width / 2.0, point.y - bounds.size.height / 2.0)
+            offset: CPPointMake(0.0, 0.0)
+             event: anEvent
+        pasteboard: nil
+            source: self
+         slideBack: YES];
+}
+
+- (void)pasteboard:(CPPasteboard)aPasteboard provideDataForType:(CPString)aType
+{
+    if(aType == CPColorDragType)
+        [aPasteboard setData:_dragColor forType:aType];
+}
+
+- (void)performDragOperation:(id <CPDraggingInfo>)aSender
+{    
+    var location = [self convertPoint:[aSender draggingLocation] fromView:nil],
+        pasteboard = [aSender draggingPasteboard],
+        swatch = nil;
+
+    if(![pasteboard availableTypeFromArray:[CPColorDragType]] || location.x > [self bounds].size.width - 1 || location.x < 1)
+        return NO;
+        
+    [self setColor:[pasteboard dataForType:CPColorDragType] atIndex: FLOOR(location.x / 13)];
+}
+
+@end
+
+/* @ignore */
+@implementation _CPColorPanelPreview : CPView
+{
+    CPColorPanel    _colorPanel;
+}
+
+- (id)initWithFrame:(CPRect)aFrame
+{
+    self = [super initWithFrame:aFrame];
+    
+    [self registerForDraggedTypes:[CPArray arrayWithObjects:CPColorDragType]];
+    
+    return self;
+}
+
+- (void)setColorPanel:(CPColorPanel)aPanel
+{
+    _colorPanel = aPanel;
+}
+
+- (CPColorPanel)colorPanel
+{
+    return _colorPanel;
+}
+
+- (void)performDragOperation:(id <CPDraggingInfo>)aSender
+{
+    var pasteboard = [aSender draggingPasteboard];
+
+    if(![pasteboard availableTypeFromArray:[CPColorDragType]])
+        return NO;
+        
+    var color = [pasteboard dataForType:CPColorDragType];
+    [_colorPanel setColor: color updatePicker: YES];
+}
+
+- (BOOL)isOpaque
+{
+    return YES;
+}
+
+- (void)mouseDragged:(CPEvent)anEvent
+{
+    var point = [self convertPoint:[anEvent locationInWindow] fromView:nil];
+
+    [[CPPasteboard pasteboardWithName:CPDragPboard] declareTypes:[CPArray arrayWithObject:CPColorDragType] owner:self];    
+    
+    var bounds = CPRectMake(0, 0, 15, 15);
+    
+    // FIXME: http://280north.lighthouseapp.com/projects/13294-cappuccino/tickets/25-implement-cpbox
+    var dragView = [[CPView alloc] initWithFrame: bounds];
+        dragFillView = [[CPView alloc] initWithFrame:CGRectInset(bounds, 1.0, 1.0)];
+    
+    [dragView setBackgroundColor:[CPColor blackColor]];
+    [dragFillView setBackgroundColor:[self backgroundColor]];
+    
+    [dragView addSubview:dragFillView];
+    
+    [self dragView: dragView
+                at: CPPointMake(point.x - bounds.size.width / 2.0, point.y - bounds.size.height / 2.0)
+            offset: CPPointMake(0.0, 0.0)
+             event: anEvent
+        pasteboard: nil
+            source: self
+         slideBack: YES];
+}
+
+- (void)pasteboard:(CPPasteboard)aPasteboard provideDataForType:(CPString)aType
+{
+    if(aType == CPColorDragType)
+        [aPasteboard setData:[self backgroundColor] forType:aType];
+}
+
+@end
+
+@import "CPColorPicker.j"
+@import "CPSliderColorPicker.j"
+
+[CPColorPanel provideColorPickerClass:CPColorWheelColorPicker];
+[CPColorPanel provideColorPickerClass:CPSliderColorPicker];

AppKit/CPColorPicker.j

@@ -0,0 +1,375 @@
+/*
+ * CPColorPicker.j
+ * AppKit
+ *
+ * Created by Ross Boucher.
+ * Copyright 2008, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPObject.j>
+@import "CPColorPanel.j"
+
+/*! 
+    @ingroup appkit
+    @class CPColorPicker
+
+    CPColorPicker is an abstract superclass for all color picker subclasses. If you want a particular color picker, use CPColorPanel's \c +setPickerMode: method. The simplest way to implement your own color picker is to create a subclass of CPColorPicker.
+*/
+@implementation CPColorPicker : CPObject
+{
+    CPColorPanel    _panel;
+    int             _mask;
+}
+
+/*!
+    Initializes the color picker.
+    @param aMask a unique unsigned int identifying your color picker
+    @param aPanel the color panel that owns this picker
+*/
+- (id)initWithPickerMask:(int)aMask colorPanel:(CPColorPanel)aPanel
+{
+    self = [super init];
+
+    _panel = aPanel;
+    _mask  = aMask;
+
+    return self;
+}
+
+/*!
+    Returns the color panel that owns this picker
+*/
+- (CPColorPanel)colorPanel
+{
+    return _panel;
+}
+
+/*
+    FIXME Not implemented.
+    @return \c nil
+    @ignore
+*/
+- (CPImage)provideNewButtonImage
+{
+    return nil;
+}
+
+/*!
+    Sets the color picker's mode.
+    @param mode the color panel mode
+*/
+- (void)setMode:(CPColorPanelMode)mode
+{
+    return;
+}
+
+/*!
+    Sets the picker's color.
+    @param aColor the new color for the picker
+*/
+- (void)setColor:(CPColor)aColor
+{
+    return;
+}
+
+@end
+
+/*
+    The wheel mode color picker.
+    @ignore
+*/
+@implementation CPColorWheelColorPicker : CPColorPicker
+{
+    CPView          _pickerView;
+    CPView          _brightnessSlider;
+    __CPColorWheel  _hueSaturationView;
+
+    CPColor         _cachedColor;
+}
+ 
+- (id)initWithPickerMask:(int)mask colorPanel:(CPColorPanel)owningColorPanel 
+{
+    return [super initWithPickerMask:mask colorPanel: owningColorPanel];
+}
+
+-(id)initView
+{
+    aFrame = CPRectMake(0, 0, CPColorPickerViewWidth, CPColorPickerViewHeight);
+
+    _pickerView = [[CPView alloc] initWithFrame:aFrame];
+    [_pickerView setAutoresizingMask:CPViewWidthSizable|CPViewHeightSizable];
+
+    _brightnessSlider = [[CPSlider alloc] initWithFrame:CGRectMake(0, (aFrame.size.height - 34), aFrame.size.width, 15)];
+
+    [_brightnessSlider setValue:15.0 forThemeAttribute:@"track-width"];
+    [_brightnessSlider setValue:[CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPColorPicker class]] pathForResource:@"brightness_bar.png"]]] forThemeAttribute:@"track-color"];
+
+    [_brightnessSlider setMinValue:0.0];
+    [_brightnessSlider setMaxValue:100.0];
+    [_brightnessSlider setFloatValue:100.0];
+
+    [_brightnessSlider setTarget:self];
+    [_brightnessSlider setAction:@selector(brightnessSliderDidChange:)];
+    [_brightnessSlider setAutoresizingMask:CPViewWidthSizable | CPViewMinYMargin];
+
+    _hueSaturationView = [[__CPColorWheel alloc] initWithFrame: CPRectMake(0, 0, aFrame.size.width, aFrame.size.height - 38)];
+    [_hueSaturationView setDelegate: self];
+    [_hueSaturationView setAutoresizingMask: (CPViewWidthSizable | CPViewHeightSizable)];
+
+    [_pickerView addSubview:_hueSaturationView];
+    [_pickerView addSubview:_brightnessSlider];
+}
+
+-(void)brightnessSliderDidChange:(id)sender
+{
+    [self updateColor];
+}
+
+-(void)colorWheelDidChange:(id)sender
+{
+    [self updateColor];
+}
+
+-(void)updateColor
+{
+    var hue        = [_hueSaturationView angle],
+        saturation = [_hueSaturationView distance],
+        brightness = [_brightnessSlider floatValue];
+
+    [_hueSaturationView setWheelBrightness:brightness / 100.0];
+    [_brightnessSlider setBackgroundColor:[CPColor colorWithHue:hue saturation:saturation brightness:100]];
+
+    var colorPanel = [self colorPanel],
+        opacity = [colorPanel opacity];
+
+    _cachedColor = [CPColor colorWithHue:hue saturation:saturation brightness:brightness alpha:opacity];
+
+    [[self colorPanel] setColor:_cachedColor];
+}
+
+- (BOOL)supportsMode:(int)mode
+{
+    return (mode == CPWheelColorPickerMode) ? YES : NO;
+}
+
+- (int)currentMode
+{
+    return CPWheelColorPickerMode;
+}
+
+- (CPView)provideNewView:(BOOL)initialRequest
+{
+    if (initialRequest)
+        [self initView];
+
+    return _pickerView;
+}
+
+- (void)setColor:(CPColor)newColor
+{
+    if ([newColor isEqual:_cachedColor])
+        return;
+
+    var hsb = [newColor hsbComponents];
+
+    [_hueSaturationView setPositionToColor:newColor];
+    [_brightnessSlider setFloatValue:hsb[2]];
+    [_hueSaturationView setWheelBrightness:hsb[2] / 100.0];
+
+    [_brightnessSlider setBackgroundColor:[CPColor colorWithHue:hsb[0] saturation:hsb[1] brightness:100]];
+}
+
+- (CPImage)provideNewButtonImage
+{
+    return [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:CPColorPicker] pathForResource:"wheel_button.png"] size:CGSizeMake(32, 32)];
+}
+
+- (CPImage)provideNewAlternateButtonImage
+{
+    return [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:CPColorPicker] pathForResource:"wheel_button_h.png"] size:CGSizeMake(32, 32)];
+}
+
+@end
+
+/* @ignore */
+@implementation __CPColorWheel : CPView
+{
+    DOMElement  _wheelImage;
+    DOMElement  _blackWheelImage;
+
+    CPView      _crosshair;
+
+    id          _delegate;
+
+    float       _angle;
+    float       _distance;
+
+    float       _radius;
+}
+
+-(id)initWithFrame:(CPRect)aFrame
+{
+    self = [super initWithFrame:aFrame];
+
+    var path = [[CPBundle bundleForClass:CPColorPicker] pathForResource:@"wheel.png"];
+
+    _wheelImage = new Image();
+    _wheelImage.src = path;
+    _wheelImage.style.position = "absolute";
+
+    path = [[CPBundle bundleForClass:CPColorPicker] pathForResource:@"wheel_black.png"];
+
+    _blackWheelImage = new Image();
+    _blackWheelImage.src = path;
+    _blackWheelImage.style.opacity = "0";
+    _blackWheelImage.style.filter = "alpha(opacity=0)"
+    _blackWheelImage.style.position = "absolute";
+
+    _DOMElement.appendChild(_wheelImage);
+    _DOMElement.appendChild(_blackWheelImage);
+
+    [self setWheelSize:aFrame.size];
+
+    _crosshair = [[CPView alloc] initWithFrame:CPRectMake(_radius - 2, _radius - 2, 4, 4)];
+    [_crosshair setBackgroundColor:[CPColor blackColor]];
+
+    var view = [[CPView alloc] initWithFrame:CGRectInset([_crosshair bounds], 1.0, 1.0)];
+    [view setBackgroundColor:[CPColor whiteColor]];
+
+    [_crosshair addSubview:view];
+
+    [self addSubview:_crosshair];
+
+    return self;
+}
+
+-(void)setWheelBrightness:(float)brightness
+{
+    _blackWheelImage.style.opacity = 1.0 - brightness;
+    _blackWheelImage.style.filter = "alpha(opacity=" + (1.0 - brightness)*100 + ")"
+}
+
+-(void)setFrameSize:(CPSize)aSize
+{
+    [super setFrameSize:aSize];
+    [self setWheelSize:aSize];
+}
+
+-(void)setWheelSize:(CPSize)aSize
+{
+    var min = MIN(aSize.width, aSize.height);
+
+    _blackWheelImage.style.width = min;
+    _blackWheelImage.style.height = min;
+    _blackWheelImage.width = min;
+    _blackWheelImage.height = min;
+    _blackWheelImage.style.top = (aSize.height - min) / 2.0 + "px";
+    _blackWheelImage.style.left = (aSize.width - min) / 2.0 + "px";
+
+    _wheelImage.style.width = min;
+    _wheelImage.style.height = min;
+    _wheelImage.width = min;
+    _wheelImage.height = min;
+    _wheelImage.style.top = (aSize.height - min) / 2.0 + "px";
+    _wheelImage.style.left = (aSize.width - min) / 2.0 + "px";
+
+    _radius = min / 2.0;
+
+    [self setAngle:[self degreesToRadians:_angle] distance:(_distance / 100.0) * _radius];
+}
+
+-(void)setDelegate:(id)aDelegate
+{
+    _delegate = aDelegate;
+}
+
+-(id)delegate
+{
+    return _delegate;
+}
+
+-(float)angle
+{
+    return _angle;
+}
+
+-(float)distance
+{
+    return _distance;
+}
+
+-(void)mouseDown:(CPEvent)anEvent
+{
+    [self reposition:anEvent];
+}
+
+-(void)mouseDragged:(CPEvent)anEvent
+{
+    [self reposition:anEvent];
+}
+
+-(void)reposition:(CPEvent)anEvent
+{
+    var bounds   = [self bounds],
+        location = [self convertPoint:[anEvent locationInWindow] fromView:nil];
+
+    var midX   = CGRectGetMidX(bounds);
+    var midY   = CGRectGetMidY(bounds);
+
+    var distance = MIN(SQRT((location.x - midX)*(location.x - midX) + (location.y - midY)*(location.y - midY)), _radius);
+    var angle    = ATAN2(location.y - midY, location.x - midX);
+
+    [self setAngle:angle distance:distance];
+
+    [_delegate colorWheelDidChange:self];
+}
+
+-(void)setAngle:(int)angle distance:(float)distance
+{
+    var bounds = [self bounds];
+    var midX   = CGRectGetMidX(bounds);
+    var midY   = CGRectGetMidY(bounds);
+
+    _angle     = [self radiansToDegrees:angle];
+    _distance  = (distance / _radius) * 100.0;
+
+    [_crosshair setFrameOrigin:CPPointMake(COS(angle) * distance + midX - 2.0, SIN(angle) * distance + midY - 2.0)];
+}
+
+-(void)setPositionToColor:(CPColor)aColor
+{
+    var hsb    = [aColor hsbComponents],
+        bounds = [self bounds];
+
+    var angle    = [self degreesToRadians:hsb[0]],
+        distance = (hsb[1] / 100.0) * _radius;
+
+    [self setAngle:angle distance:distance];
+}
+
+-(int)radiansToDegrees:(float)radians
+{
+    return ((-radians / PI) * 180 + 360) % 360;
+}
+
+-(float)degreesToRadians:(float)degrees
+{
+    return -(((degrees - 360) / 180) * PI);
+}
+
+@end
+

AppKit/CPColorWell.j

@@ -0,0 +1,308 @@
+/*
+ * CPColorWell.j
+ * AppKit
+ *
+ * Created by Ross Boucher.
+ * Copyright 2008, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPString.j>
+
+@import "CPView.j"
+@import "CPColor.j"
+@import "CPColorPanel.j"
+
+
+var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiveNotification";
+
+/*! 
+    @ingroup appkit
+    @class CPColorWell
+
+    CPColorWell is a CPControl for selecting and displaying a single color value. An example of a CPColorWell object (or simply color well) is found in CPColorPanel, which uses a color well to display the current color selection.</p>
+
+    <p>An application can have one or more active CPColorWells. You can activate multiple CPColorWells by invoking the \c -activate: method with \c NO as its argument. When a mouse-down event occurs on an CPColorWell's border, it becomes the only active color well. When a color well becomes active, it brings up the color panel also.
+*/
+@implementation CPColorWell : CPControl
+{
+    BOOL    _active;
+    BOOL    _bordered;
+    
+    CPColor _color;
+    CPView  _wellView;
+}
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    self = [super initWithFrame:aFrame];
+    
+    if (self)
+    {
+        _active = NO;
+        _bordered = YES;
+        _color = [CPColor whiteColor];
+        
+        [self drawBezelWithHighlight:NO];
+        [self drawWellInside:CGRectInset([self bounds], 3.0, 3.0)];
+        
+        [self _registerForNotifications];
+    }
+    
+    return self;
+}
+
+- (void)_registerForNotifications
+{
+    var defaultCenter = [CPNotificationCenter defaultCenter];
+
+    [defaultCenter
+        addObserver:self
+           selector:@selector(colorWellDidBecomeExclusive:)
+               name:_CPColorWellDidBecomeExclusiveNotification
+             object:nil];
+
+    [defaultCenter
+        addObserver:self
+           selector:@selector(colorPanelWillClose:)
+               name:CPWindowWillCloseNotification
+             object:[CPColorPanel sharedColorPanel]];
+}
+
+/*!
+    Returns whether the color well is bordered
+*/
+- (BOOL)isBordered
+{
+    return _bordered;
+}
+
+/*!
+    Sets the color well's current color.
+*/
+- (void)setBordered:(BOOL)bordered
+{
+    if (_bordered == bordered)
+        return;
+        
+    _bordered = bordered;
+    
+    [self drawWellInside:CGRectInset([self bounds], 3.0, 3.0)];
+}
+
+// Managing Color From Color Wells
+
+/*!
+    Returns the color well's current color.
+*/
+- (CPColor)color
+{
+    return _color;
+}
+
+/*!
+    Sets the color well's current color.
+*/
+- (void)setColor:(CPColor)aColor
+{
+    if (_color == aColor)
+        return;
+    
+    _color = aColor;
+    
+    [self drawWellInside:CGRectInset([self bounds], 3.0, 3.0)];
+}
+
+/*!
+    Changes the color of the well to that of \c aSender.
+    @param aSender the object from which to retrieve the color
+*/
+- (void)takeColorFrom:(id)aSender
+{
+    [self setColor:[aSender color]];
+}
+
+// Activating and Deactivating Color Wells
+/*!
+    Activates the color well, displays the color panel, and makes the panel's current color the same as its own. 
+    If exclusive is \c YES, deactivates any other CPColorWells. \c NO, keeps them active.
+    @param shouldBeExclusive whether other color wells should be deactivated.
+*/
+- (void)activate:(BOOL)shouldBeExclusive
+{
+    if (shouldBeExclusive)
+        // FIXME: make this queue!
+        [[CPNotificationCenter defaultCenter]
+            postNotificationName:_CPColorWellDidBecomeExclusiveNotification
+                          object:self];
+
+
+    if ([self isActive])
+        return;
+        
+    _active = YES;
+    
+    [[CPNotificationCenter defaultCenter]
+        addObserver:self
+           selector:@selector(colorPanelDidChangeColor:)
+               name:CPColorPanelColorDidChangeNotification
+             object:[CPColorPanel sharedColorPanel]];
+}
+
+/*!
+    Deactivates the color well.
+*/
+- (void)deactivate
+{
+    if (![self isActive])
+        return;
+    
+    _active = NO;
+    
+    [[CPNotificationCenter defaultCenter]
+        removeObserver:self
+                  name:CPColorPanelColorDidChangeNotification
+                object:[CPColorPanel sharedColorPanel]];
+}
+
+/*!
+    Returns \c YES if the color well is active.
+*/
+- (BOOL)isActive
+{
+    return _active;
+}
+
+// Drawing a Color Well
+
+- (void)drawBezelWithHighlight:(BOOL)shouldHighlight
+{
+}
+
+/*!
+    Draws the colored area inside the color well without borders.
+    @param aRect the location at which to draw
+*/
+- (void)drawWellInside:(CGRect)aRect
+{
+    if (!_wellView)
+    {
+        _wellView = [[CPView alloc] initWithFrame:aRect];
+        [_wellView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
+        
+        [self addSubview:_wellView];
+    }
+    else
+        [_wellView setFrame:aRect];
+    
+    [_wellView setBackgroundColor:_color];
+}
+
+- (void)colorPanelDidChangeColor:(CPNotification)aNotification
+{
+    [self takeColorFrom:[aNotification object]];
+    
+    [self sendAction:[self action] to:[self target]];
+}
+
+- (void)colorWellDidBecomeExclusive:(CPNotification)aNotification
+{
+    if (self != [aNotification object])
+        [self deactivate];
+}
+
+- (void)colorPanelWillClose:(CPNotification)aNotification
+{
+    [self deactivate];
+}
+
+- (void)mouseDown:(CPEvent)anEvent
+{
+    [self drawBezelWithHighlight:YES];
+}
+
+- (void)mouseDragged:(CPEvent)anEvent
+{
+    [self drawBezelWithHighlight:CGRectContainsPoint([self bounds], [self convertPoint:[anEvent locationInWindow] fromView:nil])];
+}
+
+-(void)mouseUp:(CPEvent)anEvent
+{
+    [self drawBezelWithHighlight:NO];
+
+    if (!CGRectContainsPoint([self bounds], [self convertPoint:[anEvent locationInWindow] fromView:nil]))
+        return;
+        
+    [self activate:YES];
+
+    var colorPanel = [CPColorPanel sharedColorPanel];
+    
+    [colorPanel setColor:_color];
+    [colorPanel orderFront:self];
+}
+
+@end
+
+var CPColorWellColorKey     = "CPColorWellColorKey",
+    CPColorWellBorderedKey  = "CPColorWellBorderedKey";
+
+@implementation CPColorWell (CPCoding)
+
+/*!
+    Initializes the color well by unarchiving data from \c aCoder.
+    @param aCoder the coder containing the archived CPColorWell.
+*/
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super initWithCoder:aCoder];
+    
+    if (self)
+    {
+        _active = NO;
+        _bordered = [aCoder decodeObjectForKey:CPColorWellBorderedKey];
+        _color = [aCoder decodeObjectForKey:CPColorWellColorKey];
+
+        [self drawBezelWithHighlight:NO];
+        [self drawWellInside:CGRectInset([self bounds], 3.0, 3.0)];
+
+        [self _registerForNotifications];
+    }
+    
+    return self;
+}
+
+/*!
+    Archives this button into the provided coder.
+    @param aCoder the coder to which the color well's instance data will be written.
+*/
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    // We do this in order to avoid encoding the _wellView, which 
+    // should just automatically be created programmatically as needed.
+    var actualSubviews = _subviews;
+    
+    _subviews = [_subviews copy];
+    [_subviews removeObjectIdenticalTo:_wellView];
+    
+    [super encodeWithCoder:aCoder];
+    
+    _subviews = actualSubviews;
+    
+    [aCoder encodeObject:_color forKey:CPColorWellColorKey];
+    [aCoder encodeObject:_bordered forKey:CPColorWellBorderedKey];
+}
+
+@end

AppKit/CPCompatibility.j

@@ -0,0 +1,225 @@
+/*
+ * CPCompatibility.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 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 "CPEvent.j"
+@import "CPPlatform.j"
+
+// Browser Engines
+CPUnknownBrowserEngine                  = 0;
+CPGeckoBrowserEngine                    = 1;
+CPInternetExplorerBrowserEngine         = 2;
+CPKHTMLBrowserEngine                    = 3;
+CPOperaBrowserEngine                    = 4;
+CPWebKitBrowserEngine                   = 5;
+
+// Operating Systems
+CPMacOperatingSystem                    = 0;
+CPWindowsOperatingSystem                = 1;
+CPOtherOperatingSystem                  = 2;
+
+// Features
+CPCSSRGBAFeature                        = 1 << 5;
+
+CPHTMLCanvasFeature                     = 1 << 6;
+CPHTMLContentEditableFeature            = 1 << 7;
+CPHTMLDragAndDropFeature                = 1 << 8;
+
+CPJavascriptInnerTextFeature            = 1 << 9;
+CPJavascriptTextContentFeature          = 1 << 10;
+CPJavascriptClipboardEventsFeature      = 1 << 11;
+CPJavascriptClipboardAccessFeature      = 1 << 12;
+CPJavaScriptCanvasDrawFeature           = 1 << 13;
+CPJavaScriptCanvasTransformFeature      = 1 << 14;
+
+CPVMLFeature                            = 1 << 15;
+
+CPJavascriptRemedialKeySupport          = 1 << 16;
+CPJavaScriptShadowFeature               = 1 << 20;
+
+CPJavaScriptNegativeMouseWheelValues    = 1 << 22;
+CPJavaScriptMouseWheelValues_8_15       = 1 << 23
+
+CPOpacityRequiresFilterFeature          = 1 << 24;
+
+//Internet explorer does not allow dynamically changing the type of an input element
+CPInputTypeCanBeChangedFeature          = 1 << 25;
+CPHTML5DragAndDropSourceYOffBy1         = 1 << 26;
+
+
+
+
+var USER_AGENT                          = "",
+    PLATFORM_ENGINE                     = CPUnknownBrowserEngine,
+    PLATFORM_FEATURES                   = 0;
+
+// default these features to true
+
+PLATFORM_FEATURES |= CPInputTypeCanBeChangedFeature;
+
+if (typeof window != "undfined" && typeof window.navigator != "undefined")
+    USER_AGENT = window.navigator.userAgent;
+
+// Opera
+if (window.opera)
+{
+    PLATFORM_ENGINE = CPOperaBrowserEngine;
+    
+    PLATFORM_FEATURES |= CPJavaScriptCanvasDrawFeature;
+}
+
+// Internet Explorer
+else if (window.attachEvent) // Must follow Opera check.
+{
+    PLATFORM_ENGINE = CPInternetExplorerBrowserEngine;
+    
+    // Features we can only be sure of with IE (no known independent tests)
+    PLATFORM_FEATURES |= CPVMLFeature;
+    PLATFORM_FEATURES |= CPJavascriptRemedialKeySupport;
+    PLATFORM_FEATURES |= CPJavaScriptShadowFeature;
+    
+    PLATFORM_FEATURES |= CPOpacityRequiresFilterFeature;
+
+    PLATFORM_FEATURES &= ~CPInputTypeCanBeChangedFeature;
+}
+
+// WebKit
+else if (USER_AGENT.indexOf("AppleWebKit/") != -1)
+{
+    PLATFORM_ENGINE = CPWebKitBrowserEngine;
+    
+    // Features we can only be sure of with WebKit (no known independent tests)
+    PLATFORM_FEATURES |= CPCSSRGBAFeature;
+    PLATFORM_FEATURES |= CPHTMLContentEditableFeature;
+    PLATFORM_FEATURES |= CPHTMLDragAndDropFeature;
+    PLATFORM_FEATURES |= CPJavascriptClipboardEventsFeature;
+    PLATFORM_FEATURES |= CPJavascriptClipboardAccessFeature;
+    PLATFORM_FEATURES |= CPJavaScriptShadowFeature;
+    
+    var versionStart = USER_AGENT.indexOf("AppleWebKit/") + "AppleWebKit/".length,
+        versionEnd = USER_AGENT.indexOf(" ", versionStart),
+        versionString = USER_AGENT.substring(versionStart, versionEnd),
+        versionDivision = versionString.indexOf('.'),
+        majorVersion = parseInt(versionString.substring(0, versionDivision)),
+        minorVersion = parseInt(versionString.substr(versionDivision + 1));
+
+    if((USER_AGENT.indexOf("Safari") !== CPNotFound && (majorVersion > 525 || (majorVersion === 525 && minorVersion > 14))) || USER_AGENT.indexOf("Chrome") !== CPNotFound)
+        PLATFORM_FEATURES |= CPJavascriptRemedialKeySupport;
+
+    // FIXME this is a terrible hack to get around this bug:
+    // https://bugs.webkit.org/show_bug.cgi?id=21548
+    if (![CPPlatform isBrowser])
+        PLATFORM_FEATURES |= CPJavascriptRemedialKeySupport;
+
+    if (majorVersion < 532 || (majorVersion === 532 && minorVersion < 6))
+        PLATFORM_FEATURES |= CPHTML5DragAndDropSourceYOffBy1;
+}
+
+// KHTML
+else if (USER_AGENT.indexOf("KHTML") != -1) // Must follow WebKit check.
+{
+    PLATFORM_ENGINE = CPKHTMLBrowserEngine;
+}
+
+// Gecko
+else if (USER_AGENT.indexOf("Gecko") !== -1) // Must follow KHTML check.
+{
+    PLATFORM_ENGINE = CPGeckoBrowserEngine;
+    
+    PLATFORM_FEATURES |= CPJavaScriptCanvasDrawFeature;
+    
+    var index = USER_AGENT.indexOf("Firefox"),
+        version = (index === -1) ? 2.0 : parseFloat(USER_AGENT.substring(index + "Firefox".length + 1));
+    
+    if (version >= 3.0)
+        PLATFORM_FEATURES |= CPCSSRGBAFeature;
+
+    if (version < 3.0)
+        PLATFORM_FEATURES |= CPJavaScriptMouseWheelValues_8_15;
+}
+
+// Feature Specific Checks
+if (typeof document != "undefined")
+{
+    var canvasElement = document.createElement("canvas");
+    // Detect Canvas Support
+    if (canvasElement && canvasElement.getContext)
+    {
+        PLATFORM_FEATURES |= CPHTMLCanvasFeature;
+    
+        // Detect Canvas setTransform/transform support
+        var context = document.createElement("canvas").getContext("2d");
+        
+        if (context && context.setTransform && context.transform)
+            PLATFORM_FEATURES |= CPJavaScriptCanvasTransformFeature;
+    }
+    
+    var DOMElement = document.createElement("div");
+    
+    // Detect whether we have innerText or textContent (or neither)
+    if (DOMElement.innerText != undefined)
+        PLATFORM_FEATURES |= CPJavascriptInnerTextFeature;
+    else if (DOMElement.textContent != undefined)
+        PLATFORM_FEATURES |= CPJavascriptTextContentFeature;
+}
+
+function CPFeatureIsCompatible(aFeature)
+{
+    return PLATFORM_FEATURES & aFeature;
+}
+
+function CPBrowserIsEngine(anEngine)
+{
+    return PLATFORM_ENGINE === anEngine;
+}
+
+function CPBrowserIsOperatingSystem(anOperatingSystem)
+{
+    return OPERATING_SYSTEM === anOperatingSystem;
+}
+
+OPERATING_SYSTEM = CPOtherOperatingSystem;
+
+if (USER_AGENT.indexOf("Mac") !== -1)
+{
+    OPERATING_SYSTEM = CPMacOperatingSystem;
+
+    CPPlatformActionKeyMask = CPCommandKeyMask;
+
+    CPUndoKeyEquivalent = @"Z";
+    CPRedoKeyEquivalent = @"Z";
+
+    CPUndoKeyEquivalentModifierMask = CPCommandKeyMask;
+    CPRedoKeyEquivalentModifierMask = CPCommandKeyMask | CPShiftKeyMask;
+}
+else
+{
+    if (USER_AGENT.indexOf("Windows") !== -1)
+        OPERATING_SYSTEM = CPWindowsOperatingSystem;
+
+    CPPlatformActionKeyMask = CPControlKeyMask;
+
+    CPUndoKeyEquivalent = @"Z";
+    CPRedoKeyEquivalent = @"Y";
+
+    CPUndoKeyEquivalentModifierMask = CPControlKeyMask;
+    CPRedoKeyEquivalentModifierMask = CPControlKeyMask;
+}

AppKit/CPControl.j

@@ -0,0 +1,689 @@
+/*
+ * CPControl.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 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 "CPFont.j"
+@import "CPShadow.j"
+@import "CPView.j"
+
+#include "CoreGraphics/CGGeometry.h"
+#include "Platform/Platform.h"
+
+/*
+    @global
+    @group CPTextAlignment
+*/
+CPLeftTextAlignment         = 0;
+/*
+    @global
+    @group CPTextAlignment
+*/
+CPRightTextAlignment        = 1;
+/*
+    @global
+    @group CPTextAlignment
+*/
+CPCenterTextAlignment       = 2;
+/*
+    @global
+    @group CPTextAlignment
+*/
+CPJustifiedTextAlignment    = 3;
+/*
+    @global
+    @group CPTextAlignment
+*/
+CPNaturalTextAlignment      = 4;
+
+/*
+    @global
+    @group CPControlSize
+*/
+CPRegularControlSize        = 0;
+/*
+    @global
+    @group CPControlSize
+*/
+CPSmallControlSize          = 1;
+/*
+    @global
+    @group CPControlSize
+*/
+CPMiniControlSize           = 2;
+
+CPControlNormalBackgroundColor      = "CPControlNormalBackgroundColor";
+CPControlSelectedBackgroundColor    = "CPControlSelectedBackgroundColor";
+CPControlHighlightedBackgroundColor = "CPControlHighlightedBackgroundColor";
+CPControlDisabledBackgroundColor    = "CPControlDisabledBackgroundColor";
+
+CPControlTextDidBeginEditingNotification    = "CPControlTextDidBeginEditingNotification";
+CPControlTextDidChangeNotification          = "CPControlTextDidChangeNotification";
+CPControlTextDidEndEditingNotification      = "CPControlTextDidEndEditingNotification";
+
+var CPControlBlackColor     = [CPColor blackColor];
+
+/*! 
+    @ingroup appkit
+    @class CPControl
+
+    CPControl is an abstract superclass used to implement user interface elements. As a subclass of CPView and CPResponder it has the ability to handle screen drawing and handling user input.
+*/
+@implementation CPControl : CPView
+{
+    id                  _value;
+    
+    // Target-Action Support
+    id                  _target;
+    SEL                 _action;
+    int                 _sendActionOn;
+    BOOL                _sendsActionOnEndEditing @accessors(property=sendsActionOnEndEditing);
+
+    // Mouse Tracking Support
+    BOOL                _continuousTracking;
+    BOOL                _trackingWasWithinFrame;
+    unsigned            _trackingMouseDownFlags;
+    CGPoint             _previousTrackingLocation;
+
+    CPString            _toolTip;
+}
+
++ (CPDictionary)themeAttributes
+{
+    return [CPDictionary dictionaryWithObjects:[CPLeftTextAlignment,
+                                                CPTopVerticalTextAlignment,
+                                                CPLineBreakByClipping,
+                                                [CPColor blackColor],
+                                                [CPFont systemFontOfSize:12.0],
+                                                nil,
+                                                _CGSizeMakeZero(),
+                                                CPImageLeft,
+                                                CPScaleToFit,
+                                                _CGSizeMakeZero(),
+                                                _CGSizeMake(-1.0, -1.0)]
+                                       forKeys:[@"alignment",
+                                                @"vertical-alignment",
+                                                @"line-break-mode",
+                                                @"text-color",
+                                                @"font",
+                                                @"text-shadow-color",
+                                                @"text-shadow-offset",
+                                                @"image-position",
+                                                @"image-scaling",
+                                                @"min-size",
+                                                @"max-size"]];
+}
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    self = [super initWithFrame:aFrame];
+    
+    if (self)
+    {
+        _sendActionOn = CPLeftMouseUpMask;
+        _trackingMouseDownFlags = 0;
+    }
+    
+    return self;
+}
+
+/*!
+    Sets the receiver's target action
+    @param anAction Sets the action message that gets sent to the target.
+*/
+- (void)setAction:(SEL)anAction
+{
+    _action = anAction;
+}
+
+/*!
+    Returns the receiver's target action
+*/
+- (SEL)action
+{
+    return _action;
+}
+
+/*!
+    Sets the receiver's target. The target receives action messages from the receiver.
+    @param aTarget the object that will receive the message specified by action
+*/
+- (void)setTarget:(id)aTarget
+{
+    _target = aTarget;
+}
+
+/*!
+    Returns the receiver's target. The target receives action messages from the receiver.
+*/
+- (id)target
+{
+    return _target;
+}
+
+/*!
+    Causes \c anAction to be sent to \c anObject.
+    @param anAction the action to send
+    @param anObject the object to which the action will be sent
+*/
+- (void)sendAction:(SEL)anAction to:(id)anObject
+{
+    [CPApp sendAction:anAction to:anObject from:self];
+}
+
+- (int)sendActionOn:(int)mask
+{
+    var previousMask = _sendActionOn;
+    
+    _sendActionOn = mask;
+    
+    return previousMask;
+}
+
+/*!
+    Sets the tooltip for the receiver.
+    @param aToolTip the tooltip
+*/
+/*
+-(void)setToolTip:(CPString)aToolTip
+{
+    if (_toolTip == aToolTip)
+        return;
+    
+    _toolTip = aToolTip;
+
+#if PLATFORM(DOM)
+    _DOMElement.title = aToolTip;
+#endif
+}
+*/
+/*!
+    Returns the receiver's tooltip
+*/
+/*
+-(CPString)toolTip
+{
+    return _toolTip;
+}
+*/
+
+/*!
+    Returns whether the control can continuously send its action messages.
+*/
+- (BOOL)isContinuous
+{
+    // Some subclasses should redefine this with CPLeftMouseDraggedMask
+    return (_sendActionOn & CPPeriodicMask) !== 0;
+}
+
+/*!
+    Sets whether the cell can continuously send its action messages.
+ */
+- (void)setContinuous:(BOOL)flag
+{
+    // Some subclasses should redefine this with CPLeftMouseDraggedMask
+    if (flag)
+        _sendActionOn |= CPPeriodicMask;
+    else 
+        _sendActionOn &= ~CPPeriodicMask;
+}
+
+- (BOOL)tracksMouseOutsideOfFrame
+{
+    return NO;
+}
+
+- (void)trackMouse:(CPEvent)anEvent
+{
+    var type = [anEvent type],
+        currentLocation = [self convertPoint:[anEvent locationInWindow] fromView:nil];
+        isWithinFrame = [self tracksMouseOutsideOfFrame] || CGRectContainsPoint([self bounds], currentLocation);
+
+    if (type === CPLeftMouseUp)
+    {
+        [self stopTracking:_previousTrackingLocation at:currentLocation mouseIsUp:YES];
+        
+        _trackingMouseDownFlags = 0;
+    }
+    
+    else
+    {
+        if (type === CPLeftMouseDown)
+        {
+            _trackingMouseDownFlags = [anEvent modifierFlags];
+            _continuousTracking = [self startTrackingAt:currentLocation];
+        }
+        else if (type === CPLeftMouseDragged)
+        {
+            if (isWithinFrame)
+            {
+                if (!_trackingWasWithinFrame)
+                    _continuousTracking = [self startTrackingAt:currentLocation];
+                
+                else if (_continuousTracking)
+                    _continuousTracking = [self continueTracking:_previousTrackingLocation at:currentLocation];
+            }
+            else
+                [self stopTracking:_previousTrackingLocation at:currentLocation mouseIsUp:NO];
+        }
+        
+        [CPApp setTarget:self selector:@selector(trackMouse:) forNextEventMatchingMask:CPLeftMouseDraggedMask | CPLeftMouseUpMask untilDate:nil inMode:nil dequeue:YES];
+    }
+    
+    if ((_sendActionOn & (1 << type)) && isWithinFrame)
+        [self sendAction:_action to:_target];
+    
+    _trackingWasWithinFrame = isWithinFrame;
+    _previousTrackingLocation = currentLocation;
+}
+
+- (void)setState:(int)state
+{
+}
+
+- (int)nextState
+{
+    return 0;
+}
+
+- (void)performClick:(id)sender 
+{
+    [self highlight:YES];
+    [self setState:[self nextState]];
+    [self sendAction:[self action] to:[self target]];
+    [self highlight:NO];
+}
+
+- (unsigned)mouseDownFlags
+{
+    return _trackingMouseDownFlags;
+}
+
+- (BOOL)startTrackingAt:(CGPoint)aPoint
+{
+    [self highlight:YES];
+    
+    return (_sendActionOn & CPPeriodicMask) || (_sendActionOn & CPLeftMouseDraggedMask);
+}
+
+- (BOOL)continueTracking:(CGPoint)lastPoint at:(CGPoint)aPoint
+{
+    return (_sendActionOn & CPPeriodicMask) || (_sendActionOn & CPLeftMouseDraggedMask);
+}
+
+- (void)stopTracking:(CGPoint)lastPoint at:(CGPoint)aPoint mouseIsUp:(BOOL)mouseIsUp
+{
+    [self highlight:NO];
+}
+
+- (void)mouseDown:(CPEvent)anEvent
+{
+    if (![self isEnabled])
+        return;
+    
+    [self trackMouse:anEvent];
+}
+
+/*!
+    Returns the receiver's object value
+*/
+- (id)objectValue
+{
+    return _value;
+}
+
+/*!
+    Set's the receiver's object value
+*/
+- (void)setObjectValue:(id)anObject
+{
+    _value = anObject;
+    
+    [self setNeedsLayout];
+    [self setNeedsDisplay:YES];
+}
+
+/*!
+    Returns the receiver's float value
+*/
+- (float)floatValue
+{
+    var floatValue = parseFloat(_value, 10);
+    return isNaN(floatValue) ? 0.0 : floatValue;
+}
+
+/*!
+    Sets the receiver's float value
+*/
+- (void)setFloatValue:(float)aValue
+{
+    [self setObjectValue:aValue];
+}
+
+/*!
+    Returns the receiver's double value
+*/
+- (double)doubleValue
+{
+    var doubleValue = parseFloat(_value, 10);
+    return isNaN(doubleValue) ? 0.0 : doubleValue;
+}
+
+/*!
+    Set's the receiver's double value
+*/
+- (void)setDoubleValue:(double)anObject
+{
+    [self setObjectValue:anObject];
+}
+
+/*!
+    Returns the receiver's int value
+*/
+- (int)intValue
+{
+    var intValue = parseInt(_value, 10);
+    return isNaN(intValue) ? 0.0 : intValue;
+}
+
+/*!
+    Set's the receiver's int value
+*/
+- (void)setIntValue:(int)anObject
+{
+    [self setObjectValue:anObject];
+}
+
+/*!
+    Returns the receiver's int value
+*/
+- (int)integerValue
+{
+    var intValue = parseInt(_value, 10);
+    return isNaN(intValue) ? 0.0 : intValue;
+}
+
+/*!
+    Set's the receiver's int value
+*/
+- (void)setIntegerValue:(int)anObject
+{
+    [self setObjectValue:anObject];
+}
+
+/*!
+    Returns the receiver's int value
+*/
+- (CPString)stringValue
+{
+    return (_value === undefined || _value === nil) ? "" : String(_value);
+}
+
+/*!
+    Set's the receiver's int value
+*/
+- (void)setStringValue:(CPString)anObject
+{
+    [self setObjectValue:anObject];
+}
+
+- (void)takeDoubleValueFrom:(id)sender
+{
+    if ([sender respondsToSelector:@selector(doubleValue)])
+        [self setDoubleValue:[sender doubleValue]];
+}
+
+
+- (void)takeFloatValueFrom:(id)sender
+{
+    if ([sender respondsToSelector:@selector(floatValue)])
+        [self setFloatValue:[sender floatValue]];
+}
+
+
+- (void)takeIntegerValueFrom:(id)sender
+{
+    if ([sender respondsToSelector:@selector(integerValue)])
+        [self setIntegerValue:[sender integerValue]];
+}
+
+
+- (void)takeIntValueFrom:(id)sender
+{
+    if ([sender respondsToSelector:@selector(intValue)])
+        [self setIntValue:[sender intValue]];
+}
+
+
+- (void)takeObjectValueFrom:(id)sender
+{
+    if ([sender respondsToSelector:@selector(objectValue)])
+        [self setObjectValue:[sender objectValue]];
+}
+
+- (void)takeStringValueFrom:(id)sender
+{
+    if ([sender respondsToSelector:@selector(stringValue)])
+        [self setStringValue:[sender stringValue]];
+}
+
+- (void)textDidBeginEditing:(CPNotification)note 
+{
+    //this looks to prevent false propagation of notifications for other objects
+    if([note object] != self)
+        return;
+
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPControlTextDidBeginEditingNotification object:self userInfo:[CPDictionary dictionaryWithObject:[note object] forKey:"CPFieldEditor"]];
+}
+
+- (void)textDidChange:(CPNotification)note 
+{
+    //this looks to prevent false propagation of notifications for other objects
+    if([note object] != self)
+        return;
+
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPControlTextDidChangeNotification object:self userInfo:[CPDictionary dictionaryWithObject:[note object] forKey:"CPFieldEditor"]];
+}
+
+- (void)textDidEndEditing:(CPNotification)note 
+{
+    //this looks to prevent false propagation of notifications for other objects
+    if([note object] != self)
+        return;
+
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPControlTextDidEndEditingNotification object:self userInfo:[CPDictionary dictionaryWithObject:[note object] forKey:"CPFieldEditor"]];
+}
+
+#define BRIDGE(UPPERCASE, LOWERCASE, ATTRIBUTENAME) \
+/*! Sets the value for ATTRIBUTENAME */\
+- (void)set##UPPERCASE:(id)aValue\
+{\
+[self setValue:aValue forThemeAttribute:ATTRIBUTENAME];\
+}\
+/*! Returns the current value for ATTRIBUTENAME */\
+- (id)LOWERCASE\
+{\
+return [self valueForThemeAttribute:ATTRIBUTENAME];\
+}
+
+BRIDGE(Alignment, alignment, "alignment")
+BRIDGE(VerticalAlignment, verticalAlignment, "vertical-alignment")
+BRIDGE(LineBreakMode, lineBreakMode, "line-break-mode")
+BRIDGE(TextColor, textColor, "text-color")
+BRIDGE(Font, font, "font")
+BRIDGE(TextShadowColor, textShadowColor, "text-shadow-color")
+BRIDGE(TextShadowOffset, textShadowOffset, "text-shadow-offset")
+BRIDGE(ImagePosition, imagePosition, "image-position")
+BRIDGE(ImageScaling, imageScaling, "image-scaling")
+
+- (void)setEnabled:(BOOL)isEnabled
+{
+    if (isEnabled)
+        [self unsetThemeState:CPThemeStateDisabled];
+    else
+        [self setThemeState:CPThemeStateDisabled];
+}
+
+- (BOOL)isEnabled
+{
+    return ![self hasThemeState:CPThemeStateDisabled];
+}
+
+- (void)highlight:(BOOL)shouldHighlight
+{
+    [self setHighlighted:shouldHighlight];
+}
+
+- (void)setHighlighted:(BOOL)isHighlighted
+{
+    if (isHighlighted)
+        [self setThemeState:CPThemeStateHighlighted];
+    else
+        [self unsetThemeState:CPThemeStateHighlighted];
+}
+
+- (BOOL)isHighlighted
+{
+    return [self hasThemeState:CPThemeStateHighlighted];
+}
+
+@end
+
+var CPControlValueKey           = "CPControlValueKey",
+    CPControlControlStateKey    = @"CPControlControlStateKey",
+    CPControlIsEnabledKey       = "CPControlIsEnabledKey",
+    
+    CPControlTargetKey          = "CPControlTargetKey",
+    CPControlActionKey          = "CPControlActionKey",
+    CPControlSendActionOnKey    = "CPControlSendActionOnKey";
+
+var __Deprecated__CPImageViewImageKey   = @"CPImageViewImageKey";
+
+@implementation CPControl (CPCoding)
+
+/*
+    Initializes the control by unarchiving it from a coder.
+    @param aCoder the coder from which to unarchive the control
+    @return the initialized control
+*/
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super initWithCoder:aCoder];
+
+    if (self)
+    {
+        [self setObjectValue:[aCoder decodeObjectForKey:CPControlValueKey]];
+
+        [self setTarget:[aCoder decodeObjectForKey:CPControlTargetKey]];
+        [self setAction:[aCoder decodeObjectForKey:CPControlActionKey]];
+
+        [self sendActionOn:[aCoder decodeIntForKey:CPControlSendActionOnKey]];
+    }
+    
+    return self;
+}
+
+/*
+    Archives the control to the provided coder.
+    @param aCoder the coder to which the control will be archived.
+*/
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [super encodeWithCoder:aCoder];
+
+    if (_value !== nil)
+        [aCoder encodeObject:_value forKey:CPControlValueKey];
+
+    if (_target !== nil)
+        [aCoder encodeConditionalObject:_target forKey:CPControlTargetKey];
+
+    if (_action !== NULL)
+        [aCoder encodeObject:_action forKey:CPControlActionKey];
+
+    [aCoder encodeInt:_sendActionOn forKey:CPControlSendActionOnKey];
+}
+
+@end
+
+var _CPControlSizeIdentifiers               = [],
+    _CPControlCachedColorWithPatternImages  = {},
+    _CPControlCachedThreePartImagePattern   = {};
+
+_CPControlSizeIdentifiers[CPRegularControlSize] = "Regular";
+_CPControlSizeIdentifiers[CPSmallControlSize]   = "Small";
+_CPControlSizeIdentifiers[CPMiniControlSize]    = "Mini";
+    
+function _CPControlIdentifierForControlSize(aControlSize)
+{
+    return _CPControlSizeIdentifiers[aControlSize];
+}
+
+function _CPControlColorWithPatternImage(sizes, aClassName)
+{
+    var index = 1,
+        count = arguments.length,
+        identifier = "";
+    
+    for (; index < count; ++index)
+        identifier += arguments[index];
+    
+    var color = _CPControlCachedColorWithPatternImages[identifier];
+    
+    if (!color)
+    {
+        var bundle = [CPBundle bundleForClass:[CPControl class]];
+    
+        color = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:aClassName + "/" + identifier + ".png"] size:sizes[identifier]]];
+
+        _CPControlCachedColorWithPatternImages[identifier] = color;
+    }
+    
+    return color;
+}
+
+function _CPControlThreePartImagePattern(isVertical, sizes, aClassName)
+{
+    var index = 2,
+        count = arguments.length,
+        identifier = "";
+    
+    for (; index < count; ++index)
+        identifier += arguments[index];
+
+    var color = _CPControlCachedThreePartImagePattern[identifier];
+    
+    if (!color)
+    {
+        var bundle = [CPBundle bundleForClass:[CPControl class]],
+            path = aClassName + "/" + identifier;
+        
+        sizes = sizes[identifier];
+
+        color = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:[
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:path + "0.png"] size:sizes[0]],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:path + "1.png"] size:sizes[1]],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:path + "2.png"] size:sizes[2]]
+                ] isVertical:isVertical]];
+                
+        _CPControlCachedThreePartImagePattern[identifier] = color;
+    }
+    
+    return color;
+}

AppKit/CPCookie.j

@@ -0,0 +1,114 @@
+/*
+ * CPCookie.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPObject.j>
+@import <Foundation/CPString.j>
+
+
+/*! 
+    @ingroup appkit
+    @class CPCookie
+    CPCookie is the Cappuccino interface to a web browser cookie. You can set the name
+*/
+@implementation CPCookie : CPObject
+{
+    CPString    _cookieName;
+    CPString    _cookieValue;
+    
+    CPString    _expires;
+}
+
+/*!
+    Initializes a cookie with a given name \c aName.
+    @param the name for the cookie
+*/
+- (id)initWithName:(CPString)aName
+{
+    self = [super init];
+    
+    _cookieName  = aName;
+    _cookieValue = [self _readCookieValue];
+
+    return self;
+}
+
+/*!
+    Returns the cookie's data value
+*/
+- (CPString)value
+{
+    return _cookieValue;
+}
+
+/*!
+    Returns the cookie's name
+*/
+- (CPString)name
+{
+    return _cookieName;
+}
+
+/*!
+    Returns the cookie's expiration date
+*/
+- (CPString)expires
+{
+    return _expires;
+}
+
+/*!
+    Sets a value, expiration date, and domain for the cookie
+    @param value the cookie's value
+    @param date the cookie's expiration date
+    @param domain the cookie's domain
+*/
+- (void)setValue:(CPString)value expires:(CPDate)date domain:(CPString)domain
+{
+    if(date)
+        var expires = "; expires="+date.toGMTString();
+    else 
+        var expires = "";
+        
+    if(domain)
+        domain = "; domain="+domain;
+    else 
+        domain = "";
+        
+	document.cookie = _cookieName+"="+value+expires+"; path=/"+domain;        
+}
+
+/* @ignore */
+- (CPString)_readCookieValue
+{
+	var nameEQ = _cookieName + "=";
+	var ca = document.cookie.split(';');
+	for(var i=0;i < ca.length;i++) {
+		var c = ca[i];
+		while (c.charAt(0)==' ') c = c.substring(1,c.length);
+		if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length);
+	}
+	return "";
+}
+
+@end
+
+//http://www.quirksmode.org/js/cookies.html

AppKit/CPCursor.j

@@ -0,0 +1,264 @@
+/*
+Testing browsers:
+    WebKit r50235 (Safari 4.0.3+)
+    FireFox 3.5
+    Opera 10.0.0
+
+Implemented class methods:
+    Webkit : All
+    IE     : All
+    FireFox Win : All
+    FireFox Mac : All except closedHandCursor disappearingItemCursor // Firefox mac does not support url cursors
+    Opera       : All except resizeLeftRightCursor resizeUpDownCursor operationNotAllowedCursor dragCopyCursor dragLinkCursor contextualMenuCursor openHandCursor closedHandCursor disappearingItemCursor // Opera does not support url cursors so these won't work with images
+*/
+
+var currentCursor = nil,
+    cursorStack = [],
+    cursors = {},
+    cursorURLFormat = nil;
+
+@implementation CPCursor : CPObject
+{
+    CPString _cssString;
+    BOOL     _isSetOnMouseEntered @accessors(readwrite, getter=isSetOnMouseEntered, setter=setOnMouseEntered:);
+    BOOL     _isSetOnMouseExited @accessors(readwrite, getter=isSetOnMouseExited, setter=setOnMouseExited:);
+}
+
++ (CPCursor)currentCursor
+{
+    return currentCursor;
+}
+
+- (id)initWithCSSString:(CPString)aString
+{
+    if (self = [super init])
+        _cssString = aString;
+
+    return self;
+}
+
++ (CPCursor)cursorWithCSSString:(CPString)cssString
+{
+    var cursor = cursors[cssString];
+
+    if (typeof cursor == 'undefined')
+    {
+        cursor = [[CPCursor alloc] initWithCSSString:cssString];
+        cursors[cssString] = cursor;
+    }
+
+    return cursor;
+}
+
++ (CPCursor)cursorWithImageNamed:(CPString)imageName
+{
+    if (!cursorURLFormat)
+    {
+        cursorURLFormat = @"url(" + [[CPBundle bundleForClass:self] resourcePath] + @"/CPCursor/%@.cur)";
+
+        if (CPBrowserIsEngine(CPGeckoBrowserEngine))
+            cursorURLFormat += ", default";
+    }
+    
+    var url = [CPString stringWithFormat:cursorURLFormat, imageName];
+    
+    return [[CPCursor alloc] initWithCSSString:url];
+}
+
+- (CPString)_cssString
+{
+    return _cssString;
+}
+
++ (CPCursor)arrowCursor
+{
+    return [CPCursor cursorWithCSSString:@"default"]; // WebKit | FF | opera | IE
+}
+
++ (CPCursor)crosshairCursor
+{
+    return [CPCursor cursorWithCSSString:@"crosshair"]; // WebKit | FF | opera | IE
+}
+
++ (CPCursor)IBeamCursor
+{
+    return [CPCursor cursorWithCSSString:@"text"]; // WebKit | FF | opera | IE
+}
+
++ (CPCursor)pointingHandCursor
+{
+    return [CPCursor cursorWithCSSString:@"pointer"]; // WebKit | FF | opera | IE
+}
+
++ (CPCursor)resizeDownCursor
+{
+    if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
+        return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)];
+        
+    return [CPCursor cursorWithCSSString:"s-resize"]; // WebKit | FF | opera
+}
+
++ (CPCursor)resizeUpCursor
+{
+    if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
+        return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)];
+
+    return [CPCursor cursorWithCSSString:@"n-resize"]; // WebKit | FF | opera
+}
+
++ (CPCursor)resizeLeftCursor
+{
+    if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
+        return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)];
+
+    return [CPCursor cursorWithCSSString:@"w-resize"]; // WebKit | FF | opera
+}
+
++ (CPCursor)resizeRightCursor
+{
+    if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
+        return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)];
+
+    return [CPCursor cursorWithCSSString:@"e-resize"]; // WebKit | FF | opera
+}
+
++ (CPCursor)resizeLeftRightCursor
+{
+    return [CPCursor cursorWithCSSString:@"col-resize"]; // WebKit | FF | IE
+}
+
++ (CPCursor)resizeUpDownCursor
+{
+    return [CPCursor cursorWithCSSString:@"row-resize"]; // WebKit | FF | IE
+}
+
++ (CPCursor)operationNotAllowedCursor
+{
+    return [CPCursor cursorWithCSSString:@"not-allowed"]; // WebKit | FF | IE
+}
+
++ (CPCursor)dragCopyCursor
+{
+    if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
+        return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)];
+
+    return [CPCursor cursorWithCSSString:@"copy"]; // WebKit | FF
+}
+
++ (CPCursor)dragLinkCursor
+{
+    if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
+        return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)];
+
+    return [CPCursor cursorWithCSSString:@"alias"]; // WebKit | FF
+}
+
++ (CPCursor)contextualMenuCursor
+{
+    if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
+        return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)];
+
+    return [CPCursor cursorWithCSSString:@"context-menu"]; // WebKit | FF Mac . Not impl FF Win.
+}
+
++ (CPCursor)openHandCursor
+{
+    if (CPBrowserIsEngine(CPWebKitBrowserEngine))
+        return [CPCursor cursorWithCSSString:@"-webkit-grab"];
+    else if (CPBrowserIsEngine(CPGeckoBrowserEngine) || CPBrowserIsEngine(CPOperaBrowserEngine))
+        return [CPCursor cursorWithCSSString:@"move"];
+
+    return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)]; // WebKit only. move in FFMac|Opera 
+}
+
++ (CPCursor)closedHandCursor
+{
+    if (CPBrowserIsEngine(CPWebKitBrowserEngine))
+        return [CPCursor cursorWithCSSString:@"-webkit-grabbing"];
+
+    return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)]; // WebKit only 
+}
+
++ (CPCursor)disappearingItemCursor
+{
+    return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)]; // None
+}
+
++ (void)hide
+{
+    document.body.style.cursor = 'none'; // Not supported in IE
+}
+
++ (void)unhide
+{
+    document.body.style.cursor = [currentCursor _cssString];
+}
+
++ (void)setHiddenUntilMouseMoves:(BOOL)flag
+{
+    if (flag)
+        [CPCursor hide];
+    else
+        [CPCursor unhide];
+}
+
+- (id)initWithImage:(CPImage)image hotSpot:(CPPoint)hotSpot
+{
+    return [self initWithCSSString:"url(" + [image filename] + ")"];
+}
+
+- (void)mouseEntered:(CPEvent)event
+{
+}
+
+- (void)mouseExited:(CPEvent)event
+{
+}
+
+- (void)set
+{
+    document.body.style.cursor = _cssString;
+    currentCursor = self; 
+
+#if PLATFORM(DOM)
+    var platformWindows = [[CPPlatformWindow visiblePlatformWindows] allObjects];
+    for (var i = 0, count = [platformWindows count]; i < count; i++)
+        platformWindows[i]._DOMWindow.document.body.style.cursor = _cssString;
+#endif
+
+}
+
+- (void)push
+{
+    currentCursor = cursorStack.push(self);
+}
+
+- (void)pop
+{
+    [CPCursor pop];
+}
+
++ (void)pop
+{
+    if (cursorStack.length > 1)
+    {
+        cursorStack.pop();
+        currentCursor = cursorStack[cursorStack.length - 1];
+    }
+}
+
+- (id)initWithCoder:(CPCoder)coder
+{
+    if (self = [super init])
+        _cssString = [coder decodeObjectForKey:@"CPCursorNameKey"];
+
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)coder
+{
+    [coder encodeObject:_cssString forKey:@"CPCursorNameKey"];
+}
+
+@end
+

AppKit/CPDocument.j

@@ -0,0 +1,930 @@
+/*
+ * CPDocument.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPString.j>
+@import <Foundation/CPArray.j>
+
+@import "CPResponder.j"
+@import "CPSavePanel.j"
+@import "CPViewController.j"
+@import "CPWindowController.j"
+
+
+/*
+    @global
+    @group CPSaveOperationType
+*/
+CPSaveOperation             = 0;
+/*
+    @global
+    @group CPSaveOperationType
+*/
+CPSaveAsOperation           = 1;
+/*
+    @global
+    @group CPSaveOperationType
+*/
+CPSaveToOperation           = 2;
+/*
+    @global
+    @group CPSaveOperationType
+*/
+CPAutosaveOperation         = 3;
+
+/*
+    @global
+    @group CPDocumentChangeType
+*/
+CPChangeDone                = 0;
+/*
+    @global
+    @group CPDocumentChangeType
+*/
+CPChangeUndone              = 1;
+/*
+    @global
+    @group CPDocumentChangeType
+*/
+CPChangeCleared             = 2;
+/*
+    @global
+    @group CPDocumentChangeType
+*/
+CPChangeReadOtherContents   = 3;
+/*
+    @global
+    @group CPDocumentChangeType
+*/
+CPChangeAutosaved           = 4;
+
+CPDocumentWillSaveNotification      = @"CPDocumentWillSaveNotification";
+CPDocumentDidSaveNotification       = @"CPDocumentDidSaveNotification";
+CPDocumentDidFailToSaveNotification = @"CPDocumentDidFailToSaveNotification";
+
+var CPDocumentUntitledCount = 0;
+
+/*! 
+    @ingroup appkit
+    @class CPDocument
+
+    CPDocument is used to represent a document/file in a Cappuccino application.
+    In a document-based application, generally multiple documents are open simutaneously
+    (multiple text documents, slide presentations, spreadsheets, etc.), and multiple
+    CPDocuments should be used to represent this.
+*/
+@implementation CPDocument : CPResponder
+{
+    CPWindow            _window; // For outlet purposes.
+    CPView              _view; // For outlet purposes
+    CPDictionary        _viewControllersForWindowControllers;
+
+    CPURL               _fileURL;
+    CPString            _fileType;
+    CPArray             _windowControllers;
+    unsigned            _untitledDocumentIndex;
+
+    BOOL                _hasUndoManager;
+    CPUndoManager       _undoManager;
+
+    int                 _changeCount;
+
+    CPURLConnection     _readConnection;
+    CPURLRequest        _writeRequest;
+
+    CPAlert             _canCloseAlert;
+}
+
+/*!
+    Initializes an empty document.
+    @return the initialized document
+*/
+- (id)init
+{
+    self = [super init];
+    
+    if (self)
+    {
+        _windowControllers = [];
+        _viewControllersForWindowControllers = [CPDictionary dictionary];
+
+        _hasUndoManager = YES;
+        _changeCount = 0;
+
+        [self setNextResponder:CPApp];
+    }
+    
+    return self;
+}
+
+/*!
+    Initializes the document with a specific data type.
+    @param aType the type of document to initialize
+    @param anError not used
+    @return the initialized document
+*/
+- (id)initWithType:(CPString)aType error:({CPError})anError
+{
+    self = [self init];
+    
+    if (self)
+        [self setFileType:aType];
+    
+    return self;
+}
+
+/*!
+    Initializes a document of a specific type located at a URL. Notifies
+    the provided delegate after initialization.
+    @param anAbsoluteURL the url of the document content
+    @param aType the type of document located at the URL
+    @param aDelegate the delegate to notify
+    @param aDidReadSelector the selector used to notify the delegate
+    @param aContextInfo context information passed to the delegate
+    after initialization
+    @return the initialized document
+*/
+- (id)initWithContentsOfURL:(CPURL)anAbsoluteURL ofType:(CPString)aType delegate:(id)aDelegate didReadSelector:(SEL)aDidReadSelector contextInfo:(id)aContextInfo
+{
+    self = [self init];
+    
+    if (self)
+    {
+        [self setFileURL:anAbsoluteURL];
+        [self setFileType:aType];
+
+        [self readFromURL:anAbsoluteURL ofType:aType delegate:aDelegate didReadSelector:aDidReadSelector contextInfo:aContextInfo];
+    }
+    
+    return self;
+}
+
+/*!
+    Initializes the document from a URL.
+    @param anAbsoluteURL the document location
+    @param absoluteContentsURL the location of the document's contents
+    @param aType the type of the contents
+    @param aDelegate this object will receive a callback after the document's contents are loaded
+    @param aDidReadSelector the message selector that will be sent to \c aDelegate
+    @param aContextInfo passed as the argument to the message sent to the \c aDelegate
+    @return the initialized document
+*/
+- (id)initForURL:(CPURL)anAbsoluteURL withContentsOfURL:(CPURL)absoluteContentsURL ofType:(CPString)aType delegate:(id)aDelegate didReadSelector:(SEL)aDidReadSelector contextInfo:(id)aContextInfo
+{
+    self = [self init];
+    
+    if (self)
+    {
+        [self setFileURL:anAbsoluteURL];
+        [self setFileType:aType];
+
+        [self readFromURL:absoluteContentsURL ofType:aType delegate:aDelegate didReadSelector:aDidReadSelector contextInfo:aContextInfo];
+    }
+    
+    return self;
+}
+
+/*!
+    Returns the receiver's data in a specified type. The default implementation just
+    throws an exception.
+    @param aType the format of the data
+    @param anError not used
+    @throws CPUnsupportedMethodException if this method hasn't been overriden by the subclass
+    @return the document data
+*/
+- (CPData)dataOfType:(CPString)aType error:({CPError})anError
+{
+    [CPException raise:CPUnsupportedMethodException
+                reason:"dataOfType:error: must be overridden by the document subclass."];
+}
+
+/*!
+    Sets the content of the document by reading the provided
+    data. The default implementation just throws an exception.
+    @param aData the document's data
+    @param aType the document type
+    @param anError not used
+    @throws CPUnsupportedMethodException if this method hasn't been
+    overridden by the subclass
+*/
+- (void)readFromData:(CPData)aData ofType:(CPString)aType error:(CPError)anError
+{
+    [CPException raise:CPUnsupportedMethodException
+                reason:"readFromData:ofType: must be overridden by the document subclass."];
+}
+
+- (void)viewControllerWillLoadCib:(CPViewController)aViewController
+{
+}
+
+- (void)viewControllerDidLoadCib:(CPViewController)aViewController
+{
+}
+
+- (CPWindowController)firstEligibleExistingWindowController
+{
+    return nil;
+}
+
+// Creating and managing window controllers
+/*!
+    Creates the window controller for this document.
+*/
+- (void)makeWindowControllers
+{
+    [self makeViewAndWindowControllers];
+}
+
+- (void)makeViewAndWindowControllers
+{
+    var viewCibName = [self viewCibName],
+        viewController = nil,
+        windowController = nil;
+
+    // Create our view controller if we have a cib for it.
+    if ([viewCibName length])
+        viewController = [[CPViewController alloc] initWithCibName:viewCibName bundle:nil owner:self];
+
+    // If we have a view controller, check if we have a free window for it.
+    if (viewController)
+        windowController = [self firstEligibleExistingWindowController];
+
+    // If not, create one.
+    if (!windowController)
+    {
+        var windowCibName = [self windowCibName];
+
+        // From a cib if we have one.
+        if ([windowCibName length])
+            windowController = [[CPWindowController alloc] initWithWindowCibName:windowCibName owner:self];
+
+        // If not you get a standard window capable of displaying multiple documents and view
+        else if (viewController)
+        {
+            var view = [viewController view],
+                viewFrame = [view frame];
+            
+            viewFrame.origin = CGPointMake(50, 50);
+
+            var theWindow = [[CPWindow alloc] initWithContentRect:viewFrame styleMask:CPTitledWindowMask | CPClosableWindowMask | CPMiniaturizableWindowMask | CPResizableWindowMask];
+
+            windowController = [[CPWindowController alloc] initWithWindow:theWindow];
+        }
+    }
+
+    if (windowController && viewController)
+        [windowController setSupportsMultipleDocuments:YES];
+
+    if (windowController)
+        [self addWindowController:windowController];
+
+    if (viewController)
+        [self addViewController:viewController forWindowController:windowController];
+}
+
+/*!
+    Returns the document's window controllers
+*/
+- (CPArray)windowControllers
+{
+    return _windowControllers;
+}
+
+/*!
+    Add a controller to the document's list of controllers. This should
+    be called after making a new window controller.
+    @param aWindowController the controller to add
+*/
+- (void)addWindowController:(CPWindowController)aWindowController
+{
+    [_windowControllers addObject:aWindowController];
+
+    if ([aWindowController document] !== self)
+        [aWindowController setDocument:self];
+}
+
+/*!
+    Remove a controller to the document's list of controllers. This should
+    be called after closing the controller's window.
+    @param aWindowController the controller to remove
+*/
+- (void)removeWindowController:(CPWindowController)aWindowController
+{
+    if (aWindowController)
+        [_windowControllers removeObject:aWindowController];
+
+    if ([aWindowController document] === self)
+        [aWindowController setDocument:nil];
+}
+
+- (CPView)view
+{
+    return _view;
+}
+
+- (CPArray)viewControllers
+{
+    return [_viewControllersForWindowControllers allValues];
+}
+
+- (void)addViewController:(CPViewController)aViewController forWindowController:(CPWindowController)aWindowController
+{
+    // FIXME: exception if we don't own the window controller?
+    [_viewControllersForWindowControllers setObject:aViewController forKey:[aWindowController UID]];
+
+    if ([aWindowController document] === self)
+        [aWindowController setViewController:aViewController];
+}
+
+- (void)removeViewController:(CPViewController)aViewController
+{
+    [_viewControllersForWindowControllers removeObject:aViewController];
+}
+
+- (CPViewController)viewControllerForWindowController:(CPWindowController)aWindowController
+{
+    return [_viewControllersForWindowControllers objectForKey:[aWindowController UID]];
+}
+
+// Managing Document Windows
+/*!
+    Shows all the document's windows.
+*/
+- (void)showWindows
+{
+    [_windowControllers makeObjectsPerformSelector:@selector(setDocument:) withObject:self];
+    [_windowControllers makeObjectsPerformSelector:@selector(showWindow:) withObject:self];
+}
+
+/*!
+    Returns the name of the document as displayed in the title bar.
+*/
+- (CPString)displayName
+{
+    if (_fileURL)
+        return [_fileURL lastPathComponent];
+    
+    if (!_untitledDocumentIndex)
+        _untitledDocumentIndex = ++CPDocumentUntitledCount;
+	
+	if (_untitledDocumentIndex == 1)
+	   return @"Untitled";
+
+	return @"Untitled " + _untitledDocumentIndex;
+}
+
+- (CPString)viewCibName
+{
+    return nil;
+}
+
+/*!
+    Returns the document's Cib name
+*/
+- (CPString)windowCibName
+{
+    return nil;
+}
+
+/*!
+    Called after \c aWindowController loads the document's Nib file.
+    @param aWindowController the controller that loaded the Nib file
+*/
+- (void)windowControllerDidLoadCib:(CPWindowController)aWindowController
+{
+}
+
+/*!
+    Called before \c aWindowController will load the document's Nib file.
+    @param aWindowController the controller that will load the Nib file
+*/
+- (void)windowControllerWillLoadCib:(CPWindowController)aWindowController
+{
+}
+
+// Reading from and Writing to URLs
+/*!
+    Set the document's data from a URL. Notifies the provided delegate afterwards.
+    @param anAbsoluteURL the URL to the document's content
+    @param aType the document type
+    @param aDelegate delegate to notify after reading the data
+    @param aDidReadSelector message that will be sent to the delegate
+    @param aContextInfo context information that gets sent to the delegate
+*/
+- (void)readFromURL:(CPURL)anAbsoluteURL ofType:(CPString)aType delegate:(id)aDelegate didReadSelector:(SEL)aDidReadSelector contextInfo:(id)aContextInfo
+{
+    [_readConnection cancel];
+
+    // FIXME: Oh man is this every looking for trouble, we need to handle login at the Cappuccino level, with HTTP Errors.
+    _readConnection = [CPURLConnection connectionWithRequest:[CPURLRequest requestWithURL:anAbsoluteURL] delegate:self];
+
+    _readConnection.session = _CPReadSessionMake(aType, aDelegate, aDidReadSelector, aContextInfo);
+}
+
+/*!
+    Returns the path to the document's file.
+*/
+- (CPURL)fileURL
+{
+    return _fileURL;
+}
+
+/*!
+    Sets the path to the document's file.
+    @param aFileURL the path to the document's file
+*/
+- (void)setFileURL:(CPURL)aFileURL
+{
+    if (_fileURL === aFileURL)
+        return;
+
+    _fileURL = aFileURL;
+    
+    [_windowControllers makeObjectsPerformSelector:@selector(synchronizeWindowTitleWithDocumentName)];
+}
+
+/*!
+    Saves the document to the specified URL. Notifies the provided delegate
+    with the provided selector and context info afterwards.
+    @param anAbsoluteURL the url to write the document data to
+    @param aTypeName the document type
+    @param aSaveOperation the type of save operation
+    @param aDelegate the delegate to notify after saving
+    @param aDidSaveSelector the selector to send the delegate
+    @param aContextInfo context info that gets passed to the delegate
+*/
+- (void)saveToURL:(CPURL)anAbsoluteURL ofType:(CPString)aTypeName forSaveOperation:(CPSaveOperationType)aSaveOperation delegate:(id)aDelegate didSaveSelector:(SEL)aDidSaveSelector contextInfo:(id)aContextInfo
+{
+    var data = [self dataOfType:[self fileType] error:nil],
+        oldChangeCount = _changeCount;
+
+    _writeRequest = [CPURLRequest requestWithURL:anAbsoluteURL];
+
+    // FIXME: THIS IS WRONG! We need a way to decide
+    if ([CPPlatform isBrowser])
+        [_writeRequest setHTTPMethod:@"POST"];
+    else
+        [_writeRequest setHTTPMethod:@"PUT"];
+
+    [_writeRequest setHTTPBody:[data string]];
+
+    [_writeRequest setValue:@"close" forHTTPHeaderField:@"Connection"];
+
+    if (aSaveOperation == CPSaveOperation)
+        [_writeRequest setValue:@"true" forHTTPHeaderField:@"x-cappuccino-overwrite"];
+
+    if (aSaveOperation != CPSaveToOperation)
+        [self updateChangeCount:CPChangeCleared];
+
+    // FIXME: Oh man is this every looking for trouble, we need to handle login at the Cappuccino level, with HTTP Errors.
+    var connection = [CPURLConnection connectionWithRequest:_writeRequest delegate:self];
+
+    connection.session = _CPSaveSessionMake(anAbsoluteURL, aSaveOperation, oldChangeCount, aDelegate, aDidSaveSelector, aContextInfo, connection);
+}
+
+/*
+    Implemented as a delegate method for CPURLConnection
+    @ignore
+*/
+- (void)connection:(CPURLConnection)aConnection didReceiveResponse:(CPURLResponse)aResponse
+{
+    // If we got this far and it wasn't an HTTP request, then everything is fine.
+    if (![aResponse isKindOfClass:[CPHTTPURLResponse class]])
+        return;
+    
+    var statusCode = [aResponse statusCode];
+    
+    // Nothing to do if everything is hunky dory.
+    if (statusCode === 200)
+        return;
+    
+    var session = aConnection.session;
+    
+    if (aConnection == _readConnection)
+    {
+        [aConnection cancel];
+            
+        alert("There was an error retrieving the document.");
+        
+        objj_msgSend(session.delegate, session.didReadSelector, self, NO, session.contextInfo);
+    }
+    else
+    {
+        // 409: Conflict, in Cappuccino, overwrite protection for documents.
+        if (statusCode == 409)
+        {
+            [aConnection cancel];
+            
+            if (confirm("There already exists a file with that name, would you like to overwrite it?"))
+            {
+                [_writeRequest setValue:@"true" forHTTPHeaderField:@"x-cappuccino-overwrite"];
+    
+                [aConnection start];
+            }
+            else        
+            {
+                if (session.saveOperation != CPSaveToOperation)
+                {
+                    _changeCount += session.changeCount;
+                    [_windowControllers makeObjectsPerformSelector:@selector(setDocumentEdited:) withObject:[self isDocumentEdited]];
+                }
+                
+                _writeRequest = nil;
+    
+                objj_msgSend(session.delegate, session.didSaveSelector, self, NO, session.contextInfo);
+                [self _sendDocumentSavedNotification:NO];
+            }
+        }
+    }
+}
+
+/*
+    Implemented as a delegate method for CPURLConnection
+    @ignore
+*/
+- (void)connection:(CPURLConnection)aConnection didReceiveData:(CPString)aData
+{
+    var session = aConnection.session;
+        
+    // READ
+    if (aConnection == _readConnection)
+    {
+        [self readFromData:[CPData dataWithString:aData] ofType:session.fileType error:nil];
+
+        objj_msgSend(session.delegate, session.didReadSelector, self, YES, session.contextInfo);
+    }
+    else
+    {
+        if (session.saveOperation != CPSaveToOperation)
+            [self setFileURL:session.absoluteURL];
+            
+        _writeRequest = nil;
+        
+        objj_msgSend(session.delegate, session.didSaveSelector, self, YES, session.contextInfo);
+        [self _sendDocumentSavedNotification:YES];
+    }
+}
+
+/*
+    Implemented as a delegate method for CPURLConnection
+    @ignore
+*/
+- (void)connection:(CPURLConnection)aConnection didFailWithError:(CPError)anError
+{
+    var session = aConnection.session;
+        
+    if (_readConnection == aConnection)
+        objj_msgSend(session.delegate, session.didReadSelector, self, NO, session.contextInfo);
+    
+    else
+    {        
+        if (session.saveOperation != CPSaveToOperation)
+        {
+            _changeCount += session.changeCount;
+            [_windowControllers makeObjectsPerformSelector:@selector(setDocumentEdited:) withObject:[self isDocumentEdited]];
+        }        
+
+        _writeRequest = nil;
+
+        alert("There was an error saving the document.");
+
+        objj_msgSend(session.delegate, session.didSaveSelector, self, NO, session.contextInfo);
+        [self _sendDocumentSavedNotification:NO];
+    }
+}
+
+/*
+    Implemented as a delegate method for CPURLConnection
+    @ignore
+*/
+- (void)connectionDidFinishLoading:(CPURLConnection)aConnection
+{
+    if (_readConnection == aConnection)
+        _readConnection = nil;
+}
+
+// Managing Document Status
+/*!
+    Returns \c YES if there are any unsaved changes.
+*/
+- (BOOL)isDocumentEdited
+{
+    return _changeCount != 0;
+}
+
+/*!
+    Updates the number of unsaved changes to the document.
+    @param aChangeType a new document change to apply
+*/
+- (void)updateChangeCount:(CPDocumentChangeType)aChangeType
+{
+    if (aChangeType == CPChangeDone)
+        ++_changeCount;
+    else if (aChangeType == CPChangeUndone)
+        --_changeCount;
+    else if (aChangeType == CPChangeCleared)
+        _changeCount = 0;
+    /*else if (aChangeType == CPCHangeReadOtherContents)
+        
+    else if (aChangeType == CPChangeAutosaved)*/ 
+    
+    [_windowControllers makeObjectsPerformSelector:@selector(setDocumentEdited:) withObject:[self isDocumentEdited]];
+}
+
+// Managing File Types
+/*!
+    Sets the document's file type
+    @param aType the document's type
+*/
+- (void)setFileType:(CPString)aType
+{
+    _fileType = aType;
+}
+
+/*!
+    Returns the document's file type
+*/
+- (CPString)fileType
+{
+    return _fileType;
+}
+
+// Working with Undo Manager
+/*!
+    Returns \c YES if the document has a
+    CPUndoManager.
+*/
+- (BOOL)hasUndoManager
+{
+    return _hasUndoManager;
+}
+
+/*!
+    Sets whether the document should have a CPUndoManager.
+    @param aFlag \c YES makes the document have an undo manager
+*/
+- (void)setHasUndoManager:(BOOL)aFlag
+{
+    if (_hasUndoManager == aFlag)
+        return;
+    
+    _hasUndoManager = aFlag;
+    
+    if (!_hasUndoManager)
+        [self setUndoManager:nil];
+}
+
+/* @ignore */
+- (void)_undoManagerWillCloseGroup:(CPNotification)aNotification
+{
+    var undoManager = [aNotification object];
+    
+    if ([undoManager isUndoing] || [undoManager isRedoing])
+        return;
+
+    [self updateChangeCount:CPChangeDone];
+}
+
+/* @ignore */
+- (void)_undoManagerDidUndoChange:(CPNotification)aNotification
+{
+    [self updateChangeCount:CPChangeUndone];
+}
+
+/* @ignore */
+- (void)_undoManagerDidRedoChange:(CPNotification)aNotification
+{
+    [self updateChangeCount:CPChangeDone];
+}
+
+/*
+    Sets the document's undo manager. This method will add the
+    undo manager as an observer to the notification center.
+    @param anUndoManager the new undo manager for the document
+*/
+- (void)setUndoManager:(CPUndoManager)anUndoManager
+{
+    var defaultCenter = [CPNotificationCenter defaultCenter];
+    
+    if (_undoManager)
+    {
+        [defaultCenter removeObserver:self
+                                 name:CPUndoManagerDidUndoChangeNotification
+                               object:_undoManager];
+                               
+        [defaultCenter removeObserver:self
+                                 name:CPUndoManagerDidRedoChangeNotification
+                               object:_undoManager];
+
+        [defaultCenter removeObserver:self
+                                 name:CPUndoManagerWillCloseUndoGroupNotification
+                               object:_undoManager];
+    }
+    
+    _undoManager = anUndoManager;
+    
+    if (_undoManager)
+    {
+    
+        [defaultCenter addObserver:self
+                          selector:@selector(_undoManagerDidUndoChange:)
+                              name:CPUndoManagerDidUndoChangeNotification
+                            object:_undoManager];
+                            
+        [defaultCenter addObserver:self
+                          selector:@selector(_undoManagerDidRedoChange:)
+                              name:CPUndoManagerDidRedoChangeNotification
+                            object:_undoManager];
+
+        [defaultCenter addObserver:self
+                          selector:@selector(_undoManagerWillCloseGroup:)
+                              name:CPUndoManagerWillCloseUndoGroupNotification
+                            object:_undoManager];
+    }
+}
+
+/*!
+    Returns the document's undo manager. If the document
+    should have one, but the manager is \c nil, it
+    will be created and then returned.
+    @return the document's undo manager
+*/
+- (CPUndoManager)undoManager
+{
+    if (_hasUndoManager && !_undoManager)
+        [self setUndoManager:[[CPUndoManager alloc] init]];
+
+    return _undoManager;
+}
+ 
+/*
+    Implemented as a delegate of a CPWindow
+    @ignore
+*/
+- (CPUndoManager)windowWillReturnUndoManager:(CPWindow)aWindow
+{
+    return [self undoManager];
+}
+
+// Handling User Actions
+/*!
+    Saves the document. If the document does not
+    have a file path to save to (\c fileURL)
+    then \c -saveDocumentAs: will be called.
+    @param aSender the object requesting the save
+*/
+- (void)saveDocument:(id)aSender
+{
+    [self saveDocumentWithDelegate:nil didSaveSelector:nil contextInfo:nil];
+}
+
+- (void)saveDocumentWithDelegate:(id)delegate didSaveSelector:(SEL)didSaveSelector contextInfo:(Object)contextInfo
+{
+    if (_fileURL)
+    {
+        [[CPNotificationCenter defaultCenter]
+            postNotificationName:CPDocumentWillSaveNotification
+                          object:self];
+        
+        [self saveToURL:_fileURL ofType:[self fileType] forSaveOperation:CPSaveOperation delegate:delegate didSaveSelector:didSaveSelector contextInfo:contextInfo];
+    }
+    else
+        [self _saveDocumentAsWithDelegate:delegate didSaveSelector:didSaveSelector contextInfo:contextInfo];
+}
+
+/*!
+    Saves the document to a user specified path.
+    @param aSender the object requesting the operation
+*/
+- (void)saveDocumentAs:(id)aSender
+{
+    [self _saveDocumentAsWithDelegate:nil didSaveSelector:nil contextInfo:nil];
+}
+
+- (void)_saveDocumentAsWithDelegate:(id)delegate didSaveSelector:(SEL)didSaveSelector contextInfo:(Object)contextInfo
+{
+    var savePanel = [CPSavePanel savePanel],
+        response = [savePanel runModal];
+
+    if (!response)
+        return;
+
+    var saveURL = [savePanel URL];
+
+    [[CPNotificationCenter defaultCenter]
+        postNotificationName:CPDocumentWillSaveNotification
+                      object:self];
+
+    [self saveToURL:saveURL ofType:[self fileType] forSaveOperation:CPSaveAsOperation delegate:delegate didSaveSelector:didSaveSelector contextInfo:contextInfo];
+}
+
+/*
+    @ignore
+*/
+- (void)_sendDocumentSavedNotification:(BOOL)didSave
+{
+    if (didSave)
+        [[CPNotificationCenter defaultCenter]
+            postNotificationName:CPDocumentDidSaveNotification
+                          object:self];
+    else
+        [[CPNotificationCenter defaultCenter]
+            postNotificationName:CPDocumentDidFailToSaveNotification
+                          object:self];
+}
+
+@end
+
+@implementation CPDocument (ClosingDocuments)
+
+- (void)close
+{
+    [_windowControllers makeObjectsPerformSelector:@selector(removeDocumentAndCloseIfNecessary:) withObject:self];
+    [[CPDocumentController sharedDocumentController] removeDocument:self];
+}
+
+- (void)shouldCloseWindowController:(CPWindowController)controller delegate:(id)delegate shouldCloseSelector:(SEL)selector contextInfo:(Object)info 
+{
+    if ([controller shouldCloseDocument] || ([_windowControllers count] < 2 && [_windowControllers indexOfObject:controller] !== CPNotFound))
+        [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);
+}
+
+- (void)_document:(CPDocument)aDocument shouldClose:(BOOL)shouldClose context:(Object)context
+{
+    if (aDocument === self && shouldClose)
+        [self close];
+
+    objj_msgSend(context.delegate, 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);
+
+    _canCloseAlert = [[CPAlert alloc] init];
+
+    [_canCloseAlert setDelegate:self];
+    [_canCloseAlert setAlertStyle:CPWarningAlertStyle];
+    [_canCloseAlert setTitle:@"Unsaved Document"];
+    [_canCloseAlert setMessageText:sprintf(@"Do you want to save the changes you've made to the document \"%@\"?", 
+                                        [self displayName] || [self fileName])];
+
+    [_canCloseAlert addButtonWithTitle:@"Save"];
+    [_canCloseAlert addButtonWithTitle:@"Cancel"];
+    [_canCloseAlert addButtonWithTitle:@"Don't Save"];
+
+    _canCloseAlert._context = {delegate:aDelegate, selector:aSelector, context:context};
+
+    [_canCloseAlert runModal];
+}
+
+- (void)alertDidEnd:(CPAlert)alert returnCode:(int)returnCode
+{
+    if (alert !== _canCloseAlert)
+        return;
+
+    var delegate = alert._context.delegate,
+        selector = alert._context.selector,
+        context = alert._context.context;
+
+    if (returnCode === 0)
+        [self saveDocumentWithDelegate:delegate didSaveSelector:selector contextInfo:context];
+    else
+        objj_msgSend(delegate, selector, self, returnCode === 2, context);
+
+    _canCloseAlert = nil;
+}
+
+@end
+
+var _CPReadSessionMake = function(aType, aDelegate, aDidReadSelector, aContextInfo)
+{
+    return { fileType:aType, delegate:aDelegate, didReadSelector:aDidReadSelector, contextInfo:aContextInfo };
+}
+
+var _CPSaveSessionMake = function(anAbsoluteURL, aSaveOperation, aChangeCount, aDelegate, aDidSaveSelector, aContextInfo, aConnection)
+{
+    return { absoluteURL:anAbsoluteURL, saveOperation:aSaveOperation, changeCount:aChangeCount, delegate:aDelegate, didSaveSelector:aDidSaveSelector, contextInfo:aContextInfo, connection:aConnection };
+}

AppKit/CPDocumentController.j

@@ -0,0 +1,457 @@
+/*
+ * CPDocumentController.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPObject.j>
+@import <Foundation/CPBundle.j>
+
+@import "CPDocument.j"
+@import "CPOpenPanel.j";
+
+
+var CPSharedDocumentController = nil;
+
+/*! 
+    @ingroup appkit
+    @class CPDocumentController
+    This class is responsible for managing an application's open documents.
+*/
+@implementation CPDocumentController : CPObject
+{
+    CPArray _documents;
+    CPArray _documentTypes;
+}
+
+/*!
+    Returns the singleton instance of the application's document controller. If it has not 
+    been created yet, it will be created then returned.
+    @return a CPDocumentController
+*/
++ (id)sharedDocumentController
+{
+    if (!CPSharedDocumentController)
+        [[self alloc] init];
+    
+    return CPSharedDocumentController;
+}
+
+/*
+    @ignore
+*/
+- (id)init
+{
+    self = [super init];
+    
+    if (self)
+    {
+        _documents = [[CPArray alloc] init];
+        
+        if (!CPSharedDocumentController)
+            CPSharedDocumentController = self;
+
+        _documentTypes = [[[CPBundle mainBundle] infoDictionary] objectForKey:@"CPBundleDocumentTypes"];
+    }
+    return self;
+}
+
+// Creating and Opening Documents
+
+/*!
+    Returns the document matching the specified URL. This
+    method searches documents already open. It does not
+    open the document at the URL if it is not already open.
+    @param aURL the url of the document
+    @return the document, or \c nil if such a document is not open
+*/
+- (CPDocument)documentForURL:(CPURL)aURL
+{
+    var index = 0,
+        count = [_documents count];
+	
+	for (; index < count; ++index)
+    {
+        var theDocument = _documents[index];
+        
+		if ([[theDocument fileURL] isEqual:aURL])
+			return theDocument;
+    }
+	
+	return nil;
+}
+
+/*!
+    Creates a new document of the specified type.
+    @param aType the type of the new document
+    @param shouldDisplay whether to display the document on screen
+*/
+- (void)openUntitledDocumentOfType:(CPString)aType display:(BOOL)shouldDisplay
+{
+    var theDocument = [self makeUntitledDocumentOfType:aType error:nil];
+    
+    if (theDocument)
+        [self addDocument:theDocument];
+    
+    if (shouldDisplay)
+    {
+        [theDocument makeWindowControllers];
+        [theDocument showWindows];
+    }
+
+    return theDocument;
+}
+
+/*!
+    Creates a document of the specified type.
+    @param aType the document type
+    @param anError not used
+    @return the created document
+*/
+- (CPDocument)makeUntitledDocumentOfType:(CPString)aType error:({CPError})anError
+{
+    return [[[self documentClassForType:aType] alloc] initWithType:aType error:anError];
+}
+
+/*!
+    Opens the document at the specified URL.
+    @param anAbsoluteURL the path to the document's file
+    @param shouldDisplay whether to display the document on screen
+    @param anError not used
+    @return the opened document
+*/
+- (CPDocument)openDocumentWithContentsOfURL:(CPURL)anAbsoluteURL display:(BOOL)shouldDisplay error:(CPError)anError
+{
+    var result = [self documentForURL:anAbsoluteURL];
+
+    if (!result)
+    {
+        var type = [self typeForContentsOfURL:anAbsoluteURL error:anError];
+
+        result = [self makeDocumentWithContentsOfURL:anAbsoluteURL ofType:type delegate:self didReadSelector:@selector(document:didRead:contextInfo:) contextInfo:[CPDictionary dictionaryWithObject:shouldDisplay forKey:@"shouldDisplay"]];
+
+        [self addDocument:result];
+
+        if (result)
+            [self noteNewRecentDocument:result];
+    }
+    else if (shouldDisplay)
+        [result showWindows];
+
+    return result;
+}
+
+/*!
+    Loads a document for a specified URL with it's content
+    retrieved from another URL.
+    @param anAbsoluteURL the document URL
+    @param absoluteContentsURL the location of the document's contents
+    @param anError not used
+    @return the loaded document or \c nil if there was an error
+*/
+- (CPDocument)reopenDocumentForURL:(CPURL)anAbsoluteURL withContentsOfURL:(CPURL)absoluteContentsURL error:(CPError)anError
+{
+    return [self makeDocumentForURL:anAbsoluteURL withContentsOfURL:absoluteContentsURL  ofType:[[_documentTypes objectAtIndex:0] objectForKey:@"CPBundleTypeName"] delegate:self didReadSelector:@selector(document:didRead:contextInfo:) contextInfo:nil];
+}
+
+/*!
+    Creates a document from the contents at the specified URL.
+    Notifies the provided delegate with the provided selector afterwards.
+    @param anAbsoluteURL the location of the document data
+    @param aType the document type
+    @param aDelegate the delegate to notify
+    @param aSelector the selector to notify with
+    @param aContextInfo the context infomration passed to the delegate
+*/
+- (CPDocument)makeDocumentWithContentsOfURL:(CPURL)anAbsoluteURL ofType:(CPString)aType delegate:(id)aDelegate didReadSelector:(SEL)aSelector contextInfo:(id)aContextInfo
+{
+    return [[[self documentClassForType:aType] alloc] initWithContentsOfURL:anAbsoluteURL ofType:aType delegate:aDelegate didReadSelector:aSelector contextInfo:aContextInfo];
+}
+
+/*!
+    Creates a document from the contents of a URL, and sets
+    the document's URL location as another URL.
+    @param anAbsoluteURL the document's location
+    @param absoluteContentsURL the location of the document's contents
+    @param aType the document's data type
+    @param aDelegate receives a callback after the load has completed
+    @param aSelector the selector to invoke for the callback
+    @param aContextInfo an object passed as an argument for the callback
+    @return a new document or \c nil if there was an error
+*/
+- (CPDocument)makeDocumentForURL:(CPURL)anAbsoluteURL withContentsOfURL:(CPURL)absoluteContentsURL ofType:(CPString)aType delegate:(id)aDelegate didReadSelector:(SEL)aSelector contextInfo:(id)aContextInfo
+{
+    return [[[self documentClassForType:aType] alloc] initForURL:anAbsoluteURL withContentsOfURL:absoluteContentsURL ofType:aType delegate:aDelegate didReadSelector:aSelector contextInfo:aContextInfo];
+}
+
+/*
+    Implemented delegate method
+    @ignore
+*/
+- (void)document:(CPDocument)aDocument didRead:(BOOL)didRead contextInfo:(id)aContextInfo
+{
+    if (!didRead)
+        return;
+
+    [aDocument makeWindowControllers];
+    
+    if ([aContextInfo objectForKey:@"shouldDisplay"])
+        [aDocument showWindows];
+}
+
+/*!
+    Opens a new document in the application.
+    @param aSender the requesting object
+*/
+- (CFAction)newDocument:(id)aSender
+{
+    [self openUntitledDocumentOfType:[[_documentTypes objectAtIndex:0] objectForKey:@"CPBundleTypeName"] display:YES];
+}
+
+-(void)openDocument:(id)aSender
+{
+    var openPanel = [CPOpenPanel openPanel];
+
+    [openPanel runModal];
+
+    var URLs = [openPanel URLs],
+        index = 0,
+        count = [URLs count];
+
+    for (; index < count; ++index)
+        [self openDocumentWithContentsOfURL:[CPURL URLWithString:URLs[index]] display:YES error:nil];
+}
+
+// Managing Documents
+
+/*!
+    Returns the array of all documents being managed. This is
+    the same as all open documents in the application.
+*/
+- (CPArray)documents
+{
+    return _documents;
+}
+
+/*!
+    Adds \c aDocument under the control of the receiver.
+    @param aDocument the document to add
+*/
+- (void)addDocument:(CPDocument)aDocument
+{
+    [_documents addObject:aDocument];
+}
+
+/*!
+    Removes \c aDocument from the control of the receiver.
+    @param aDocument the document to remove
+*/
+- (void)removeDocument:(CPDocument)aDocument
+{
+    [_documents removeObjectIdenticalTo:aDocument];
+}
+
+- (CPString)defaultType
+{
+    return [_documentTypes[0] objectForKey:@"CPBundleTypeName"];
+}
+
+- (CPString)typeForContentsOfURL:(CPURL)anAbsoluteURL error:(CPError)outError
+{
+    var index = 0,
+        count = _documentTypes.length,
+        
+        extension = [[anAbsoluteURL pathExtension] lowercaseString],
+        starType = nil;
+    
+    for (; index < count; ++index)
+    {
+        var documentType = _documentTypes[index],
+            extensions = [documentType objectForKey:@"CFBundleTypeExtensions"],
+            extensionIndex = 0,
+            extensionCount = extensions.length;
+        
+        for (; extensionIndex < extensionCount; ++extensionIndex)
+        {
+            var thisExtension = [extensions[extensionIndex] lowercaseString];
+            if (thisExtension === extension)
+                return [documentType objectForKey:@"CPBundleTypeName"];
+
+            if (thisExtension === "****")
+                starType = [documentType objectForKey:@"CPBundleTypeName"];
+        }
+    }
+
+    return starType || [self defaultType];
+}
+
+// Managing Document Types
+
+/* @ignore */
+- (CPDictionary)_infoForType:(CPString)aType
+{
+    var i = 0,
+        count = [_documentTypes count];
+
+    for (;i < count; ++i)
+    {
+        var documentType = _documentTypes[i];
+        
+        if ([documentType objectForKey:@"CPBundleTypeName"] == aType)
+            return documentType;
+    }
+    
+    return nil;
+}
+
+/*!
+    Returns the CPDocument subclass associated with \c aType.
+    @param aType the type of document
+    @return a Cappuccino Class object, or \c nil if no match was found
+*/
+- (Class)documentClassForType:(CPString)aType
+{
+    var className = [[self _infoForType:aType] objectForKey:@"CPDocumentClass"];
+
+    return className ? CPClassFromString(className) : nil;
+}
+
+@end
+
+@implementation CPDocumentController (Closing)
+
+- (void)closeAllDocumentsWithDelegate:(id)aDelegate didCloseAllSelector:(SEL)didCloseSelector contextInfo:(Object)info 
+{
+    var context = {
+        delegate: aDelegate,
+        selector: didCloseSelector,
+        context: info
+    };
+
+    [self _closeDocumentsStartingWith:nil shouldClose:YES context:context];
+}
+
+// Recursive callback method. Start it by passing in a document of nil.
+- (void)_closeDocumentsStartingWith:(CPDocument)aDocument shouldClose:(BOOL)shouldClose context:(Object)context
+{
+    if (shouldClose)
+    {
+        [aDocument close];
+
+        if ([[self documents] count] > 0)
+        {
+            [[[self documents] lastObject] canCloseDocumentWithDelegate:self
+                                                    shouldCloseSelector:@selector(_closeDocumentsStartingWith:shouldClose:context:)
+                                                            contextInfo:context];
+            return;
+        }
+    }
+
+    if ([context.delegate respondsToSelector:context.selector])
+        objj_msgSend(context.delegate, context.selector, self, [[self documents] count] === 0, context.context);
+}
+
+@end
+
+@implementation CPDocumentController (Recents)
+
+- (CPArray)recentDocumentURLs
+{
+    // FIXME move this to CP land
+    if (typeof window["cpRecentDocumentURLs"] === 'function')
+        return window.cpRecentDocumentURLs();
+
+    return [];
+}
+
+- (void)clearRecentDocuments:(id)sender
+{
+    if (typeof window["cpClearRecentDocuments"] === 'function')
+        window.cpClearRecentDocuments();
+
+   [self _updateRecentDocumentsMenu];
+}
+
+- (void)noteNewRecentDocument:(CPDocument)aDocument
+{
+    [self noteNewRecentDocumentURL:[[aDocument fileURL] absoluteString]];
+}
+
+- (void)noteNewRecentDocumentURL:(CPString)aURL
+{
+    if (typeof window["cpNoteNewRecentDocumentPath"] === 'function')
+        window.cpNoteNewRecentDocumentPath(aURL);
+
+   [self _updateRecentDocumentsMenu];
+}
+
+- (void)_removeAllRecentDocumentsFromMenu:(CPMenu)aMenu
+{
+    var items = [aMenu itemArray],
+        count = [items count];
+
+    while (count--)
+    {
+        var item = items[count];
+
+        if ([item action] === @selector(_openRecentDocument:))
+            [aMenu removeItemAtIndex:count];
+    }
+}
+
+- (void)_updateRecentDocumentsMenu
+{
+    var menu = [[CPApp mainMenu] _menuWithName:@"_CPRecentDocumentsMenu"],
+        recentDocuments = [self recentDocumentURLs],
+        menuItems = [menu itemArray],
+        documentCount = [recentDocuments count],
+        menuItemCount = [menuItems count];
+
+    [self _removeAllRecentDocumentsFromMenu:menu];
+
+    if (menuItemCount)
+    {
+        if (!documentCount)
+        {
+            if ([menuItems[0] isSeparatorItem])
+                [menu removeItemAtIndex:0];
+        }
+        else
+        {
+            if (![menuItems[0] isSeparatorItem])
+                [menu insertItem:[CPMenuItem separatorItem] atIndex:0];
+        }
+    }
+
+    while (documentCount--)
+    {
+        var path = recentDocuments[documentCount],
+            item = [[CPMenuItem alloc] initWithTitle:[path lastPathComponent] action:@selector(_openRecentDocument:) keyEquivalent:nil];
+
+        [item setTag:path];
+        [menu insertItem:item atIndex:0];
+    }
+}
+
+- (void)_openRecentDocument:(id)sender
+{
+    [self openDocumentWithContentsOfURL:[sender tag] display:YES error:nil];
+}
+
+@end

AppKit/CPDragServer.j

@@ -0,0 +1,436 @@
+/*
+ * CPDragServer.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 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 <AppKit/CPView.j>
+@import <AppKit/CPEvent.j>
+@import <AppKit/CPPasteboard.j>
+@import <AppKit/CPImageView.j>
+
+#import "CoreGraphics/CGGeometry.h"
+#import "Platform/Platform.h"
+
+
+CPDragOperationNone     = 0,
+CPDragOperationCopy     = 1 << 1,
+CPDragOperationLink     = 1 << 1,
+CPDragOperationGeneric  = 1 << 2,
+CPDragOperationPrivate  = 1 << 3,
+CPDragOperationMove     = 1 << 4,
+CPDragOperationDelete   = 1 << 5,
+CPDragOperationEvery    = -1;
+
+#define DRAGGING_WINDOW(anObject) ([anObject isKindOfClass:[CPWindow class]] ? anObject : [anObject window])
+
+var    CPDragServerPreviousEvent      = nil,
+CPDragServerAutoscrollInterval = nil;
+/*
+var CPDragServerAutoscroll = function()
+{
+    [CPDragServerSource autoscroll:CPDragServerPreviousEvent];
+}
+
+    if (CPDragServerAutoscrollInterval === nil)
+    {
+        if ([CPDragServerSource respondsToSelector:@selector(autoscroll:)])
+            CPDragServerAutoscrollInterval = setInterval(CPDragServerAutoscroll, 100);
+    }
+
+    CPDragServerPreviousEvent = anEvent;
+
+        if (CPDragServerAutoscrollInterval !== nil)
+            clearInterval(CPDragServerAutoscrollInterval);
+
+        CPDragServerAutoscrollInterval = nil;
+*/
+
+var CPSharedDragServer     = nil;
+
+var CPDragServerSource             = nil;
+var CPDragServerDraggingInfo       = nil;
+
+/*
+    CPDraggingInfo is a container of information about a specific dragging session.
+    @ignore
+*/
+@implementation CPDraggingInfo : CPObject
+{
+}
+
+- (CPPasteboard)draggingPasteboard
+{
+    if ([CPPlatform supportsDragAndDrop])
+        return [_CPDOMDataTransferPasteboard DOMDataTransferPasteboard];
+
+    return [[CPDragServer sharedDragServer] draggingPasteboard];
+}
+
+- (id)draggingSource
+{
+    return [[CPDragServer sharedDragServer] draggingSource];
+}
+
+/*
+- (unsigned)draggingSourceOperationMask
+*/
+
+- (CPPoint)draggingLocation
+{
+    return [[CPDragServer sharedDragServer] draggingLocation];
+}
+
+- (CPWindow)draggingDestinationWindow
+{
+    return DRAGGING_WINDOW([[CPDragServer sharedDragServer] draggingDestination]);
+}
+
+- (CPImage)draggedImage
+{
+    return [[self draggedView] image];
+}
+
+- (CGPoint)draggedImageLocation
+{
+    return [self draggedViewLocation];
+}
+
+- (CPView)draggedView
+{
+    return [[CPDragServer sharedDragServer] draggedView];
+}
+
+- (CGPoint)draggedViewLocation
+{
+    var dragServer = [CPDragServer sharedDragServer];
+
+    return [DRAGGING_WINDOW([dragServer draggingDestination]) convertPlatformWindowToBase:[[dragServer draggedView] frame].origin];
+}
+
+@end
+
+var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
+    CPDraggingSource_draggedImage_endAt_operation_  = 1 << 1,
+    CPDraggingSource_draggedView_movedTo_           = 1 << 2,
+    CPDraggingSource_draggedView_endedAt_operation_ = 1 << 3;
+
+@implementation CPDragServer : CPObject
+{
+    BOOL            _isDragging @accessors(readonly, getter=isDragging);
+
+    CPWindow        _draggedWindow @accessors(readonly, getter=draggedWindow);
+    CPView          _draggedView @accessors(readonly, getter=draggedView);
+    CPImageView     _imageView;
+
+    BOOL            _isDraggingImage;
+
+    CGSize          _draggingOffset @accessors(readonly, getter=draggingOffset);
+
+    CPPasteboard    _draggingPasteboard @accessors(readonly, getter=draggingPasteboard);
+
+    id              _draggingSource @accessors(readonly, getter=draggingSource);
+    unsigned        _implementedDraggingSourceMethods;
+
+    CGPoint         _draggingLocation;
+    id              _draggingDestination;
+}
+
+/*
+    Private Objective-J/Cappuccino method
+    @ignore
+*/
++ (void)initialize
+{
+    if (self !== [CPDragServer class])
+        return;
+
+    CPDragServerDraggingInfo = [[CPDraggingInfo alloc] init];
+}
+
++ (CPDragServer)sharedDragServer
+{
+    if (!CPSharedDragServer)
+        CPSharedDragServer = [[CPDragServer alloc] init];
+
+    return CPSharedDragServer;
+}
+
+/*
+    @ignore
+*/
+- (id)init
+{
+    self = [super init];
+
+    if (self)
+    {
+        _draggedWindow = [[CPWindow alloc] initWithContentRect:_CGRectMakeZero() styleMask:CPBorderlessWindowMask];
+
+        [_draggedWindow setLevel:CPDraggingWindowLevel];
+    }
+
+    return self;
+}
+
+- (CGPoint)draggingLocation
+{
+    return _draggingLocation
+}
+
+- (void)draggingStartedInPlatformWindow:(CPPlatformWindow)aPlatformWindow globalLocation:(CGPoint)aLocation
+{
+    if (_isDraggingImage)
+    {
+        if ([_draggingSource respondsToSelector:@selector(draggedImage:beganAt:)])
+            [_draggingSource draggedImage:[_draggedView image] beganAt:aLocation];
+    }
+    else
+    {
+        if ([_draggingSource respondsToSelector:@selector(draggedView:beganAt:)])
+            [_draggingSource draggedView:_draggedView beganAt:aLocation];
+    }
+
+    if (![CPPlatform supportsDragAndDrop])
+        [_draggedWindow orderFront:self];
+}
+
+- (void)draggingSourceUpdatedWithGlobalLocation:(CGPoint)aGlobalLocation
+{
+    if (![CPPlatform supportsDragAndDrop])
+        [_draggedWindow setFrameOrigin:_CGPointMake(aGlobalLocation.x - _draggingOffset.width, aGlobalLocation.y - _draggingOffset.height)];
+
+    if (_implementedDraggingSourceMethods & CPDraggingSource_draggedImage_movedTo_)
+        [_draggingSource draggedImage:[_draggedView image] movedTo:aGlobalLocation];
+
+    else if (_implementedDraggingSourceMethods & CPDraggingSource_draggedView_movedTo_)
+        [_draggingSource draggedView:_draggedView movedTo:aGlobalLocation];
+}
+
+- (CPDragOperation)draggingUpdatedInPlatformWindow:(CPPlatformWindow)aPlatformWindow location:(CGPoint)aLocation
+{
+    var dragOperation = CPDragOperationCopy;
+    // We have to convert base to bridge since the drag event comes from the source window, not the drag window.
+    var draggingDestination = [aPlatformWindow _dragHitTest:aLocation pasteboard:[CPDragServerDraggingInfo draggingPasteboard]];
+
+    if (draggingDestination)
+        _draggingLocation = [DRAGGING_WINDOW(draggingDestination) convertPlatformWindowToBase:aLocation];
+
+    if(draggingDestination !== _draggingDestination)
+    {
+        if (_draggingDestination && [_draggingDestination respondsToSelector:@selector(draggingExited:)])
+            [_draggingDestination draggingExited:CPDragServerDraggingInfo];
+
+        _draggingDestination = draggingDestination;
+
+        if (_draggingDestination && [_draggingDestination respondsToSelector:@selector(draggingEntered:)])
+            dragOperation = [_draggingDestination draggingEntered:CPDragServerDraggingInfo];
+    }
+    else if (_draggingDestination && [_draggingDestination respondsToSelector:@selector(draggingUpdated:)])
+        dragOperation = [_draggingDestination draggingUpdated:CPDragServerDraggingInfo];
+
+    if (!_draggingDestination)
+        dragOperation = CPDragOperationNone;
+
+    return dragOperation;
+}
+
+- (void)draggingEndedInPlatformWindow:(CPPlatformWindow)aPlatformWindow globalLocation:(CGPoint)aLocation operation:(CPDragOperation)anOperation
+{
+    [_draggedView removeFromSuperview];
+
+    if (![CPPlatform supportsDragAndDrop])
+        [_draggedWindow orderOut:self];
+
+    if (_implementedDraggingSourceMethods & CPDraggingSource_draggedImage_endAt_operation_)
+        [_draggingSource draggedImage:[_draggedView image] endedAt:aLocation operation:anOperation];
+
+    else if (_implementedDraggingSourceMethods & CPDraggingSource_draggedView_endedAt_operation_)
+        [_draggingSource draggedView:_draggedView endedAt:aLocation operation:anOperation];
+
+    _isDragging = NO;
+}
+
+- (void)performDragOperationInPlatformWindow:(CPPlatformWindow)aPlatformWindow
+{
+    if (_draggingDestination && 
+        (![_draggingDestination respondsToSelector:@selector(prepareForDragOperation:)] || [_draggingDestination prepareForDragOperation:CPDragServerDraggingInfo]) && 
+        (![_draggingDestination respondsToSelector:@selector(performDragOperation:)] || [_draggingDestination performDragOperation:CPDragServerDraggingInfo]) &&
+        [_draggingDestination respondsToSelector:@selector(concludeDragOperation:)])
+        [_draggingDestination concludeDragOperation:CPDragServerDraggingInfo];
+}
+
+/*!
+    Initiates a drag session.
+    @param aView the view being dragged
+    @param aWindow the window where the drag source is
+    @param viewLocation
+    @param mouseOffset
+    @param anEvent
+    @param aPasteboard the pasteboard that contains the drag data
+    @param aSourceObject the object where the drag started
+    @param slideBack if \c YES, \c aView slides back to
+    its origin on a failed drop
+*/
+- (void)dragView:(CPView)aView fromWindow:(CPWindow)aWindow at:(CGPoint)viewLocation offset:(CGSize)mouseOffset event:(CPEvent)mouseDownEvent pasteboard:(CPPasteboard)aPasteboard source:(id)aSourceObject slideBack:(BOOL)slideBack
+{
+    _isDragging = YES;
+
+    _draggedView = aView;
+    _draggingPasteboard = aPasteboard || [CPPasteboard pasteboardWithName:CPDragPboard];
+    _draggingSource = aSourceObject;
+    _draggingDestination = nil;
+
+    // The offset is based on the distance from where we want the view to be initially from where the mouse is initially
+    // Hence the use of mouseDownEvent's location and view's location in global coordinates.
+    var mouseDownWindow = [mouseDownEvent window],
+        mouseDownEventLocation = [mouseDownEvent locationInWindow];
+
+    if (mouseDownEventLocation)
+    {
+        if (mouseDownWindow)
+            mouseDownEventLocation = [mouseDownWindow convertBaseToGlobal:mouseDownEventLocation];
+
+        _draggingOffset = _CGSizeMake(mouseDownEventLocation.x - viewLocation.x, mouseDownEventLocation.y - viewLocation.y);
+    }
+    else
+        _draggingOffset = _CGSizeMakerZero();
+
+    if ([CPPlatform isBrowser])
+        [_draggedWindow setPlatformWindow:[aWindow platformWindow]];
+
+    [aView setFrameOrigin:_CGPointMakeZero()];
+
+    var mouseLocation = [CPEvent mouseLocation];
+
+    // Place it where the mouse pointer is.
+    [_draggedWindow setFrameOrigin:_CGPointMake(mouseLocation.x - _draggingOffset.width, mouseLocation.y - _draggingOffset.height)];
+    [_draggedWindow setFrameSize:[aView frame].size];
+
+    [[_draggedWindow contentView] addSubview:aView];
+
+    _implementedDraggingSourceMethods = 0;
+
+    if (_draggedView === _imageView)
+    {
+        if ([_draggingSource respondsToSelector:@selector(draggedImage:movedTo:)])
+            _implementedDraggingSourceMethods |= CPDraggingSource_draggedImage_movedTo_;
+
+        if ([_draggingSource respondsToSelector:@selector(draggedImage:endAt:operation:)])
+            _implementedDraggingSourceMethods |= CPDraggingSource_draggedImage_endAt_operation_;
+    }
+    else
+    {
+        if ([_draggingSource respondsToSelector:@selector(draggedView:movedTo:)])
+            _implementedDraggingSourceMethods |= CPDraggingSource_draggedView_movedTo_;
+
+        if ([_draggingSource respondsToSelector:@selector(draggedView:endedAt:operation:)])
+            _implementedDraggingSourceMethods |= CPDraggingSource_draggedView_endedAt_operation_;
+    }
+
+    if (![CPPlatform supportsDragAndDrop])
+    {
+        [self draggingStartedInPlatformWindow:[aWindow platformWindow] globalLocation:mouseLocation];
+        [self trackDragging:mouseDownEvent];
+    }
+}
+
+/*!
+    Initiates a drag session.
+    @param anImage the image to be dragged
+    @param aWindow the source window of the drag session
+    @param imageLocation
+    @param mouseOffset
+    @param anEvent
+    @param aPasteboard the pasteboard where the drag data is located
+    @param aSourceObject the object where the drag started
+    @param slideBack if \c YES, \c aView slides back to
+    its origin on a failed drop
+*/
+- (void)dragImage:(CPImage)anImage fromWindow:(CPWindow)aWindow at:(CGPoint)imageLocation offset:(CGSize)mouseOffset event:(CPEvent)anEvent pasteboard:(CPPasteboard)aPasteboard source:(id)aSourceObject slideBack:(BOOL)slideBack
+{
+    _isDraggingImage = YES;
+
+    var imageSize = [anImage size];
+
+    if (!_imageView)
+        _imageView = [[CPImageView alloc] initWithFrame:_CGRectMake(0.0, 0.0, imageSize.width, imageSize.height)];
+
+    [_imageView setImage:anImage];
+
+    [self dragView:_imageView fromWindow:aWindow at:imageLocation offset:mouseOffset event:anEvent pasteboard:aPasteboard source:aSourceObject slideBack:slideBack];
+}
+
+- (void)trackDragging:(CPEvent)anEvent
+{
+    var type = [anEvent type],
+        platformWindow = [_draggedWindow platformWindow],
+        platformWindowLocation = [[anEvent window] convertBaseToPlatformWindow:[anEvent locationInWindow]];
+
+    if (type === CPLeftMouseUp)
+    {
+        [self performDragOperationInPlatformWindow:platformWindow];
+        [self draggingEndedInPlatformWindow:platformWindow globalLocation:platformWindowLocation operation:CPDragOperationNone];
+
+        // Stop tracking events.
+        return;
+    }
+
+    [self draggingSourceUpdatedWithGlobalLocation:platformWindowLocation];
+    [self draggingUpdatedInPlatformWindow:platformWindow location:platformWindowLocation];
+
+    // If we're not a mouse up, then we're going to want to grab the next event.
+    [CPApp setTarget:self selector:@selector(trackDragging:)
+        forNextEventMatchingMask:CPMouseMovedMask | CPLeftMouseDraggedMask | CPLeftMouseUpMask
+        untilDate:nil inMode:0 dequeue:NO];
+}
+
+@end
+
+@implementation CPWindow (CPDraggingAdditions)
+
+/* @ignore */
+- (id)_dragHitTest:(CGPoint)aPoint pasteboard:(CPPasteboard)aPasteboard
+{
+    // If none of our views or ourselves has registered for drag events...
+    if (!_inclusiveRegisteredDraggedTypes)
+        return nil;
+
+// We don't need to do this because the only place this gets called
+// -_dragHitTest: in CPPlatformWindow does this already. Perhaps to
+// be safe?
+//    if (![self containsPoint:aPoint])
+//        return nil;
+
+    var adjustedPoint = [self convertPlatformWindowToBase:aPoint],
+        hitView = [_windowView hitTest:adjustedPoint];
+
+    while (hitView && ![aPasteboard availableTypeFromArray:[hitView registeredDraggedTypes]])
+        hitView = [hitView superview];
+
+    if (hitView)
+        return hitView;
+
+    if ([aPasteboard availableTypeFromArray:[self registeredDraggedTypes]])
+        return self;
+
+    return nil;
+}
+
+@end

AppKit/CPEvent.j

@@ -0,0 +1,505 @@
+/*
+ * CPEvent.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPObject.j>
+
+#include "CoreGraphics/CGGeometry.h"
+
+
+CPLeftMouseDown                         = 1;
+CPLeftMouseUp                           = 2;
+CPRightMouseDown                        = 3;
+CPRightMouseUp                          = 4;
+CPMouseMoved                            = 5;
+CPLeftMouseDragged                      = 6;
+CPRightMouseDragged                     = 7;
+CPMouseEntered                          = 8;
+CPMouseExited                           = 9;
+CPKeyDown                               = 10;
+CPKeyUp                                 = 11;
+CPFlagsChanged                          = 12;
+CPAppKitDefined                         = 13;
+CPSystemDefined                         = 14;
+CPApplicationDefined                    = 15;
+CPPeriodic                              = 16;
+CPCursorUpdate                          = 17; 
+CPScrollWheel                           = 22;
+CPOtherMouseDown                        = 25;
+CPOtherMouseUp                          = 26;
+CPOtherMouseDragged                     = 27;
+
+// iPhone Event Types
+CPTouchStart                            = 28;
+CPTouchMove                             = 29;
+CPTouchEnd                              = 30;
+CPTouchCancel                           = 31;
+                                        
+                                        
+CPAlphaShiftKeyMask                     = 1 << 16;
+CPShiftKeyMask                          = 1 << 17;
+CPControlKeyMask                        = 1 << 18;
+CPAlternateKeyMask                      = 1 << 19;
+CPCommandKeyMask                        = 1 << 20;
+CPNumericPadKeyMask                     = 1 << 21;
+CPHelpKeyMask                           = 1 << 22;
+CPFunctionKeyMask                       = 1 << 23;
+CPDeviceIndependentModifierFlagsMask    = 0xffff0000;
+
+CPLeftMouseDownMask                     = 1 << CPLeftMouseDown;
+CPLeftMouseUpMask                       = 1 << CPLeftMouseUp;
+CPRightMouseDownMask                    = 1 << CPRightMouseDown;
+CPRightMouseUpMask                      = 1 << CPRightMouseUp;
+CPOtherMouseDownMask                    = 1 << CPOtherMouseDown;
+CPOtherMouseUpMask                      = 1 << CPOtherMouseUp;
+CPMouseMovedMask                        = 1 << CPMouseMoved;
+CPLeftMouseDraggedMask                  = 1 << CPLeftMouseDragged;
+CPRightMouseDraggedMask                 = 1 << CPRightMouseDragged;
+CPOtherMouseDragged                     = 1 << CPOtherMouseDragged;
+CPMouseEnteredMask                      = 1 << CPMouseEntered;
+CPMouseExitedMask                       = 1 << CPMouseExited;
+CPCursorUpdateMask                      = 1 << CPCursorUpdate;
+CPKeyDownMask                           = 1 << CPKeyDown;
+CPKeyUpMask                             = 1 << CPKeyUp;
+CPFlagsChangedMask                      = 1 << CPFlagsChanged;
+CPAppKitDefinedMask                     = 1 << CPAppKitDefined;
+CPSystemDefinedMask                     = 1 << CPSystemDefined;
+CPApplicationDefinedMask                = 1 << CPApplicationDefined;
+CPPeriodicMask                          = 1 << CPPeriodic;
+CPScrollWheelMask                       = 1 << CPScrollWheel;
+CPAnyEventMask                          = 0xffffffff;
+
+CPDOMEventDoubleClick                   = "dblclick",
+CPDOMEventMouseDown                     = "mousedown",
+CPDOMEventMouseUp                       = "mouseup",
+CPDOMEventMouseMoved                    = "mousemove",
+CPDOMEventMouseDragged                  = "mousedrag",
+CPDOMEventKeyUp                         = "keyup",
+CPDOMEventKeyDown                       = "keydown",
+CPDOMEventKeyPress                      = "keypress";
+CPDOMEventCopy                          = "copy";
+CPDOMEventPaste                         = "paste";
+CPDOMEventScrollWheel                   = "mousewheel";
+CPDOMEventTouchStart                    = "touchstart";
+CPDOMEventTouchMove                     = "touchmove";
+CPDOMEventTouchEnd                      = "touchend";
+CPDOMEventTouchCancel                   = "touchcancel";
+
+var _CPEventPeriodicEventPeriod         = 0,
+    _CPEventPeriodicEventTimer          = nil;
+
+/*! 
+    @ingroup appkit
+    @class CPEvent
+    CPEvent encapsulates the details of a Cappuccino keyboard or mouse event.
+*/
+@implementation CPEvent : CPObject
+{
+    CPEventType         _type;
+    CPPoint             _location;
+    unsigned            _modifierFlags;
+    CPTimeInterval      _timestamp;
+    CPGraphicsContext   _context;
+    int                 _eventNumber;
+    unsigned            _clickCount;
+    float               _pressure;
+    CPWindow            _window;
+    Number              _windowNumber;
+    CPString            _characters;
+    CPString            _charactersIgnoringModifiers
+    BOOL                _isARepeat;
+    unsigned            _keyCode;
+    DOMEvent            _DOMEvent;
+    
+    float               _deltaX;
+    float               _deltaY;
+    float               _deltaZ;
+}
+
+/*!
+    Creates a new keyboard event.
+    @param anEventType the event type. Must be one of CPKeyDown, CPKeyUp or CPFlagsChanged
+    @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 characters the characters associated with the event
+    @param unmodCharacters the string of keys pressed without the presence of any modifiers other than Shift
+    @param repeatKey \c YES if this is caused by the system repeat as opposed to the user pressing the key again
+    @param code a number associated with the keyboard key of this event
+    @throws CPInternalInconsistencyException if \c anEventType is not a CPKeyDown,
+    CPKeyUp or CPFlagsChanged
+    @return the keyboard event
+*/
++ (CPEvent)keyEventWithType:(CPEventType)anEventType location:(CGPoint)aPoint modifierFlags:(unsigned int)modifierFlags
+    timestamp:(CPTimeInterval)aTimestamp windowNumber:(int)aWindowNumber context:(CPGraphicsContext)aGraphicsContext
+    characters:(CPString)characters charactersIgnoringModifiers:(CPString)unmodCharacters isARepeat:(BOOL)repeatKey keyCode:(unsigned short)code
+{
+    return [[self alloc] _initKeyEventWithType:anEventType location:aPoint modifierFlags:modifierFlags
+        timestamp:aTimestamp windowNumber:aWindowNumber context:aGraphicsContext 
+        characters:characters charactersIgnoringModifiers:unmodCharacters isARepeat:repeatKey keyCode:code];
+}
+
+/*!
+    Creates a new mouse 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 aClickCount the number of clicks that caused this event
+    @param aPressure the amount of pressure applied to the input device (ranges from 0.0 to 1.0)
+    @throws CPInternalInconsistencyException if an invalid event type is provided
+    @return the new mouse event
+*/
++ (id)mouseEventWithType:(CPEventType)anEventType location:(CGPoint)aPoint modifierFlags:(unsigned)modifierFlags 
+    timestamp:(CPTimeInterval)aTimestamp windowNumber:(int)aWindowNumber context:(CPGraphicsContext)aGraphicsContext
+    eventNumber:(int)anEventNumber clickCount:(int)aClickCount pressure:(float)aPressure
+{
+    return [[self alloc] _initMouseEventWithType:anEventType location:aPoint modifierFlags:modifierFlags
+        timestamp:aTimestamp windowNumber:aWindowNumber context:aGraphicsContext eventNumber:anEventNumber clickCount:aClickCount pressure:aPressure];
+}
+
+/*!
+    Creates a new custom event
+    @param anEventType the event type. Must be one of CPAppKitDefined, CPSystemDefined, CPApplicationDefined or CPPeriodic
+    @param aLocation 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 aSubtype a numeric identifier to differentiate this event from other custom events
+    @param aData1 more data that describes the event
+    @param aData2 even more data that describes the event
+    @throws CPInternalInconsistencyException if an invalid event type is provided
+    @return the new custom event
+*/
++ (CPEvent)otherEventWithType:(CPEventType)anEventType location:(CGPoint)aLocation modifierFlags:(unsigned)modifierFlags
+    timestamp:(CPTimeInterval)aTimestamp windowNumber:(int)aWindowNumber context:(CPGraphicsContext)aGraphicsContext
+    subtype:(short)aSubtype data1:(int)aData1 data2:(int)aData2
+{
+    return [[self alloc] _initOtherEventWithType:anEventType location:aLocation modifierFlags:modifierFlags
+        timestamp:aTimestamp windowNumber:aWindowNumber context:aGraphicsContext subtype:aSubtype data1:aData1 data2:aData2];
+}
+
+/* @ignore */
+- (id)_initMouseEventWithType:(CPEventType)anEventType location:(CPPoint)aPoint modifierFlags:(unsigned)modifierFlags 
+    timestamp:(CPTimeInterval)aTimestamp windowNumber:(int)aWindowNumber context:(CPGraphicsContext)aGraphicsContext
+    eventNumber:(int)anEventNumber clickCount:(int)aClickCount pressure:(float)aPressure
+{
+    self = [super init];
+    
+    if (self)
+    {
+        _type = anEventType;
+        _location = CPPointCreateCopy(aPoint);
+        _modifierFlags = modifierFlags;
+        _timestamp = aTimestamp;
+        _context = aGraphicsContext;
+        _eventNumber = anEventNumber;
+        _clickCount = aClickCount;
+        _pressure = aPressure;
+        _window = [CPApp windowWithWindowNumber:aWindowNumber];
+    }
+    
+    return self;
+}
+
+/* @ignore */
+- (id)_initKeyEventWithType:(CPEventType)anEventType location:(CPPoint)aPoint modifierFlags:(unsigned int)modifierFlags
+    timestamp:(CPTimeInterval)aTimestamp windowNumber:(int)aWindowNumber context:(CPGraphicsContext)aGraphicsContext
+    characters:(CPString)characters charactersIgnoringModifiers:(CPString)unmodCharacters isARepeat:(BOOL)isARepeat keyCode:(unsigned short)code
+{
+    self = [super init];
+    
+    if (self)
+    {
+        _type = anEventType;
+        _location = CPPointCreateCopy(aPoint);
+        _modifierFlags = modifierFlags;
+        _timestamp = aTimestamp;
+        _context = aGraphicsContext;
+        _characters = characters;
+        _charactersIgnoringModifiers = unmodCharacters;
+        _isARepeat = isARepeat;
+        _keyCode = code;
+        _windowNumber = aWindowNumber;
+    }
+    
+    return self;
+}
+
+/* @ignore */
+- (id)_initOtherEventWithType:(CPEventType)anEventType location:(CGPoint)aPoint modifierFlags:(unsigned)modifierFlags
+    timestamp:(CPTimeInterval)aTimestamp windowNumber:(int)aWindowNumber context:(CPGraphicsContext)aGraphicsContext
+    subtype:(short)aSubtype data1:(int)aData1 data2:(int)aData2
+{
+    self = [super init];
+    
+    if (self)
+    {
+        _type = anEventType;
+        _location = CPPointCreateCopy(aPoint);
+        _modifierFlags = modifierFlags;
+        _timestamp = aTimestamp;
+        _context = aGraphicsContext;
+        _subtype = aSubtype;
+        _data1 = aData1;
+        _data2 = aData2;
+    }   
+
+    return self;
+}
+
+/*!
+    Returns the location of the mouse (for mouse events).
+    If this is not a mouse event, it returns \c nil.
+    If \c window returns \c nil, then
+    the mouse coordinates will be based on the screen coordinates.
+    Otherwise, the coordinates are relative to the window's coordinates.
+    @return the location of the mouse, or \c nil for non-mouse events.
+*/
+- (CGPoint)locationInWindow
+{
+    return _CGPointMakeCopy(_location);
+}
+
+- (CGPoint)globalLocation
+{
+    var theWindow = [self window],
+        location = [self locationInWindow];
+
+    if (theWindow)
+        return [theWindow convertBaseToGlobal:location];
+
+    return location;
+}
+
+/*!
+    Returns event information as a bit mask
+*/
+- (unsigned)modifierFlags
+{
+    return _modifierFlags;
+}
+
+/*!
+    Returns the time the event occurred
+*/
+- (CPTimeInterval)timestamp
+{
+    return _timestamp;
+}
+
+/*!
+    Returns the type of event.
+*/
+- (CPEventType)type
+{
+    return _type;
+}
+
+/*!
+    Returns the event's associated window
+*/
+- (CPWindow)window
+{
+    if (!_window)
+        _window = [CPApp windowWithWindowNumber:_windowNumber];
+
+    return _window;
+}
+
+/*!
+    The number of the window associated with the event.
+*/
+- (int)windowNumber
+{
+    return _windowNumber;
+}
+
+// Mouse Event Information
+/*!
+    Returns the button number for the mouse that generated the event.
+*/
+- (int)buttonNumber
+{
+    return _buttonNumber;
+}
+
+/*!
+    Returns the number of clicks that caused this event. (mouse only)
+*/
+- (int)clickCount
+{
+    return _clickCount;
+}
+
+/*!
+    Returns the characters associated with this event (keyboard only)
+    @throws CPInternalInconsistencyException if this method is called on a non-key event
+*/
+- (CPString)characters
+{
+    return _characters;
+}
+
+/*!
+    Returns the character ignoring any modifiers (except shift).
+    @throws CPInternalInconsistencyException if this method is called on a non-key event
+*/
+- (CPString)charactersIgnoringModifiers
+{
+    return _charactersIgnoringModifiers;
+}
+
+/*!
+    Returns \c YES if the keyboard event was caused by the key being held down.
+    @throws CPInternalInconsistencyException if this method is called on a non-key event
+*/
+- (BOOL)isARepeat
+{
+    return _isARepeat;
+}
+
+/*!
+    Returns the key's key code.
+    @throws CPInternalInconsistencyException if this method is called on a non-key event
+*/
+- (unsigned short)keyCode
+{
+    return _keyCode;
+}
+
++ (CGPoint)mouseLocation
+{
+    // FIXME: this is incorrect, we shouldn't depend on the current event.
+    var event = [CPApp currentEvent],
+        eventWindow = [event window];
+
+    if (eventWindow)
+        return [eventWindow convertBaseToGlobal:[event locationInWindow]];
+
+    return [event locationInWindow];
+}
+
+- (float)pressure
+{
+    return _pressure;
+}
+
+/*
+    @ignore
+*/
+- (DOMEvent)_DOMEvent
+{
+    return _DOMEvent;
+}
+
+// Getting Scroll Wheel Event Infomration
+/*!
+    Returns the change in the x-axis for a mouse event.
+*/
+- (float)deltaX
+{
+    return _deltaX;
+}
+
+/*!
+    Returns the change in the y-axis for a mouse event.
+*/
+- (float)deltaY
+{
+    return _deltaY;
+}
+
+/*!
+    Returns the change in the x-axis for a mouse event.
+*/
+- (float)deltaZ
+{
+    return _deltaZ;
+}
+
+- (BOOL)_couldBeKeyEquivalent
+{
+    // FIXME: More cases? Space?
+    return  _type === CPKeyDown &&
+            _modifierFlags & (CPCommandKeyMask | CPControlKeyMask) &&
+            [_characters length] > 0;
+}
+
+/*!
+    Generates periodic events every \c aPeriod seconds.
+    @param aDelay the number of seconds before the first event
+    @param aPeriod the length of time in seconds between successive events
+*/
++ (void)startPeriodicEventsAfterDelay:(CPTimeInterval)aDelay withPeriod:(CPTimeInterval)aPeriod
+{
+    _CPEventPeriodicEventPeriod = aPeriod;
+    
+    // FIXME: OH TIMERS!!!
+    _CPEventPeriodicEventTimer = window.setTimeout(function() { _CPEventPeriodicEventTimer = window.setInterval(_CPEventFirePeriodEvent, aPeriod * 1000.0); }, aDelay * 1000.0);
+}
+
+/*!
+    Stops the periodic events from being generated
+*/
++ (void)stopPeriodicEvents
+{
+    if (_CPEventPeriodicEventTimer === nil)
+        return;
+    
+    window.clearTimeout(_CPEventPeriodicEventTimer);
+    
+    _CPEventPeriodicEventTimer = nil;
+}
+
+@end
+
+function _CPEventFirePeriodEvent()
+{
+    [CPApp sendEvent:[CPEvent otherEventWithType:CPPeriodic location:_CGPointMakeZero() modifierFlags:0 timestamp:0 windowNumber:0 context:nil subtype:0 data1:0 data2:0]];
+}
+
+var CPEventClass = [CPEvent class];
+
+function _CPEventFromNativeMouseEvent(aNativeEvent, anEventType, aPoint, modifierFlags, aTimestamp, aWindowNumber, aGraphicsContext, anEventNumber, aClickCount, aPressure)
+{
+    aNativeEvent.isa = CPEventClass;
+
+    aNativeEvent._type = anEventType;
+    aNativeEvent._location = aPoint;
+    aNativeEvent._modifierFlags = modifierFlags;
+    aNativeEvent._timestamp = aTimestamp;
+    aNativeEvent._windowNumber = aWindowNumber;
+    aNativeEvent._window = nil;
+    aNativeEvent._context = aGraphicsContext;
+    aNativeEvent._eventNumber = anEventNumber;
+    aNativeEvent._clickCount = aClickCount;
+    aNativeEvent._pressure = aPressure;
+
+    return aNativeEvent;
+}
+

AppKit/CPFlashMovie.j

@@ -0,0 +1,61 @@
+/*
+ * CPFlashMovie.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPObject.j>
+
+/*! 
+    @ingroup appkit
+    @class CPFlashMovie
+
+    CPFlashMovie is used to represent a Flash movie in the Cappuccino framework.
+*/
+@implementation CPFlashMovie : CPObject
+{
+    CPString _fileName;
+}
+
+/*!
+    Creates a new Flash movie with the swf at \c aFileName.
+    @param aFilename the swf to load
+    @return the initialized CPFlashMovie
+*/
++ (id)flashMovieWithFile:(CPString)aFileName
+{
+    return [[self alloc] initWithFile:aFileName];
+}
+
+/*!
+    Initializes the Flash movie.
+    @param aFilename the swf to load
+    @return the initialized CPFlashMovie
+*/
+- (id)initWithFile:(CPString)aFileName
+{
+    self = [super init];
+    
+    if (self)
+        _fileName = aFileName;
+    
+    return self;
+}
+
+@end

AppKit/CPFlashView.j

@@ -0,0 +1,112 @@
+/*
+ * CPFlashView.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 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 "CPFlashMovie.j"
+@import "CPView.j"
+
+
+/*!
+    @ingroup appkit
+*/
+@implementation CPFlashView : CPView
+{
+    CPFlashMovie    _flashMovie;
+    
+    DOMElement      _DOMEmbedElement;
+    DOMElement      _DOMMParamElement;
+    DOMElement      _DOMObjectElement;
+}
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    self = [super initWithFrame:aFrame];
+    
+    if (self)
+    {
+        _DOMObjectElement = document.createElement("object");
+        _DOMObjectElement.width = "100%";
+        _DOMObjectElement.height = "100%";
+        _DOMObjectElement.style.top = "0px";
+        _DOMObjectElement.style.left = "0px";
+        
+        _DOMParamElement = document.createElement("param");
+        _DOMParamElement.name = "movie";
+        
+        _DOMObjectElement.appendChild(_DOMParamElement);
+        
+        var param = document.createElement("param");
+        
+        param.name = "wmode";
+        param.value = "transparent";
+        
+        _DOMObjectElement.appendChild(param);
+        
+        _DOMEmbedElement = document.createElement("embed");
+
+        _DOMEmbedElement.type = "application/x-shockwave-flash";
+        _DOMEmbedElement.setAttribute("wmode", "transparent");
+        _DOMEmbedElement.width = "100%";
+        _DOMEmbedElement.height = "100%";
+
+        // IE requires this thing to be in the _DOMElement and not the _DOMObjectElement.
+        _DOMElement.appendChild(_DOMEmbedElement);
+                
+        _DOMElement.appendChild(_DOMObjectElement);
+    }
+    
+    return self;
+}
+
+- (void)setFlashMovie:(CPFlashMovie)aFlashMovie
+{
+    if (_flashMovie == aFlashMovie)
+        return;
+        
+    _flashMovie = aFlashMovie;
+    
+    _DOMParamElement.value = aFlashMovie._fileName;
+    
+    if (_DOMEmbedElement)
+       _DOMEmbedElement.src = aFlashMovie._fileName;
+}
+
+- (CPFlashMovie)flashMovie
+{
+    return _flashMovie;
+}
+
+- (void)mouseDragged:(CPEvent)anEvent
+{
+    [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];
+}
+
+- (void)mouseDown:(CPEvent)anEvent
+{
+    [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];
+}
+
+- (void)mouseUp:(CPEvent)anEvent
+{
+    [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];
+}
+
+@end

AppKit/CPFont.j

@@ -0,0 +1,161 @@
+/*
+ * CPFont.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 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
+ */
+
+var _CPFonts                = {};
+    _CPFontSystemFontFace   = @"Arial";
+
+#define _CPCachedFont(aName, aSize, isBold) _CPFonts[(isBold ? @"bold " : @"") + ROUND(aSize) + @"px '" + aName + @"'"]
+
+/*! 
+    @ingroup appkit
+    @class CPFont
+
+    The CPFont class allows control of the fonts used for displaying text anywhere on the screen. The primary method for getting a particular font is through one of the class methods that take a name and/or size as arguments, and return the appropriate CPFont.
+*/
+@implementation CPFont : CPObject
+{
+    CPString    _name;
+    float       _size;
+    BOOL        _isBold;
+    
+    CPString    _cssString;
+}
+
+/*!
+    Returns a font with the specified name and size.
+    @param aName the name of the font
+    @param aSize the size of the font (in points)
+    @return the requested font
+*/
++ (CPFont)fontWithName:(CPString)aName size:(float)aSize
+{
+    return _CPCachedFont(aName, aSize, NO) || [[CPFont alloc] _initWithName:aName size:aSize bold:NO];
+}
+
+/*!
+    Returns a bold font with the specified name and size.
+    @param aName the name of the font
+    @param aSize the size of the font (in points)
+    @return the requested bold font
+*/
++ (CPFont)boldFontWithName:(CPString)aName size:(float)aSize
+{
+    return _CPCachedFont(aName, aSize, YES) || [[CPFont alloc] _initWithName:aName size:aSize bold:YES];
+}
+
+/*!
+    Returns the system font scaled to the specified size
+    @param aSize the size of the font (in points)
+    @return the requested system font
+*/
++ (CPFont)systemFontOfSize:(CPSize)aSize
+{
+    return _CPCachedFont(_CPFontSystemFontFace, aSize, NO) || [[CPFont alloc] _initWithName:_CPFontSystemFontFace size:aSize bold:NO];
+}
+
+/*!
+    Returns the bold system font scaled to the specified size
+    @param aSize the size of the font (in points)
+    @return the requested bold system font
+*/
++ (CPFont)boldSystemFontOfSize:(CPSize)aSize
+{
+    return _CPCachedFont(_CPFontSystemFontFace, aSize, YES) || [[CPFont alloc] _initWithName:_CPFontSystemFontFace size:aSize bold:YES];
+}
+
+/*  FIXME Font Descriptor
+    @ignore
+*/
+- (id)_initWithName:(CPString)aName size:(float)aSize bold:(BOOL)isBold
+{   
+    self = [super init];
+    
+    if (self)
+    {
+        _name = aName;
+        _size = aSize;
+        _isBold = isBold;
+        
+        _cssString = (_isBold ? @"bold " : @"") + ROUND(aSize) + @"px '" + aName + @"'";
+        
+        _CPFonts[_cssString] = self;
+    }
+    
+    return self;
+}
+
+/*!
+    Returns the font size (in points)
+*/
+- (float)size
+{
+    return _size;
+}
+
+/*!
+    Returns the font as a CSS string
+*/
+- (CPString)cssString
+{
+    return _cssString;
+}
+
+/*!
+    Returns the font's family name
+*/
+- (CPString)familyName
+{
+    return _name;
+}
+
+@end
+
+var CPFontNameKey   = @"CPFontNameKey",
+    CPFontSizeKey   = @"CPFontSizeKey",
+    CPFontIsBoldKey = @"CPFontIsBoldKey";
+
+@implementation CPFont (CPCoding)
+
+/*!
+    Initializes the font from a coder.
+    @param aCoder the coder from which to read the font data
+    @return the initialized font
+*/
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    return [self _initWithName:[aCoder decodeObjectForKey:CPFontNameKey]
+        size:[aCoder decodeFloatForKey:CPFontSizeKey]
+        bold:[aCoder decodeBoolForKey:CPFontIsBoldKey]];
+}
+
+/*!
+    Writes the font information out to a coder.
+    @param aCoder the coder to which the data will be written
+*/
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [aCoder encodeObject:_name forKey:CPFontNameKey];
+    [aCoder encodeFloat:_size forKey:CPFontSizeKey];
+    [aCoder encodeBool:_isBold forKey:CPFontIsBoldKey];
+}
+
+@end

AppKit/CPFontManager.j

@@ -0,0 +1,174 @@
+/*
+ * CPFontManager.j
+ * AppKit
+ *
+ * Created by Tom Robinson.
+ * Copyright 2008, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPObject.j>
+
+@import <AppKit/CPFont.j>
+
+
+var CPSharedFontManager     = nil,
+    CPFontManagerFactory    = Nil;
+
+/*!
+    @ingroup appkit
+*/
+@implementation CPFontManager : CPObject
+{
+    CPArray _availableFonts;
+}
+
+// Getting the Shared Font Manager
+/*!
+    Returns the application's font manager. If the font
+    manager does not exist yet, it will be created.
+*/
++ (CPFontManager)sharedFontManager
+{
+    if (!CPSharedFontManager)
+        CPSharedFontManager = [[CPFontManagerFactory alloc] init];
+    
+    return CPSharedFontManager;
+}
+
+// Changing the Default Font Conversion Classes
+/*!
+    Sets the class that will be used to create the applcation's
+    font manager.
+*/
++ (void)setFontManagerFactory:(Class)aClass
+{
+    CPFontManagerFactory = aClass;
+}
+
+/*!
+    Returns an array of the available fonts
+*/
+- (CPArray)availableFonts
+{
+    if (!_availableFonts)
+    {   
+        _CPFontDetectSpan = document.createElement("span");
+        _CPFontDetectSpan.fontSize = "24px";
+        _CPFontDetectSpan.appendChild(document.createTextNode("mmmmmmmmmml"));
+        var div = document.createElement("div");
+        div.style.position = "absolute";
+        div.style.top = "-1000px";
+        div.appendChild(_CPFontDetectSpan);
+        document.getElementsByTagName("body")[0].appendChild(div);
+    
+	   _CPFontDetectReferenceFonts = _CPFontDetectPickTwoDifferentFonts(["monospace", "serif", "sans-serif", "cursive"]);
+    
+        _availableFonts = [];
+        for (var i = 0; i < _CPFontDetectAllFonts.length; i++) {
+            var available = _CPFontDetectFontAvailable(_CPFontDetectAllFonts[i]);
+		    if (available)
+                _availableFonts.push(_CPFontDetectAllFonts[i]);
+        }
+    }
+    return _availableFonts;
+}
+
+/*!
+    Returns the available fonts matching the provided name.
+    @param aFontName the name of the font
+*/
+- (CPArray)fontWithNameIsAvailable:(CPString)aFontName
+{
+    return _CPFontDetectFontAvailable(aFontName);
+}
+
+@end
+
+var _CPFontDetectSpan,
+    _CPFontDetectReferenceFonts,
+    _CPFontDetectAllFonts = [
+        /* "04b_21","A Charming Font","Abadi MT Condensed","Abadi MT Condensed Extra Bold","Abadi MT Condensed Light","Academy Engraved LET","Agency FB","Alba","Alba Matter","Alba Super","Algerian",*/ 
+        "American Typewriter", 
+        /* "Andale Mono","Andale Mono IPA","Andy", */
+        "Apple Chancery","Arial","Arial Black","Arial Narrow","Arial Rounded MT Bold","Arial Unicode MS",
+        /* "Avant Garde","Avantgarde","Baby Kruffy","Base 02","Baskerville","Baskerville Old Face","Bauhaus 93","Beesknees ITC","Bell MT","Berlin Sans FB","Berlin Sans FB Demi","Bernard MT Condensed","Bickley Script",*/
+        "Big Caslon","Bitstream Vera Sans","Bitstream Vera Sans Mono","Bitstream Vera Serif",
+        /* "Blackadder ITC","Blackletter686 BT","Bodoni MT","Bodoni MT Black","Bodoni MT Condensed","Bodoni MT Poster Compressed","Book Antiqua","Bookman","Bookman Old Style","Bradley Hand ITC","Braggadocio","Britannic Bold","Broadway","Broadway BT",*/
+        "Brush Script MT",
+        /* "BudHand","CAMPBELL","Calibri","Californian FB","Calisto MT","Calligraph421 BT",*/
+        "Cambria",
+        /* "Candara","Capitals",*/
+        "Caslon","Castellar","Cataneo BT","Centaur","Century Gothic","Century Schoolbook","Century Schoolbook L",
+        /* "Champignon","Charcoal","Charter","Charter BT","Chicago","Chick","Chiller","ClearlyU","Colonna MT",*/
+        "Comic Sans", "Comic Sans MS","Consolas","Constantia","Cooper Black","Copperplate","Copperplate Gothic Bold","Copperplate Gothic Light","Corbel","Courier","Courier New",
+        /* "Croobie","Curlz MT","Desdemona","Didot","DomBold BT","Edwardian Script ITC","Engravers MT","Eras Bold ITC","Eras Demi ITC","Eras Light ITC","Eras Medium ITC","Eurostile","FIRSTHOME","Fat","Felix Titling","Fine Hand","Fixed","Footlight MT Light","Forte","Franklin Gothic Book","Franklin Gothic Demi","Franklin Gothic Demi Cond","Franklin Gothic Heavy","Franklin Gothic Medium","Franklin Gothic Medium Cond","Freestyle Script","French Script MT","Freshbot","Frosty",*/
+        "Futura",
+        /* "GENUINE","Gadget","Garamond",*/
+        "Geneva","Georgia","Georgia Ref", "Geeza Pro", "Gigi","Gill Sans","Gill Sans MT","Gill Sans MT Condensed","Gill Sans MT Ext Condensed Bold","Gill Sans Ultra Bold","Gill Sans Ultra Bold Condensed",
+        /* "GlooGun","Gloucester MT Extra Condensed","Goudy Old Style","Goudy Stout","Haettenschweiler","Harlow Solid Italic","Harrington",*/
+        "Helvetica","Helvetica Narrow","Helvetica Neue","Herculanum","High Tower Text","Highlight LET","Hoefler Text","Impact","Imprint MT Shadow",
+        /* "Informal Roman","Jenkins v2.0","John Handy LET","Jokerman","Jokerman LET","Jokewood","Juice ITC","Kabel Ult BT","Kartika","Kino MT","Kristen ITC","Kunstler Script","La Bamba LET", */
+        "Lucida","Lucida Bright","Lucida Calligraphy","Lucida Console","Lucida Fax","Lucida Grande","Lucida Handwriting","Lucida Sans","Lucida Sans Typewriter","Lucida Sans Unicode", 
+        /* "Luxi Mono","Luxi Sans","Luxi Serif","MARKETPRO","MS Reference Sans Serif","MS Reference Serif","Magneto","Maiandra GD", */ 
+        "Marker Felt",
+        /* "Matisse ITC","Matura MT Script Capitals","Mead Bold","Mekanik LET","Mercurius Script MT Bold", */
+        "Microsoft Sans Serif","Milano LET","Minion Web","MisterEarl BT","Mistral","Monaco","Monotype Corsiva","Monotype.com","New Century Schoolbook","New York","News Gothic MT",
+        /* "Niagara Engraved","Niagara Solid","Nimbus Mono L","Nimbus Roman No9 L","OCR A Extended","OCRB","Odessa LET","Old English Text MT","OldDreadfulNo7 BT","One Stroke Script LET","Onyx","Optima","Orange LET","Palace Script MT","Palatino","Palatino Linotype", */
+        "Papyrus",
+        /* "ParkAvenue BT","Pepita MT","Perpetua","Perpetua Titling MT","Placard Condensed","Playbill","Poornut","Pristina","Pump Demi Bold LET","Pussycat","Quixley LET","Rage Italic","Rage Italic LET","Ravie","Rockwell","Rockwell Condensed","Rockwell Extra Bold","Ruach LET","Runic MT Condensed","Sand","Script MT Bold","Scruff LET","Segoe UI","Showcard Gothic","Skia","Smudger LET","Snap ITC","Square721 BT","Staccato222 BT","Stencil","Sylfaen", */
+        "Tahoma","Techno","Tempus Sans ITC","Terminal","Textile","Times","Times New Roman","Tiranti Solid LET","Trebuchet MS",
+        /* "Tw Cen MT","Tw Cen MT Condensed","Tw Cen MT Condensed Extra Bold","URW Antiqua T","URW Bookman L","URW Chancery L","URW Gothic L","URW Palladio L","Univers","University Roman LET","Utopia", */
+        "Verdana","Verdana Ref", /* "Victorian LET","Viner Hand ITC","Vivaldi","Vladimir Script","Vrinda","Weltron Urban","Westwood LET","Wide Latin","Zapf Chancery", */
+        "Zapfino"];
+
+// Compare against the reference fonts. Return true if it produces a different size than at least one of them.
+var _CPFontDetectFontAvailable = function(font) {
+	for (var i = 0; i < _CPFontDetectReferenceFonts.length; i++)
+		if (_CPFontDetectCompareFonts(_CPFontDetectReferenceFonts[i], font))
+			return true;
+	return false;
+}
+
+var _CPFontDetectCache = {};
+
+// Compares two given fonts. Returns true if they produce different sizes (i.e. fontA didn't fallback to fontB)
+var _CPFontDetectCompareFonts = function(fontA, fontB) {
+    var a;
+    if (_CPFontDetectCache[fontA]) {
+        a = _CPFontDetectCache[fontA];
+    } else {
+    	_CPFontDetectSpan.style.fontFamily = '"' + fontA + '"';
+        _CPFontDetectCache[fontA] = a = { w: _CPFontDetectSpan.offsetWidth, h: _CPFontDetectSpan.offsetHeight };
+    }
+	
+	_CPFontDetectSpan.style.fontFamily= '"' + fontB + '", "' + fontA + '"';
+	var bWidth = _CPFontDetectSpan.offsetWidth;
+	var bHeight = _CPFontDetectSpan.offsetHeight;
+	
+	return (a.w != bWidth || a.h != bHeight);
+}
+
+// Test the candidate fonts pairwise until we find two that are different. Otherwise return the first.
+var _CPFontDetectPickTwoDifferentFonts = function(candidates) {
+	for (var i = 0; i < candidates.length; i++)
+		for (var j = 0; j < i; j++)
+			if (_CPFontDetectCompareFonts(candidates[i], candidates[j]))
+				return [candidates[i], candidates[j]];
+	return [candidates[0]];
+}
+
+[CPFontManager setFontManagerFactory:[CPFontManager class]];

AppKit/CPGeometry.j

@@ -0,0 +1,509 @@
+/*
+ * CPGeometry.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 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 "CGGeometry.j"
+
+
+CPMinXEdge = 0;
+CPMinYEdge = 1;
+CPMaxXEdge = 2;
+CPMaxYEdge = 3;
+
+// FIXME: the rest!
+CPMakePoint = CGPointMake;
+CPMakeSize = CGSizeMake;
+CPMakeRect = CGRectMake;
+
+/*!
+    @addtogroup appkit
+    @{
+*/
+
+/*!
+  Creates a copy of a specified point and returns the copy
+  @group CGPoint
+  @param the point to be copied
+  @return CGPoint the copy of the provided CGPoint
+  */
+function CPPointCreateCopy(aPoint)
+{
+    return { x: aPoint.x, y: aPoint.y };
+}
+
+/*!
+  Makes a CGPoint object out of two numbers provided as arguments
+  @group CGPoint
+  @param x the x-coordinate of the CGPoint
+  @param y the y-coordinate of the CGPoint
+  @return CGPoint a CGPoint with an X and Y coordinate equal to the function arguments
+  */
+function CPPointMake(x, y)
+{
+    return { x: x, y: y };
+}
+
+/*!
+    Makes a CGRect with an origin and size equal to \c aRect less the \c dX/dY insets specified.
+    @param dX the size of the inset in the x-axis
+    @param dY the size of the inset in the y-axis
+    @group CGRect
+    @return CGRect a rectangle like \c aRect with an inset
+*/
+function CPRectInset(aRect, dX, dY)
+{
+    return CPRectMake(  aRect.origin.x + dX, aRect.origin.y + dY, 
+                        aRect.size.width - 2 * dX, aRect.size.height - 2*dY);
+}
+
+/*!
+    @group CGRect
+    @ignore
+    @return void
+    @deprecated
+*/
+function CPRectIntegral(aRect)
+{
+    // FIXME!!!
+    alert("CPRectIntegral unimplemented");
+}
+
+/*!
+    Returns the intersection of the two provided rectangles as a new rectangle
+    @group CGRect
+    @param lhsRect the first rectangle used for calculation
+    @param rhsRect the second rectangle used for calculation
+    @return CGRect the intersection of the two rectangles
+*/
+function CPRectIntersection(lhsRect, rhsRect)
+{
+    var intersection = CPRectMake(
+        Math.max(CPRectGetMinX(lhsRect), CPRectGetMinX(rhsRect)), 
+        Math.max(CPRectGetMinY(lhsRect), CPRectGetMinY(rhsRect)), 
+        0, 0);
+    
+    intersection.size.width = Math.min(CPRectGetMaxX(lhsRect), CPRectGetMaxX(rhsRect)) - CPRectGetMinX(intersection);
+    intersection.size.height = Math.min(CPRectGetMaxY(lhsRect), CPRectGetMaxY(rhsRect)) - CPRectGetMinY(intersection);
+    
+    return CPRectIsEmpty(intersection) ? CPRectMakeZero() : intersection;
+}
+
+/*!
+    Creates a copy of the provided rectangle
+    @group CGRect
+    @param aRect the CGRect that will be copied
+    @return CGRect the rectangle copy
+*/
+function CPRectCreateCopy(aRect)
+{
+    return { origin: CPPointCreateCopy(aRect.origin), size: CPSizeCreateCopy(aRect.size) };
+}
+
+/*!
+    Returns a CGRect made of the specified arguments
+    @group CGRect
+    @param x the x-coordinate of the rectangle's origin
+    @param y the y-coordinate of the rectangle's origin
+    @param width the width of the new rectangle
+    @param height the height of the new rectangle
+    @return CGRect the new rectangle
+*/
+function CPRectMake(x, y, width, height)
+{
+    return { origin: CPPointMake(x, y), size: CPSizeMake(width, height) };
+}
+
+/*!
+    Creates a new rectangle with its origin offset by \c dX and \c dY.
+    @group CGRect
+    @param aRect the rectangle to copy the origin and size from
+    @param dX the amount added to the x-size of the new rectangle
+    @param dY the amount added to the y-size of the new rectangle
+    @return CGRect the new rectangle with modified size
+*/
+function CPRectOffset(aRect, dX, dY)
+{
+    return CPRectMake(aRect.origin.x + dX, aRect.origin.y + dY, aRect.size.width, aRect.size.height);
+}
+
+/*!
+    @group CGRect
+    @param aRect a CGRect
+    @return CGRect
+*/
+function CPRectStandardize(aRect)
+{
+    var width = CPRectGetWidth(aRect),
+        height = CPRectGetHeight(aRect),
+        standardized = CPRectCreateCopy(aRect);
+
+    if (width < 0.0)
+    {
+        standardized.origin.x += width;
+        standardized.size.width = -width;
+    }
+    
+    if (height < 0.0)
+    {
+        standardized.origin.y += height;
+        standardized.size.height = -height;
+    }
+    
+    return standardized;
+}
+
+/*!
+    Returns the smallest rectangle that can contain the two argument \c CGRects.
+    @group CGRect
+    @param lhsRect the first CGRect to use for the union calculation
+    @param rhsRect the second CGRect to use for the union calculation
+    @return CGRect the union rectangle
+*/
+function CPRectUnion(lhsRect, rhsRect)
+{
+    var minX = Math.min(CPRectGetMinX(lhsRect), CPRectGetMinX(rhsRect)),
+        minY = Math.min(CPRectGetMinY(lhsRect), CPRectGetMinY(rhsRect)),
+        maxX = Math.max(CPRectGetMaxX(lhsRect), CPRectGetMaxX(rhsRect)),
+        maxY = Math.max(CPRectGetMaxY(lhsRect), CPRectGetMaxY(rhsRect));
+    
+    return CPRectMake(minX, minY, maxX - minX, maxY - minY);
+}
+
+/*!
+    Creates and returns a copy of the provided CGSize
+    @group CGSize
+    @param aSize the CGSize to copy
+    @return CGSize the copy of the CGSize
+*/
+function CPSizeCreateCopy(aSize)
+{
+    return { width: aSize.width, height: aSize.height };
+}
+
+/*!
+    Creates and returns a new CGSize object from the provided dimensions.
+    @group CGSize
+    @param width the width for the new CGSize
+    @param height the height for the new CGSize
+    @return CGSize the new CGSize
+*/
+function CPSizeMake(width, height)
+{
+    return { width: width, height: height };
+}
+
+/*!
+    Returns \c YES if the CGRect, \c aRect, contains
+    the CGPoint, \c aPoint.
+    @param aRect the rectangle to test with
+    @param aPoint the point to test with
+    @group CGRect
+    @return BOOL \c YES if the rectangle contains the point, \c NO otherwise.
+*/
+function CPRectContainsPoint(aRect, aPoint)
+{
+    return  aPoint.x >= CPRectGetMinX(aRect) &&
+            aPoint.y >= CPRectGetMinY(aRect) &&
+   			aPoint.x < CPRectGetMaxX(aRect) &&
+   			aPoint.y < CPRectGetMaxY(aRect);
+}
+
+/*!
+    Returns a \c BOOL indicating whether CGRect \c possibleOuter
+    contains CGRect \c possibleInner.
+    @group CGRect
+    @param possibleOuter the CGRect to test if \c possibleInner is inside of
+    @param possibleInner the CGRect to test if it fits inside \c possibleOuter.
+    @return BOOL \c YES if \c possibleInner fits inside \c possibleOuter.
+*/
+function CPRectContainsRect(possibleOuter, possibleInner)
+{
+    return CGRectContainsRect(possibleOuter, possibleInner);
+}
+
+/*!
+    Tests whether the two CGPoints are equal to each other by comparing their
+    \c x and \c y members.
+    @group @CGPoint
+    @param lhsPoint the first CGPoint to check
+    @param rhsPoint the second CGPoint to check
+    @return BOOL \c YES if the two points have the same x's, and the same y's.
+*/
+function CPPointEqualToPoint(lhsPoint, rhsPoint)
+{
+    return lhsPoint.x == rhsPoint.x && lhsPoint.y == rhsPoint.y;
+}
+
+/*!
+    Test whether the two CGRects have the same origin and size
+    @group CGRect
+    @param lhsRect the first CGRect to compare
+    @param rhsRect the second CGRect to compare
+    @return BOOL \c YES if the two rectangles have the same origin and size. \c NO, otherwise.
+*/
+function CPRectEqualToRect(lhsRect, rhsRect)
+{
+    return  CPPointEqualToPoint(lhsRect.origin, rhsRect.origin) && 
+            CPSizeEqualToSize(lhsRect.size, rhsRect.size);
+}
+
+/*!
+    @group CGRect
+    @param aRect a CGRect
+    @return int
+*/
+function CPRectGetHeight(aRect)
+{
+    return aRect.size.height;
+}
+
+/*!
+    @group CGRect
+    @param aRect a CGRect
+    @return int
+*/
+function CPRectGetMaxX(aRect)
+{
+    return aRect.origin.x + aRect.size.width;
+}
+
+/*!
+    @group CGRect
+    @param aRect a CGRect
+    @return int
+*/
+function CPRectGetMaxY(aRect)
+{
+    return aRect.origin.y + aRect.size.height;
+}
+
+/*!
+    @group CGRect
+    @param aRect a CGRect
+    @return float
+*/
+function CPRectGetMidX(aRect)
+{
+    return aRect.origin.x + (aRect.size.width) / 2.0;
+}
+
+/*!
+    @group CGRect
+    @param aRect a CGRect
+    @return float
+*/
+function CPRectGetMidY(aRect)
+{
+    return aRect.origin.y + (aRect.size.height) / 2.0;
+}
+
+/*!
+    @group CGRect
+    @param aRect a CGRect
+    @return int
+*/
+function CPRectGetMinX(aRect)
+{
+    return aRect.origin.x;
+}
+
+/*!
+    @group CGRect
+    @param aRect a CGRect
+    @return int
+*/
+function CPRectGetMinY(aRect)
+{
+    return aRect.origin.y;
+}
+
+/*!
+    @group CGRect
+    @param aRect a CGRect
+    @return int
+*/
+function CPRectGetWidth(aRect)
+{
+    return aRect.size.width;
+}
+
+/*!
+    Returns \c YES if the two rectangles intersect
+    @group CGRect
+    @param lhsRect the first CGRect
+    @param rhsRect the second CGRect
+    @return BOOL \c YES if the two rectangles have any common spaces, and \c NO, otherwise.
+*/
+function CPRectIntersectsRect(lhsRect, rhsRect)
+{
+    return !CPRectIsEmpty(CPRectIntersection(lhsRect, rhsRect));
+}
+
+/*!
+    Returns \c YES if the CGRect has no area.
+    The test is performed by checking if the width and height are both zero.
+    @group CGRect
+    @param aRect the CGRect to test
+    @return BOOL \c YES if the CGRect has no area, and \c NO, otherwise.
+*/
+function CPRectIsEmpty(aRect)
+{
+    return aRect.size.width <= 0.0 || aRect.size.height <= 0.0;
+}
+
+/*!
+    Returns \c YES if the CGRect has no area.
+    The test is performed by checking if the width and height are both zero.
+    @group CGRect
+    @return BOOL \c YES if the CGRect has no area, and \c NO, otherwise.
+*/
+function CPRectIsNull(aRect)
+{
+    return aRect.size.width <= 0.0 || aRect.size.height <= 0.0;
+}
+
+/*!
+    Returns \c YES if the two CGSizes are identical.
+    @group CGSize
+    @param lhsSize the first CGSize to compare
+    @param rhsSize the second CGSize to compare
+    @return BOOL \c YES if the two sizes are identical. \c NO, otherwise.
+*/
+function CPSizeEqualToSize(lhsSize, rhsSize)
+{
+    return lhsSize.width == rhsSize.width && lhsSize.height == rhsSize.height;
+}
+
+/*!
+    Returns a human readable string of the provided CGPoint.
+    @group CGPoint
+    @param aPoint the point to represent
+    @return CGPoint a string representation of the CGPoint
+*/
+function CPStringFromPoint(aPoint)
+{
+    return "{" + aPoint.x + ", " + aPoint.y + "}";
+}
+
+/*!
+    Returns a human readable string of the provided CGSize.
+    @group CGSize
+    @param aSize the size to represent
+    @return CGSize a string representation of the CGSize
+*/
+function CPStringFromSize(aSize)
+{
+    return "{" + aSize.width + ", " + aSize.height + "}";
+}
+
+/*!
+    Returns a human readable string of the provided CGRect.
+    @group CGRect
+    @param aRect the rectangle to represent
+    @return CGString the string representation of the rectangle
+*/
+function CPStringFromRect(aRect)
+{
+    return "{" + CPStringFromPoint(aRect.origin) + ", " + CPStringFromSize(aRect.size) + "}";
+}
+
+/*!
+    Returns a CGPoint from a string with a comma separated pair of integers.
+    @group CGPoint
+    @param aString a string containing two comma separated integers
+    @return CGPoint the point object created from the string
+*/
+function CPPointFromString(aString)
+{
+    var comma = aString.indexOf(',');
+    
+    return { x:parseFloat(aString.substr(1, comma - 1), 10), y:parseFloat(aString.substring(comma + 1, aString.length), 10) };
+}
+
+/*!
+    Returns a CGSize from a string containing a pair of comma separated integers.
+    @group CGSize
+    @param aString a string containing two comma separated integers
+    @return CGSize the size object created from the string
+*/
+function CPSizeFromString(aString)
+{
+    var comma = aString.indexOf(',');
+    
+    return { width:parseFloat(aString.substr(1, comma - 1), 10), height:parseFloat(aString.substring(comma + 1, aString.length), 10) };
+}
+
+/*!
+    Returns a CGRect created from a string.
+    @group CGRect
+    @param aString a string in the form generated by \c CPStringFromRect
+    @return CGRect the rectangle created from the string
+*/
+function CPRectFromString(aString)
+{
+    var comma = aString.indexOf(',', aString.indexOf(',') + 1);
+    
+    return { origin:CPPointFromString(aString.substr(1, comma - 1)), size:CPSizeFromString(aString.substring(comma + 2, aString.length)) };
+}
+
+/*!
+    @group CGPoint
+    @param anEvent
+    @return CGPoint
+*/
+function CPPointFromEvent(anEvent)
+{
+    return CPPointMake(anEvent.clientX, anEvent.clientY, 0);
+}
+
+/*!
+    Returns a zero sized CGSize.
+    @group CGSize
+    @return CGSize a size object with zeros for \c width and \c height
+*/
+function CPSizeMakeZero()
+{
+    return CPSizeMake(0, 0);
+}
+
+/*!
+    Returns a rectangle at origin \c (0,0) and size of \c (0,0).
+    @group CGRect
+    @return CGRect a zeroed out CGRect
+*/
+function CPRectMakeZero()
+{
+    return CPRectMake(0, 0, 0, 0);
+}
+
+/*!
+    Returns a point located at \c (0, 0).
+    @group CGPoint
+    @return CGPoint a point located at \c (0, 0)
+*/
+function CPPointMakeZero()
+{
+    return CPPointMake(0, 0, 0);
+}
+
+/*! 
+    @}
+*/

AppKit/CPGraphicsContext.j

@@ -0,0 +1,84 @@
+/*
+ * CPGraphicsContext.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 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
+ */
+
+var CPGraphicsContextCurrent    = nil;
+
+/*!
+    @ingroup appkit
+    Provides an interface for drawing to the screen.
+*/
+@implementation CPGraphicsContext : CPObject
+{
+    CPContext   _graphicsPort;
+}
+
+/*!
+    Returns the current graphics context.
+*/
++ (CPGraphicsContext)currentContext
+{
+    return CPGraphicsContextCurrent;
+}
+
+/*!
+    Sets the current graphics context
+*/
++ (void)setCurrentContext:(CPGraphicsContext)aGraphicsContext
+{
+    CPGraphicsContextCurrent = aGraphicsContext;
+}
+
+/*!
+    Creates a graphics context with a provided port.
+    @param aContext the context to initialize with
+    @param aFlag whether the context should be flipped
+    @return the initialized graphics context
+*/
++ (CPGraphicsContext)graphicsContextWithGraphicsPort:(CGContext)aContext flipped:(BOOL)aFlag
+{
+    return [[self alloc] initWithGraphicsPort:aContext];
+}
+
+/*!
+    Initializes the context with a graphics port.
+    @param aGraphicsPort the graphics port to initialize with
+    @return the initialized context
+*/
+- (id)initWithGraphicsPort:(CPContext)aGraphicsPort
+{
+    self = [super init];
+    
+    if (self)
+        _graphicsPort = aGraphicsPort;
+    
+    return self;
+}
+
+/*!
+    Returns the graphics context's port.
+*/
+- (CGContext)graphicsPort
+{
+    return _graphicsPort;
+}
+
+@end

AppKit/CPImage.j

@@ -0,0 +1,460 @@
+/*
+ * CPImage.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+ 
+@import <Foundation/CPBundle.j>
+@import <Foundation/CPNotificationCenter.j>
+@import <Foundation/CPObject.j>
+@import <Foundation/CPRunLoop.j>
+@import <Foundation/CPString.j>
+
+@import "CPGeometry.j"
+
+CPImageLoadStatusInitialized    = 0;
+CPImageLoadStatusLoading        = 1;
+CPImageLoadStatusCompleted      = 2;
+CPImageLoadStatusCancelled      = 3;
+CPImageLoadStatusInvalidData    = 4;
+CPImageLoadStatusUnexpectedEOF  = 5;
+CPImageLoadStatusReadError      = 6;
+
+CPImageDidLoadNotification      = @"CPImageDidLoadNotification";
+
+function CPImageInBundle(aFilename, aSize, aBundle)
+{
+    if (!aBundle)
+        aBundle = [CPBundle mainBundle];
+    
+    if (aSize)
+        return [[CPImage alloc] initWithContentsOfFile:[aBundle pathForResource:aFilename] size:aSize];
+    
+    return [[CPImage alloc] initWithContentsOfFile:[aBundle pathForResource:aFilename]];
+}
+
+/*! 
+    @ingroup appkit
+    @class CPImage
+
+    CPImage is used to represent images in the Cappuccino framework. It supports loading
+    all image types supported by the browser.
+
+    @par Delegate Methods
+    
+    @delegate -(void)imageDidLoad:(CPImage)image;
+    Called when the specified image has finished loading.
+    @param image the image that loaded
+
+    @delegate -(void)imageDidError:(CPImage)image;
+    Called when the specified image had an error loading.
+    @param image the image with the loading error
+
+    @delegate -(void)imageDidAbort:(CPImage)image;
+    Called when the image loading was aborted.
+    @param image the image that was aborted
+*/
+@implementation CPImage : CPObject
+{
+    CGSize      _size;
+    CPString    _filename;
+    
+    id          _delegate;
+    unsigned    _loadStatus;
+    
+    Image       _image;
+}
+
+- (id)init
+{
+    return [self initByReferencingFile:@"" size:CGSizeMake(-1, -1)];
+}
+
+/*!
+    Initializes the image, by associating it with a filename. The image
+    denoted in \c aFilename is not actually loaded. It will
+    be loaded once needed.
+    @param aFilename the file containing the image
+    @param aSize the image's size
+    @return the initialized image
+*/
+- (id)initByReferencingFile:(CPString)aFilename size:(CGSize)aSize
+{
+    self = [super init];
+    
+    if (self)
+    {
+        _size = CPSizeCreateCopy(aSize);
+        _filename = aFilename;
+        _loadStatus = CPImageLoadStatusInitialized;
+    }
+    
+    return self;
+}
+
+/*!
+    Initializes the image. Loads the specified image into memory.
+    @param aFilename the image to load
+    @param aSize the size of the image
+    @return the initialized image.
+*/
+- (id)initWithContentsOfFile:(CPString)aFilename size:(CGSize)aSize
+{
+    self = [self initByReferencingFile:aFilename size:aSize];
+    
+    if (self)
+        [self load];
+    
+    return self;
+}
+
+/*!
+    Initializes the receiver with the contents of the specified
+    image file. The method loads the data into memory.
+    @param aFilename the file name of the image
+    @return the initialized image
+*/
+- (id)initWithContentsOfFile:(CPString)aFilename
+{
+    self = [self initByReferencingFile:aFilename size:CGSizeMake(-1, -1)];
+    
+    if (self)
+        [self load];
+    
+    return self;
+}
+
+/*!
+    Returns the path of the file associated with this image.
+*/
+- (CPString)filename
+{
+    return _filename;
+}
+
+/*!
+    Sets the size of the image.
+    @param the size of the image
+*/
+- (void)setSize:(CGSize)aSize
+{
+    _size = CGSizeMakeCopy(aSize);
+}
+
+/*!
+    Returns the size of the image
+*/
+- (CGSize)size
+{
+    return _size;
+}
+
+/*!
+    Sets the receiver's delegate.
+    @param the delegate
+*/
+- (void)setDelegate:(id)aDelegate
+{
+    _delegate = aDelegate;
+}
+
+/*!
+    Returns the receiver's delegate
+*/
+- (id)delegate
+{
+    return _delegate;
+}
+
+/*!
+    Returns the load status, which will be CPImageLoadStatusCompleted if the image data has already been loaded.
+*/
+- (unsigned)loadStatus
+{
+    return _loadStatus;
+}
+
+/*!
+    Loads the image data from the file into memory. You
+    should not call this method directly. Instead use
+    one of the initializers.
+*/
+
+- (void)load
+{
+    if (_loadStatus == CPImageLoadStatusLoading || _loadStatus == CPImageLoadStatusCompleted)
+        return;
+        
+    _loadStatus = CPImageLoadStatusLoading;
+
+    _image = new Image();
+
+    var isSynchronous = YES;
+
+    // FIXME: We need a better/performance way of doing this.
+    _image.onload = function ()
+        {
+            if (isSynchronous)
+                window.setTimeout(function() { [self _imageDidLoad]; }, 0);
+            else
+            {
+                [self _imageDidLoad];
+                [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
+            }
+            [self _derefFromImage];
+        }
+    
+    _image.onerror = function ()
+        {
+            if (isSynchronous)
+                window.setTimeout(function() { [self _imageDidError]; }, 0);
+            else
+            {
+                [self _imageDidError];
+                [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
+            }
+            [self _derefFromImage];
+        }
+    
+    _image.onabort = function ()
+        {
+            if (isSynchronous)
+                window.setTimeout(function() { [self _imageDidAbort]; }, 0);
+            else
+            {
+                [self _imageDidAbort];
+                [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
+            }
+            [self _derefFromImage];
+        }
+        
+    _image.src = _filename;
+    
+    isSynchronous = NO;
+}
+
+- (BOOL)isThreePartImage
+{
+    return NO;
+}
+
+- (BOOL)isNinePartImage
+{
+    return NO;
+}
+
+/* @ignore */
+- (void)_derefFromImage
+{
+    _image.onload = null;
+    _image.onerror = null;
+    _image.onabort = null;
+}
+
+/* @ignore */
+- (void)_imageDidLoad
+{
+    _loadStatus = CPImageLoadStatusCompleted;
+
+    // FIXME: IE is wrong on image sizes????
+    if (!_size || (_size.width == -1 && _size.height == -1))
+        _size = CGSizeMake(_image.width, _image.height);
+
+    [[CPNotificationCenter defaultCenter]
+        postNotificationName:CPImageDidLoadNotification
+        object:self];
+        
+    if ([_delegate respondsToSelector:@selector(imageDidLoad:)])
+        [_delegate imageDidLoad:self];
+}
+
+/* @ignore */
+- (void)_imageDidError
+{
+    _loadStatus = CPImageLoadStatusReadError;
+    
+    if ([_delegate respondsToSelector:@selector(imageDidError:)])
+        [_delegate imageDidError:self];
+}
+
+/* @ignore */
+- (void)_imageDidAbort
+{
+    _loadStatus = CPImageLoadStatusCancelled;
+    
+    if ([_delegate respondsToSelector:@selector(imageDidAbort:)])
+        [_delegate imageDidAbort:self];
+}
+
+@end
+
+@implementation CPImage (CPCoding)
+
+/*!
+    Initializes the image with data from a coder.
+    @param aCoder the coder from which to read the image data
+    @return the initialized image
+*/
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    return [self initWithContentsOfFile:[aCoder decodeObjectForKey:@"CPFilename"] size:[aCoder decodeSizeForKey:@"CPSize"]];
+}
+
+/*!
+    Writes the image data from memory into the coder.
+    @param aCoder the coder to which the data will be written
+*/
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [aCoder encodeObject:_filename forKey:@"CPFilename"];
+    [aCoder encodeSize:_size forKey:@"CPSize"];
+}
+
+@end
+
+@implementation CPThreePartImage : CPObject
+{
+    CPArray _imageSlices;
+    BOOL    _isVertical;
+}
+
+- (id)initWithImageSlices:(CPArray)imageSlices isVertical:(BOOL)isVertical
+{
+    self = [super init];
+    
+    if (self)
+    {
+        _imageSlices = imageSlices;
+        _isVertical = isVertical;
+    }
+
+    return self;
+}
+
+- (CPString)filename
+{
+    return @"";
+}
+
+- (CPArray)imageSlices
+{
+    return _imageSlices;
+}
+
+- (BOOL)isVertical
+{
+    return _isVertical;
+}
+
+- (BOOL)isThreePartImage
+{
+    return YES;
+}
+
+- (BOOL)isNinePartImage
+{
+    return NO;
+}
+
+@end
+
+var CPThreePartImageImageSlicesKey  = @"CPThreePartImageImageSlicesKey",
+    CPThreePartImageIsVerticalKey   = @"CPThreePartImageIsVerticalKey";
+
+@implementation CPThreePartImage (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super init];
+    
+    if (self)
+    {
+        _imageSlices = [aCoder decodeObjectForKey:CPThreePartImageImageSlicesKey];
+        _isVertical = [aCoder decodeBoolForKey:CPThreePartImageIsVerticalKey];
+    }
+    
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [aCoder encodeObject:_imageSlices forKey:CPThreePartImageImageSlicesKey];
+    [aCoder encodeBool:_isVertical forKey:CPThreePartImageIsVerticalKey];
+}
+
+@end
+
+
+@implementation CPNinePartImage : CPObject
+{
+    CPArray _imageSlices;
+}
+
+- (id)initWithImageSlices:(CPArray)imageSlices
+{
+    self = [super init];
+    
+    if (self)
+        _imageSlices = imageSlices;
+    
+    return self;
+}
+
+- (CPString)filename
+{
+    return @"";
+}
+
+- (CPArray)imageSlices
+{
+    return _imageSlices;
+}
+
+- (BOOL)isThreePartImage
+{
+    return NO;
+}
+
+- (BOOL)isNinePartImage
+{
+    return YES;
+}
+
+@end
+
+var CPNinePartImageImageSlicesKey   = @"CPNinePartImageImageSlicesKey";
+
+@implementation CPNinePartImage (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super init];
+    
+    if (self)
+        _imageSlices = [aCoder decodeObjectForKey:CPNinePartImageImageSlicesKey];
+    
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [aCoder encodeObject:_imageSlices forKey:CPNinePartImageImageSlicesKey];
+}
+
+@end

AppKit/CPImageView.j

@@ -0,0 +1,462 @@
+/*
+ * CPImageView.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPNotificationCenter.j>
+
+@import "CPControl.j"
+@import "CPImage.j"
+@import "CPShadowView.j"
+
+#include "Platform/Platform.h"
+#include "Platform/DOM/CPDOMDisplayServer.h"
+
+#include "CoreGraphics/CGGeometry.h"
+
+
+/*
+    @global
+    @group CPImageScaling
+*/
+CPScaleProportionally   = 0;
+/*
+    @global
+    @group CPImageScaling
+*/
+CPScaleToFit            = 1;
+/*
+    @global
+    @group CPImageScaling
+*/
+CPScaleNone             = 2;
+
+
+var CPImageViewShadowBackgroundColor = nil;
+    
+var LEFT_SHADOW_INSET       = 3.0,
+    RIGHT_SHADOW_INSET      = 3.0,
+    TOP_SHADOW_INSET        = 3.0,
+    BOTTOM_SHADOW_INSET     = 5.0,
+    VERTICAL_SHADOW_INSET   = TOP_SHADOW_INSET + BOTTOM_SHADOW_INSET,
+    HORIZONTAL_SHADOW_INSET = LEFT_SHADOW_INSET + RIGHT_SHADOW_INSET;
+
+/*! 
+    @ingroup appkit
+    @class CPImageView
+
+    This class is a control that displays an image.
+*/
+@implementation CPImageView : CPControl
+{
+    DOMElement      _DOMImageElement;
+    
+    BOOL            _hasShadow;
+    CPView          _shadowView;
+
+    BOOL            _isEditable;
+
+    CGRect          _imageRect;
+}
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    self = [super initWithFrame:aFrame];
+    
+    if (self)
+    {
+#if PLATFORM(DOM)
+        _DOMImageElement = document.createElement("img");
+        _DOMImageElement.style.position = "absolute";
+        _DOMImageElement.style.left = "0px";
+        _DOMImageElement.style.top = "0px";
+
+        if ([CPPlatform supportsDragAndDrop])
+        {
+            _DOMImageElement.setAttribute("draggable", "true");
+            _DOMImageElement.style["-khtml-user-drag"] = "element";
+        }
+
+        CPDOMDisplayServerAppendChild(_DOMElement, _DOMImageElement);
+        
+        _DOMImageElement.style.visibility = "hidden";
+#endif
+    }
+    
+    return self;
+}
+
+/*!
+    Returns the view's image.
+*/
+- (CPImage)image
+{
+    return [self objectValue];
+}
+
+- (void)setImage:(CPImage)anImage
+{
+    [self setObjectValue:anImage];
+}
+
+/*! @ignore */
+- (void)setObjectValue:(CPImage)anImage
+{
+    var oldImage = [self objectValue];
+    
+    if (oldImage === anImage)
+        return;
+        
+    [super setObjectValue:anImage];
+    
+    var defaultCenter = [CPNotificationCenter defaultCenter];
+    
+    if (oldImage)
+        [defaultCenter removeObserver:self name:CPImageDidLoadNotification object:oldImage];
+
+    var newImage = [self objectValue];
+    
+#if PLATFORM(DOM)
+    _DOMImageElement.src = newImage ? [newImage filename] : "";
+#endif
+
+    var size = [newImage size];
+    
+    if (size && size.width === -1 && size.height === -1)
+    {
+        [defaultCenter addObserver:self selector:@selector(imageDidLoad:) name:CPImageDidLoadNotification object:newImage];
+        
+#if PLATFORM(DOM)
+        _DOMImageElement.width = 0;
+        _DOMImageElement.height = 0;
+#endif
+
+        [_shadowView setHidden:YES];
+    }
+    else
+    {
+        [self hideOrDisplayContents];
+        [self setNeedsLayout];
+        [self setNeedsDisplay:YES];
+    }
+}
+
+- (void)imageDidLoad:(CPNotification)aNotification
+{
+    [self hideOrDisplayContents];
+    
+    [self setNeedsLayout];
+    [self setNeedsDisplay:YES];
+}
+
+/*!
+    Returns \c YES if the image view draws with
+    a drop shadow. The default is \c NO.
+*/
+- (BOOL)hasShadow
+{
+    return _hasShadow;
+}
+
+/*!
+    Sets whether the image view should draw with a drop shadow.
+    @param shouldHaveShadow whether the image view should have a shadow
+*/
+- (void)setHasShadow:(BOOL)shouldHaveShadow
+{
+    if (_hasShadow == shouldHaveShadow)
+        return;
+    
+    _hasShadow = shouldHaveShadow;
+
+    if (_hasShadow)
+    {
+        _shadowView = [[CPShadowView alloc] initWithFrame:[self bounds]];
+                        
+        [self addSubview:_shadowView];
+        
+        [self setNeedsLayout];
+        [self setNeedsDisplay:YES];
+    }
+    else
+    {
+        [_shadowView removeFromSuperview];
+        
+        _shadowView = nil;
+    }
+    
+    [self hideOrDisplayContents];
+}
+
+/*!
+    Sets the type of image scaling that should be used to
+    render the image.
+    @param anImageScaling the type of scaling to use
+*/
+- (void)setImageScaling:(CPImageScaling)anImageScaling
+{
+    [super setImageScaling:anImageScaling];
+    
+#if PLATFORM(DOM)
+    if ([self currentValueForThemeAttribute:@"image-scaling"] === CPScaleToFit)
+    {
+        CPDOMDisplayServerSetStyleLeftTop(_DOMImageElement, NULL, 0.0, 0.0);
+    }
+#endif
+    
+    [self setNeedsLayout];
+    [self setNeedsDisplay:YES];
+}
+
+/*!
+    Toggles the display of the image view.
+*/
+- (void)hideOrDisplayContents
+{
+    if (![self image])
+    {
+#if PLATFORM(DOM)
+        _DOMImageElement.style.visibility = "hidden";
+#endif
+        [_shadowView setHidden:YES];
+    }
+    else
+    {
+#if PLATFORM(DOM)
+        _DOMImageElement.style.visibility = "visible";
+#endif
+        [_shadowView setHidden:NO];
+    }
+}
+
+/*!
+    Returns the view's image rectangle
+*/
+- (CGRect)imageRect
+{
+    return _imageRect;
+}
+
+/*!
+    Add a description
+*/
+- (void)layoutSubviews
+{
+    if (![self image])
+        return;
+
+    var bounds = [self bounds],
+        image = [self image],
+        imageScaling = [self currentValueForThemeAttribute:@"image-scaling"],
+        x = 0.0,
+        y = 0.0,
+        insetWidth = (_hasShadow ? HORIZONTAL_SHADOW_INSET : 0.0),
+        insetHeight = (_hasShadow ? VERTICAL_SHADOW_INSET : 0.0),
+        boundsWidth = _CGRectGetWidth(bounds),
+        boundsHeight = _CGRectGetHeight(bounds),
+        width = boundsWidth - insetWidth,
+        height = boundsHeight - insetHeight;
+
+    if (imageScaling === CPScaleToFit)
+    {
+#if PLATFORM(DOM)
+        _DOMImageElement.width = ROUND(width);
+        _DOMImageElement.height = ROUND(height);
+#endif
+    }
+    else
+    {
+        var size = [image size];
+        
+        if (size.width == -1 && size.height == -1)
+            return;
+
+        if (imageScaling === CPScaleProportionally)
+        {
+            // The max size it can be is size.width x size.height, so only
+            // only proportion otherwise.
+            if (width >= size.width && height >= size.height)
+            {
+                width = size.width;
+                height = size.height;
+            }
+            else
+            {
+                var imageRatio = size.width / size.height,
+                    viewRatio = width / height;
+                    
+                if (viewRatio > imageRatio)
+                    width = height * imageRatio;
+                else
+                    height = width / imageRatio;
+            }
+
+#if PLATFORM(DOM)
+            _DOMImageElement.width = ROUND(width);
+            _DOMImageElement.height = ROUND(height);
+#endif
+        }
+        else
+        {
+            width = size.width;
+            height = size.height;
+        }
+    
+        if (imageScaling == CPScaleNone)
+        {
+#if PLATFORM(DOM)
+            _DOMImageElement.width = ROUND(size.width);
+            _DOMImageElement.height = ROUND(size.height);
+#endif
+        }
+
+        var x = (boundsWidth - width) / 2.0,
+            y = (boundsHeight - height) / 2.0;
+
+#if PLATFORM(DOM)
+        CPDOMDisplayServerSetStyleLeftTop(_DOMImageElement, NULL, x, y);
+#endif
+    }
+
+    _imageRect = _CGRectMake(x, y, width, height);
+    
+    if (_hasShadow)
+        [_shadowView setFrame:_CGRectMake(x - LEFT_SHADOW_INSET, y - TOP_SHADOW_INSET, width + insetWidth, height + insetHeight)];
+}
+
+- (void)mouseDown:(CPEvent)anEvent
+{
+    // Should we do something with this event?
+    [[self nextResponder] mouseDown:anEvent];
+}
+
+- (void)setEditable:(BOOL)shouldBeEditable
+{
+    if (_isEditable === shouldBeEditable)
+        return;
+
+    _isEditable = shouldBeEditable;
+
+    if (_isEditable)
+        [self registerForDraggedTypes:[CPImagesPboardType]];
+
+    else
+    {
+        var draggedTypes = [self registeredDraggedTypes];
+
+        [self unregisterDraggedTypes];
+
+        [draggedTypes removeObjectIdenticalTo:CPImagesPboardType];
+
+        [self registerForDraggedTypes:draggedTypes];
+    }
+}
+
+- (BOOL)isEditable
+{
+    return _isEditable;
+}
+
+- (void)performDragOperation:(CPDraggingInfo)aSender
+{
+    var images = [CPKeyedUnarchiver unarchiveObjectWithData:[[aSender draggingPasteboard] dataForType:CPImagesPboardType]];
+
+    if ([images count])
+        [self setImage:images[0]];
+}
+
+@end
+
+var CPImageViewImageKey         = @"CPImageViewImageKey",
+    CPImageViewImageScalingKey  = @"CPImageViewImageScalingKey",
+    CPImageViewHasShadowKey     = @"CPImageViewHasShadowKey",
+    CPImageViewIsEditableKey    = @"CPImageViewIsEditableKey";
+
+@implementation CPImageView (CPCoding)
+
+/*!
+    Initializes the image view with the provided coder.
+    @param aCoder the coder from which data will be read.
+    @return the initialized image view
+*/
+- (id)initWithCoder:(CPCoder)aCoder
+{
+#if PLATFORM(DOM)
+    _DOMImageElement = document.createElement("img");
+    _DOMImageElement.style.position = "absolute";
+    _DOMImageElement.style.left = "0px";
+    _DOMImageElement.style.top = "0px";
+    _DOMImageElement.style.visibility = "hidden";
+    if ([CPPlatform supportsDragAndDrop])
+    {
+        _DOMImageElement.setAttribute("draggable", "true");
+        _DOMImageElement.style["-khtml-user-drag"] = "element";
+    }
+#endif
+
+    self = [super initWithCoder:aCoder];
+    
+    if (self)
+    {
+#if PLATFORM(DOM)
+        _DOMElement.appendChild(_DOMImageElement);
+#endif
+
+        [self setHasShadow:[aCoder decodeBoolForKey:CPImageViewHasShadowKey]];
+        
+        if ([aCoder decodeBoolForKey:CPImageViewIsEditableKey] || NO)
+            [self setEditable:YES];
+
+        [self setNeedsLayout];
+        [self setNeedsDisplay:YES];
+    }
+    
+    return self;
+}
+
+/*!
+    Writes the image view out to the coder.
+    @param aCoder the coder to which the image
+    view will be written
+*/
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    // We do this in order to avoid encoding the _shadowView, which 
+    // should just automatically be created programmatically as needed.
+    if (_shadowView)
+    {
+        var actualSubviews = _subviews;
+        
+        _subviews = [_subviews copy];
+        [_subviews removeObjectIdenticalTo:_shadowView];
+    }
+        
+    [super encodeWithCoder:aCoder];
+    
+    if (_shadowView)
+        _subviews = actualSubviews;
+    
+    [aCoder encodeBool:_hasShadow forKey:CPImageViewHasShadowKey];
+
+    if (_isEditable)
+        [aCoder encodeBool:_isEditable forKey:CPImageViewIsEditableKey];
+}
+
+@end

AppKit/CPMenu/_CPMenuBarWindow.j

@@ -0,0 +1,556 @@
+
+#include "../CoreGraphics/CGGeometry.h"
+
+@import "_CPMenuWindow.j"
+
+
+var MENUBAR_HEIGHT          = 28.0,
+    MENUBAR_MARGIN          = 10.0,
+    MENUBAR_LEFT_MARGIN     = 10.0,
+    MENUBAR_RIGHT_MARGIN    = 10.0;
+
+var _CPMenuBarWindowBackgroundColor = nil,
+    _CPMenuBarWindowFont            = nil;
+
+@implementation _CPMenuBarWindow : CPPanel
+{
+    CPMenu      _menu;
+    CPView      _highlightView;
+    CPArray     _menuItemViews;
+    
+    CPMenuItem  _trackingMenuItem;
+    
+    CPImageView _iconImageView;
+    CPTextField _titleField;
+    
+    CPColor     _textColor;
+    CPColor     _titleColor;
+    
+    CPColor     _textShadowColor;
+    CPColor     _titleShadowColor;
+    
+    CPColor     _highlightColor;
+    CPColor     _highlightTextColor;
+    CPColor     _highlightTextShadowColor;
+}
+
++ (void)initialize
+{
+    if (self != [_CPMenuBarWindow class])
+        return;
+        
+    var bundle = [CPBundle bundleForClass:self];
+    
+    _CPMenuBarWindowFont = [CPFont boldSystemFontOfSize:12.0];
+}
+
++ (CPFont)font
+{
+    return _CPMenuBarWindowFont;
+}
+
+- (id)init
+{
+    // This only shows up in browser land, so don't bother calculating metrics in desktop.
+    var contentRect = [[CPPlatformWindow primaryPlatformWindow] contentBounds];
+
+    contentRect.size.height = MENUBAR_HEIGHT;
+
+    self = [super initWithContentRect:contentRect styleMask:CPBorderlessWindowMask];
+
+    if (self)
+    {
+        // FIXME: http://280north.lighthouseapp.com/projects/13294-cappuccino/tickets/39-dont-allow-windows-to-go-above-menubar
+        [self setLevel:-1];//CPTornOffMenuWindowLevel];
+        [self setAutoresizingMask:CPWindowWidthSizable];
+     
+        var contentView = [self contentView];
+        
+        [contentView setAutoresizesSubviews:NO];
+        
+        [self setBecomesKeyOnlyIfNeeded:YES];
+        
+        //
+        _iconImageView = [[CPImageView alloc] initWithFrame:CGRectMake(0.0, 0.0, 16.0, 16.0)];
+        
+        [contentView addSubview:_iconImageView];
+        
+        _titleField = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
+
+        [_titleField setFont:[CPFont boldSystemFontOfSize:13.0]];
+        [_titleField setAlignment:CPCenterTextAlignment];
+        [_titleField setTextShadowOffset:CGSizeMake(0, 1)];
+        
+        [contentView addSubview:_titleField];
+    }
+    
+    return self;
+}
+
+- (void)setTitle:(CPString)aTitle
+{
+#if PLATFORM(DOM)
+    var bundleName = [[CPBundle mainBundle] objectForInfoDictionaryKey:@"CPBundleName"];
+
+    if (![bundleName length])
+        document.title = aTitle;
+    else if ([aTitle length])
+        document.title = aTitle + @" - " + bundleName;
+    else
+        document.title = bundleName;
+#endif
+
+    [_titleField setStringValue:aTitle];
+    [_titleField sizeToFit];
+    
+    [self tile];
+}
+
+- (void)setIconImage:(CPImage)anImage
+{
+    [_iconImageView setImage:anImage];
+    [_iconImageView setHidden:anImage == nil];
+
+    [self tile];
+}
+
+- (void)setIconImageAlphaValue:(float)anAlphaValue
+{
+    [_iconImageView setAlphaValue:anAlphaValue];
+}
+
+- (void)setColor:(CPColor)aColor
+{
+    if (!aColor)
+    {
+        if (!_CPMenuBarWindowBackgroundColor)
+            _CPMenuBarWindowBackgroundColor = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[_CPMenuBarWindow class]] pathForResource:@"_CPMenuBarWindow/_CPMenuBarWindowBackground.png"] size:CGSizeMake(1.0, 28.0)]];
+            
+        [[self contentView] setBackgroundColor:_CPMenuBarWindowBackgroundColor];
+    }
+    else
+        [[self contentView] setBackgroundColor:aColor];
+}
+
+- (void)setTextColor:(CPColor)aColor
+{
+    if (_textColor == aColor)
+        return;
+    
+    _textColor = aColor;
+    
+    [_menuItemViews makeObjectsPerformSelector:@selector(setTextColor:) withObject:_textColor];
+}
+
+- (void)setTitleColor:(CPColor)aColor
+{
+    if (_titleColor == aColor)
+        return;
+    
+    _titleColor = aColor;
+    
+    [_titleField setTextColor:aColor ? aColor : [CPColor blackColor]];
+}
+
+- (void)setTextShadowColor:(CPColor)aColor
+{
+    if (_textShadowColor == aColor)
+        return;
+    
+    _textShadowColor = aColor;
+    
+    [_menuItemViews makeObjectsPerformSelector:@selector(setTextShadowColor:) withObject:_textShadowColor];
+}
+
+- (void)setTitleShadowColor:(CPColor)aColor
+{
+    if (_titleShadowColor == aColor)
+        return;
+    
+    _titleShadowColor = aColor;
+    
+    [_titleField setTextShadowColor:aColor ? aColor : [CPColor whiteColor]];
+}
+
+- (void)setHighlightColor:(CPColor)aColor
+{
+    if (_highlightColor == aColor)
+        return;
+    
+    _highlightColor = aColor;
+}
+
+- (void)setHighlightTextColor:(CPColor)aColor
+{
+    if (_highlightTextColor == aColor)
+        return;
+    
+    _highlightTextColor = aColor;
+
+//    [_menuItemViews makeObjectsPerformSelector:@selector(setActivateColor:) withObject:_highlightTextColor];
+}
+
+- (void)setHighlightTextShadowColor:(CPColor)aColor
+{
+    if (_highlightTextShadowColor == aColor)
+        return;
+    
+    _highlightTextShadowColor = aColor;
+    
+//    [_menuItemViews makeObjectsPerformSelector:@selector(setActivateShadowColor:) withObject:_highlightTextShadowColor];
+}
+
+- (void)setMenu:(CPMenu)aMenu
+{
+    if (_menu == aMenu)
+        return;
+    
+    var defaultCenter = [CPNotificationCenter defaultCenter];
+    
+    if (_menu)
+    {
+        [defaultCenter
+            removeObserver:self
+                      name:CPMenuDidAddItemNotification
+                    object:_menu];
+
+        [defaultCenter
+            removeObserver:self
+                      name:CPMenuDidChangeItemNotification
+                    object:_menu];
+
+        [defaultCenter
+            removeObserver:self
+                      name:CPMenuDidRemoveItemNotification
+                    object:_menu];
+                    
+        var items = [_menu itemArray],
+            count = items.length;
+        
+        while (count--)
+            [[items[count] _menuItemView] removeFromSuperview];
+    }
+
+    _menu = aMenu;
+    
+    if (_menu)
+    {
+        [defaultCenter
+            addObserver:self
+              selector:@selector(menuDidAddItem:)
+                  name:CPMenuDidAddItemNotification
+                object:_menu];
+    
+        [defaultCenter
+            addObserver:self
+              selector:@selector(menuDidChangeItem:)
+                  name:CPMenuDidChangeItemNotification
+                object:_menu];
+                
+        [defaultCenter
+            addObserver:self
+              selector:@selector(menuDidRemoveItem:)
+                  name:CPMenuDidRemoveItemNotification
+                object:_menu];
+    }
+    
+    _menuItemViews = [];
+    
+    var contentView = [self contentView],
+        items = [_menu itemArray],
+        count = items.length;
+    
+    for (index = 0; index < count; ++index)
+    {
+        var item = items[index],
+            menuItemView = [item _menuItemView];
+            
+        _menuItemViews.push(menuItemView);
+
+        [menuItemView setTextColor:_textColor];
+        [menuItemView setHidden:[item isHidden]];
+        
+        [menuItemView synchronizeWithMenuItem];
+        
+        [contentView addSubview:menuItemView];
+    }
+        
+    [self tile];
+}
+
+- (void)menuDidChangeItem:(CPNotification)aNotification
+{
+    var menuItem = [_menu itemAtIndex:[[aNotification userInfo] objectForKey:@"CPMenuItemIndex"]],
+        menuItemView = [menuItem _menuItemView];
+
+    [menuItemView setHidden:[menuItem isHidden]];
+    [menuItemView synchronizeWithMenuItem];
+    
+    [self tile];
+}
+
+- (void)menuDidAddItem:(CPNotification)aNotification
+{
+    var index = [[aNotification userInfo] objectForKey:@"CPMenuItemIndex"],
+        menuItem = [_menu itemAtIndex:index],
+        menuItemView = [menuItem _menuItemView];
+
+    [_menuItemViews insertObject:menuItemView atIndex:index];
+
+    [menuItemView setTextColor:_textColor];
+    [menuItemView setHidden:[menuItem isHidden]];
+
+    [menuItemView synchronizeWithMenuItem];
+    
+    [[self contentView] addSubview:menuItemView];
+    
+    [self tile];
+}
+
+- (void)menuDidRemoveItem:(CPNotification)aNotification
+{
+    var index = [[aNotification userInfo] objectForKey:@"CPMenuItemIndex"],
+        menuItemView = [_menuItemViews objectAtIndex:index];
+
+    [_menuItemViews removeObjectAtIndex:index];
+
+    [menuItemView removeFromSuperview];
+        
+    [self tile];
+}
+
+- (void)mouseDown:(CPEvent)anEvent
+{
+    var constraintRect = CGRectInset([[self platformWindow] visibleFrame], 5.0, 0.0);
+
+    constraintRect.size.height -= 5.0;
+
+    [[_CPMenuManager sharedMenuManager]
+        beginTracking:anEvent
+        menuContainer:self
+       constraintRect:constraintRect
+             callback:function(aMenuContainer, aMenu)
+             {
+                [aMenu _performActionOfHighlightedItemChain];
+                [aMenu _highlightItemAtIndex:CPNotFound];
+             }];
+}
+
+- (CPFont)font
+{
+    [CPFont systemFontOfSize:12.0];
+}
+
+- (void)tile
+{
+    var items = [_menu itemArray],
+        index = 0,
+        count = items.length,
+        
+        x = MENUBAR_LEFT_MARGIN,
+        y = 0.0,
+        isLeftAligned = YES;
+    
+    for (; index < count; ++index)
+    {
+        var item = items[index];
+        
+        if ([item isSeparatorItem])
+        {
+            x = CGRectGetWidth([self frame]) - MENUBAR_RIGHT_MARGIN;
+            isLeftAligned = NO;
+            
+            continue;
+        }
+        
+         if ([item isHidden])
+            continue;
+
+        var menuItemView = [item _menuItemView],
+            frame = [menuItemView frame];
+        
+        if (isLeftAligned)
+        {
+            [menuItemView setFrame:CGRectMake(x, 0.0, CGRectGetWidth(frame), MENUBAR_HEIGHT)];
+
+            x += CGRectGetWidth([menuItemView frame]);
+        }
+        else
+        {
+            [menuItemView setFrame:CGRectMake(x - CGRectGetWidth(frame), 0.0, CGRectGetWidth(frame), MENUBAR_HEIGHT)];
+     
+            x = CGRectGetMinX([menuItemView frame]);
+        }
+    }
+    
+    var bounds = [[self contentView] bounds],
+        titleFrame = [_titleField frame];
+    
+    if ([_iconImageView isHidden])
+        [_titleField setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth(titleFrame)) / 2.0, (CGRectGetHeight(bounds) - CGRectGetHeight(titleFrame)) / 2.0)];
+    else
+    {
+        var iconFrame = [_iconImageView frame],
+            iconWidth = CGRectGetWidth(iconFrame),
+            totalWidth = iconWidth + CGRectGetWidth(titleFrame);
+        
+        [_iconImageView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - totalWidth) / 2.0, (CGRectGetHeight(bounds) - CGRectGetHeight(iconFrame)) / 2.0)];
+        [_titleField setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - totalWidth) / 2.0 + iconWidth, (CGRectGetHeight(bounds) - CGRectGetHeight(titleFrame)) / 2.0)];
+    }
+}
+
+- (void)setFrame:(CGRect)aRect display:(BOOL)shouldDisplay animate:(BOOL)shouldAnimate
+{
+    var size = [self frame].size;
+
+    [super setFrame:aRect display:shouldDisplay animate:shouldAnimate];
+
+    if (!_CGSizeEqualToSize(size, aRect.size))
+        [self tile];
+}
+
+@end
+
+@implementation _CPMenuBarWindow (CPMenuContainer)
+
+- (BOOL)isMenuBar
+{
+    return YES;
+}
+
+- (CGRect)globalFrame
+{
+    return [self frame];
+}
+
+- (_CPManagerScrollingState)scrollingStateForPoint:(CGPoint)aGlobalLocation
+{
+    return _CPMenuManagerScrollingStateNone;
+}
+
+- (CPInteger)itemIndexAtPoint:(CGPoint)aPoint
+{
+    var items = [_menu itemArray],
+        index = items.length;
+
+    while (index--)
+    {
+        var item = items[index];
+
+        if ([item isHidden] || [item isSeparatorItem])
+            continue;
+
+        if (CGRectContainsPoint([self rectForItemAtIndex:index], aPoint))
+            return index;
+    }
+
+    return CPNotFound;
+}
+
+- (CGRect)rectForItemAtIndex:(CPInteger)anIndex
+{
+    var menuItem = [_menu itemAtIndex:anIndex === CPNotFound ? 0 : anIndex];
+
+    return [[menuItem _menuItemView] frame];
+}
+
+@end
+
+@implementation _CPMenuBarView : _CPMenuView
+{
+}
+
+- (CGRect)rectForItemAtIndex:(int)anIndex
+{
+    return [_menuItemViews[anIndex === CPNotFound ? 0 : anIndex] frame];
+}
+
+- (int)itemIndexAtPoint:(CGPoint)aPoint
+{
+    var bounds = [self bounds];
+
+    if (!CGRectContainsPoint(bounds, aPoint))
+        return CPNotFound;
+
+    var x = aPoint.x,
+        low = 0,
+        high = _visibleMenuItemInfos.length - 1;
+
+    while (low <= high)
+    {
+        var middle = FLOOR(low + (high - low) / 2),
+            info = _visibleMenuItemInfos[middle],
+            frame = [info.view frame];
+
+        if (x < CGRectGetMinX(frame))
+            high = middle - 1;
+
+        else if (x > CGRectGetMaxX(frame))
+            low = middle + 1;
+
+        else
+            return info.index;
+   }
+
+   return CPNotFound;
+}
+
+- (void)tile
+{
+    var items = [_menu itemArray],
+        index = 0,
+        count = items.length,
+
+        x = MENUBAR_LEFT_MARGIN,
+        y = 0.0,
+        isLeftAligned = YES;
+
+    for (; index < count; ++index)
+    {
+        var item = items[index];
+        
+        if ([item isSeparatorItem])
+        {
+            x = CGRectGetWidth([self frame]) - MENUBAR_RIGHT_MARGIN;
+            isLeftAligned = NO;
+            
+            continue;
+        }
+        
+         if ([item isHidden])
+            continue;
+
+        var menuItemView = [item _menuItemView],
+            frame = [menuItemView frame];
+        
+        if (isLeftAligned)
+        {
+            [menuItemView setFrameOrigin:CGPointMake(x, (MENUBAR_HEIGHT - 1.0 - CGRectGetHeight(frame)) / 2.0)];
+     
+            x += CGRectGetWidth([menuItemView frame]) + MENUBAR_MARGIN;
+        }
+        else
+        {
+            [menuItemView setFrameOrigin:CGPointMake(x - CGRectGetWidth(frame), (MENUBAR_HEIGHT - 1.0 - CGRectGetHeight(frame)) / 2.0)];
+     
+            x = CGRectGetMinX([menuItemView frame]) - MENUBAR_MARGIN;
+        }
+    }
+    
+    var bounds = [[self contentView] bounds],
+        titleFrame = [_titleField frame];
+    
+    if ([_iconImageView isHidden])
+        [_titleField setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth(titleFrame)) / 2.0, (CGRectGetHeight(bounds) - CGRectGetHeight(titleFrame)) / 2.0)];
+    else
+    {
+        var iconFrame = [_iconImageView frame],
+            iconWidth = CGRectGetWidth(iconFrame),
+            totalWidth = iconWidth + CGRectGetWidth(titleFrame);
+        
+        [_iconImageView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - totalWidth) / 2.0, (CGRectGetHeight(bounds) - CGRectGetHeight(iconFrame)) / 2.0)];
+        [_titleField setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - totalWidth) / 2.0 + iconWidth, (CGRectGetHeight(bounds) - CGRectGetHeight(titleFrame)) / 2.0)];
+    }
+}
+
+@end

AppKit/CPMenu/_CPMenuManager.j

@@ -0,0 +1,312 @@
+
+#include "../CoreGraphics/CGGeometry.h"
+
+@import <Foundation/CPObject.j>
+
+
+_CPMenuManagerScrollingStateUp      = -1,
+_CPMenuManagerScrollingStateDown    = 1,
+_CPMenuManagerScrollingStateNone    = 0;
+
+var STICKY_TIME_INTERVAL        = 500;
+
+var SharedMenuManager = nil;
+
+@implementation _CPMenuManager: CPObject
+{
+    CPTimeInterval      _startTime;
+    int                 _scrollingState;
+    CGPoint             _lastGlobalLocation;
+
+    CPView              _lastMouseOverMenuView;
+
+    CGRect              _constraintRect;
+    CPMutableArray      _menuContainerStack;
+
+    Function            _trackingCallback;
+}
+
++ (_CPMenuManager)sharedMenuManager
+{
+    if (!SharedMenuManager)
+        SharedMenuManager = [[_CPMenuManager alloc] init];
+
+    return SharedMenuManager;
+}
+
+- (id)init
+{
+    if (SharedMenuManager)
+        return SharedMenuManager;
+
+    return [super init];    
+}
+
+- (id)trackingMenuContainer
+{
+    return _menuContainerStack[0];
+}
+
+- (CPMenu)trackingMenu
+{
+    return [[self trackingMenuContainer] menu];
+}
+
+- (void)beginTracking:(CPEvent)anEvent
+        menuContainer:(id)aMenuContainer
+       constraintRect:(CGRect)aRect
+             callback:(Function)aCallback
+{
+    CPApp._activeMenu = [aMenuContainer menu];
+
+    _startTime = [anEvent timestamp];//new Date();
+    _scrollingState = _CPMenuManagerScrollingStateNone;
+
+    _constraintRect = aRect;
+    _trackingCallback = aCallback;
+    _menuContainerStack = [aMenuContainer];
+
+    [self trackEvent:anEvent];
+}
+
+- (void)trackEvent:(CPEvent)anEvent
+{
+    var type = [anEvent type],
+        trackingMenu = [self trackingMenu];
+
+    // Close Menu Event.
+    if (type === CPAppKitDefined)
+    {
+        // Stop all periodic events at this point.
+        [CPEvent stopPeriodicEvents];
+
+        // Get the highlighted item from the original menu.
+        var highlightedItem = [trackingMenu highlightedItem];
+
+        // Hide all submenus.
+        [self showMenu:nil fromMenu:trackingMenu atPoint:nil];
+
+        var delegate = [trackingMenu delegate];
+
+        if ([delegate respondsToSelector:@selector(menuDidClose:)])
+            [delegate menuDidClose:trackingMenu];
+
+        if (_trackingCallback)
+            _trackingCallback([self trackingMenuContainer], trackingMenu);
+
+        [[CPNotificationCenter defaultCenter]
+            postNotificationName:CPMenuDidEndTrackingNotification
+                          object:trackingMenu];
+
+        CPApp._activeMenu = nil;
+
+        return;
+    }
+
+    [CPApp setTarget:self selector:@selector(trackEvent:) forNextEventMatchingMask:CPPeriodicMask | CPMouseMovedMask | CPLeftMouseDraggedMask | CPLeftMouseUpMask | CPAppKitDefinedMask untilDate:nil inMode:nil dequeue:YES];
+
+    // Periodic events don't have a valid location.
+    var globalLocation = type === CPPeriodic ? _lastGlobalLocation : [anEvent globalLocation];
+
+    // Remember this for the next periodic event.
+    _lastGlobalLocation = globalLocation;
+
+    // Find which menu window the mouse is currently on top of
+    var activeMenuContainer = [self menuContainerForPoint:globalLocation],
+        menuLocation = [activeMenuContainer convertGlobalToBase:globalLocation],
+        activeItemIndex = activeMenuContainer ? [activeMenuContainer itemIndexAtPoint:menuLocation] : CPNotFound,
+        activeMenu = activeMenuContainer ? [activeMenuContainer menu] : nil,
+        activeItem = activeItemIndex !== CPNotFound ? [activeMenu itemAtIndex:activeItemIndex] : nil,
+        mouseOverMenuView = activeMenuContainer ? [activeItem view] : nil;
+
+    if (type === CPPeriodic)
+    {
+        if (_scrollingState === _CPMenuManagerScrollingStateUp)
+            [activeMenuContainer scrollUp];
+
+        else if (_scrollingState === _CPMenuManagerScrollingStateDown)
+            [activeMenuContainer scrollDown];
+    }
+
+    // If we're over a custom menu view...
+    if (mouseOverMenuView)
+    {
+        if (!_lastMouseOverMenuView)
+            [activeMenu _highlightItemAtIndex:CPNotFound];
+        
+        if (_lastMouseOverMenuView != mouseOverMenuView)
+        {
+            [mouseOverMenuView mouseExited:anEvent];
+            // FIXME: Possibly multiple of these?
+            [_lastMouseOverMenuView mouseEntered:anEvent];
+            
+            _lastMouseOverMenuView = mouseOverMenuView;
+        }
+
+        var menuContainerWindow = activeMenuContainer;
+
+        if (![menuContainerWindow isKindOfClass:[CPWindow class]])
+            menuContainerWindow = [menuContainerWindow window];
+
+        [menuContainerWindow
+            sendEvent:[CPEvent mouseEventWithType:type location:menuLocation modifierFlags:[anEvent modifierFlags]
+            timestamp:[anEvent timestamp]
+         windowNumber:menuContainerWindow
+              context:nil
+          eventNumber:0
+           clickCount:[anEvent clickCount]
+             pressure:[anEvent pressure]]];
+    }
+    else
+    {
+        if (_lastMouseOverMenuView)
+        {
+            [_lastMouseOverMenuView mouseExited:anEvent];
+            _lastMouseOverMenuView = nil;
+        }
+        
+        [activeMenu _highlightItemAtIndex:activeItemIndex];
+        
+        if (type === CPMouseMoved || type === CPLeftMouseDragged || type === CPLeftMouseDown)
+        {
+            var oldScrollingState = _scrollingState;
+
+            _scrollingState = [activeMenuContainer scrollingStateForPoint:globalLocation];
+
+            if (_scrollingState !== oldScrollingState)
+            {
+                if (_scrollingState === _CPMenuManagerScrollingStateNone)
+                    [CPEvent stopPeriodicEvents];
+            
+                else if (oldScrollingState === _CPMenuManagerScrollingStateNone)
+                    [CPEvent startPeriodicEventsAfterDelay:0.0 withPeriod:0.04];
+            }
+        }
+        else if (type === CPLeftMouseUp && ([anEvent timestamp] - _startTime > STICKY_TIME_INTERVAL))
+            [trackingMenu cancelTracking];
+    }
+
+    // If the item has a submenu, show it.
+    if ([activeItem hasSubmenu])// && [activeItem action] === @selector(submenuAction:))
+    {
+        var activeItemRect = [activeMenuContainer rectForItemAtIndex:activeItemIndex];
+
+        if ([activeMenuContainer isMenuBar])
+            var newMenuOrigin = CGPointMake(CGRectGetMinX(activeItemRect), CGRectGetMaxY(activeItemRect));
+        else
+            var newMenuOrigin = CGPointMake(CGRectGetMaxX(activeItemRect), CGRectGetMinY(activeItemRect));
+
+        newMenuOrigin = [activeMenuContainer convertBaseToGlobal:newMenuOrigin];
+
+        [self showMenu:[activeItem submenu] fromMenu:[activeItem menu] atPoint:newMenuOrigin];
+    }
+
+    // This handles both the case where we've moved away from the menu, and where 
+    // we've moved to an item without a submenu.
+    else
+        [self showMenu:nil fromMenu:activeMenu atPoint:CGPointMakeZero()];
+}
+
+
+- (id)menuContainerForPoint:(float)aGlobalLocation
+{
+    var count = [_menuContainerStack count],
+        firstMenuContainer = _menuContainerStack[0];
+
+    // Trivial case.
+    if (count === 1)
+        return firstMenuContainer;
+
+    var firstMenuWindowIndex = 0,
+        lastMenuWindowIndex = count - 1;
+
+    // If the first menu container is a bar, then it has to fall strictly within its bounds.
+    if ([firstMenuContainer isMenuBar])
+    {
+        if (CGRectContainsPoint([firstMenuContainer globalFrame], aGlobalLocation))
+            return firstMenuContainer;
+
+        firstMenuWindowIndex = 1;
+    }
+
+    var index = count,
+        x = aGlobalLocation.x,
+        closerDeltaX = Infinity,
+        closerMenuContainer = nil;
+
+    while (index-- > firstMenuWindowIndex)
+    {
+        var menuContainer = _menuContainerStack[index],
+            menuContainerFrame = [menuContainer globalFrame],
+            menuContainerMinX = _CGRectGetMinX(menuContainerFrame),
+            menuContainerMaxX = _CGRectGetMaxX(menuContainerFrame);
+
+        // If within the x bounds of this menu container, return it.
+        if (x < menuContainerMaxX && x >= menuContainerMinX)
+            return menuContainer;
+
+        // If this is either the first or last menu *window*, check to see how close we are to it.
+        if (index === firstMenuWindowIndex || index === lastMenuWindowIndex)
+        {
+            var deltaX = ABS(x < menuContainerMinX ? menuContainerMinX - x : menuContainerMaxX - x);
+
+            if (deltaX < closerDeltaX)
+            {
+                closerMenuContainer = menuContainer;
+                closerDeltaX = deltaX;
+            }
+        }
+    }
+
+    return closerMenuContainer;
+}
+
+- (void)showMenu:(CPMenu)newMenu fromMenu:(CPMenu)baseMenu atPoint:(CGPoint)aGlobalLocation
+{
+    var count = _menuContainerStack.length,
+        index = count;
+
+    // Hide all menus up to the base menu...
+    while (index--)
+    {
+        var menuContainer = _menuContainerStack[index],
+            menu = [menuContainer menu];
+
+        // If we reach the base menu, or this menu is already being shown, break.
+        if (menu === baseMenu)
+            break;
+
+        // If this menu is already being shown, unhighlight and return.
+        if (menu === newMenu)//&& [menu supermenu] === baseMenu)
+            return [newMenu _highlightItemAtIndex:CPNotFound];
+
+        [menuContainer orderOut:self];
+        [menuContainer setMenu:nil];
+
+        [_CPMenuWindow poolMenuWindow:menuContainer];
+        [_menuContainerStack removeObjectAtIndex:index];
+    }
+
+    if (!newMenu)
+        return;
+
+    // Unhighlight any previously highlighted item.
+    [newMenu _highlightItemAtIndex:CPNotFound];
+
+    var menuWindow = [_CPMenuWindow menuWindowWithMenu:newMenu font:[_menuContainerStack[0] font]];
+
+    [_menuContainerStack addObject:menuWindow];
+
+    [menuWindow setConstraintRect:_constraintRect];
+
+    // If our parent menu is a menu bar...
+    if (baseMenu === [self trackingMenu] && [[self trackingMenuContainer] isMenuBar])
+        [menuWindow setBackgroundStyle:_CPMenuWindowMenuBarBackgroundStyle];
+    else
+        [menuWindow setBackgroundStyle:_CPMenuWindowPopUpBackgroundStyle];        
+    
+    [menuWindow setFrameOrigin:aGlobalLocation];
+    [menuWindow orderFront:self];
+}
+
+@end

AppKit/CPMenu/_CPMenuWindow.j

@@ -0,0 +1,548 @@
+
+#include "../CoreGraphics/CGGeometry.h"
+
+
+var _CPMenuWindowPool                       = [],
+    _CPMenuWindowPoolCapacity               = 5,
+    
+    _CPMenuWindowBackgroundColors           = [];
+    
+_CPMenuWindowMenuBarBackgroundStyle         = 0;
+_CPMenuWindowPopUpBackgroundStyle           = 1;
+_CPMenuWindowAttachedMenuBackgroundStyle    = 2;
+
+var STICKY_TIME_INTERVAL        = 500,
+
+    TOP_MARGIN                  = 5.0,
+    LEFT_MARGIN                 = 1.0,
+    RIGHT_MARGIN                = 1.0,
+    BOTTOM_MARGIN               = 5.0,
+    
+    SCROLL_INDICATOR_HEIGHT     = 16.0;
+
+/*
+    @ignore
+*/
+@implementation _CPMenuWindow : CPWindow
+{
+    _CPMenuView         _menuView;
+    CPClipView          _menuClipView;
+    
+    CPImageView         _moreAboveView;
+    CPImageView         _moreBelowView;
+    
+    CGRect              _unconstrainedFrame;
+    CGRect              _constraintRect;
+}
+
++ (id)menuWindowWithMenu:(CPMenu)aMenu font:(CPFont)aFont
+{
+    var menuWindow = nil;
+
+    if (_CPMenuWindowPool.length)
+    {
+        menuWindow = _CPMenuWindowPool.pop();
+
+        // Do this so that coordinates will be accurate.
+        [menuWindow setFrameOrigin:CGPointMakeZero()];
+    }
+    else
+        menuWindow = [[_CPMenuWindow alloc] init];
+
+    [menuWindow setFont:aFont];
+    [menuWindow setMenu:aMenu];
+    [menuWindow setMinWidth:[aMenu minimumWidth]];
+
+    return menuWindow;
+}
+
++ (void)poolMenuWindow:(_CPMenuWindow)aMenuWindow
+{
+    if (!aMenuWindow || _CPMenuWindowPool.length >= _CPMenuWindowPoolCapacity)
+        return;
+
+    _CPMenuWindowPool.push(aMenuWindow);
+}
+
++ (void)initialize
+{
+    if (self != [_CPMenuWindow class])
+        return;
+    
+    var bundle = [CPBundle bundleForClass:self];
+    
+    _CPMenuWindowMoreAboveImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowMoreAbove.png"] size:CGSizeMake(38.0, 18.0)];
+    _CPMenuWindowMoreBelowImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowMoreBelow.png"] size:CGSizeMake(38.0, 18.0)];
+}
+
+- (id)initWithContentRect:(CGRect)aRect styleMask:(unsigned)aStyleMask
+{
+    _constraintRect = _CGRectMakeZero();
+    _unconstrainedFrame = _CGRectMakeZero();
+
+    self = [super initWithContentRect:aRect styleMask:CPBorderlessWindowMask];
+
+    if (self)
+    {
+        [self setLevel:CPPopUpMenuWindowLevel];
+        [self setHasShadow:YES];
+        [self setShadowStyle:CPMenuWindowShadowStyle];
+        [self setAcceptsMouseMovedEvents:YES];
+
+        var contentView = [self contentView];
+        
+        _menuView = [[_CPMenuView alloc] initWithFrame:CGRectMakeZero()];
+        
+        _menuClipView = [[CPClipView alloc] initWithFrame:CGRectMake(LEFT_MARGIN, TOP_MARGIN, 0.0, 0.0)];
+        [_menuClipView setDocumentView:_menuView];
+        
+        [contentView addSubview:_menuClipView];
+        
+        _moreAboveView = [[CPImageView alloc] initWithFrame:CGRectMakeZero()];
+        
+        [_moreAboveView setImage:_CPMenuWindowMoreAboveImage];
+        [_moreAboveView setFrameSize:[_CPMenuWindowMoreAboveImage size]];
+        
+        [contentView addSubview:_moreAboveView];
+        
+        _moreBelowView = [[CPImageView alloc] initWithFrame:CGRectMakeZero()];
+    
+        [_moreBelowView setImage:_CPMenuWindowMoreBelowImage];
+        [_moreBelowView setFrameSize:[_CPMenuWindowMoreBelowImage size]];
+        
+        [contentView addSubview:_moreBelowView];
+
+        [self setShadowStyle:CPWindowShadowStyleMenu];
+    }
+    
+    return self;
+}
+
++ (float)_standardLeftMargin
+{
+    return LEFT_MARGIN;
+}
+
+- (void)setFont:(CPFont)aFont
+{
+    [_menuView setFont:aFont];
+}
+
+- (CPFont)font
+{
+    return [_menuView font];
+}
+
++ (CPColor)backgroundColorForBackgroundStyle:(_CPMenuWindowBackgroundStyle)aBackgroundStyle
+{
+    var color = _CPMenuWindowBackgroundColors[aBackgroundStyle];
+    
+    if (!color)
+    {
+        var bundle = [CPBundle bundleForClass:[self class]];
+
+        if (aBackgroundStyle == _CPMenuWindowPopUpBackgroundStyle)
+            color = [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:
+                [
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded0.png"] size:CGSizeMake(4.0, 4.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow1.png"] size:CGSizeMake(1.0, 4.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded2.png"] size:CGSizeMake(4.0, 4.0)],
+                    
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow3.png"] size:CGSizeMake(4.0, 1.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow4.png"] size:CGSizeMake(1.0, 1.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow5.png"] size:CGSizeMake(4.0, 1.0)],
+                    
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded6.png"] size:CGSizeMake(4.0, 4.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow7.png"] size:CGSizeMake(1.0, 4.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded8.png"] size:CGSizeMake(4.0, 4.0)]
+                ]]];
+        
+        else if (aBackgroundStyle == _CPMenuWindowMenuBarBackgroundStyle)
+            color = [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:
+                [
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow3.png"] size:CGSizeMake(4.0, 0.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow4.png"] size:CGSizeMake(1.0, 0.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow5.png"] size:CGSizeMake(4.0, 0.0)],
+                    
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow3.png"] size:CGSizeMake(4.0, 1.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow4.png"] size:CGSizeMake(1.0, 1.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow5.png"] size:CGSizeMake(4.0, 1.0)],
+                    
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded6.png"] size:CGSizeMake(4.0, 4.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow7.png"] size:CGSizeMake(1.0, 4.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded8.png"] size:CGSizeMake(4.0, 4.0)]
+                ]]];
+                
+        _CPMenuWindowBackgroundColors[aBackgroundStyle] = color;
+    }
+
+    return color;
+}
+
+- (void)setBackgroundStyle:(_CPMenuWindowBackgroundStyle)aBackgroundStyle
+{
+    [self setBackgroundColor:[[self class] backgroundColorForBackgroundStyle:aBackgroundStyle]];
+}
+
+- (void)setMenu:(CPMenu)aMenu
+{
+    [aMenu _setMenuWindow:self];
+    [_menuView setMenu:aMenu];
+    
+    var menuViewSize = [_menuView frame].size;
+    
+    [self setFrameSize:CGSizeMake(LEFT_MARGIN + menuViewSize.width + RIGHT_MARGIN, TOP_MARGIN + menuViewSize.height + BOTTOM_MARGIN)];
+    
+    [_menuView scrollPoint:CGPointMake(0.0, 0.0)];
+    [_menuClipView setFrame:CGRectMake(LEFT_MARGIN, TOP_MARGIN, menuViewSize.width, menuViewSize.height)];
+}
+
+- (void)setMinWidth:(float)aWidth
+{
+    var size = [self unconstrainedFrame].size;
+
+    [self setFrameSize:CGSizeMake(MAX(size.width, aWidth), size.height)];
+}
+
+- (CPMenu)menu
+{
+    return [_menuView menu];
+}
+
+- (void)orderFront:(id)aSender
+{
+    [self setFrame:_unconstrainedFrame];
+    
+    [super orderFront:aSender];
+}
+
+- (void)setConstraintRect:(CGRect)aRect
+{
+    _constraintRect = aRect;
+
+    [self setFrame:_unconstrainedFrame];
+}
+
+- (CGRect)unconstrainedFrame
+{
+    return _CGRectMakeCopy(_unconstrainedFrame);
+}
+
+// We need this because if not this will call setFrame: with -frame instead of -unconstrainedFrame, turning
+// the constrained frame into the unconstrained frame.
+- (void)setFrameOrigin:(CGPoint)aPoint
+{
+    [super setFrame:_CGRectMake(aPoint.x, aPoint.y, _CGRectGetWidth(_unconstrainedFrame), _CGRectGetHeight(_unconstrainedFrame))];
+}
+
+- (void)setFrameSize:(CGSize)aSize
+{
+    [super setFrame:_CGRectMake(_CGRectGetMinX(_unconstrainedFrame), _CGRectGetMinY(_unconstrainedFrame), aSize.width, aSize.height)];
+}
+
+- (void)setFrame:(CGRect)aFrame display:(BOOL)shouldDisplay animate:(BOOL)shouldAnimate
+{
+    // FIXME: There are integral window issues with platform windows.
+    // FIXME: This gets called far too often.
+    _unconstrainedFrame = _CGRectMakeCopy(aFrame);
+
+    var constrainedFrame = CGRectIntersection(_unconstrainedFrame, _constraintRect);
+
+    // We don't want to simply intersect the visible frame and the unconstrained frame.
+    // We should be allowing as much of the width to fit as possible (pushing back and forward).
+    constrainedFrame.origin.x = CGRectGetMinX(_unconstrainedFrame);
+    constrainedFrame.size.width = CGRectGetWidth(_unconstrainedFrame);
+
+    if (CGRectGetWidth(constrainedFrame) > CGRectGetWidth(_constraintRect))
+        constrainedFrame.size.width = CGRectGetWidth(_constraintRect);
+
+    if (CGRectGetMaxX(constrainedFrame) > CGRectGetMaxX(_constraintRect))
+        constrainedFrame.origin.x -= CGRectGetMaxX(constrainedFrame) - CGRectGetMaxX(_constraintRect);
+
+    if (CGRectGetMinX(constrainedFrame) < CGRectGetMinX(_constraintRect))
+        constrainedFrame.origin.x = CGRectGetMinX(_constraintRect);
+
+    [super setFrame:constrainedFrame display:shouldDisplay animate:shouldAnimate];
+
+    // This needs to happen before changing the frame.
+    var menuViewOrigin = CGPointMake(CGRectGetMinX(aFrame) + LEFT_MARGIN, CGRectGetMinY(aFrame) + TOP_MARGIN),
+        moreAbove = menuViewOrigin.y < CGRectGetMinY(constrainedFrame) + TOP_MARGIN,
+        moreBelow = menuViewOrigin.y + CGRectGetHeight([_menuView frame]) > CGRectGetMaxY(constrainedFrame) - BOTTOM_MARGIN,
+
+        topMargin = TOP_MARGIN,
+        bottomMargin = BOTTOM_MARGIN,
+        
+        contentView = [self contentView],
+        bounds = [contentView bounds];
+
+    if (moreAbove)
+    {
+        topMargin += SCROLL_INDICATOR_HEIGHT;
+    
+        var frame = [_moreAboveView frame];
+        
+        [_moreAboveView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth(frame)) / 2.0, (TOP_MARGIN + SCROLL_INDICATOR_HEIGHT - CGRectGetHeight(frame)) / 2.0)];
+    }
+
+    [_moreAboveView setHidden:!moreAbove];
+
+    if (moreBelow)
+    {
+        bottomMargin += SCROLL_INDICATOR_HEIGHT;
+    
+        [_moreBelowView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth([_moreBelowView frame])) / 2.0, CGRectGetHeight(bounds) - SCROLL_INDICATOR_HEIGHT - BOTTOM_MARGIN)];
+    }
+    
+    [_moreBelowView setHidden:!moreBelow];
+
+    var clipFrame = CGRectMake(LEFT_MARGIN, topMargin, CGRectGetWidth(constrainedFrame) - LEFT_MARGIN - RIGHT_MARGIN, CGRectGetHeight(constrainedFrame) - topMargin - bottomMargin)
+
+    [_menuClipView setFrame:clipFrame];
+    [_menuView setFrameSize:CGSizeMake(CGRectGetWidth(clipFrame), CGRectGetHeight([_menuView frame]))];
+
+    [_menuView scrollPoint:CGPointMake(0.0, [self convertBaseToGlobal:clipFrame.origin].y - menuViewOrigin.y)];
+}
+
+- (BOOL)hasMinimumNumberOfVisibleItems
+{
+    var visibleRect = [_menuView visibleRect];
+
+    // Clearly if the entire view isn't visible the minimum won't be visible.
+    if (CGRectIsEmpty(visibleRect))
+        return NO;
+
+    var numberOfUnhiddenItems = [_menuView numberOfUnhiddenItems],
+        minimumNumberOfVisibleItems = MIN(numberOfUnhiddenItems, 3),
+        count = 0,
+        index = [_menuView itemIndexAtPoint:[_menuView convertPoint:[_menuClipView frame].origin fromView:nil]];
+
+    for (; index < numberOfUnhiddenItems && count < minimumNumberOfVisibleItems; ++index)
+    {
+        var itemRect = [_menuView rectForUnhiddenItemAtIndex:index],
+            visibleItemRect = CGRectIntersection(visibleRect, itemRect);
+
+        // As soon as we get to the first unhidden item that is no longer visible, stop.
+        if (CGRectIsEmpty(visibleItemRect))
+            break;
+
+        // If the item is *completely* visible, count it.
+        if (CGRectEqualToRect(visibleItemRect, itemRect))
+            ++count;
+    }
+
+    return count >= minimumNumberOfVisibleItems;
+}
+
+- (BOOL)canScrollUp
+{
+    return ![_moreAboveView isHidden];
+}
+
+- (BOOL)canScrollDown
+{
+    return ![_moreBelowView isHidden];
+}
+
+- (BOOL)canScroll
+{
+    return [self canScrollUp] || [self canScrollDown];
+}
+
+- (void)scrollUp
+{
+    if (CGRectGetMinY(_unconstrainedFrame) >= CGRectGetMinY(_constraintRect))
+        return;
+
+    _unconstrainedFrame.origin.y += 10;
+
+    [self setFrame:_unconstrainedFrame];
+}
+
+- (void)scrollDown
+{
+    if (CGRectGetMaxY(_unconstrainedFrame) <= CGRectGetHeight(_constraintRect))
+        return;
+
+    _unconstrainedFrame.origin.y -= 10;
+
+    [self setFrame:_unconstrainedFrame];
+}
+
+@end
+
+@implementation _CPMenuWindow (CPMenuContainer)
+
+- (CGRect)globalFrame
+{
+    return [self frame];
+}
+
+- (BOOL)isMenuBar
+{
+    return NO;
+}
+
+- (_CPManagerScrollingState)scrollingStateForPoint:(CGPoint)aGlobalLocation
+{
+    var frame = [self frame];
+
+    if (![self canScroll])
+        return _CPMenuManagerScrollingStateNone;
+
+    // If we're at or above of the top scroll indicator...
+    if (aGlobalLocation.y < CGRectGetMinY(frame) + TOP_MARGIN + SCROLL_INDICATOR_HEIGHT)
+        return _CPMenuManagerScrollingStateUp;
+
+    // If we're at or below the bottom scroll indicator...
+    if (aGlobalLocation.y > CGRectGetMaxY(frame) - BOTTOM_MARGIN - SCROLL_INDICATOR_HEIGHT)
+        return _CPMenuManagerScrollingStateDown;
+
+    return _CPMenuManagerScrollingStateNone;
+}
+
+- (float)deltaYForItemAtIndex:(int)anIndex
+{
+    return TOP_MARGIN + CGRectGetMinY([_menuView rectForItemAtIndex:anIndex]);
+}
+
+- (CGPoint)rectForItemAtIndex:(int)anIndex
+{
+    return [_menuView convertRect:[_menuView rectForItemAtIndex:anIndex] toView:nil];
+}
+
+- (int)itemIndexAtPoint:(CGPoint)aPoint
+{
+    // Don't return indexes of items that aren't visible.
+    if (!CGRectContainsPoint([_menuClipView bounds], [_menuClipView convertPoint:aPoint fromView:nil]))
+        return NO;
+
+    return [_menuView itemIndexAtPoint:[_menuView convertPoint:aPoint fromView:nil]];
+}
+
+@end
+
+/*
+    @ignore
+*/
+
+@implementation _CPMenuView : CPView
+{
+    CPArray _menuItemViews;
+    CPArray _visibleMenuItemInfos;
+    
+    CPFont  _font @accessors(property=font);
+}
+
+- (unsigned)numberOfUnhiddenItems
+{
+    return _visibleMenuItemInfos.length;
+}
+
+- (CGRect)rectForUnhiddenItemAtIndex:(int)anIndex
+{
+    return [self rectForItemAtIndex:_visibleMenuItemInfos[anIndex].index];
+}
+
+- (CGRect)rectForItemAtIndex:(int)anIndex
+{
+    return [_menuItemViews[anIndex === CPNotFound ? 0 : anIndex] frame];
+}
+
+- (int)itemIndexAtPoint:(CGPoint)aPoint
+{
+    var x = aPoint.x,
+        bounds = [self bounds];
+
+    if (x < CGRectGetMinX(bounds) || x > CGRectGetMaxX(bounds))
+        return CPNotFound;
+
+    var y = aPoint.y,
+        low = 0,
+        high = _visibleMenuItemInfos.length - 1;
+
+    while (low <= high)
+    {
+        var middle = FLOOR(low + (high - low) / 2),
+            info = _visibleMenuItemInfos[middle]
+            frame = [info.view frame];
+
+        if (y < CGRectGetMinY(frame))
+            high = middle - 1;
+
+        else if (y > CGRectGetMaxY(frame))
+            low = middle + 1;
+
+        else
+            return info.index;
+   }
+
+   return CPNotFound;
+}
+
+- (void)tile
+{
+    [_menuItemViews makeObjectsPerformSelector:@selector(removeFromSuperview)];   
+
+    _menuItemViews = [];
+    _visibleMenuItemInfos = [];
+
+    var menu = [self menu];
+
+    if (!menu)
+        return;
+
+    var items = [menu itemArray],
+        index = 0,
+        count = [items count],
+        maxWidth = 0,
+        y = 0,
+        showsStateColumn = [menu showsStateColumn];
+
+    for (; index < count; ++index)
+    {
+        var item = items[index],
+            view = [item _menuItemView];        
+        
+        _menuItemViews.push(view);
+        
+        if ([item isHidden])
+            continue;
+
+        _visibleMenuItemInfos.push({ view:view, index:index });
+        
+        [view setFont:_font];
+        [view setShowsStateColumn:showsStateColumn];
+        [view synchronizeWithMenuItem];
+
+        [view setFrameOrigin:CGPointMake(0.0, y)];
+
+        [self addSubview:view];
+
+        var size = [view minSize],
+            width = size.width;
+
+        if (maxWidth < width)
+            maxWidth = width;
+
+        y += size.height;
+    }
+
+    for (index = 0; index < count; ++index)
+    {
+        var view = _menuItemViews[index];
+
+        [view setFrameSize:CGSizeMake(maxWidth, CGRectGetHeight([view frame]))];
+    }
+
+    [self setAutoresizesSubviews:NO];
+    [self setFrameSize:CGSizeMake(maxWidth, y)];
+    [self setAutoresizesSubviews:YES];
+}
+
+- (void)setMenu:(CPMenu)aMenu
+{
+    [super setMenu:aMenu];
+    [self tile];
+}
+
+@end

AppKit/CPMenuItem/CPMenuItem.j

@@ -0,0 +1,910 @@
+/*
+ * CPMenuItem.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPCoder.j>
+@import <Foundation/CPObject.j>
+@import <Foundation/CPString.j>
+
+@import "CPImage.j"
+@import "CPMenu.j"
+@import "CPView.j"
+@import "_CPMenuItemView.j"
+
+/*! 
+    @ingroup appkit
+    @class CPMenuItem
+
+    A CPMenuItem is added to a CPMenu.
+    It has an action and a target for that action to be sent to
+    whenever the item is 'activated'.
+*/
+@implementation CPMenuItem : CPObject
+{
+    BOOL            _isSeparator;
+
+    CPString        _title;
+    //CPAttributedString  _attributedTitle;
+    
+    CPFont          _font;
+                  
+    id              _target;
+    SEL             _action;
+                    
+    BOOL            _isEnabled;
+    BOOL            _isHidden;
+                    
+    int             _tag;
+    int             _state;
+                    
+    CPImage         _image;
+    CPImage         _alternateImage;
+    CPImage         _onStateImage;
+    CPImage         _offStateImage;
+    CPImage         _mixedStateImage;
+                    
+    CPMenu          _submenu;
+    CPMenu          _menu;
+                    
+    CPString        _keyEquivalent;
+    unsigned        _keyEquivalentModifierMask;
+                    
+    int             _mnemonicLocation;
+                    
+    BOOL            _isAlternate;
+    int             _indentationLevel;
+                    
+    CPString        _toolTip;
+    id              _representedObject;
+    CPView          _view;
+    
+    _CPMenuItemView _menuItemView;
+}
+
+- (id)init
+{
+    return [self initWithTitle:@"" action:nil keyEquivalent:nil];
+}
+
+/*!
+    Initializes the menu item with a title, action, and keyboard equivalent.
+    @param aTitle the menu item's title
+    @param anAction the action that gets triggered when the item is selected
+    @param aKeyEquivalent the keyboard shortcut for the item
+    @return the initialized menu item
+*/
+- (id)initWithTitle:(CPString)aTitle action:(SEL)anAction keyEquivalent:(CPString)aKeyEquivalent
+{
+    self = [super init];
+    
+    if (self)
+    {
+        _isSeparator = NO;
+
+        _title = aTitle;
+        _action = anAction;
+        
+        _isEnabled = YES;
+        
+        _tag = 0;
+        _state = CPOffState;
+        
+        _keyEquivalent = aKeyEquivalent || @"";
+        _keyEquivalentModifierMask = CPPlatformActionKeyMask;
+
+        _indentationLevel = 0;
+
+        _mnemonicLocation = CPNotFound;
+    }
+    
+    return self;
+}
+
+// Enabling a Menu Item
+/*!
+    Sets whether the menu item is enabled or not
+    @param isEnabled \c YES enables the item. \c NO disables it.
+*/
+- (void)setEnabled:(BOOL)isEnabled
+{
+    if ([_menu autoenablesItems])
+        return;
+
+    _isEnabled = isEnabled;
+
+    [_menuItemView setDirty];
+
+    [_menu itemChanged:self];
+}
+
+/*!
+    Returns \c YES if the item is enabled.
+*/
+- (BOOL)isEnabled
+{
+    return _isEnabled;
+}
+
+// Managing Hidden Status
+/*!
+    Sets whether the item should be hidden. A hidden item can not be triggered by keyboard shortcuts.
+    @param isHidden \c YES hides the item. \c NO reveals it.
+*/
+- (void)setHidden:(BOOL)isHidden
+{
+    if (_isHidden == isHidden)
+        return;
+    
+    _isHidden = isHidden;
+
+    [_menu itemChanged:self];
+}
+
+/*!
+    Returns \c YES if the item is hidden.
+*/
+- (BOOL)isHidden
+{
+    return _isHidden;
+}
+
+/*!
+    Returns \c YES if the item is hidden or if one of it's supermenus is hidden.
+*/
+- (BOOL)isHiddenOrHasHiddenAncestor
+{
+    if (_isHidden)
+        return YES;
+    
+    var supermenu = [_menu supermenu];
+    
+    if ([[supermenu itemAtIndex:[supermenu indexOfItemWithSubmenu:_menu]] isHiddenOrHasHiddenAncestor])
+        return YES;
+
+    return NO;
+}
+
+// Managing Target and Action
+/*!
+    Sets the menu item's action target.
+    @param aTarget the target for the action
+*/
+- (void)setTarget:(id)aTarget
+{
+    _target = aTarget;
+}
+
+/*!
+    Returns the item's action target
+*/
+- (id)target
+{
+    return _target;
+}
+
+/*!
+    Sets the action that gets sent to the item's target when triggered.
+    @param anAction the action to send
+*/
+- (void)setAction:(SEL)anAction
+{
+    _action = anAction;
+}
+
+/*!
+    Returns the item's action.
+*/
+- (SEL)action
+{
+    return _action;
+}
+
+// Managing the Title
+/*!
+    Sets the item's title.
+    @param aTitle the item's new title
+*/
+- (void)setTitle:(CPString)aTitle
+{
+    _mnemonicLocation = CPNotFound;
+
+    if (_title == aTitle)
+        return;
+    
+    _title = aTitle;
+    
+    [_menuItemView setDirty];
+    
+    [_menu itemChanged:self];
+}
+
+/*!
+    Returns the menu item's title.
+*/
+- (CPString)title
+{
+    return _title;
+}
+
+/*!
+    Set's the item's text color
+*/
+- (void)setTextColor:(CPString)aColor
+{
+    //FIXME IMPLEMENT
+}
+
+/*!
+    Sets the font for the text of this menu item
+    @param aFont the font for the menu item
+*/
+- (void)setFont:(CPFont)aFont
+{
+    if (_font == aFont)
+        return;
+        
+    _font = aFont;
+
+    [_menu itemChanged:self];
+    
+    [_menuItemView setDirty];
+}
+
+/*!
+    Returns the menu item's font
+*/
+- (CPFont)font
+{
+    return _font;
+}
+
+/*
+- (void)setAttributedTitle:(CPAttributedString)aTitle
+{
+}
+
+- (CPAttributedString)attributedTitle
+{
+}
+*/
+
+// Managing the Tag
+/*!
+    Sets the menu item's tag
+    @param aTag the tag for the item
+*/
+- (void)setTag:(int)aTag
+{
+    _tag = aTag;
+}
+
+/*!
+    Returns the item's tag
+*/
+- (int)tag
+{
+    return _tag;
+}
+
+/*!
+    Sets the state of the menu item. Possible states are:
+<pre>
+CPMixedState
+CPOnState
+CPOffState
+</pre>
+*/
+- (void)setState:(int)aState
+{
+    if (_state == aState)
+        return;
+    
+    _state = aState;
+    
+    [_menu itemChanged:self];
+
+    [_menuItemView setDirty];
+}
+
+/*!
+    Returns the menu item's current state. Possible states are:
+<pre>
+CPMixedState
+CPOnState
+CPOffState
+</pre>
+*/
+- (int)state
+{
+    return _state;
+}
+
+// Managing the Image
+/*!
+    Sets the menu item's image
+    @param anImage the menu item's image
+*/
+- (void)setImage:(CPImage)anImage
+{
+    if (_image == anImage)
+        return;
+    
+    _image = anImage;
+
+    [_menuItemView setDirty];
+    
+    [_menu itemChanged:self];
+}
+
+/*!
+    Returns the menu item's image
+*/
+- (CPImage)image
+{
+    return _image;
+}
+
+/*!
+    Sets the menu item's alternate image
+    @param anImage the menu item's alternate image
+*/
+- (void)setAlternateImage:(CPImage)anImage
+{
+    _alternateImage = anImage;
+}
+
+/*!
+    Returns the menu item's alternate image
+*/
+- (CPImage)alternateImage
+{
+    return _alternateImage;
+}
+
+/*!
+    Sets the image that is shown when the
+    menu item is in the 'on' state.
+    @param anImage the image to show
+*/
+- (void)setOnStateImage:(CPImage)anImage
+{
+    if (_onStateImage == anImage)
+        return;
+    
+    _onStateImage = anImage;
+    [_menu itemChanged:self];
+}
+
+/*!
+    Returns the image shown when the menu item is in the 'on' state.
+*/
+- (CPImage)onStateImage
+{
+    return _onStateImage;
+}
+
+/*!
+    Sets the image that is shown when the menu item is in the 'off' state.
+    @param anImage the image to show
+*/
+- (void)setOffStateImage:(CPImage)anImage
+{
+    if (_offStateImage == anImage)
+        return;
+    
+    _offStateImage = anImage;
+    [_menu itemChanged:self];
+}
+
+/*!
+    Returns the image shown when the menu item is in the 'off' state.
+*/
+- (CPImage)offStateImage
+{
+    return _offStateImage;
+}
+
+/*!
+    Sets the image that is shown when the menu item is in the 'mixed' state.
+    @param anImage the image to show
+*/
+- (void)setMixedStateImage:(CPImage)anImage
+{
+    if (_mixedStateImage == anImage)
+        return;
+    
+    _mixedStateImage = anImage;
+    [_menu itemChanged:self];
+}
+
+/*!
+    Returns the image shown when the menu item is
+    in the 'mixed' state.
+*/
+- (CPImage)mixedStateImage
+{
+    return _mixedStateImage;
+}
+
+// Managing Subemenus
+/*!
+    Sets the submenu for this item
+    @param aMenu the submenu
+*/
+- (void)setSubmenu:(CPMenu)aMenu
+{
+    if (_submenu === aMenu)
+        return;
+
+    var supermenu = [_submenu supermenu];
+
+    if (supermenu)
+        [CPException raise:CPInvalidArgumentException
+		   reason: @"Can't add submenu \"" + [aMenu title] + "\" to item \"" + [self title] + "\", because it is already submenu of \"" + [[aMenu supermenu] title] + "\""];
+
+    _submenu = aMenu;
+
+    if (_submenu)
+    {
+        [_submenu setSupermenu:_menu];
+
+        [self setTarget:_menu];
+        [self setAction:@selector(submenuAction:)];
+    }
+    else
+    {
+        [self setTarget:nil];
+        [self setAction:NULL];
+    }
+
+    [_menuItemView setDirty];
+
+    [_menu itemChanged:self];
+}
+
+/*!
+    Returns the submenu of the item. \c nil if there is no submenu.
+*/
+- (CPMenu)submenu
+{
+    return _submenu;
+}
+
+/*!
+    Returns \c YES if the menu item has a submenu.
+*/
+- (BOOL)hasSubmenu
+{
+    return _submenu ? YES : NO;
+}
+
+// Getting a Separator Item
+
+/*!
+    Returns a new menu item separator.
+*/
++ (CPMenuItem)separatorItem
+{
+    var separatorItem = [[self alloc] initWithTitle:@"" action:nil keyEquivalent:nil];
+
+    separatorItem._isSeparator = YES;
+
+    return separatorItem;
+}
+
+/*!
+    Returns \c YES if the menu item is a separator.
+*/
+- (BOOL)isSeparatorItem
+{
+    return _isSeparator;
+}
+
+// Managing the Owning Menu
+/*!
+    Set the container menu of this item.
+    @param aMenu the item's container menu
+*/
+- (void)setMenu:(CPMenu)aMenu
+{
+    _menu = aMenu;
+}
+
+/*!
+    Returns the container menu of this item
+*/
+- (CPMenu)menu
+{
+    return _menu;
+}
+
+//
+
+/*!
+    Sets the keyboard shortcut for this menu item
+    @param aString the keyboard shortcut
+*/
+- (void)setKeyEquivalent:(CPString)aString
+{
+    _keyEquivalent = aString || @"";
+}
+
+/*!
+    Returns the keyboard shortcut for this menu item
+*/
+- (CPString)keyEquivalent
+{
+    return _keyEquivalent;
+}
+
+/*!
+    Sets the modifier mask used for the item's keyboard shortcut.
+    Can be a combination of:
+<pre>
+CPShiftKeyMask
+CPAlternateKeyMask
+CPCommandKeyMask
+CPControlKeyMask
+</pre>
+*/
+- (void)setKeyEquivalentModifierMask:(unsigned)aMask
+{
+    _keyEquivalentModifierMask = aMask;
+}
+
+/*!
+    Returns the item's keyboard shortcut modifier mask.
+    Can be a combination of:
+<pre>
+CPShiftKeyMask
+CPAlternateKeyMask
+CPCommandKeyMask
+CPControlKeyMask
+</pre>
+*/
+- (unsigned)keyEquivalentModifierMask
+{
+    return _keyEquivalentModifierMask;
+}
+
+- (CPString)keyEquivalentStringRepresentation
+{
+    if (![_keyEquivalent length])
+        return @"";
+
+    var string = _keyEquivalent.toUpperCase();
+
+    if (_keyEquivalentModifierMask & CPCommandKeyMask)
+        string = "⌘" + string;
+
+    if (_keyEquivalentModifierMask & CPShiftKeyMask)
+        string = "⇧" + string;
+
+    if (_keyEquivalentModifierMask & CPControlKeyMask)
+        string = "^" + string;
+
+    return string;
+}
+
+// Managing Mnemonics
+/*!
+    Sets the index of the mnemonic character in the title. The character
+    will be underlined and is used as a shortcut for navigation.
+    @param aLocation the index of the character in the title
+*/
+- (void)setMnemonicLocation:(unsigned)aLocation
+{
+    _mnemonicLocation = aLocation;
+}
+
+/*!
+    Returns the index of the mnemonic character in the title.
+*/
+- (unsigned)mnemonicLocation
+{
+    return _mnemonicLocation;
+}
+
+/*!
+    Sets the title of the menu item and the mnemonic character. The mnemonic chracter should be preceded by an '&'.
+    @param aTitle the title string with a denoted mnemonic
+*/
+- (void)setTitleWithMnemonicLocation:(CPString)aTitle
+{
+    var location = [aTitle rangeOfString:@"&"].location;
+    
+    if (location == CPNotFound)
+        [self setTitle:aTitle];
+    else
+    {
+        [self setTitle:[aTitle substringToIndex:location] + [aTitle substringFromIndex:location + 1]];
+        [self setMnemonicLocation:location];
+    }    
+}
+
+/*!
+    Returns the menu items mnemonic character
+*/
+- (CPString)mnemonic
+{
+    return _mnemonicLocation == CPNotFound ? @"" : [_title characterAtIndex:_mnemonicLocation];
+}
+
+// Managing Alternates
+
+/*!
+    Sets whether this item is an alternate for the previous menu item.
+    @param isAlternate \c YES denotes that this menu item is an alternate
+*/
+- (void)setAlternate:(BOOL)isAlternate
+{
+    _isAlternate = isAlternate;
+}
+
+/*!
+    Returns \c YES if the menu item is an alternate for the previous item.
+*/
+- (BOOL)isAlternate
+{
+    return _isAlternate;
+}
+
+// Managing Indentation Levels
+
+/*!
+    Sets the indentation level of the menu item. Must be a value between 0 and 15 (inclusive).
+    @param aLevel the item's new indentation level
+    @throws CPInvalidArgumentException if aLevel is less than 0
+*/
+- (void)setIndentationLevel:(unsigned)aLevel
+{
+    if (aLevel < 0)
+        [CPException raise:CPInvalidArgumentException reason:"setIndentationLevel: argument must be greater than or equal to 0."];
+        
+    _indentationLevel = MIN(15, aLevel);
+}
+
+/*!
+    Returns the menu item's indentation level. This is a value between 0 and 15 (inclusive).
+*/
+- (unsigned)indentationLevel
+{
+    return _indentationLevel;
+}
+
+// Managing Tool Tips
+/*!
+    Sets the tooltip for the menu item.
+    @param aToolTip the tool tip for the item
+*/
+- (void)setToolTip:(CPString)aToolTip
+{
+    _toolTip = aToolTip;
+}
+
+/*!
+    Returns the item's tooltip
+*/
+- (CPString)toolTip
+{
+    return _toolTip;
+}
+
+// Representing an Object
+
+/*!
+    Sets the menu item's represented object. This is a kind of tag for the developer. Not a UI feature.
+    @param anObject the represented object
+*/
+- (void)setRepresentedObject:(id)anObject
+{
+    _representedObject = anObject;
+}
+
+/*!
+    Returns the item's represented object.
+*/
+- (id)representedObject
+{
+    return _representedObject;
+}
+
+// Managing the View
+
+/*!
+    Sets the view for the menu item
+    @param aView the menu's item's view
+*/
+- (void)setView:(CPView)aView
+{
+    if (_view === aView)
+        return;
+    
+    _view = aView;
+    
+    [_menuItemView setDirty];
+    
+    [_menu itemChanged:self];
+}
+
+/*!
+    Returns the menu item's view
+*/
+- (CPView)view
+{
+    return _view;
+}
+
+// Getting Highlighted Status
+
+/*!
+    Returns \c YES if the menu item is highlighted.
+*/
+- (BOOL)isHighlighted
+{
+    return [[self menu] highlightedItem] == self;
+}
+
+//
+
+/*
+    @ignore
+*/
+- (id)_menuItemView
+{
+    if (!_menuItemView)
+        _menuItemView = [[_CPMenuItemView alloc] initWithFrame:CGRectMakeZero() forMenuItem:self];
+    
+    return _menuItemView;
+}
+
+- (BOOL)_isSelectable
+{
+    return ![self submenu] || [self action] !== @selector(submenuAction:) || [self target] !== [self menu];
+}
+
+@end
+
+var CPMenuItemIsSeparatorKey                = @"CPMenuItemIsSeparatorKey",
+
+    CPMenuItemTitleKey                      = @"CPMenuItemTitleKey",
+    CPMenuItemTargetKey                     = @"CPMenuItemTargetKey",
+    CPMenuItemActionKey                     = @"CPMenuItemActionKey",
+
+    CPMenuItemIsEnabledKey                  = @"CPMenuItemIsEnabledKey",
+    CPMenuItemIsHiddenKey                   = @"CPMenuItemIsHiddenKey",
+
+    CPMenuItemTagKey                        = @"CPMenuItemTagKey",
+    CPMenuItemStateKey                      = @"CPMenuItemStateKey",
+
+    CPMenuItemImageKey                      = @"CPMenuItemImageKey",
+    CPMenuItemAlternateImageKey             = @"CPMenuItemAlternateImageKey",
+
+    CPMenuItemSubmenuKey                    = @"CPMenuItemSubmenuKey",
+    CPMenuItemMenuKey                       = @"CPMenuItemMenuKey",
+
+    CPMenuItemKeyEquivalentKey              = @"CPMenuItemKeyEquivalentKey",
+    CPMenuItemKeyEquivalentModifierMaskKey  = @"CPMenuItemKeyEquivalentModifierMaskKey",
+
+    CPMenuItemIndentationLevelKey           = @"CPMenuItemIndentationLevelKey",
+
+    CPMenuItemRepresentedObjectKey          = @"CPMenuItemRepresentedObjectKey",
+    CPMenuItemViewKey                       = @"CPMenuItemViewKey";
+
+#define DEFAULT_VALUE(aKey, aDefaultValue) [aCoder containsValueForKey:(aKey)] ? [aCoder decodeObjectForKey:(aKey)] : (aDefaultValue)
+#define ENCODE_IFNOT(aKey, aValue, aDefaultValue) if ((aValue) !== (aDefaultValue)) [aCoder encodeObject:(aValue) forKey:(aKey)];
+
+@implementation CPMenuItem (CPCoding)
+/*!
+    Initializes the menu item from a coder.
+    @param aCoder the coder from which to initialize
+    @return the initialized menu item
+*/
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super init];
+    
+    if (self)
+    {
+        _isSeparator = [aCoder containsValueForKey:CPMenuItemIsSeparatorKey] && [aCoder decodeBoolForKey:CPMenuItemIsSeparatorKey];
+
+        _title = [aCoder decodeObjectForKey:CPMenuItemTitleKey];
+        
+//        _font;
+                  
+        _target = [aCoder decodeObjectForKey:CPMenuItemTargetKey];
+        _action = [aCoder decodeObjectForKey:CPMenuItemActionKey];
+
+        _isEnabled = DEFAULT_VALUE(CPMenuItemIsEnabledKey, YES);
+        _isHidden = DEFAULT_VALUE(CPMenuItemIsHiddenKey, NO);
+        _tag = DEFAULT_VALUE(CPMenuItemTagKey, 0);
+        _state = DEFAULT_VALUE(CPMenuItemStateKey, CPOffState);
+//    int             _state;
+
+        _image = DEFAULT_VALUE(CPMenuItemImageKey, nil);
+        _alternateImage = DEFAULT_VALUE(CPMenuItemAlternateImageKey, nil);
+//    CPImage         _onStateImage;
+//    CPImage         _offStateImage;
+//    CPImage         _mixedStateImage;
+
+        // This order matters because setSubmenu: needs _menu to be around.
+        _menu = DEFAULT_VALUE(CPMenuItemMenuKey, nil);
+        [self setSubmenu:DEFAULT_VALUE(CPMenuItemSubmenuKey, nil)];
+
+        _keyEquivalent = [aCoder decodeObjectForKey:CPMenuItemKeyEquivalentKey] || @"";
+        _keyEquivalentModifierMask = [aCoder decodeObjectForKey:CPMenuItemKeyEquivalentModifierMaskKey] || 0;
+
+//    int             _mnemonicLocation;
+
+//    BOOL            _isAlternate;
+
+        // Default is 0.
+        [self setIndentationLevel:[aCoder decodeIntForKey:CPMenuItemIndentationLevelKey] || 0];
+
+//    CPString        _toolTip;
+
+        _representedObject = DEFAULT_VALUE(CPMenuItemRepresentedObjectKey, nil);
+        _view = DEFAULT_VALUE(CPMenuItemViewKey, nil);
+    }
+    
+    return self;
+}
+
+/*!
+    Writes the menu item out to a coder.
+    @param aCoder the coder to write the menu item out to
+*/
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    if (_isSeparator)
+        [aCoder encodeBool:_isSeparator forKey:CPMenuItemIsSeparatorKey];
+
+    [aCoder encodeObject:_title forKey:CPMenuItemTitleKey];
+        
+    [aCoder encodeObject:_target forKey:CPMenuItemTargetKey];
+    [aCoder encodeObject:_action forKey:CPMenuItemActionKey];
+
+    ENCODE_IFNOT(CPMenuItemIsEnabledKey, _isEnabled, YES); 
+    ENCODE_IFNOT(CPMenuItemIsHiddenKey, _isHidden, NO);
+
+    ENCODE_IFNOT(CPMenuItemTagKey, _tag, 0);
+    ENCODE_IFNOT(CPMenuItemStateKey, _state, CPOffState);
+
+    ENCODE_IFNOT(CPMenuItemImageKey, _image, nil);
+    ENCODE_IFNOT(CPMenuItemAlternateImageKey, _alternateImage, nil);
+    
+    ENCODE_IFNOT(CPMenuItemSubmenuKey, _submenu, nil);
+    ENCODE_IFNOT(CPMenuItemMenuKey, _menu, nil);
+
+    if (_keyEquivalent && _keyEquivalent.length)
+        [aCoder encodeObject:_keyEquivalent forKey:CPMenuItemKeyEquivalentKey];
+
+    if (_keyEquivalentModifierMask)
+        [aCoder encodeObject:_keyEquivalentModifierMask forKey:CPMenuItemKeyEquivalentModifierMaskKey];
+
+    if (_indentationLevel > 0)
+        [aCoder encodeInt:_indentationLevel forKey:CPMenuItemIndentationLevelKey];
+
+    ENCODE_IFNOT(CPMenuItemRepresentedObjectKey, _representedObject, nil);
+    ENCODE_IFNOT(CPMenuItemViewKey, _view, nil);
+}
+
+@end

AppKit/CPMenuItem/_CPMenuItemMenuBarView.j

@@ -0,0 +1,232 @@
+var HORIZONTAL_MARGIN           = 8.0,
+    SUBMENU_INDICATOR_MARGIN    = 3.0,
+    VERTICAL_MARGIN             = 4.0;
+
+var SelectionColor                              = nil,
+    SUBMENU_INDICATOR_COLOR                     = nil,
+    _CPMenuItemSelectionColor                   = nil,
+    _CPMenuItemTextShadowColor                  = nil,
+    
+    _CPMenuItemDefaultStateImages               = [],
+    _CPMenuItemDefaultStateHighlightedImages    = [];
+
+@implementation _CPMenuItemMenuBarView : CPView
+{
+    CPMenuItem              _menuItem @accessors(property=menuItem);
+
+    CPFont                  _font;
+    CPColor                 _textColor;
+    CPColor                 _textShadowColor;
+
+    BOOL                    _isDirty;
+
+    _CPImageAndTextView     _imageAndTextView;
+    CPView                  _submenuIndicatorView;
+}
+
++ (void)initialize
+{
+    if (self !== [_CPMenuItemMenuBarView class])
+        return;
+
+    var bundle = [CPBundle bundleForClass:self];
+
+    SelectionColor = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuBarWindow/_CPMenuBarWindowBackgroundSelected.png"] size:CGSizeMake(1.0, 28.0)]];
+
+    SUBMENU_INDICATOR_COLOR = [CPColor grayColor];
+
+    _CPMenuItemSelectionColor =  [CPColor colorWithCalibratedRed:95.0 / 255.0 green:131.0 / 255.0 blue:185.0 / 255.0 alpha:1.0];
+    _CPMenuItemTextShadowColor = [CPColor colorWithCalibratedRed:26.0 / 255.0 green: 73.0 / 255.0 blue:109.0 / 255.0 alpha:1.0];
+    
+    _CPMenuItemDefaultStateImages[CPOffState]               = nil;
+    _CPMenuItemDefaultStateHighlightedImages[CPOffState]    = nil;
+
+    _CPMenuItemDefaultStateImages[CPOnState]               = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPMenuItem/CPMenuItemOnState.png"] size:CGSizeMake(14.0, 14.0)];
+    _CPMenuItemDefaultStateHighlightedImages[CPOnState]    = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPMenuItem/CPMenuItemOnStateHighlighted.png"] size:CGSizeMake(14.0, 14.0)];
+
+    _CPMenuItemDefaultStateImages[CPMixedState]             = nil;
+    _CPMenuItemDefaultStateHighlightedImages[CPMixedState]  = nil;
+}
+
++ (id)view
+{
+    return [[self alloc] init];
+}
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    self = [super initWithFrame:aFrame];
+
+    if (self)
+    {
+        _imageAndTextView = [[_CPImageAndTextView alloc] initWithFrame:CGRectMake(HORIZONTAL_MARGIN, 0.0, 0.0, 0.0)];
+
+        [_imageAndTextView setImagePosition:CPImageLeft];
+        [_imageAndTextView setTextShadowOffset:CGSizeMake(0.0, 1.0)];
+        [_imageAndTextView setAutoresizingMask:CPViewMinYMargin | CPViewMaxYMargin];
+
+        [self addSubview:_imageAndTextView];
+
+        _submenuIndicatorView = [[_CPMenuItemMenuBarSubmenuIndicatorView alloc] initWithFrame:CGRectMake(0.0, 0.0, 9.0, 6.0)];
+
+        [_submenuIndicatorView setAutoresizingMask:CPViewMinYMargin | CPViewMaxYMargin];
+
+        [self addSubview:_submenuIndicatorView];
+
+        [self setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
+    }
+
+    return self;
+}
+
+- (CPColor)textColor
+{
+    if (![_menuItem isEnabled])
+        return [CPColor lightGrayColor];
+
+    return _textColor || [CPColor colorWithCalibratedRed:70.0 / 255.0 green:69.0 / 255.0 blue:69.0 / 255.0 alpha:1.0];
+}
+
+- (CPColor)textShadowColor
+{
+    if (![_menuItem isEnabled])
+        return [CPColor colorWithWhite:0.8 alpha:0.8];
+
+    return _textShadowColor || [CPColor colorWithWhite:1.0 alpha:0.8];
+}
+
+- (void)update
+{
+    var x = HORIZONTAL_MARGIN,
+        height = 0.0;
+
+    [_imageAndTextView setFont:[_menuItem font] || [_CPMenuBarWindow font]];
+    [_imageAndTextView setVerticalAlignment:CPCenterVerticalTextAlignment];
+    [_imageAndTextView setImage:[_menuItem image]];
+    [_imageAndTextView setText:[_menuItem title]];
+    [_imageAndTextView setTextColor:[self textColor]];
+    [_imageAndTextView setTextShadowColor:[self textShadowColor]];
+    [_imageAndTextView setTextShadowOffset:CGSizeMake(0.0, 1.0)];
+    [_imageAndTextView sizeToFit];
+
+    var imageAndTextViewFrame = [_imageAndTextView frame];
+
+    imageAndTextViewFrame.origin.x = x;
+    x += CGRectGetWidth(imageAndTextViewFrame);
+    height = MAX(height, CGRectGetHeight(imageAndTextViewFrame));
+
+    var hasSubmenuIndicator = [_menuItem hasSubmenu] && [_menuItem action];
+
+    if (hasSubmenuIndicator)
+    {
+        [_submenuIndicatorView setHidden:NO];
+        [_submenuIndicatorView setColor:[self textColor]];
+        [_submenuIndicatorView setShadowColor:[self textShadowColor]];
+
+        var submenuViewFrame = [_submenuIndicatorView frame];
+
+        submenuViewFrame.origin.x = x + SUBMENU_INDICATOR_MARGIN;
+
+        x = CGRectGetMaxX(submenuViewFrame);
+        height = MAX(height, CGRectGetHeight(submenuViewFrame));
+    }
+    else
+        [_submenuIndicatorView setHidden:YES];
+
+    height += 2.0 * VERTICAL_MARGIN;
+
+    imageAndTextViewFrame.origin.y = FLOOR((height - CGRectGetHeight(imageAndTextViewFrame)) / 2.0);
+    [_imageAndTextView setFrame:imageAndTextViewFrame];
+    
+    if (hasSubmenuIndicator)
+    {
+        submenuViewFrame.origin.y = FLOOR((height - CGRectGetHeight(submenuViewFrame)) / 2.0) + 1.0;
+        [_submenuIndicatorView setFrame:submenuViewFrame];
+    }
+
+    _minSize = CGSizeMake(x + HORIZONTAL_MARGIN, height);
+    
+    [self setAutoresizesSubviews:NO];
+    [self setFrameSize:_minSize];
+    [self setAutoresizesSubviews:YES];
+}
+
+- (void)highlight:(BOOL)shouldHighlight
+{
+    // FIXME: This should probably be even throw.
+    if (![_menuItem isEnabled])
+        return; 
+
+    if (shouldHighlight)
+    {
+        [self setBackgroundColor:SelectionColor];
+
+        [_imageAndTextView setTextColor:[CPColor whiteColor]];
+        [_imageAndTextView setTextShadowColor:_CPMenuItemTextShadowColor];
+
+        [_submenuIndicatorView setColor:[CPColor whiteColor]];
+        [_submenuIndicatorView setShadowColor:[CPColor colorWithWhite:0.1 alpha:0.7]];
+    }
+    else
+    {
+        [self setBackgroundColor:nil];
+
+        [_imageAndTextView setTextColor:[self textColor]];
+        [_imageAndTextView setTextShadowColor:[self textShadowColor]];
+
+        [_submenuIndicatorView setColor:[self textColor]];
+        [_submenuIndicatorView setShadowColor:[self textShadowColor]];
+    }
+}
+
+@end
+
+@implementation _CPMenuItemMenuBarSubmenuIndicatorView : CPView
+{
+    CPColor _color;
+    CPColor _shadowColor;
+}
+
+- (void)setColor:(CPColor)aColor
+{
+    if (_color === aColor)
+        return;
+
+    _color = aColor;
+
+    [self setNeedsDisplay:YES];
+}
+
+- (void)setShadowColor:(CPColor)aColor
+{
+    if (_shadowColor === aColor)
+        return;
+
+    _shadowColor = aColor;
+
+    [self setNeedsDisplay:YES];
+}
+
+- (void)drawRect:(CGRect)aRect
+{
+    var context = [[CPGraphicsContext currentContext] graphicsPort],
+        bounds = [self bounds];
+    
+    bounds.size.height -= 1.0;
+    bounds.size.width -= 2.0;
+    bounds.origin.x += 1.0;
+
+    CGContextBeginPath(context);
+    
+    CGContextMoveToPoint(context, CGRectGetMinX(bounds), CGRectGetMinY(bounds));
+    CGContextAddLineToPoint(context, CGRectGetMaxX(bounds), CGRectGetMinY(bounds));
+    CGContextAddLineToPoint(context, CGRectGetMidX(bounds), CGRectGetMaxY(bounds));
+    
+    CGContextClosePath(context);
+    
+    CGContextSetShadowWithColor(context, CGSizeMake(0.0, 1.0), 1.1, _shadowColor);
+    CGContextSetFillColor(context, _color);
+    CGContextFillPath(context);
+}
+
+@end

AppKit/CPMenuItem/_CPMenuItemSeparatorView.j

@@ -0,0 +1,38 @@
+
+@import <AppKit/CPView.j>
+
+
+@implementation _CPMenuItemSeparatorView : CPView
+{
+}
+
++ (id)view
+{
+    return [[self alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, 10.0)];
+}
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    self = [super initWithFrame:aFrame];
+
+    if (self)
+        [self setAutoresizingMask:CPViewWidthSizable];
+
+    return self;
+}
+
+- (void)drawRect:(CGRect)aRect
+{
+    var context = [[CPGraphicsContext currentContext] graphicsPort],
+        bounds = [self bounds];
+
+    CGContextBeginPath(context);
+    
+    CGContextMoveToPoint(context, CGRectGetMinX(bounds), FLOOR(CGRectGetMidY(bounds)) - 0.5);
+    CGContextAddLineToPoint(context, CGRectGetMaxX(bounds), FLOOR(CGRectGetMidY(bounds)) - 0.5);
+    
+    CGContextSetStrokeColor(context, [CPColor lightGrayColor]);
+    CGContextStrokePath(context);
+}
+
+@end

AppKit/CPMenuItem/_CPMenuItemStandardView.j

@@ -0,0 +1,298 @@
+var LEFT_MARGIN                 = 3.0,
+    RIGHT_MARGIN                = 14.0 + 3.0,
+    STATE_COLUMN_WIDTH          = 14.0,
+    INDENTATION_WIDTH           = 17.0,
+    VERTICAL_MARGIN             = 4.0,
+    
+    RIGHT_COLUMNS_MARGIN        = 30.0,
+    KEY_EQUIVALENT_MARGIN       = 10.0;
+
+var SUBMENU_INDICATOR_COLOR                     = nil,
+    _CPMenuItemSelectionColor                   = nil,
+    _CPMenuItemTextShadowColor                  = nil,
+    
+    _CPMenuItemDefaultStateImages               = [],
+    _CPMenuItemDefaultStateHighlightedImages    = [];
+
+@implementation _CPMenuItemStandardView : CPView
+{
+    CPMenuItem              _menuItem @accessors(property=menuItem);
+
+    CPFont                  _font;
+    CPColor                 _textColor;
+    CPColor                 _textShadowColor;
+
+    CGSize                  _minSize @accessors(readonly, property=minSize);
+    BOOL                    _isDirty;
+
+    CPImageView             _stateView;
+    _CPImageAndTextView     _imageAndTextView;
+    _CPImageAndTextView     _keyEquivalentView;
+    CPView                  _submenuIndicatorView;
+}
+
++ (void)initialize
+{
+    if (self !== [_CPMenuItemStandardView class])
+        return;
+
+    SUBMENU_INDICATOR_COLOR = [CPColor grayColor];
+
+    _CPMenuItemSelectionColor =  [CPColor colorWithCalibratedRed:95.0 / 255.0 green:131.0 / 255.0 blue:185.0 / 255.0 alpha:1.0];
+    _CPMenuItemTextShadowColor = [CPColor colorWithCalibratedRed:26.0 / 255.0 green: 73.0 / 255.0 blue:109.0 / 255.0 alpha:1.0]
+    
+    var bundle = [CPBundle bundleForClass:self];
+    
+    _CPMenuItemDefaultStateImages[CPOffState]               = nil;
+    _CPMenuItemDefaultStateHighlightedImages[CPOffState]    = nil;
+
+    _CPMenuItemDefaultStateImages[CPOnState]               = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPMenuItem/CPMenuItemOnState.png"] size:CGSizeMake(14.0, 14.0)];
+    _CPMenuItemDefaultStateHighlightedImages[CPOnState]    = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPMenuItem/CPMenuItemOnStateHighlighted.png"] size:CGSizeMake(14.0, 14.0)];
+
+    _CPMenuItemDefaultStateImages[CPMixedState]             = nil;
+    _CPMenuItemDefaultStateHighlightedImages[CPMixedState]  = nil;
+}
+
++ (id)view
+{
+    return [[self alloc] init];
+}
+
++ (float)_standardLeftMargin
+{
+    return LEFT_MARGIN + STATE_COLUMN_WIDTH;
+}
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    self = [super initWithFrame:aFrame];
+
+    if (self)
+    {
+        _stateView = [[CPImageView alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, 0.0)];
+
+        [_stateView setImageScaling:CPScaleNone];
+
+        [self addSubview:_stateView];
+
+        _imageAndTextView = [[_CPImageAndTextView alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, 0.0)];
+
+        [_imageAndTextView setImagePosition:CPImageLeft];
+        [_imageAndTextView setTextShadowOffset:CGSizeMake(0.0, 1.0)];
+
+        [self addSubview:_imageAndTextView];
+
+        _keyEquivalentView = [[_CPImageAndTextView alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, 0.0)];
+
+        [_keyEquivalentView setImagePosition:CPNoImage];
+        [_keyEquivalentView setTextShadowOffset:CGSizeMake(0.0, 1.0)];
+        [_keyEquivalentView setAutoresizingMask:CPViewMinXMargin];
+
+        [self addSubview:_keyEquivalentView];
+
+        _submenuIndicatorView = [[_CPMenuItemSubmenuIndicatorView alloc] initWithFrame:CGRectMake(0.0, 0.0, 8.0, 10.0)];
+
+        [_submenuIndicatorView setColor:SUBMENU_INDICATOR_COLOR];
+        [_submenuIndicatorView setAutoresizingMask:CPViewMinXMargin];
+
+        [self addSubview:_submenuIndicatorView];
+
+        [self setAutoresizingMask:CPViewWidthSizable];
+    }
+
+    return self;
+}
+
+- (CPColor)textColor
+{
+    if (![_menuItem isEnabled])
+        return [CPColor lightGrayColor];
+
+    return _textColor || [CPColor colorWithCalibratedRed:70.0 / 255.0 green:69.0 / 255.0 blue:69.0 / 255.0 alpha:1.0];
+}
+
+- (CPColor)textShadowColor
+{
+    if (![_menuItem isEnabled])
+        return nil;
+
+    return _textShadowColor || [CPColor colorWithWhite:1.0 alpha:0.8];
+}
+
+- (void)setFont:(CPFont)aFont
+{
+    _font = aFont;
+}
+
+- (void)update
+{
+    var x = LEFT_MARGIN + [_menuItem indentationLevel] * INDENTATION_WIDTH,
+        height = 0.0,
+        hasStateColumn = [[_menuItem menu] showsStateColumn];
+
+    if (hasStateColumn)
+    {
+        [_stateView setHidden:NO];
+        [_stateView setImage:_CPMenuItemDefaultStateImages[[_menuItem state]] || nil];
+
+        x += STATE_COLUMN_WIDTH;
+    }
+    else
+        [_stateView setHidden:YES];
+
+    [_imageAndTextView setFont:[_menuItem font] || _font];
+    [_imageAndTextView setVerticalAlignment:CPCenterVerticalTextAlignment];
+    [_imageAndTextView setImage:[_menuItem image]];
+    [_imageAndTextView setText:[_menuItem title]];
+    [_imageAndTextView setTextColor:[self textColor]];
+    [_imageAndTextView setTextShadowColor:[self textShadowColor]];
+    [_imageAndTextView setTextShadowOffset:CGSizeMake(0.0, 1.0)];
+    [_imageAndTextView sizeToFit];
+
+    var imageAndTextViewFrame = [_imageAndTextView frame];
+
+    imageAndTextViewFrame.origin.x = x;
+    x += CGRectGetWidth(imageAndTextViewFrame);
+    height = MAX(height, CGRectGetHeight(imageAndTextViewFrame));
+
+    var hasKeyEquivalent = !![_menuItem keyEquivalent],
+        hasSubmenu = [_menuItem hasSubmenu];
+
+    if (hasKeyEquivalent || hasSubmenu)
+        x += RIGHT_COLUMNS_MARGIN;
+
+    if (hasKeyEquivalent)
+    {
+        [_keyEquivalentView setFont:[_menuItem font] || _font];
+        [_keyEquivalentView setVerticalAlignment:CPCenterVerticalTextAlignment];
+        [_keyEquivalentView setImage:[_menuItem image]];
+        [_keyEquivalentView setText:[_menuItem keyEquivalentStringRepresentation]];
+        [_keyEquivalentView setTextColor:[self textColor]];
+        [_keyEquivalentView setTextShadowColor:[self textShadowColor]];
+        [_keyEquivalentView setTextShadowOffset:CGSizeMake(0, 1)];
+        [_keyEquivalentView setFrameOrigin:CGPointMake(x, VERTICAL_MARGIN)];
+        [_keyEquivalentView sizeToFit];
+        
+        var keyEquivalentViewFrame = [_keyEquivalentView frame];
+
+        keyEquivalentViewFrame.origin.x = x;
+        x += CGRectGetWidth(keyEquivalentViewFrame);
+        height = MAX(height, CGRectGetHeight(keyEquivalentViewFrame));
+
+        if (hasSubmenu)
+            x += RIGHT_COLUMNS_MARGIN;
+    }
+    else
+        [_keyEquivalentView setHidden:YES];
+
+    if (hasSubmenu)
+    {
+        [_submenuIndicatorView setHidden:NO];
+
+        var submenuViewFrame = [_submenuIndicatorView frame];
+
+        submenuViewFrame.origin.x = x;
+
+        x += CGRectGetWidth(submenuViewFrame);
+        height = MAX(height, CGRectGetHeight(submenuViewFrame));
+    }
+    else
+        [_submenuIndicatorView setHidden:YES];
+
+    height += 2.0 * VERTICAL_MARGIN;
+
+    imageAndTextViewFrame.origin.y = FLOOR((height - CGRectGetHeight(imageAndTextViewFrame)) / 2.0);
+    [_imageAndTextView setFrame:imageAndTextViewFrame];
+
+    if (hasStateColumn)
+        [_stateView setFrameSize:CGSizeMake(STATE_COLUMN_WIDTH, height)];
+
+    if (hasKeyEquivalent)
+    {
+        keyEquivalentViewFrame.origin.y = FLOOR((height - CGRectGetHeight(keyEquivalentViewFrame)) / 2.0);
+        [_keyEquivalentView setFrame:keyEquivalentViewFrame];
+    }
+    
+    if (hasSubmenu)
+    {
+        submenuViewFrame.origin.y = FLOOR((height - CGRectGetHeight(submenuViewFrame)) / 2.0);
+        [_submenuIndicatorView setFrame:submenuViewFrame];
+    }
+
+    _minSize = CGSizeMake(x + RIGHT_MARGIN, height);
+    
+    [self setAutoresizesSubviews:NO];
+    [self setFrameSize:_minSize];
+    [self setAutoresizesSubviews:YES];
+}
+
+- (void)highlight:(BOOL)shouldHighlight
+{
+    // FIXME: This should probably be even throw.
+    if (![_menuItem isEnabled])
+        return; 
+
+    if (shouldHighlight)
+    {
+        [self setBackgroundColor:_CPMenuItemSelectionColor];
+
+        [_imageAndTextView setTextColor:[CPColor whiteColor]];
+        [_keyEquivalentView setTextColor:[CPColor whiteColor]];
+        [_submenuIndicatorView setColor:[CPColor whiteColor]];
+
+        [_imageAndTextView setTextShadowColor:_CPMenuItemTextShadowColor];
+        [_keyEquivalentView setTextShadowColor:_CPMenuItemTextShadowColor];
+    }
+    else
+    {
+        [self setBackgroundColor:nil];
+        
+        [_imageAndTextView setTextColor:[self textColor]];
+        [_keyEquivalentView setTextColor:[self textColor]];
+        [_submenuIndicatorView setColor:SUBMENU_INDICATOR_COLOR];
+
+        [_imageAndTextView setTextShadowColor:[self textShadowColor]];
+        [_keyEquivalentView setTextShadowColor:[self textShadowColor]];
+    }
+    
+    if (shouldHighlight)
+        [_stateView setImage:_CPMenuItemDefaultStateHighlightedImages[[_menuItem state]] || nil];
+    else
+        [_stateView setImage:_CPMenuItemDefaultStateImages[[_menuItem state]] || nil];
+}
+
+@end
+
+@implementation _CPMenuItemSubmenuIndicatorView : CPView
+{
+    CPColor _color;
+}
+
+- (void)setColor:(CPColor)aColor
+{
+    if (_color === aColor)
+        return;
+
+    _color = aColor;
+
+    [self setNeedsDisplay:YES];
+}
+
+- (void)drawRect:(CGRect)aRect
+{
+    var context = [[CPGraphicsContext currentContext] graphicsPort],
+        bounds = [self bounds];
+    
+    CGContextBeginPath(context);
+    
+    CGContextMoveToPoint(context, CGRectGetMinX(bounds), CGRectGetMinY(bounds));
+    CGContextAddLineToPoint(context, CGRectGetMaxX(bounds), CGRectGetMidY(bounds));
+    CGContextAddLineToPoint(context, CGRectGetMinX(bounds), CGRectGetMaxY(bounds));
+    
+    CGContextClosePath(context);
+    
+    CGContextSetFillColor(context, _color);
+    CGContextFillPath(context);
+}
+
+@end

AppKit/CPMenuItem/_CPMenuItemView.j

@@ -0,0 +1,273 @@
+
+@import "_CPMenuItemSeparatorView.j"
+@import "_CPMenuItemStandardView.j"
+@import "_CPMenuItemMenuBarView.j"
+
+
+var LEFT_MARGIN                 = 3.0,
+    RIGHT_MARGIN                = 16.0,
+    STATE_COLUMN_WIDTH          = 14.0,
+    INDENTATION_WIDTH           = 17.0,
+    VERTICAL_MARGIN             = 4.0;
+    
+var _CPMenuItemSelectionColor                   = nil,
+    _CPMenuItemTextShadowColor                  = nil,
+    
+    _CPMenuItemDefaultStateImages               = [],
+    _CPMenuItemDefaultStateHighlightedImages    = [];
+
+/*
+    @ignore
+*/
+@implementation _CPMenuItemView : CPView
+{
+    CPMenuItem              _menuItem;
+    CPView                  _view;
+
+    CPFont                  _font;
+    CPColor                 _textColor;
+    CPColor                 _textShadowColor;
+
+    CGSize                  _minSize;
+    BOOL                    _isDirty;
+    BOOL                    _showsStateColumn;
+
+    CPImageView             _stateView;
+    _CPImageAndTextView     _imageAndTextView;
+    CPView                  _submenuView;
+}
+
++ (void)initialize
+{
+    if (self != [_CPMenuItemView class])
+        return;
+    
+    _CPMenuItemSelectionColor =  [CPColor colorWithCalibratedRed:95.0 / 255.0 green:131.0 / 255.0 blue:185.0 / 255.0 alpha:1.0];
+    _CPMenuItemTextShadowColor = [CPColor colorWithCalibratedRed:26.0 / 255.0 green: 73.0 / 255.0 blue:109.0 / 255.0 alpha:1.0]
+    
+    var bundle = [CPBundle bundleForClass:self];
+    
+    _CPMenuItemDefaultStateImages[CPOffState]               = nil;
+    _CPMenuItemDefaultStateHighlightedImages[CPOffState]    = nil;
+
+    _CPMenuItemDefaultStateImages[CPOnState]               = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPMenuItem/CPMenuItemOnState.png"] size:CGSizeMake(14.0, 14.0)];
+    _CPMenuItemDefaultStateHighlightedImages[CPOnState]    = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPMenuItem/CPMenuItemOnStateHighlighted.png"] size:CGSizeMake(14.0, 14.0)];
+
+    _CPMenuItemDefaultStateImages[CPMixedState]             = nil;
+    _CPMenuItemDefaultStateHighlightedImages[CPMixedState]  = nil;
+}
+
++ (float)leftMargin
+{
+    return LEFT_MARGIN + STATE_COLUMN_WIDTH;
+}
+
+- (id)initWithFrame:(CGRect)aFrame forMenuItem:(CPMenuItem)aMenuItem
+{
+    self = [super initWithFrame:aFrame];
+
+    if (self)
+    {
+        _menuItem = aMenuItem;
+        _showsStateColumn = YES;
+        _isDirty = YES;
+        
+        [self setAutoresizingMask:CPViewWidthSizable];
+
+        [self synchronizeWithMenuItem];
+    }
+    
+    return self;
+}
+
+- (CGSize)minSize
+{
+    return _minSize;
+}
+
+- (void)setDirty
+{
+    _isDirty = YES;
+}
+
+- (void)synchronizeWithMenuItem
+{
+    var menuItemView = [_menuItem view];
+
+    if ([_menuItem isSeparatorItem])
+    {
+        if (![_view isKindOfClass:[_CPMenuItemSeparatorView class]])
+        {
+            [_view removeFromSuperview];
+            _view = [_CPMenuItemSeparatorView view];
+        }
+    }
+    else if (menuItemView)
+    {
+        if (_view !== menuItemView)
+        {
+            [_view removeFromSuperview];
+            _view = menuItemView;
+        }
+    }
+    
+    else if ([_menuItem menu] == [CPApp mainMenu])
+    {
+        if (![_view isKindOfClass:[_CPMenuItemMenuBarView class]])
+        {
+            [_view removeFromSuperview];
+            _view = [_CPMenuItemMenuBarView view];
+        }
+
+        [_view setMenuItem:_menuItem];
+    }
+    else
+    {
+        if (![_view isKindOfClass:[_CPMenuItemStandardView class]])
+        {
+            [_view removeFromSuperview];
+            _view = [_CPMenuItemStandardView view];
+        }
+        
+        [_view setMenuItem:_menuItem];
+    }
+
+    if ([_view superview] !== self)
+        [self addSubview:_view];
+
+    if ([_view respondsToSelector:@selector(update)])
+        [_view update];
+
+    _minSize = [_view frame].size;
+    [self setAutoresizesSubviews:NO];
+    [self setFrameSize:_minSize];
+    [self setAutoresizesSubviews:YES];
+}
+
+- (void)setShowsStateColumn:(BOOL)shouldShowStateColumn
+{
+    _showsStateColumn = shouldShowStateColumn;
+}
+
+- (void)highlight:(BOOL)shouldHighlight
+{
+    if ([_view respondsToSelector:@selector(highlight:)])
+        [_view highlight:shouldHighlight];
+}
+
+- (void)activate:(BOOL)shouldActivate
+{
+    [_imageAndTextView setImage:[_menuItem image]];
+    
+    if (shouldActivate)
+    {
+        [_imageAndTextView setTextColor:[self activateColor] || [CPColor whiteColor]];
+        [_imageAndTextView setTextShadowColor:[self activateShadowColor] || [CPColor blackColor]];
+        [_submenuView setColor:[self activateColor] || [CPColor whiteColor]];
+    }
+    else
+    {
+        [_imageAndTextView setTextColor:[self textColor]];
+        [_imageAndTextView setTextShadowColor:[self textShadowColor]];
+        [_submenuView setColor:[self textColor]];
+    }
+}
+
+- (BOOL)eventOnSubmenu:(CPEvent)anEvent
+{
+    if (![_menuItem hasSubmenu])
+        return NO;
+        
+    return CGRectContainsPoint([_submenuView frame], [self convertPoint:[anEvent locationInWindow] fromView:nil]);
+}
+
+- (BOOL)isHidden
+{
+    return [_menuItem isHidden];
+}
+
+- (CPMenuItem)menuItem
+{
+    return _menuItem;
+}
+
+- (void)setFont:(CPFont)aFont
+{
+    if (_font === aFont)
+        return;
+
+    _font = aFont;
+
+    if ([_view respondsToSelector:@selector(setFont:)])
+        [_view setFont:aFont];
+
+    [self setDirty];
+}
+
+- (void)setTextColor:(CPColor)aColor
+{
+    if (_textColor == aColor)
+        return;
+    
+    _textColor = aColor;
+
+    [_imageAndTextView setTextColor:[self textColor]];
+    [_submenuView setColor:[self textColor]];
+}
+
+- (CPColor)textColor
+{
+    return nil;
+}
+
+- (void)setTextShadowColor:(CPColor)aColor
+{
+    if (_textShadowColor == aColor)
+        return;
+    
+    _textShadowColor = aColor;
+
+    [_imageAndTextView setTextShadowColor:[self textShadowColor]];
+    //[_submenuView setColor:[self textColor]];
+}
+
+- (CPColor)textShadowColor
+{
+    return [_menuItem isEnabled] ? (_textShadowColor ? _textShadowColor : [CPColor colorWithWhite:1.0 alpha:0.8]) : [CPColor colorWithWhite:0.8 alpha:0.8];
+}
+
+@end
+
+@implementation _CPMenuItemArrowView : CPView
+{
+    CPColor _color;
+}
+
+- (void)setColor:(CPColor)aColor
+{
+    if (_color == aColor)
+        return;
+
+    _color = aColor;
+    
+    [self setNeedsDisplay:YES];
+}
+
+- (void)drawRect:(CGRect)aRect
+{
+    var context = [[CPGraphicsContext currentContext] graphicsPort];
+    
+    CGContextBeginPath(context);
+    
+    CGContextMoveToPoint(context, 1.0, 4.0);
+    CGContextAddLineToPoint(context, 9.0, 4.0);
+    CGContextAddLineToPoint(context, 5.0, 8.0);
+    CGContextAddLineToPoint(context, 1.0, 4.0);
+    
+    CGContextClosePath(context);
+    
+    CGContextSetFillColor(context, _color);
+    CGContextFillPath(context);
+}
+
+@end

AppKit/CPOpenPanel.j

@@ -0,0 +1,46 @@
+
+@import <AppKit/CPPanel.j>
+
+
+@implementation CPOpenPanel : CPPanel
+{
+    BOOL    _canChooseFiles             @accessors(property=canChooseFiles);
+    BOOL    _canChooseDirectories       @accessors(property=canChooseDirectories);
+    BOOL    _allowsMultipleSelection    @accessors(property=allowsMultipleSelection);
+    CPURL   _directoryURL               @accessors(property=directoryURL);
+    CPArray _URLs;
+}
+
++ (id)openPanel
+{
+    return [[CPOpenPanel alloc] init];
+}
+
+- (CPInteger)runModal
+{
+    if (typeof window["cpOpenPanel"] === "function")
+    {
+        // FIXME: Is this correct???
+        [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
+
+        var options = { directoryURL: [self directoryURL],
+                        canChooseFiles: [self canChooseFiles],
+                        canChooseDirectories: [self canChooseDirectories],
+                        allowsMultipleSelection: [self allowsMultipleSelection] };
+
+        var result = window.cpOpenPanel(options);
+
+        _URLs = result.URLs;
+
+        return result.button;
+    }
+
+    throw "-runModal is unimplemented.";
+}
+
+- (CPArray)URLs
+{
+    return _URLs;
+}
+
+@end

AppKit/CPOutlineView.j

@@ -0,0 +1,853 @@
+/*
+ * CPOutlineView.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2009, 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 "CPTableColumn.j"
+@import "CPTableView.j"
+
+#include "CoreGraphics/CGGeometry.h"
+
+
+CPOutlineViewColumnDidMoveNotification          = @"CPOutlineViewColumnDidMoveNotification";
+CPOutlineViewColumnDidResizeNotification        = @"CPOutlineViewColumnDidResizeNotification";
+CPOutlineViewItemDidCollapseNotification        = @"CPOutlineViewItemDidCollapseNotification";
+CPOutlineViewItemDidExpandNotification          = @"CPOutlineViewItemDidExpandNotification";
+CPOutlineViewItemWillCollapseNotification       = @"CPOutlineViewItemWillCollapseNotification";
+CPOutlineViewItemWillExpandNotification         = @"CPOutlineViewItemWillExpandNotification";
+CPOutlineViewSelectionDidChangeNotification     = @"CPOutlineViewSelectionDidChangeNotification";
+CPOutlineViewSelectionIsChangingNotification    = @"CPOutlineViewSelectionIsChangingNotification";
+
+var CPOutlineViewDataSource_outlineView_setObjectValue_forTableColumn_byItem_                       = 1 << 1,
+    CPOutlineViewDataSource_outlineView_shouldDeferDisplayingChildrenOfItem_                        = 1 << 2,
+
+    CPOutlineViewDataSource_outlineView_acceptDrop_item_childIndex_                                 = 1 << 3,
+    CPOutlineViewDataSource_outlineView_validateDrop_proposedItem_proposedChildIndex_               = 1 << 4,
+    CPOutlineViewDataSource_outlineView_validateDrop_proposedRow_proposedDropOperation_             = 1 << 5,
+    CPOutlineViewDataSource_outlineView_namesOfPromisedFilesDroppedAtDestination_forDraggedItems_   = 1 << 6,
+
+    CPOutlineViewDataSource_outlineView_itemForPersistentObject_                                    = 1 << 7,
+    CPOutlineViewDataSource_outlineView_persistentObjectForItem_                                    = 1 << 8,
+
+    CPOutlineViewDataSource_outlineView_writeItems_toPasteboard_                                    = 1 << 9,
+
+    CPOutlineViewDataSource_outlineView_sortDescriptorsDidChange_                                   = 1 << 10;
+
+@implementation CPOutlineView : CPTableView
+{
+    id              _outlineViewDataSource;
+    id              _outlineViewDelegate;
+    CPTableColumn   _outlineTableColumn;
+
+    float           _indentationPerLevel;
+    BOOL            _indentationMarkerFollowsDataView;
+
+    CPInteger       _implementedOutlineViewDataSourceMethods;
+
+    Object          _rootItemInfo;
+    CPMutableArray  _itemsForRows;
+    Object          _itemInfosForItems;
+
+    CPControl       _disclosureControlPrototype;
+    CPArray         _disclosureControlsForRows;
+    CPData          _disclosureControlData;
+    CPArray         _disclosureControlQueue;
+}
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    self = [super initWithFrame:aFrame];
+
+    if (self)
+    {
+        // The root item has weight "0", thus represents the weight solely of its descendants.
+        _rootItemInfo = { isExpanded:YES, isExpandable:NO, level:-1, row:-1, children:[], weight:0 };
+
+        _itemsForRows = [];
+        _itemInfosForItems = { };
+        _disclosureControlsForRows = [];
+
+        [self setIndentationPerLevel:16.0];
+        [self setIndentationMarkerFollowsDataView:YES];
+
+        [super setDataSource:[[_CPOutlineViewTableViewDataSource alloc] initWithOutlineView:self]];
+
+        [self setDisclosureControlPrototype:[[CPDisclosureButton alloc] initWithFrame:CGRectMake(0.0, 0.0, 10.0, 10.0)]];
+    }
+
+    return self;
+}
+
+- (void)setDataSource:(id)aDataSource
+{
+    if (_outlineViewDataSource === aDataSource)
+        return;
+
+    if (![aDataSource respondsToSelector:@selector(outlineView:child:ofItem:)])
+        [CPException raise:CPInternalInconsistencyException reason:"Data source must implement 'outlineView:child:ofItem:'"];
+
+    if (![aDataSource respondsToSelector:@selector(outlineView:isItemExpandable:)])
+        [CPException raise:CPInternalInconsistencyException reason:"Data source must implement 'outlineView:isItemExpandable:'"];
+
+    if (![aDataSource respondsToSelector:@selector(outlineView:numberOfChildrenOfItem:)])
+        [CPException raise:CPInternalInconsistencyException reason:"Data source must implement 'outlineView:numberOfChildrenOfItem:'"];
+
+    if (![aDataSource respondsToSelector:@selector(outlineView:objectValueForTableColumn:byItem:)])
+        [CPException raise:CPInternalInconsistencyException reason:"Data source must implement 'outlineView:objectValueForTableColumn:byItem:'"];
+
+    _outlineViewDataSource = aDataSource;
+    _implementedOutlineViewDataSourceMethods = 0;
+
+    if ([_outlineViewDataSource respondsToSelector:@selector(outlineView:setObjectValue:forTableColumn:byItem:)])
+        _implementedOutlineViewDataSourceMethods |= CPOutlineViewDataSource_outlineView_setObjectValue_forTableColumn_byItem_;
+
+    if ([_outlineViewDataSource respondsToSelector:@selector(outlineView:shouldDeferDisplayingChildrenOfItem:)])
+        _implementedOutlineViewDataSourceMethods |= CPOutlineViewDataSource_outlineView_shouldDeferDisplayingChildrenOfItem_;
+
+    if ([_outlineViewDataSource respondsToSelector:@selector(outlineView:acceptDrop:item:childIndex:)])
+        _implementedOutlineViewDataSourceMethods |= CPOutlineViewDataSource_outlineView_acceptDrop_item_childIndex_;
+
+    if ([_outlineViewDataSource respondsToSelector:@selector(outlineView:validateDrop:proposedItem:proposedChildIndex:)])
+        _implementedOutlineViewDataSourceMethods |= CPOutlineViewDataSource_outlineView_validateDrop_proposedItem_proposedChildIndex_;
+
+    if ([_outlineViewDataSource respondsToSelector:@selector(outlineView:validateDrop:proposedRow:proposedDropOperation:)])
+        _implementedOutlineViewDataSourceMethods |= CPOutlineViewDataSource_outlineView_validateDrop_proposedRow_proposedDropOperation_;
+
+    if ([_outlineViewDataSource respondsToSelector:@selector(outlineView:namesOfPromisedFilesDroppedAtDestination:forDraggedItems:)])
+        _implementedOutlineViewDataSourceMethods |= CPOutlineViewDataSource_outlineView_namesOfPromisedFilesDroppedAtDestination_forDraggedItems_;
+
+    if ([_outlineViewDataSource respondsToSelector:@selector(outlineView:itemForPersistentObject:)])
+        _implementedOutlineViewDataSourceMethods |= CPOutlineViewDataSource_outlineView_itemForPersistentObject_;
+
+    if ([_outlineViewDataSource respondsToSelector:@selector(outlineView:persistentObjectForItem:)])
+        _implementedOutlineViewDataSourceMethods |= CPOutlineViewDataSource_outlineView_persistentObjectForItem_;
+
+    if ([_outlineViewDataSource respondsToSelector:@selector(outlineView:writeItems:toPasteboard:)])
+        _implementedOutlineViewDataSourceMethods |= CPOutlineViewDataSource_outlineView_writeItems_toPasteboard_;
+
+    if ([_outlineViewDataSource respondsToSelector:@selector(outlineView:sortDescriptorsDidChange:)])
+        _implementedOutlineViewDataSourceMethods |= CPOutlineViewDataSource_outlineView_sortDescriptorsDidChange_;
+
+    [self reloadData];
+}
+
+- (id)dataSource
+{
+    return _outlineViewDataSource;
+}
+
+- (BOOL)isExpandable:(id)anItem
+{
+    if (!anItem)
+        return YES;
+
+    var itemInfo = _itemInfosForItems[[anItem UID]];
+
+    if (!itemInfo)
+        return NO;
+
+    return itemInfo.isExpandable;
+}
+
+- (void)isItemExpanded:(id)anItem
+{
+    if (!anItem)
+        return YES;
+
+    var itemInfo = _itemInfosForItems[[anItem UID]];
+
+    if (!itemInfo)
+        return NO;
+
+    return itemInfo.isExpanded;
+}
+
+- (void)expandItem:(id)anItem
+{
+    if (!anItem)
+        return;
+
+    var itemInfo = _itemInfosForItems[[anItem UID]];
+
+    if (!itemInfo)
+        return;
+
+    if (itemInfo.isExpanded)
+        return;
+
+    itemInfo.isExpanded = YES;
+
+    [self reloadItem:anItem reloadChildren:YES];
+}
+
+- (void)collapseItem:(id)anItem
+{
+    if (!anItem)
+        return;
+
+    var itemInfo = _itemInfosForItems[[anItem UID]];
+
+    if (!itemInfo)
+        return;
+
+    if (!itemInfo.isExpanded)
+        return;
+
+    itemInfo.isExpanded = NO;
+
+    [self reloadItem:anItem reloadChildren:YES];
+}
+
+- (void)reloadItem:(id)anItem
+{
+    [self reloadItem:anItem reloadChildren:NO];
+}
+
+- (void)reloadItem:(id)anItem reloadChildren:(BOOL)shouldReloadChildren
+{
+    if (!!shouldReloadChildren || !anItem)
+        _loadItemInfoForItem(self, anItem);
+    else
+        _reloadItem(self, anItem);
+
+    [super reloadData];
+}
+
+- (id)itemAtRow:(CPInteger)aRow
+{
+    return _itemsForRows[aRow] || nil;
+}
+
+- (CPInteger)rowForItem:(id)anItem
+{
+    if (!anItem)
+        return _rootItemInfo.row;
+
+    var itemInfo = _itemInfosForItems[[anItem UID]];
+
+    if (!itemInfo)
+        return CPNotFound;
+
+    return itemInfo.row;
+}
+
+- (void)setOutlineTableColumn:(CPTableColumn)aTableColumn
+{
+    if (_outlineTableColumn === aTableColumn)
+        return;
+
+    _outlineTableColumn = aTableColumn;
+
+    // FIXME: efficiency.
+    [self reloadData];
+}
+
+- (CPTableColumn)outlineTableColumn
+{
+    return _outlineTableColumn;
+}
+
+- (CPInteger)levelForItem:(id)anItem
+{
+    if (!anItem)
+        return _rootItemInfo.level;
+
+    var itemInfo = _itemInfosForItems[[anItem UID]];
+
+    if (!itemInfo)
+        return CPNotFound;
+
+    return itemInfo.level;
+}
+
+- (CPInteger)levelForRow:(CPInteger)aRow
+{
+    return [self levelForItem:[self itemAtRow:aRow]];
+}
+
+- (void)setIndentationPerLevel:(float)anIndentationWidth
+{
+    if (_indentationPerLevel === anIndentationWidth)
+        return;
+
+    _indentationPerLevel = anIndentationWidth;
+
+    // FIXME: efficiency!!!!
+    [self reloadData];
+}
+
+- (float)indentationPerLevel
+{
+    return _indentationPerLevel;
+}
+
+- (void)setIndentationMarkerFollowsDataView:(BOOL)indentationMarkerShouldFollowDataView
+{
+    if (_indentationMarkerFollowsDataView === indentationMarkerShouldFollowDataView)
+        return;
+
+    _indentationMarkerFollowsDataView = indentationMarkerShouldFollowDataView;
+
+    // !!!!
+    [self reloadData];
+}
+
+- (BOOL)indentationMarkerFollowsDataView
+{
+    return _indentationMarkerFollowsDataView;
+}
+
+- (id)parentForItem:(id)anItem
+{
+    if (!anItem)
+        return nil;
+
+    var itemInfo = _itemInfosForItems[[anItem UID]];
+
+    if (!itemInfo)
+        return nil;
+
+    return itemInfo.parent;
+}
+
+- (CGRect)frameOfOutlineDataViewAtColumn:(CPInteger)aColumn row:(CPInteger)aRow
+{
+    var frame = [super frameOfDataViewAtColumn:aColumn row:aRow],
+        indentationWidth = ([self levelForRow:aRow] + 1) * [self indentationPerLevel];
+
+    frame.origin.x += indentationWidth;
+    frame.size.width -= indentationWidth;
+
+    return frame;
+}
+
+- (void)setDelegate:(id)aDelegate
+{
+    if (_outlineViewDelegate === aDelegate)
+        return;
+
+    var defaultCenter = [CPNotificationCenter defaultCenter];
+
+    if (_outlineViewDelegate)
+    {
+        if ([_outlineViewDelegate respondsToSelector:@selector(outlineViewColumnDidMove:)])
+            [defaultCenter
+                removeObserver:_outlineViewDelegate
+                          name:CPOutlineViewColumnDidMoveNotification
+                        object:self];
+
+        if ([_outlineViewDelegate respondsToSelector:@selector(outlineViewColumnDidResize:)])
+            [defaultCenter
+                removeObserver:_outlineViewDelegate
+                          name:CPOutlineViewColumnDidResizeNotification
+                        object:self];
+
+        if ([_outlineViewDelegate respondsToSelector:@selector(outlineViewSelectionDidChange:)])
+            [defaultCenter
+                removeObserver:_outlineViewDelegate
+                          name:CPOutlineViewSelectionDidChangeNotification
+                        object:self];
+
+        if ([_outlineViewDelegate respondsToSelector:@selector(outlineViewSelectionIsChanging:)])
+            [defaultCenter
+                removeObserver:_outlineViewDelegate
+                          name:CPOutlineViewSelectionIsChangingNotification
+                        object:self];
+    }
+
+    _outlineViewDelegate = aDelegate;/*
+    _implementedDelegateMethods = 0;
+
+    if ([_outlineViewDelegate respondsToSelector:@selector(selectionShouldChangeInTableView:)])
+        _implementedDelegateMethods |= CPTableViewDelegate_selectionShouldChangeInTableView_;
+
+    if ([_outlineViewDelegate respondsToSelector:@selector(tableView:dataViewForTableColumn:row:)])
+        _implementedDelegateMethods |= CPTableViewDelegate_tableView_dataViewForTableColumn_row_;
+
+    if ([_outlineViewDelegate respondsToSelector:@selector(tableView:didClickTableColumn:)])
+        _implementedDelegateMethods |= CPTableViewDelegate_tableView_didClickTableColumn_;
+
+    if ([_outlineViewDelegate respondsToSelector:@selector(tableView:didDragTableColumn:)])
+        _implementedDelegateMethods |= CPTableViewDelegate_tableView_didDragTableColumn_;
+
+    if ([_outlineViewDelegate respondsToSelector:@selector(tableView:heightOfRow:)])
+        _implementedDelegateMethods |= CPTableViewDelegate_tableView_heightOfRow_;
+
+    if ([_outlineViewDelegate respondsToSelector:@selector(tableView:isGroupRow:)])
+        _implementedDelegateMethods |= CPTableViewDelegate_tableView_isGroupRow_;
+
+    if ([_outlineViewDelegate respondsToSelector:@selector(tableView:mouseDownInHeaderOfTableColumn:)])
+        _implementedDelegateMethods |= CPTableViewDelegate_tableView_mouseDownInHeaderOfTableColumn_;
+
+    if ([_outlineViewDelegate respondsToSelector:@selector(tableView:nextTypeSelectMatchFromRow:toRow:forString:)])
+        _implementedDelegateMethods |= CPTableViewDelegate_tableView_nextTypeSelectMatchFromRow_toRow_forString_;
+
+    if ([_outlineViewDelegate respondsToSelector:@selector(tableView:selectionIndexesForProposedSelection:)])
+        _implementedDelegateMethods |= CPTableViewDelegate_tableView_selectionIndexesForProposedSelection_;
+
+    if ([_outlineViewDelegate respondsToSelector:@selector(tableView:shouldEditTableColumn:row:)])
+        _implementedDelegateMethods |= CPTableViewDelegate_tableView_shouldEditTableColumn_row_;
+
+    if ([_outlineViewDelegate respondsToSelector:@selector(tableView:shouldSelectRow:)])
+        _implementedDelegateMethods |= CPTableViewDelegate_tableView_shouldSelectRow_;
+
+    if ([_outlineViewDelegate respondsToSelector:@selector(tableView:shouldSelectTableColumn:)])
+        _implementedDelegateMethods |= CPTableViewDelegate_tableView_shouldSelectTableColumn_;
+
+    if ([_outlineViewDelegate respondsToSelector:@selector(tableView:shouldShowViewExpansionForTableColumn:row:)])
+        _implementedDelegateMethods |= CPTableViewDelegate_tableView_shouldShowViewExpansionForTableColumn_row_;
+
+    if ([_outlineViewDelegate respondsToSelector:@selector(tableView:shouldTrackView:forTableColumn:row:)])
+        _implementedDelegateMethods |= CPTableViewDelegate_tableView_shouldTrackView_forTableColumn_row_;
+
+    if ([_outlineViewDelegate respondsToSelector:@selector(tableView:shouldTypeSelectForEvent:withCurrentSearchString:)])
+        _implementedDelegateMethods |= CPTableViewDelegate_tableView_shouldTypeSelectForEvent_withCurrentSearchString_;
+
+    if ([_outlineViewDelegate respondsToSelector:@selector(tableView:toolTipForView:rect:tableColumn:row:mouseLocation:)])
+        _implementedDelegateMethods |= CPTableViewDelegate_tableView_toolTipForView_rect_tableColumn_row_mouseLocation_;
+
+    if ([_outlineViewDelegate respondsToSelector:@selector(tableView:typeSelectStringForTableColumn:row:)])
+        _implementedDelegateMethods |= CPTableViewDelegate_tableView_typeSelectStringForTableColumn_row_;
+
+    if ([_outlineViewDelegate respondsToSelector:@selector(tableView:willDisplayView:forTableColumn:row:)])
+        _implementedDelegateMethods |= CPTableViewDelegate_tableView_willDisplayView_forTableColumn_row_;
+*/
+    if ([_outlineViewDelegate respondsToSelector:@selector(outlineViewColumnDidMove:)])
+        [defaultCenter
+            addObserver:_outlineViewDelegate
+            selector:@selector(outlineViewColumnDidMove:)
+            name:CPOutlineViewColumnDidMoveNotification
+            object:self];
+
+    if ([_outlineViewDelegate respondsToSelector:@selector(outlineViewColumnDidResize:)])
+        [defaultCenter
+            addObserver:_outlineViewDelegate
+            selector:@selector(outlineViewColumnDidMove:)
+            name:CPOutlineViewColumnDidResizeNotification
+            object:self];
+
+    if ([_outlineViewDelegate respondsToSelector:@selector(outlineViewSelectionDidChange:)])
+        [defaultCenter
+            addObserver:_outlineViewDelegate
+            selector:@selector(outlineViewSelectionDidChange:)
+            name:CPOutlineViewSelectionDidChangeNotification
+            object:self];
+
+    if ([_outlineViewDelegate respondsToSelector:@selector(outlineViewSelectionIsChanging:)])
+        [defaultCenter
+            addObserver:_outlineViewDelegate
+            selector:@selector(outlineViewSelectionIsChanging:)
+            name:CPOutlineViewSelectionIsChangingNotification
+            object:self];
+}
+
+- (id)delegate
+{
+    return _outlineViewDelegate;
+}
+
+- (void)setDisclosureControlPrototype:(CPControl)aControl
+{
+    _disclosureControlPrototype = aControl;
+    _disclosureControlData = nil;
+    _disclosureControlQueue = [];
+
+    // fIXME: reall?
+    [self reloadData];
+}
+
+- (void)reloadData
+{
+    [self reloadItem:nil reloadChildren:YES];
+}
+
+- (CGRect)frameOfDataViewAtColumn:(CPInteger)aColumn row:(CPInteger)aRow
+{
+    var tableColumn = [self tableColumns][aColumn];
+
+    if (tableColumn === _outlineTableColumn)
+        return [self frameOfOutlineDataViewAtColumn:aColumn row:aRow];
+
+    return [super frameOfDataViewAtColumn:aColumn row:aRow];
+}
+
+- (void)_loadDataViewsInRows:(CPIndexSet)rows columns:(CPIndexSet)columns
+{
+    [super _loadDataViewsInRows:rows columns:columns];
+
+    var outlineColumn = [[self tableColumns] indexOfObjectIdenticalTo:[self outlineTableColumn]];
+
+    if (![columns containsIndex:outlineColumn])
+        return;
+
+    var rowArray = [];
+
+    [rows getIndexes:rowArray maxCount:-1 inIndexRange:nil];
+
+    var rowIndex = 0,
+        rowsCount = rowArray.length;
+
+    for (; rowIndex < rowsCount; ++rowIndex)
+    {
+        var row = rowArray[rowIndex],
+            item = _itemsForRows[row],
+            isExpandable = [self isExpandable:item];
+
+       if (!isExpandable)
+            continue;
+
+        var control = [self _dequeueDisclosureControl],
+            frame = [control frame],
+            dataViewFrame = [self frameOfDataViewAtColumn:outlineColumn row:row];
+
+        frame.origin.x = _indentationMarkerFollowsDataView ? _CGRectGetMinX(dataViewFrame) - _CGRectGetWidth(frame) : 0.0;
+        frame.origin.y = _CGRectGetMinY(dataViewFrame);
+        frame.size.height = _CGRectGetHeight(dataViewFrame);
+        // FIXME: center instead?
+        //frame.origin.y = _CGRectGetMidY(dataViewFrame) - _CGRectGetHeight(frame) / 2.0;
+
+        _disclosureControlsForRows[row] = control;
+
+        [control setState:[self isItemExpanded:item] ? CPOnState : CPOffState];
+        [control setFrame:frame];
+
+        [self addSubview:control];
+    }
+}
+
+- (void)_unloadDataViewsInRows:(CPIndexSet)rows columns:(CPIndexSet)columns
+{
+    [super _unloadDataViewsInRows:rows columns:columns];
+
+    var outlineColumn = [[self tableColumns] indexOfObjectIdenticalTo:[self outlineTableColumn]];
+
+    if (![columns containsIndex:outlineColumn])
+        return;
+
+    var rowArray = [];
+
+    [rows getIndexes:rowArray maxCount:-1 inIndexRange:nil];
+
+    var rowIndex = 0,
+        rowsCount = rowArray.length;
+
+    for (; rowIndex < rowsCount; ++rowIndex)
+    {
+        var row = rowArray[rowIndex],
+            control = _disclosureControlsForRows[row];
+
+        if (!control)
+            continue;
+
+        [control removeFromSuperview];
+
+        [self _enqueueDisclosureControl:control];
+
+        _disclosureControlsForRows[row] = nil;
+    }
+}
+
+- (void)_toggleFromDisclosureControl:(CPControl)aControl
+{
+    var controlFrame = [aControl frame],
+        item = [self itemAtRow:[self rowAtPoint:_CGPointMake(_CGRectGetMinX(controlFrame), _CGRectGetMidY(controlFrame))]];
+
+    if ([self isItemExpanded:item])
+        [self collapseItem:item];
+
+    else
+        [self expandItem:item];
+}
+
+- (void)_enqueueDisclosureControl:(CPControl)aControl
+{
+    _disclosureControlQueue.push(aControl);
+}
+
+- (CPControl)_dequeueDisclosureControl
+{
+    if (_disclosureControlQueue.length)
+        return _disclosureControlQueue.pop();
+
+    if (!_disclosureControlData)
+        if (!_disclosureControlPrototype)
+            return nil;
+        else
+            _disclosureControlData = [CPKeyedArchiver archivedDataWithRootObject:_disclosureControlPrototype];
+
+    var disclosureControl = [CPKeyedUnarchiver unarchiveObjectWithData:_disclosureControlData];
+
+    [disclosureControl setTarget:self];
+    [disclosureControl setAction:@selector(_toggleFromDisclosureControl:)];
+
+    return disclosureControl;
+}
+
+- (void)_noteSelectionIsChanging
+{
+    [[CPNotificationCenter defaultCenter]
+        postNotificationName:CPOutlineViewSelectionIsChangingNotification
+                      object:self
+                    userInfo:nil];
+}
+
+- (void)_noteSelectionDidChange
+{
+    [[CPNotificationCenter defaultCenter]
+        postNotificationName:CPOutlineViewSelectionDidChangeNotification
+                      object:self
+                    userInfo:nil];
+}
+
+@end
+
+var _reloadItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anItem)
+{
+    if (!anItem)
+        return;
+
+    // Get the existing info if it exists.
+    var itemInfosForItems = anOutlineView._itemInfosForItems,
+        dataSource = anOutlineView._outlineViewDataSource,
+        itemUID = [anItem UID],
+        itemInfo = itemInfosForItems[itemUID];
+
+    // If we're not in the tree, then just bail.
+    if (!itemInfo)
+        return [];
+
+    // See if the item itself can be swapped out.
+    var parent = itemInfo.parent,
+        parentItemInfo = parent ? itemInfosForItems[[parent UID]] : anOutlineView._rootItemInfo,
+        parentChildren = parentItemInfo.children,
+        index = [parentChildren indexOfObjectIdenticalTo:anItem],
+        newItem = [dataSource outlineView:anOutlineView child:index ofItem:parent];
+
+    if (anItem !== newItem)
+    {
+        itemInfosForItems[[anItem UID]] = nil;
+        itemInfosForItems[[newItem UID]] = itemInfo;
+
+        parentChildren[index] = newItem;
+        anOutlineView._itemsForRows[itemInfo.row] = newItem;
+    }
+
+    itemInfo.isExpandable = [dataSource outlineView:anOutlineView isItemExpandable:newItem];
+    itemInfo.isExpanded = itemInfo.isExpandable && itemInfo.isExpanded;
+}
+
+var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anItem,  /*BOOL*/ isIntermediate)
+{
+    var itemInfosForItems = anOutlineView._itemInfosForItems,
+        dataSource = anOutlineView._outlineViewDataSource;
+
+    if (!anItem)
+        var itemInfo = anOutlineView._rootItemInfo;
+
+    else
+    {
+        // Get the existing info if it exists.
+        var itemUID = [anItem UID],
+            itemInfo = itemInfosForItems[itemUID];
+
+        // If we're not in the tree, then just bail.
+        if (!itemInfo)
+            return [];
+
+        itemInfo.isExpandable = [dataSource outlineView:anOutlineView isItemExpandable:anItem];
+
+        // If we were previously expanded, but now no longer expandable, "de-expand".
+        // NOTE: we are *not* collapsing, thus no notification is posted.
+        if (!itemInfo.isExpandable && itemInfo.isExpanded)
+        {
+            itemInfo.isExpanded = NO;
+            itemInfo.children = [];
+        }
+    }
+
+    // The root item does not count as a descendant.
+    var weight = itemInfo.weight,
+        descendants = anItem ? [anItem] : [];
+
+    if (itemInfo.isExpanded && (!(anOutlineView._implementedOutlineViewDataSourceMethods & CPOutlineViewDataSource_outlineView_shouldDeferDisplayingChildrenOfItem_) ||
+        ![dataSource outlineView:anOutlineView shouldDeferDisplayingChildrenOfItem:anItem]))
+    {
+        var index = 0,
+            count = [dataSource outlineView:anOutlineView numberOfChildrenOfItem:anItem],
+            level = itemInfo.level + 1;
+
+        itemInfo.children = [];
+
+        for (; index < count; ++index)
+        {
+            var childItem = [dataSource outlineView:anOutlineView child:index ofItem:anItem],
+                childItemInfo = itemInfosForItems[[childItem UID]];
+
+            if (!childItemInfo)
+            {
+                childItemInfo = { isExpanded:NO, isExpandable:NO, children:[], weight:1 };
+                itemInfosForItems[[childItem UID]] = childItemInfo;
+            }
+
+            itemInfo.children[index] = childItem;
+
+            var childDescendants = _loadItemInfoForItem(anOutlineView, childItem, YES);
+
+            childItemInfo.parent = anItem;
+            childItemInfo.level = level;
+            descendants = descendants.concat(childDescendants);
+        }
+    }
+
+    itemInfo.weight = descendants.length;
+
+    if (!isIntermediate)
+    {
+        // row = -1 is the root item, so just go to row 0 since it is ignored.
+        var index = MAX(itemInfo.row, 0),
+            itemsForRows = anOutlineView._itemsForRows;
+
+        descendants.unshift(index, weight);
+
+        itemsForRows.splice.apply(itemsForRows, descendants);
+
+        var count = itemsForRows.length;
+
+        for (; index < count; ++index)
+            itemInfosForItems[[itemsForRows[index] UID]].row = index;
+
+        var deltaWeight = itemInfo.weight - weight;
+
+        if (deltaWeight !== 0)
+        {
+            var parent = itemInfo.parent;
+
+            while (parent)
+            {
+                var parentItemInfo = itemInfosForItems[[parent UID]];
+
+                parentItemInfo.weight += deltaWeight;
+                parent = parentItemInfo.parent;
+            }
+
+            if (anItem)
+                anOutlineView._rootItemInfo.weight += deltaWeight;
+        }
+    }
+
+    return descendants;
+}
+
+@implementation _CPOutlineViewTableViewDataSource : CPObject
+{
+    CPObject _outlineView;
+}
+
+- (id)initWithOutlineView:(CPOutlineView)anOutlineView
+{
+    self = [super init];
+
+    if (self)
+        _outlineView = anOutlineView;
+
+    return self;
+}
+
+- (CPInteger)numberOfRowsInTableView:(CPTableView)anOutlineView
+{
+    return _outlineView._itemsForRows.length;
+}
+
+- (id)tableView:(CPTableView)aTableView objectValueForTableColumn:(CPTableColumn)aTableColumn row:(CPInteger)aRow
+{
+    return [_outlineView._outlineViewDataSource outlineView:_outlineView objectValueForTableColumn:aTableColumn byItem:_outlineView._itemsForRows[aRow]];
+}
+
+@end
+
+@implementation _CPOutlineViewTableViewDelegate : CPObject
+{
+    CPOutlineView   _outlineView;
+}
+
+- (id)initWithOutlineView:(CPOutlineView)anOutlineView
+{
+    self = [super init];
+
+    if (self)
+        _outlineView = anOutlineView;
+
+    return self;
+}
+
+@end
+
+@implementation CPDisclosureButton : CPButton
+{
+    float _angle;
+}
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    self = [super initWithFrame:aFrame];
+
+    if (self)
+        [self setBordered:NO];
+
+    return self;
+}
+
+- (void)setState:(CPState)aState
+{
+    [super setState:aState];
+
+    if ([self state] === CPOnState)
+        _angle = 0.0;
+
+    else
+        _angle = -PI_2;
+}
+
+- (void)drawRect:(CGRect)aRect
+{
+    var bounds = [self bounds],
+        context = [[CPGraphicsContext currentContext] graphicsPort];
+
+    CGContextBeginPath(context);
+
+    CGContextTranslateCTM(context, _CGRectGetWidth(bounds) / 2.0, _CGRectGetHeight(bounds) / 2.0);
+    CGContextRotateCTM(context, _angle);
+    CGContextTranslateCTM(context, -_CGRectGetWidth(bounds) / 2.0, -_CGRectGetHeight(bounds) / 2.0);
+
+    // Center, but crisp.
+    CGContextTranslateCTM(context, FLOOR((_CGRectGetWidth(bounds) - 9.0) / 2.0), FLOOR((_CGRectGetHeight(bounds) - 8.0) / 2.0));
+
+    CGContextMoveToPoint(context, 0.0, 0.0);
+    CGContextAddLineToPoint(context, 9.0, 0.0);
+    CGContextAddLineToPoint(context, 4.5, 8.0);
+    CGContextAddLineToPoint(context, 0.0, 0.0);
+
+    CGContextClosePath(context);
+
+    CGContextSetFillColor(context, ([self themeState] & CPThemeState("highlighted")) ? [CPColor blackColor] : [CPColor grayColor]);
+    CGContextFillPath(context);
+}
+
+@end

AppKit/CPPanel.j

@@ -0,0 +1,117 @@
+/*
+ * CPPanel.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 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 "CPWindow.j"
+
+
+CPOKButton      = 1;
+CPCancelButton  = 0;
+
+/*! 
+    @ingroup appkit
+    @class CPPanel
+
+    The CPPanel class defines objects that manage the panels of the Cappuccino user interface. A panel is a window that serves an auxiliary function within an application. It generally displays controls that the user can act on to give instructions to the application or to modify the contents of a standard window.</p>
+
+<p>Panels behave differently from standard windows in only a small number of ways, but the ways are important to the user interface:</p>
+
+<ul>
+    <li>Panels can assume key window status but not main window status. (The key window receives keyboard events. The main window is the primary focus of user actions; it might contain the document the user is working on, for example.)</li>
+</ul>
+
+<p>To aid in their auxiliary role, panels can be assigned special behaviors:</p>
+
+<ul>
+    <li>A panel can be precluded from becoming the key window until the user makes a selection (makes some view in the panel the first responder) indicating an intention to begin typing. This prevents key window status from shifting to the panel unnecessarily.</li>
+    <li>Palettes and similar panels can be made to float above standard windows and other panels. This prevents them from being covered and keeps them readily available to the user.</li>
+    <li>A panel can be made to work even when there's an attention panel on-screen. This permits actions within the panel to affect the attention panel.</li>
+</ul>
+*/
+
+/*
+    @global
+    @class CPWindow
+*/
+CPDocModalWindowMask			= 1 << 6;
+
+@implementation CPPanel : CPWindow
+{
+    BOOL    _becomesKeyOnlyIfNeeded;
+    BOOL    _worksWhenModal;
+}
+
+/*!
+    Returns \c YES if the receiver is a floating panel (like a palette).
+*/
+- (BOOL)isFloatingPanel
+{
+    return [self level] == CPFloatingWindowLevel;
+}
+
+/*!
+    Sets the receiver to be a floating panel. \c YES
+    makes the window a floating panel. \c NO makes it a normal window.
+    @param isFloatingPanel specifies whether to make it floating
+*/
+- (void)setFloatingPanel:(BOOL)isFloatingPanel
+{
+    [self setLevel:isFloatingPanel ? CPFloatingWindowLevel : CPNormalWindowLevel];
+}
+
+/*!
+    Returns \c YES if the window only becomes key
+    if needed. \c NO means it behaves just like other windows.
+*/
+- (BOOL)becomesKeyOnlyIfNeeded
+{
+    return _becomesKeyOnlyIfNeeded;
+}
+
+/*!
+    Sets whether the the window becomes key only if needed.
+    @param shouldBecomeKeyOnlyIfNeeded \c YES makes the window become key only if needed
+*/
+- (void)setBecomesKeyOnlyIfNeeded:(BOOL)shouldBecomeKeyOnlyIfNeeded
+{
+    _becomesKeyOnlyIfNeeded = shouldBecomeKeyOnlyIfNeeded
+}
+
+- (BOOL)worksWhenModal
+{
+    return _worksWhenModal;
+}
+
+/*!
+    Sets whether this window can receive input while another window is running modally.
+    @param shouldWorkWhenModal whether to receive input while another window is modal
+*/
+- (void)setWorksWhenModal:(BOOL)shouldWorkWhenModal
+{
+    _worksWhenModal = shouldWorkWhenModal;
+}
+
+- (BOOL)canBecomeMainWindow
+{
+    return NO;
+}
+
+@end

AppKit/CPPasteboard.j

@@ -0,0 +1,375 @@
+/*
+ * CPPasteboard.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPObject.j>
+@import <Foundation/CPArray.j>
+@import <Foundation/CPDictionary.j>
+@import <Foundation/CPPropertyListSerialization.j>
+
+#include "Platform/Platform.h"
+
+
+CPGeneralPboard         = @"CPGeneralPboard";
+CPFontPboard            = @"CPFontPboard";
+CPRulerPboard           = @"CPRulerPboard";
+CPFindPboard            = @"CPFindPboard";
+CPDragPboard            = @"CPDragPboard";
+
+CPColorPboardType       = @"CPColorPboardType";
+CPFilenamesPboardType   = @"CPFilenamesPboardType";
+CPFontPboardType        = @"CPFontPboardType";
+CPHTMLPboardType        = @"CPHTMLPboardType";
+CPStringPboardType      = @"CPStringPboardType";
+CPURLPboardType         = @"CPURLPboardType";
+CPImagesPboardType      = @"CPImagesPboardType";
+CPVideosPboardType      = @"CPVideosPboardType";
+
+// Deprecated
+CPImagePboardType       = @"CPImagePboardType";
+
+
+var CPPasteboards = nil;
+
+/*! 
+    @ingroup appkit
+    @class CPPasteboard
+
+    CPPasteBoard is the object responsible for cut/copy/paste and drag&drop operations. 
+*/
+@implementation CPPasteboard : CPObject
+{
+    CPArray         _types;
+    CPDictionary    _owners;
+    CPDictionary    _provided;
+    
+    unsigned        _changeCount;
+    CPString        _stateUID;
+}
+
+/*
+    @ignore
+*/
++ (void)initialize
+{
+    if (self != [CPPasteboard class])
+        return;
+
+    [self setVersion:1.0];
+    
+    CPPasteboards = [CPDictionary dictionary];
+}
+
+/*!
+    Returns a new instance of a pasteboard
+*/
++ (id)generalPasteboard
+{
+    return [CPPasteboard pasteboardWithName:CPGeneralPboard];
+}
+
+/*!
+    Returns a pasteboard with the specified name. If the pasteboard doesn't exist, it will be created.
+    @param aName the name of the pasteboard
+    @return the requested pasteboard
+*/
++ (id)pasteboardWithName:(CPString)aName
+{
+    var pasteboard = [CPPasteboards objectForKey:aName];
+    
+    if (pasteboard)
+        return pasteboard;
+    
+    pasteboard = [[CPPasteboard alloc] _initWithName:aName];
+    [CPPasteboards setObject:pasteboard forKey:aName];
+    
+    return pasteboard;
+}
+
+/* @ignore */
+- (id)_initWithName:(CPString)aName
+{
+    self = [super init];
+    
+    if (self)
+    {
+        _name = aName;
+        _types = [];
+        
+        _owners = [CPDictionary dictionary];
+        _provided = [CPDictionary dictionary];
+        
+        _changeCount = 0;
+    }
+    
+    return self;
+}
+
+/*!
+    Adds supported data types to the pasteboard
+    @param types the data types
+    @param anOwner the object that contains the data types
+    @return the pasteboard's change count
+*/
+- (unsigned)addTypes:(CPArray)types owner:(id)anOwner
+{
+    var i = 0,
+        count = types.length;
+    
+    for (; i < count; ++i)
+    {
+        var type = types[i];
+        
+        if(![_owners objectForKey:type])
+        {
+            [_types addObject:type];
+            [_provided removeObjectForKey:type];
+        }
+        
+        [_owners setObject:anOwner forKey:type];
+    }
+    
+    return ++_changeCount;
+}
+
+/*!
+    Sets the data types that this pasteboard will contain.
+    @param type the data types it will support
+    @param anOwner the object that contains the the data
+    @return the pasteboard's change count
+*/
+- (unsigned)declareTypes:(CPArray)types owner:(id)anOwner
+{
+    [_types setArray:types];
+
+    _owners = [CPDictionary dictionary];
+    _provided = [CPDictionary dictionary];
+
+    var count = _types.length;
+    
+    while (count--)
+        [_owners setObject:anOwner forKey:_types[count]];
+        
+    return ++_changeCount;
+}
+
+/*!
+    Sets the pasteboard data for the specified type
+    @param aData the data
+    @param aType the data type being set
+    @return \c YES if the data was successfully written to the pasteboard
+*/
+- (BOOL)setData:(CPData)aData forType:(CPString)aType
+{
+    [_provided setObject:aData forKey:aType];
+    
+    return YES;
+}
+
+/*!
+    Writes the specified property list as data for the specified type
+    @param aPropertyList the property list to write
+    @param aType the data type
+    @return \c YES if the property list was successfully written to the pasteboard
+*/
+- (BOOL)setPropertyList:(id)aPropertyList forType:(CPString)aType
+{
+    return [self setData:[CPPropertyListSerialization dataFromPropertyList:aPropertyList format:CPPropertyListXMLFormat_v1_0 errorDescription:nil] forType:aType];
+}
+
+/*!
+    Sets the specified string as data for the specified type
+    @param aString the string to write
+    @param aType the data type
+    @return \c YES if the string was successfully written to the pasteboard
+*/
+- (void)setString:(CPString)aString forType:(CPString)aType
+{
+    return [self setPropertyList:aString forType:aType];
+}
+
+// Determining Types
+/*!
+    Checks the pasteboard's types for a match with the types listen in the specified array. The array should
+    be ordered by the requestor's most preferred data type first.
+    @param anArray an array of requested types ordered by preference
+    @return the highest match with the pasteboard's supported types or \c nil if no match was found
+*/
+- (CPString)availableTypeFromArray:(CPArray)anArray
+{
+    return [[self types] firstObjectCommonWithArray:anArray];
+}
+
+/*!
+    Returns the pasteboards supported types
+*/
+- (CPArray)types
+{
+    return _types;
+}
+
+// Reading data
+/*!
+    Returns the number of changes that have occurred to this pasteboard
+*/
+- (unsigned)changeCount
+{
+    return _changeCount;
+}
+
+/*!
+    Returns the pasteboard data for the specified data type
+    @param aType the requested data type
+    @return the requested data or \c nil if the data doesn't exist
+*/
+- (CPData)dataForType:(CPString)aType
+{
+    var data = [_provided objectForKey:aType];
+    
+    if (data)
+        return data;
+        
+    var owner = [_owners objectForKey:aType];
+    
+    if (owner)
+    {
+        [owner pasteboard:self provideDataForType:aType];
+        
+        ++_changeCount;
+        
+        return [_provided objectForKey:aType];
+    }
+    
+    return nil;
+}
+
+/*!
+    Returns the property list for the specified data type
+    @param aType the requested data type
+    @return the property list or \c nil if the list was not found
+*/
+- (id)propertyListForType:(CPString)aType
+{
+    var data = [self dataForType:aType];
+    
+    if (data)
+        return [CPPropertyListSerialization propertyListFromData:data format:CPPropertyListXMLFormat_v1_0 errorDescription:nil];
+        
+    return nil;
+}
+
+/*!
+    Returns the string for the specified data type
+    @param aType the requested data type
+    @return the string or \c nil if the string was not found
+*/
+- (CPString)stringForType:(CPString)aType
+{
+    return [self propertyListForType:aType];
+}
+
+/* @ignore */
+- (CPString)_generateStateUID
+{
+    var bits = 32;
+        
+    _stateUID = @"";
+    
+    while (bits--)
+        _stateUID += FLOOR(RAND() * 16.0).toString(16).toUpperCase();
+
+    return _stateUID;
+}
+
+/* @ignore */
+- (CPString)_stateUID
+{
+    return _stateUID;
+}
+
+@end
+
+#if PLATFORM(DOM)
+
+var DOMDataTransferPasteboard = nil;
+
+@implementation _CPDOMDataTransferPasteboard : CPPasteboard
+{
+    DataTransfer    _dataTransfer;
+}
+
++ (_CPDOMDataTransferPasteboard)DOMDataTransferPasteboard
+{
+    if (!DOMDataTransferPasteboard)
+        DOMDataTransferPasteboard = [[_CPDOMDataTransferPasteboard alloc] init];
+
+    return DOMDataTransferPasteboard;
+}
+
+- (void)_setDataTransfer:(DataTransfer)aDataTransfer
+{
+    _dataTransfer = aDataTransfer;
+}
+
+- (void)_setPasteboard:(CPPasteboard)aPasteboard
+{
+    _dataTransfer.clearData();
+
+    var types = [aPasteboard types],
+        count = types.length;
+
+    while (count--)
+    {
+        var type = types[count];
+
+        if (type === CPStringPboardType)
+            _dataTransfer.setData(type, [aPasteboard stringForType:type]);
+        else
+            _dataTransfer.setData(type, [[aPasteboard dataForType:type] string]);
+    }
+}
+
+- (CPArray)types
+{
+    return Array.prototype.slice.apply(_dataTransfer.types);
+}
+
+- (CPData)dataForType:(CPString)aType
+{
+    var dataString = _dataTransfer.getData(aType);
+
+    if (aType === CPStringPboardType)
+        return [CPData dataFromPropertyList:dataString format:kCFPropertyList280NorthFormat_v1_0 errorDescription:0];
+
+    return [CPData dataWithString:dataString];
+}
+
+- (id)propertyListForType:(CPString)aType
+{
+    if (aType === CPStringPboardType)
+        return _dataTransfer.getData(aType);
+
+    return [CPPropertyListSerialization propertyListFromData:[self dataForType:aType] format:CPPropertyListUnknownFormat errorDescription:nil];
+}
+
+@end
+
+#endif

AppKit/CPPopUpButton.j

@@ -0,0 +1,749 @@
+/*
+ * CPPopUpButton.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 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 "CPButton.j"
+@import "CPGeometry.j"
+@import "CPMenu.j"
+@import "CPMenuItem.j"
+
+#include "CoreGraphics/CGGeometry.h"
+
+
+var VISIBLE_MARGIN  = 7.0;
+
+CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
+
+/*! 
+    @ingroup appkit
+    @class CPPopUpButton
+
+    A CPPopUpButton contains a pop-up menu of items that a user can select from.
+*/
+@implementation CPPopUpButton : CPButton
+{
+    int         _selectedIndex;
+    CPRectEdge  _preferredEdge;
+    
+    CPMenu      _menu;
+}
+
++ (CPString)themeClass
+{
+    return "popup-button";
+}
+
+/*!
+    Initializes the pop-up button to the specified size.
+    @param aFrame the size for the button
+    @param shouldPullDown \c YES makes this a pull-down menu, \c NO makes it a pop-up menu.
+    @return the initialized pop-up button
+*/
+- (id)initWithFrame:(CGRect)aFrame pullsDown:(BOOL)shouldPullDown
+{
+    self = [super initWithFrame:aFrame];
+    
+    if (self)
+    {
+        _selectedIndex = CPNotFound;
+        _preferredEdge = CPMaxYEdge;
+        
+        [self setValue:CPImageLeft forThemeAttribute:@"image-position"];
+        [self setValue:CPLeftTextAlignment forThemeAttribute:@"alignment"];
+        [self setValue:CPLineBreakByTruncatingTail forThemeAttribute:@"line-break-mode"];
+        
+        [self setMenu:[[CPMenu alloc] initWithTitle:@""]];
+
+        [self setPullsDown:shouldPullDown];
+    }
+    
+    return self;
+}
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    return [self initWithFrame:aFrame pullsDown:NO];
+}
+
+// Setting the Type of Menu
+
+/*!
+    Specifies whether the object is a pull-down or a pop-up menu.
+    @param shouldPullDown \c YES makes the pop-up button
+    a pull-down menu. \c NO makes it a pop-up menu.
+*/
+- (void)setPullsDown:(BOOL)shouldPullDown
+{
+    if (shouldPullDown)
+        var changed = [self setThemeState:CPPopUpButtonStatePullsDown];
+    else
+        var changed = [self unsetThemeState:CPPopUpButtonStatePullsDown];
+
+    if (!changed)
+        return;
+
+    var items = [_menu itemArray];
+
+    if ([items count] <= 0)
+        return;
+
+    [items[0] setHidden:[self pullsDown]];
+
+    [self synchronizeTitleAndSelectedItem];
+}
+
+/*!
+    Returns \c YES if the button is a pull-down menu. \c NO if the button is a pop-up menu.
+*/
+- (BOOL)pullsDown
+{
+    return [self hasThemeState:CPPopUpButtonStatePullsDown];
+}
+
+// Inserting and Deleting Items
+
+/*!
+    Adds a new menu item using a CPMenuItem object.
+*/
+- (void)addItem:(CPMenuItem)anItem
+{
+    [_menu addItem:anItem];
+}
+
+/*!
+    Adds a new menu item with the specified title.
+    @param the new menu item's tite
+*/
+- (void)addItemWithTitle:(CPString)aTitle
+{
+    [_menu addItemWithTitle:aTitle action:NULL keyEquivalent:nil];
+}
+
+/*!
+    Adds multiple new menu items with the titles specified in the provided array.
+    @param titles an arry of names for the new items
+*/
+- (void)addItemsWithTitles:(CPArray)titles
+{
+    var index = 0,
+        count = [titles count];
+    
+    for (; index < count; ++index)
+        [self addItemWithTitle:titles[index]];
+}
+
+/*!
+    Inserts a new item with the specified title and index location.
+    @param aTitle the new itme's title
+    @param anIndex the item's index in the menu
+*/
+- (void)insertItemWithTitle:(CPString)aTitle atIndex:(int)anIndex
+{
+    var items = [self itemArray],
+        count = [items count];
+    
+    while (count--)
+        if ([items[count] title] == aTitle)
+            [self removeItemAtIndex:count];
+        
+    [_menu insertItemWithTitle:aTitle action:NULL keyEquivalent:nil atIndex:anIndex];
+}
+
+/*!
+    Removes all menu items from the pop-up button's menu
+*/
+- (void)removeAllItems
+{
+    var count = [_menu numberOfItems];
+    
+    while (count--)
+        [_menu removeItemAtIndex:0];
+}
+
+/*!
+    Removes a menu item with the specified title from the button.
+    @param aTitle the title of the item to remove
+*/
+- (void)removeItemWithTitle:(CPString)aTitle
+{
+    [self removeItemAtIndex:[self indexOfItemWithTitle:aTitle]];
+    [self synchronizeTitleAndSelectedItem];
+}
+
+/*!
+    Removes the menu item at the specified index
+    @param anIndex the index of the item to remove
+*/
+- (void)removeItemAtIndex:(int)anIndex
+{
+    [_menu removeItemAtIndex:anIndex];
+    [self synchronizeTitleAndSelectedItem];
+}
+
+// Getting the User's Selection
+/*!
+    Returns the selected item or \c nil if no item is selected.
+*/
+- (CPMenuItem)selectedItem
+{
+    if (_selectedIndex < 0 || _selectedIndex > [self numberOfItems] - 1)
+        return nil;
+    
+    return [_menu itemAtIndex:_selectedIndex];
+}
+
+/*!
+    Returns the title of the selected item or \c nil if no item is selected.
+*/
+- (CPString)titleOfSelectedItem
+{
+    return [[self selectedItem] title];
+}
+
+/*!
+    Returns the index of the selected item. If no item is selected, it returns CPNotFound.
+*/
+- (int)indexOfSelectedItem
+{
+    return _selectedIndex;
+}
+
+// For us, CPNumber is toll-free bridged to Number, so just return the selected index.
+/*!
+    Returns the selected item's index. If no item is selected, it returns CPNotFound.
+*/
+- (id)objectValue
+{
+    return _selectedIndex;
+}
+
+// Setting the Current Selection
+/*!
+    Selects the specified menu item.
+    @param aMenuItem the item to select
+*/
+- (void)selectItem:(CPMenuItem)aMenuItem
+{
+    [self selectItemAtIndex:[self indexOfItem:aMenuItem]];
+}
+
+/*!
+    Selects the item at the specified index
+    @param anIndex the index of the item to select
+*/
+- (void)selectItemAtIndex:(int)anIndex
+{
+    if (_selectedIndex == anIndex)
+        return;
+    
+    if (_selectedIndex >= 0 && ![self pullsDown])
+        [[self selectedItem] setState:CPOffState];
+    
+    _selectedIndex = anIndex;
+
+    if (_selectedIndex >= 0 && ![self pullsDown])
+        [[self selectedItem] setState:CPOnState];
+    
+    [self synchronizeTitleAndSelectedItem];
+}
+
+/*!
+    Selects the menu item with the specified tag
+    @param the tag of the item to select
+*/
+- (void)selectItemWithTag:(int)aTag
+{
+    [self selectItemAtIndex:[self indexOfItemWithTag:aTag]];
+}
+
+/*!
+    Selects the item with the specified title
+    @param the title of the item to select
+*/
+- (void)selectItemWithTitle:(CPString)aTitle
+{
+    [self selectItemAtIndex:[self indexOfItemWithTitle:aTitle]];
+}
+
+/*!
+    Sets the object for the selected item. If no item is selected, then this method has no effect.
+    @param the object set for the selected item
+*/
+- (void)setObjectValue:(id)aValue
+{
+    [self selectItemAtIndex:[aValue intValue]];
+}
+
+// Getting Menu Items
+/*!
+    Returns the button's menu of items.
+*/
+- (CPMenu)menu
+{
+    return _menu;
+}
+
+/*!
+    Sets the menu for the button
+*/
+- (void)setMenu:(CPMenu)aMenu
+{
+    if (_menu === aMenu)
+        return;
+
+    var defaultCenter = [CPNotificationCenter defaultCenter];
+    
+    if (_menu)
+    {
+        [defaultCenter
+            removeObserver:self
+                      name:CPMenuDidAddItemNotification
+                    object:_menu];
+
+        [defaultCenter
+            removeObserver:self
+                      name:CPMenuDidChangeItemNotification
+                    object:_menu];
+
+        [defaultCenter
+            removeObserver:self
+                      name:CPMenuDidRemoveItemNotification
+                    object:_menu];
+    }
+
+    _menu = aMenu;
+    
+    if (_menu)
+    {
+        [defaultCenter
+            addObserver:self
+              selector:@selector(menuDidAddItem:)
+                  name:CPMenuDidAddItemNotification
+                object:_menu];
+    
+        [defaultCenter
+            addObserver:self
+              selector:@selector(menuDidChangeItem:)
+                  name:CPMenuDidChangeItemNotification
+                object:_menu];
+                
+        [defaultCenter
+            addObserver:self
+              selector:@selector(menuDidRemoveItem:)
+                  name:CPMenuDidRemoveItemNotification
+                object:_menu];
+    }
+    
+    [self synchronizeTitleAndSelectedItem];
+}
+
+/*!
+    Returns a count of the number of items in the button's menu.
+*/
+- (int)numberOfItems
+{
+    return [_menu numberOfItems];
+}
+
+/*!
+    Returns an array of the items in the menu
+*/
+- (CPArray)itemArray
+{
+    return [_menu itemArray];
+}
+
+/*!
+    Returns the item at the specified index or \c nil if the item does not exist.
+    @param anIndex the index of the item to obtain
+*/
+- (CPMenuItem)itemAtIndex:(unsigned)anIndex
+{
+    return [_menu itemAtIndex:anIndex];
+}
+
+/*!
+    Returns the title of the item at the specified index or \c nil if no item exists.
+    @param anIndex the index of the item
+*/
+- (CPString)itemTitleAtIndex:(unsigned)anIndex
+{
+    return [[_menu itemAtIndex:anIndex] title];
+}
+
+/*!
+    Returns an array of all the menu item titles.
+*/
+- (CPArray)itemTitles
+{
+    var titles = [],
+        items = [self itemArray],
+        
+        index = 0,
+        count = [items count];
+    
+    for (; index < count; ++index)
+        items.push([items[index] title]);
+}
+
+/*!
+    Returns the menu item with the specified title.
+    @param aTitle the title of the desired menu item
+*/
+- (CPMenuItem)itemWithTitle:(CPString)aTitle
+{
+    return [_menu itemAtIndex:[_menu indexOfItemWithTitle:aTitle]];
+}
+
+/*!
+    Returns the last menu item
+*/
+- (CPMenuItem)lastItem
+{
+    return [[_menu itemArray] lastObject];
+}
+
+// Getting the Indices of Menu Items
+/*!
+    Returns the index of the specified item or CPNotFound if the item is not in the list.
+    @param aMenuItem the item to obtain the index for
+*/
+- (int)indexOfItem:(CPMenuItem)aMenuItem
+{
+    return [_menu indexOfItem:aMenuItem];
+}
+
+/*!
+    Returns the index of the item with the specified tag or CPNotFound if the item is not in the list.
+    @param aTag the item's tag
+*/
+- (int)indexOfItemWithTag:(int)aTag
+{
+    return [_menu indexOfItemWithTag:aTag];
+}
+
+/*!
+    Returns the index of the item with the specified title or CPNotFound.
+    @param aTitle the item's titel
+*/
+- (int)indexOfItemWithTitle:(CPString)aTitle
+{
+    return [_menu indexOfItemWithTitle:aTitle];
+}
+
+/*!
+    Returns the index of the item with the specified
+    represented object or CPNotFound
+    if a match does not exist.
+    @param anObject the item's represented object
+*/
+- (int)indexOfItemWithRepresentedObject:(id)anObject
+{
+    return [_menu indexOfItemWithRepresentedObject:anObject];
+}
+
+/*!
+    Returns the index of the item with the specified target
+    and action. Returns CPNotFound if the no
+    such item is in the list.
+    @param aTarget the item's target
+    @param anAction the item's action
+*/
+- (int)indexOfItemWithTarget:(id)aTarget action:(SEL)anAction
+{
+    return [_menu indexOfItemWithTarget:aTarget action:anAction];
+}
+
+// Setting the Cell Edge to Pop out in Restricted Situations
+/*!
+    Returns the button's edge where the pop-up menu will be
+    displayed when there is not enough room to display directly
+    above the button.
+*/
+- (CPRectEdge)preferredEdge
+{
+    return _preferredEdge;
+}
+
+/*!
+    Sets the preffered edge of the button to display the
+    pop-up when there is a limited amount of screen space.
+    By default, the pop-up should draw on top of the button.
+*/
+- (void)setPreferredEdge:(CPRectEdge)aRectEdge
+{
+    _preferredEdge = aRectEdge;
+}
+
+// Setting the Title
+/*!
+    Sets the pop-up button's title.
+    @param aTitle the new title
+*/
+- (void)setTitle:(CPString)aTitle
+{
+    if ([self title] === aTitle)
+        return;
+
+    if ([self pullsDown])
+    {
+        var items = [_menu itemArray];
+
+        if ([items count] <= 0)
+            [self addItemWithTitle:aTitle];
+
+        else
+        {
+            [items[0] setTitle:aTitle];
+            [self synchronizeTitleAndSelectedItem];
+        }
+    }
+    else
+    {
+        var index = [self indexOfItemWithTitle:aTitle];
+        
+        if (index < 0)
+        {
+            [self addItemWithTitle:aTitle];
+            
+            index = [self numberOfItems] - 1;
+        }
+        
+        [self selectItemAtIndex:index];
+    }
+}
+
+// Setting the Image
+/*!
+    This method has no effect. Because the image is taken
+    from the currently selected item, this method serves
+    no purpose.
+*/
+- (void)setImage:(CPImage)anImage
+{
+    // The Image is set by the currently selected item.
+}
+
+// Setting the State
+/*!
+    Makes sure the selected item and the item
+    being displayed are one and the same.
+*/
+- (void)synchronizeTitleAndSelectedItem
+{
+    var item = nil;
+
+    if ([self pullsDown])
+    {
+        var items = [_menu itemArray];
+        
+        if ([items count] > 0)
+            item = items[0];
+    }
+    else
+        item = [self selectedItem];
+
+    [super setImage:[item image]];
+    [super setTitle:[item title]];
+}
+
+//
+/*!
+    Called when the menu has a new item added to it.
+    @param aNotification information about the event
+*/
+- (void)menuDidAddItem:(CPNotification)aNotification
+{
+    var index = [[aNotification userInfo] objectForKey:@"CPMenuItemIndex"];
+    
+    if (_selectedIndex < 0)
+        [self selectItemAtIndex:0];
+    
+    else if (index == _selectedIndex)
+        [self synchronizeTitleAndSelectedItem];
+        
+    else if (index < _selectedIndex)
+        ++_selectedIndex;
+        
+    if (index == 0 && [self pullsDown])
+    {
+        var items = [_menu itemArray];
+        
+        [items[0] setHidden:YES];
+        
+        if (items.length > 0)
+            [items[1] setHidden:NO];
+    }
+
+    var item = [_menu itemArray][index],
+        action = [item action];
+
+    if (!action || (action === @selector(_popUpItemAction:)))
+    {
+        [item setTarget:self];
+        [item setAction:@selector(_popUpItemAction:)];
+    }
+}
+
+/*!
+    Called when a menu item has changed.
+    @param aNotification information about the event
+*/
+- (void)menuDidChangeItem:(CPNotification)aNotification
+{
+    var index = [[aNotification userInfo] objectForKey:@"CPMenuItemIndex"];
+
+    if ([self pullsDown] && index != 0)
+        return;
+    
+    if (![self pullsDown] && index != _selectedIndex)
+        return;
+    
+    [self synchronizeTitleAndSelectedItem];
+}
+
+/*!
+    Called when an item was removed from the menu.
+    @param aNotification information about the event
+*/
+- (void)menuDidRemoveItem:(CPNotification)aNotification
+{
+    var numberOfItems = [self numberOfItems];
+    
+    if (numberOfItems <= _selectedIndex && numberOfItems > 0)
+        [self selectItemAtIndex:numberOfItems - 1];
+    else
+        [self synchronizeTitleAndSelectedItem];
+}
+
+- (void)mouseDown:(CPEvent)anEvent
+{
+    if (![self isEnabled] || ![self numberOfItems])
+        return;
+
+    [self highlight:YES];
+
+    var menu = [self menu],
+        bounds = [self bounds],
+        minimumWidth = CGRectGetWidth(bounds);
+
+    // FIXME: setFont: should set the font on the menu.
+    [menu setFont:[self font]];
+
+    if ([self pullsDown])
+    {
+        var positionedItem = nil,
+            location = CGPointMake(0.0, CGRectGetMaxY(bounds));
+    }
+    else
+    {
+        var contentRect = [self contentRectForBounds:bounds],
+            positionedItem = [self selectedItem],
+            standardLeftMargin = [_CPMenuWindow _standardLeftMargin] + [_CPMenuItemStandardView _standardLeftMargin],
+            location = CGPointMake(CGRectGetMinX(contentRect) - standardLeftMargin, 0.0);
+
+        minimumWidth += standardLeftMargin;
+    }
+
+    [menu setMinimumWidth:minimumWidth];
+
+    [menu
+        _popUpMenuPositioningItem:positionedItem
+                       atLocation:location
+                             topY:CGRectGetMinY(bounds)
+                          bottomY:CGRectGetMaxY(bounds)
+                           inView:self
+                         callback:function(aMenu)
+        {
+            [self highlight:NO];
+
+            var highlightedItem = [aMenu highlightedItem];
+
+            if ([highlightedItem _isSelectable])
+                [self selectItem:highlightedItem];
+        }];
+/*
+    else
+    {
+        // This is confusing, I KNOW, so let me explain it to you.
+        // We want the *content* of the selected menu item to overlap the *content* of our pop up.
+        // 1. So calculate where our content is, then calculate where the menu item is.
+        // 2. Move LEFT by whatever indentation we have (offsetWidths, aka, window margin, item margin, etc).
+        // 3. MOVE UP by the difference in sizes of the content and menu item, this will only work if the content is vertically centered.
+        var contentRect = [self convertRect:[self contentRectForBounds:bounds] toView:nil],
+            menuOrigin = [theWindow convertBaseToGlobal:contentRect.origin],
+            menuItemRect = [menuWindow rectForItemAtIndex:_selectedIndex];
+
+        menuOrigin.x -= CGRectGetMinX(menuItemRect) + [menuWindow overlapOffsetWidth] + [[[menu itemAtIndex:_selectedIndex] _menuItemView] overlapOffsetWidth];
+        menuOrigin.y -= CGRectGetMinY(menuItemRect) + (CGRectGetHeight(menuItemRect) - CGRectGetHeight(contentRect)) / 2.0;
+    }
+*/
+}
+
+- (void)_popUpItemAction:(id)aSender
+{
+    [self sendAction:[self action] to:[self target]];
+}
+
+@end
+
+var CPPopUpButtonMenuKey            = @"CPPopUpButtonMenuKey",
+    CPPopUpButtonSelectedIndexKey   = @"CPPopUpButtonSelectedIndexKey",
+    CPPopUpButtonPullsDownKey       = @"CPPopUpButtonPullsDownKey";
+
+@implementation CPPopUpButton (CPCoding)
+/*!
+    Initializes the pop-up button with data from the
+    specified coder.
+    @param aCoder the coder from which to read
+    the data
+    @return the initialized pop-up button
+*/
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super initWithCoder:aCoder];
+    
+    if (self)
+    {
+        // Nothing is currently selected
+        _selectedIndex = -1;
+
+        [self setMenu:[aCoder decodeObjectForKey:CPPopUpButtonMenuKey]];
+        [self selectItemAtIndex:[aCoder decodeObjectForKey:CPPopUpButtonSelectedIndexKey]];
+    }
+    
+    return self;
+}
+
+/*!
+    Encodes the data of the pop-up button into a coder
+    @param aCoder the coder to which the data
+    will be written
+*/
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [super encodeWithCoder:aCoder];
+    
+    [aCoder encodeObject:_menu forKey:CPPopUpButtonMenuKey];
+    [aCoder encodeInt:_selectedIndex forKey:CPPopUpButtonSelectedIndexKey];
+}
+
+@end

AppKit/CPProgressIndicator.j

@@ -0,0 +1,478 @@
+/*
+ * CPProgressIndicator.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 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 <AppKit/CGGeometry.j>
+@import <AppKit/CPImageView.j>
+@import <AppKit/CPView.j>
+
+#include "CoreGraphics/CGGeometry.h"
+
+
+/*
+    @global
+    @group CPProgressIndicatorStyle
+*/
+CPProgressIndicatorBarStyle         = 0;
+/*
+    @global
+    @group CPProgressIndicatorStyle
+*/
+CPProgressIndicatorSpinningStyle    = 1;
+/*
+    @global
+    @group CPProgressIndicatorStyle
+*/
+CPProgressIndicatorHUDBarStyle      = 2;
+
+var CPProgressIndicatorSpinningStyleColors  = nil,
+
+    CPProgressIndicatorClassName            = nil,
+    CPProgressIndicatorStyleIdentifiers     = nil,
+    CPProgressIndicatorStyleSizes           = nil;
+
+/*! 
+    @ingroup appkit
+    @class CPProgressIndicator
+
+    This class is used in a Cappuccino GUI to display the progress of a
+    function or task. If the duration of the task is unknown, there is
+    also an indeterminate mode for the indicator.
+*/
+@implementation CPProgressIndicator : CPView
+{
+    double                      _minValue;
+    double                      _maxValue;
+    
+    double                      _doubleValue;
+    
+    CPControlSize               _controlSize;
+    
+    BOOL                        _isIndeterminate;
+    CPProgressIndicatorStyle    _style;
+    
+    BOOL                        _isAnimating;
+    
+    BOOL                        _isDisplayedWhenStoppedSet;
+    BOOL                        _isDisplayedWhenStopped;
+    
+    CPView                      _barView;
+}
+
+/*
+    @ignore
+*/
++ (void)initialize
+{
+    if (self != [CPProgressIndicator class])
+        return;
+    
+    var bundle = [CPBundle bundleForClass:self];
+    
+    CPProgressIndicatorSpinningStyleColors = [];
+    
+    CPProgressIndicatorSpinningStyleColors[CPMiniControlSize]       = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:
+        [bundle pathForResource:@"CPProgressIndicator/CPProgressIndicatorSpinningStyleRegular.gif"] size:CGSizeMake(64.0, 64.0)]];
+    CPProgressIndicatorSpinningStyleColors[CPSmallControlSize]      = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:
+        [bundle pathForResource:@"CPProgressIndicator/CPProgressIndicatorSpinningStyleRegular.gif"] size:CGSizeMake(64.0, 64.0)]];
+    CPProgressIndicatorSpinningStyleColors[CPRegularControlSize]    = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:
+        [bundle pathForResource:@"CPProgressIndicator/CPProgressIndicatorSpinningStyleRegular.gif"] size:CGSizeMake(64.0, 64.0)]];
+
+    CPProgressIndicatorBezelBorderViewPool = [];
+    
+    var start = CPProgressIndicatorBarStyle,
+        end = CPProgressIndicatorHUDBarStyle;
+    
+    for (; start <= end; ++start)
+    {
+        CPProgressIndicatorBezelBorderViewPool[start] = [];
+    
+        CPProgressIndicatorBezelBorderViewPool[start][CPMiniControlSize]    = [];
+        CPProgressIndicatorBezelBorderViewPool[start][CPSmallControlSize]   = [];
+        CPProgressIndicatorBezelBorderViewPool[start][CPRegularControlSize]  = [];
+    }
+    
+    CPProgressIndicatorClassName = [self className];
+    
+    
+    CPProgressIndicatorStyleIdentifiers = [];
+    
+    CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle]        = @"Bar";
+    CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorSpinningStyle]   = @"Spinny";
+    CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle]     = @"HUDBar";
+    
+    var regularIdentifier = _CPControlIdentifierForControlSize(CPRegularControlSize),
+        smallIdentifier = _CPControlIdentifierForControlSize(CPSmallControlSize),
+        miniIdentifier = _CPControlIdentifierForControlSize(CPMiniControlSize);
+
+    CPProgressIndicatorStyleSizes = [];
+
+    // Bar Sttyle
+    var prefix = CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle];
+
+    CPProgressIndicatorStyleSizes[prefix + regularIdentifier] = [_CGSizeMake(3.0, 15.0), _CGSizeMake(1.0, 15.0), _CGSizeMake(3.0, 15.0)];
+    CPProgressIndicatorStyleSizes[prefix + smallIdentifier] = [_CGSizeMake(3.0, 15.0), _CGSizeMake(1.0, 15.0), _CGSizeMake(3.0, 15.0)];
+    CPProgressIndicatorStyleSizes[prefix + miniIdentifier] = [_CGSizeMake(3.0, 15.0), _CGSizeMake(1.0, 15.0), _CGSizeMake(3.0, 15.0)];
+
+    prefix = CPProgressIndicatorClassName + @"Bar" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle];
+
+    CPProgressIndicatorStyleSizes[prefix + regularIdentifier] = _CGSizeMake(1.0, 9.0);
+    CPProgressIndicatorStyleSizes[prefix + smallIdentifier] = _CGSizeMake(1.0, 9.0);
+    CPProgressIndicatorStyleSizes[prefix + miniIdentifier] = _CGSizeMake(1.0, 9.0);
+
+    // HUD Bar Style
+    prefix = CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle];
+
+    CPProgressIndicatorStyleSizes[prefix + regularIdentifier] = [_CGSizeMake(3.0, 15.0), _CGSizeMake(1.0, 15.0), _CGSizeMake(3.0, 15.0)];
+    CPProgressIndicatorStyleSizes[prefix + smallIdentifier] = [_CGSizeMake(3.0, 15.0), _CGSizeMake(1.0, 15.0), _CGSizeMake(3.0, 15.0)];
+    CPProgressIndicatorStyleSizes[prefix + miniIdentifier] = [_CGSizeMake(3.0, 15.0), _CGSizeMake(1.0, 15.0), _CGSizeMake(3.0, 15.0)];
+
+    prefix = CPProgressIndicatorClassName + @"Bar" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle];
+
+    CPProgressIndicatorStyleSizes[prefix + regularIdentifier] = _CGSizeMake(1.0, 9.0);
+    CPProgressIndicatorStyleSizes[prefix + smallIdentifier] = _CGSizeMake(1.0, 9.0);
+    CPProgressIndicatorStyleSizes[prefix + miniIdentifier] = _CGSizeMake(1.0, 9.0);
+}
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    self = [super initWithFrame:aFrame];
+    
+    if (self)
+    {
+        _minValue = 0.0;
+        _maxValue = 100.0;
+        
+        _doubleValue = 0.0;
+        
+        _style = CPProgressIndicatorBarStyle;
+        _isDisplayedWhenStoppedSet = NO;
+        
+        _controlSize = CPRegularControlSize;
+        
+        [self updateBackgroundColor];
+        [self drawBar];
+    }
+    
+    return self;
+}
+
+/*
+    @ignore
+*/
+- (void)setUsesThreadedAnimation:(BOOL)aFlag
+{
+}
+
+/*!
+    Starts the animation of the progress indicator in indeterminate mode.
+    @param the requesting object
+*/
+- (void)startAnimation:(id)aSender
+{
+    _isAnimating = YES;
+    
+    [self _hideOrDisplay];
+}
+
+/*!
+    Stops the animation of the progress indicator in indeterminate mode.
+    @param the requesting object
+*/
+- (void)stopAnimation:(id)aSender
+{
+    _isAnimating = NO;
+
+    [self _hideOrDisplay];
+}
+
+/*!
+    Always returns \c NO. Cappuccino does not have multiple threads.
+*/
+- (BOOL)usesThreadedAnimation
+{
+    return NO;
+}
+
+// Advancing the Progress Bar
+/*!
+    Increases the progress of the bar by the specified value.
+    @param aValue the amount to increase the progress value
+*/
+- (void)incrementBy:(double)aValue
+{
+    [self setDoubleValue:_doubleValue + aValue];
+}
+
+/*!
+    Sets the progress value of the indicator.
+*/
+- (void)setDoubleValue:(double)aValue
+{
+    _doubleValue = MIN(MAX(aValue, _minValue), _maxValue);
+    
+    [self drawBar];
+}
+
+/*!
+    Returns the value of the progress indicator.
+*/
+- (double)doubleValue
+{
+    return _doubleValue;
+}
+
+/*!
+    Sets the minimum value of the progress indicator. The default is 0.0.
+    @param aValue the new minimum value
+*/
+- (void)setMinValue:(double)aValue
+{
+    _minValue = aValue;
+}
+
+/*!
+    Returns the minimum value of the progress indicator.
+*/
+- (double)minValue
+{
+    return _minValue;
+}
+
+/*!
+    Sets the maximum value of the progress indicator. The default is 100.0.
+    @param aValue the new maximum value.
+*/
+- (void)setMaxValue:(double)aValue
+{
+    _maxValue = aValue;
+}
+
+/*!
+    Returns the maximum value of the progress indicator.
+*/
+- (double)maxValue
+{
+    return _maxValue;
+}
+
+// Setting the Appearance
+/*!
+    Sets the progress indicator's size.
+    @param aControlSize the new size
+*/
+- (void)setControlSize:(CPControlSize)aControlSize
+{
+    if (_controlSize == aControlSize)
+        return;
+    
+    _controlSize = aControlSize;
+
+    [self updateBackgroundColor];
+}
+
+/*!
+    Returns the progress indicator's size
+*/
+- (CPControlSize)controlSize
+{
+    return _controlSize;
+}
+
+/*
+    Not yet implemented
+*/
+- (void)setControlTint:(CPControlTint)aControlTint
+{
+}
+
+/*
+    Not yet impemented.
+*/
+- (CPControlTint)controlTint
+{
+    return 0;
+}
+
+/*
+    Not yet implemented.
+*/
+- (void)setBezeled:(BOOL)isBezeled
+{
+}
+
+/*
+    Not yet implemented.
+*/
+- (BOOL)isBezeled
+{
+    return YES;
+}
+
+/*!
+    Specifies whether this progress indicator should be indeterminate or display progress based on it's max and min.
+    @param isDeterminate \c YES makes the indicator indeterminate
+*/
+- (void)setIndeterminate:(BOOL)isIndeterminate
+{
+    if (_isIndeterminate == isIndeterminate)
+        return;
+    
+    _isIndeterminate = isIndeterminate;
+
+    [self updateBackgroundColor];
+}
+
+/*!
+    Returns \c YES if the progress bar is indeterminate.
+*/
+- (BOOL)isIndeterminate
+{
+    return _isIndeterminate;
+}
+
+/*!
+    Sets the progress indicator's style
+    @param aStyle the style to set it to
+*/
+- (void)setStyle:(CPProgressIndicatorStyle)aStyle
+{
+    if (_style == aStyle)
+        return;
+    
+    _style = aStyle;
+    
+    [self updateBackgroundColor];
+}
+
+/*!
+    Resizes the indicator based on it's style.
+*/
+- (void)sizeToFit
+{
+    if (_style == CPProgressIndicatorSpinningStyle)
+        [self setFrameSize:[[CPProgressIndicatorSpinningStyleColors[_controlSize] patternImage] size]];
+    else
+        [self setFrameSize:CGSizeMake(CGRectGetWidth([self frame]), CPProgressIndicatorStyleSizes[
+            CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle] + 
+            _CPControlIdentifierForControlSize(_controlSize)][0].height)];
+}
+
+/*!
+    Sets whether the indicator should be displayed when it isn't animating. By default this is \c YES if the style
+    is CPProgressIndicatorBarStyle, and \c NO if it's CPProgressIndicatorSpinningStyle.
+    @param isDisplayedWhenStopped \c YES means the indicator will be displayed when it's not animating.
+*/
+- (void)setDisplayedWhenStopped:(BOOL)isDisplayedWhenStopped
+{
+    if (_isDisplayedWhenStoppedSet && _isDisplayedWhenStopped == isDisplayedWhenStopped)
+        return;
+        
+    _isDisplayedWhenStoppedSet = YES;
+    
+    _isDisplayedWhenStopped = isDisplayedWhenStopped;
+    
+    [self _hideOrDisplay];
+}
+
+/*!
+    Returns \c YES if the progress bar is displayed when not animating.
+*/
+- (BOOL)isDisplayedWhenStopped
+{
+    if (_isDisplayedWhenStoppedSet)
+        return _isDisplayedWhenStopped;
+    
+    if (_style == CPProgressIndicatorBarStyle || _style == CPProgressIndicatorHUDBarStyle)
+        return YES;
+    
+    return NO;
+}
+
+/* @ignore */
+- (void)_hideOrDisplay
+{
+    [self setHidden:!_isAnimating && ![self isDisplayedWhenStopped]];
+}
+
+- (void)setFrameSize:(CGSize)aSize
+{
+    [super setFrameSize:aSize];
+    
+    [self drawBar];
+}
+
+/* @ignore */
+- (void)drawBar
+{
+    if (_style == CPProgressIndicatorSpinningStyle)
+        return;
+    
+    if (!_barView)
+    {
+        _barView = [[CPView alloc] initWithFrame:CGRectMake(2.0, 2.0, 0.0, 9.0)];
+        
+        [_barView setBackgroundColor:[CPColor redColor]];
+        
+        [self addSubview:_barView];
+    }
+    
+    [_barView setBackgroundColor:_CPControlColorWithPatternImage(
+        CPProgressIndicatorStyleSizes,
+        CPProgressIndicatorClassName,
+        @"Bar",
+        CPProgressIndicatorStyleIdentifiers[_style],
+        _CPControlIdentifierForControlSize(_controlSize))];
+                    
+    [_barView setFrameSize:CGSizeMake(CGRectGetWidth([self bounds]) * (_doubleValue - _minValue) / (_maxValue - _minValue) - 4.0, 9.0)];
+}
+
+/* @ignore */
+- (void)updateBackgroundColor
+{
+    if (YES)//_isBezeled)
+    {
+        if (_style == CPProgressIndicatorSpinningStyle)
+        {
+            [_barView removeFromSuperview];
+            
+            _barView = nil;
+            
+            [self setBackgroundColor:CPProgressIndicatorSpinningStyleColors[_controlSize]];
+        }
+        else
+        {
+            [self setBackgroundColor:_CPControlThreePartImagePattern(
+                NO,
+                CPProgressIndicatorStyleSizes,
+                CPProgressIndicatorClassName,
+                @"BezelBorder",
+                CPProgressIndicatorStyleIdentifiers[_style],
+                _CPControlIdentifierForControlSize(_controlSize))];
+                
+            [self drawBar];
+        }
+    }
+    else
+        [self setBackgroundColor:nil];
+}
+
+@end

AppKit/CPRadio.j

@@ -0,0 +1,259 @@
+/*
+ * CPRadio.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2009, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPObject.j>
+@import <Foundation/CPSet.j>
+
+@import "CPButton.j"
+
+/*!
+    @ingroup appkit
+    
+    from this mailing list thread:
+    http://groups.google.com/group/objectivej/browse_thread/thread/7c41cbd9cbee9ea3    
+    
+    -----------------------------------
+    
+    Creating a checkbox is easy enough:
+    
+    checkbox = [[CPCheckBox alloc] initWithFrame:aFrame];
+    
+    That's basically all there is to it. Radio buttons are very similar,
+    the key difference is the introduction of a new class CPRadioGroup,
+    which defines which radio buttons are part of the same group:
+    
+    [myRadioButton setRadioGroup:aRadioGroup];
+    
+    Every radio button receives a unique radio group by default (so if you
+    do nothing further, they will all behave independently), but you can
+    use an existing radio button's group with other buttons as so:
+    
+    button1 = [[CPRadio alloc] initWithFrame:aFrame];
+    ...
+    button2 = [[CPRadio alloc] initWithFrame:aFrame radioGroup:[button1
+    radioGroup]];
+    ...
+    button3 = [[CPRadio alloc] initWithFrame:aFrame radioGroup:[button1
+    radioGroup]];
+    ...etc...
+    
+    Here, all the radio buttons will act "together". [[button1 radioGroup]
+    allRadios] returns every button that's part of this group, and
+    [[button1 radioGroup] selectedRadio] returns the currently selected
+    option.
+
+*/
+@implementation CPRadio : CPButton
+{
+    CPRadioGroup    _radioGroup;
+}
+
++ (id)radioWithTitle:(CPString)aTitle theme:(CPTheme)aTheme
+{
+    return [self buttonWithTitle:aTitle theme:aTheme];
+}
+
++ (id)radioWithTitle:(CPString)aTitle
+{
+    return [self buttonWithTitle:aTitle];
+}
+
++ (CPButton)standardButtonWithTitle:(CPString)aTitle
+{
+    var button = [[CPRadio alloc] init];
+
+    [button setTitle:aTitle];
+
+    return button;
+}
+
++ (CPString)themeClass
+{
+    return @"radio";
+}
+
+// Designated Initializer
+- (id)initWithFrame:(CGRect)aFrame radioGroup:(CPRadioGroup)aRadioGroup
+{
+    self = [super initWithFrame:aFrame];
+    
+    if (self)
+    {
+        [self setRadioGroup:aRadioGroup];
+
+        [self setHighlightsBy:CPContentsCellMask];
+        [self setShowsStateBy:CPContentsCellMask];
+
+        // Defaults?
+        [self setImagePosition:CPImageLeft];
+        [self setAlignment:CPLeftTextAlignment];
+
+        [self setBordered:YES];
+    }
+    
+    return self; 
+}
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    return [self initWithFrame:aFrame radioGroup:[CPRadioGroup new]];
+}
+
+- (CPInteger)nextState
+{
+    return CPOnState;
+}
+
+- (void)setRadioGroup:(CPRadioGroup)aRadioGroup
+{
+    if (_radioGroup === aRadioGroup)
+        return;
+
+    [_radioGroup _removeRadio:self];
+    _radioGroup = aRadioGroup;
+    [_radioGroup _addRadio:self];
+}
+
+- (CPRadioGroup)radioGroup
+{
+    return _radioGroup;
+}
+
+- (void)setObjectValue:(id)aValue
+{
+    [super setObjectValue:aValue];
+    
+    if ([self state] === CPOnState)
+        [_radioGroup _setSelectedRadio:self];
+}
+
+@end
+
+var CPRadioRadioGroupKey    = @"CPRadioRadioGroupKey";
+
+@implementation CPRadio (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super initWithCoder:aCoder];
+
+    if (self)
+        _radioGroup = [aCoder decodeObjectForKey:CPRadioRadioGroupKey];
+
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [super encodeWithCoder:aCoder];
+
+    [aCoder encodeObject:_radioGroup forKey:CPRadioRadioGroupKey];
+}
+
+@end
+
+@implementation CPRadioGroup : CPObject
+{
+    CPSet   _radios;
+    CPRadio _selectedRadio;
+
+    id      _target @accessors(property=target);
+    SEL     _action @accessors(property=action);
+}
+
+- (id)init
+{
+    self = [super init];
+
+    if (self)
+    {
+        _radios = [CPSet set];
+        _selectedRadio = nil;
+    }
+
+    return self;
+}
+
+- (void)_addRadio:(CPRadio)aRadio
+{
+    [_radios addObject:aRadio];
+
+    if ([aRadio state] === CPOnState)
+        [self _setSelectedRadio:aRadio];
+}
+
+- (void)_removeRadio:(CPRadio)aRadio
+{
+    if (_selectedRadio === aRadio)
+        _selectedRadio = nil;
+
+    [_radios removeObject:aRadio];
+}
+
+- (void)_setSelectedRadio:(CPRadio)aRadio
+{
+    if (_selectedRadio === aRadio)
+        return;
+
+    [_selectedRadio setState:CPOffState];
+    _selectedRadio = aRadio;
+
+    [CPApp sendAction:_action to:_target from:self];
+}
+
+- (CPRadio)selectedRadio
+{
+    return _selectedRadio;
+}
+
+- (CPArray)radios
+{
+    return [_radios allObjects];
+}
+
+@end
+
+var CPRadioGroupRadiosKey           = @"CPRadioGroupRadiosKey",
+    CPRadioGroupSelectedRadioKey    = @"CPRadioGroupSelectedRadioKey";
+
+@implementation CPRadioGroup (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super init];
+
+    if (self)
+    {
+        _radios = [aCoder decodeObjectForKey:CPRadioGroupRadiosKey];
+        _selectedRadio = [aCoder decodeObjectForKey:CPRadioGroupSelectedRadioKey];
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [aCoder encodeObject:_radios forKey:CPRadioGroupRadiosKey];
+    [aCoder encodeObject:_selectedRadio forKey:CPRadioGroupSelectedRadioKey];
+}
+
+@end

AppKit/CPResponder.j

@@ -0,0 +1,362 @@
+/*
+ * CPResponder.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPObject.j>
+
+
+CPDeleteKeyCode     = 8;
+CPTabKeyCode        = 9;
+CPReturnKeyCode     = 13;
+CPEscapeKeyCode     = 27;
+CPLeftArrowKeyCode  = 37;
+CPUpArrowKeyCode    = 38;
+CPRightArrowKeyCode = 39;
+CPDownArrowKeyCode  = 40;
+
+/*!
+    @ingroup appkit
+    @class CPResponder
+    
+    Subclasses of CPResonder can be part of the responder chain.
+*/
+@implementation CPResponder : CPObject
+{
+    CPMenu      _menu;
+    CPResponder _nextResponder;
+}
+
+// Changing the first responder
+/*!
+    Returns \c YES if the receiver is able to become the first responder. \c NO otherwise.
+*/
+- (BOOL)acceptsFirstResponder
+{
+    return NO;
+}
+
+/*!
+    Notifies the receiver that it will become the first responder. The receiver can reject first
+    responder if it returns \c NO. The default implementation always returns \c YES.
+    @return \c YES if the receiver accepts first responder status.
+*/
+- (BOOL)becomeFirstResponder
+{
+    return YES;
+}
+
+/*!
+    Notifies the receiver that it has been asked to give up first responder status.
+    @return \c YES if the receiver is willing to give up first responder status.
+*/
+- (BOOL)resignFirstResponder
+{
+    return YES;
+}
+
+// Setting the next responder
+/*!
+    Sets the receiver's next responder.
+    @param aResponder the responder after the receiver
+*/
+- (void)setNextResponder:(CPResponder)aResponder
+{
+    _nextResponder = aResponder;
+}
+
+/*!
+    Returns the responder after the receiver.
+*/
+- (CPResponder)nextResponder
+{
+    return _nextResponder;
+}
+
+/*!
+    Called to interpret a series of key events.
+    @param events an array of key CPEvents
+*/
+- (void)interpretKeyEvents:(CPArray)events
+{
+    var index = 0,
+        count = [events count];
+
+    for (; index < count; ++index)
+    {
+        var event = events[index];
+
+        switch([event keyCode])
+        {
+            case CPLeftArrowKeyCode:    [self doCommandBySelector:@selector(moveLeft:)];
+                                        break;
+            case CPRightArrowKeyCode:   [self doCommandBySelector:@selector(moveRight:)];
+                                        break;
+            case CPUpArrowKeyCode:      [self doCommandBySelector:@selector(moveUp:)];
+                                        break;
+            case CPDownArrowKeyCode:    [self doCommandBySelector:@selector(moveDown:)];
+                                        break;
+            case CPDeleteKeyCode:       [self doCommandBySelector:@selector(deleteBackward:)];
+                                        break;
+            case CPReturnKeyCode:
+            case 3:                     [self doCommandBySelector:@selector(insertLineBreak:)];
+                                        break;
+            
+            case CPEscapeKeyCode:       [self doCommandBySelector:@selector(cancel:)];
+                                        break;
+
+            case CPTabKeyCode:          var shift = [event modifierFlags] & CPShiftKeyMask;
+
+                                        if (!shift)
+                                            [self doCommandBySelector:@selector(insertTab:)];
+                                        else
+                                            [self doCommandBySelector:@selector(insertBackTab:)];
+
+                                        break;
+
+            default:                    [self insertText:[event characters]];
+        }
+    }
+}
+
+/*!
+    Notifies the receiver that the user has clicked the mouse down in its area.
+    @param anEvent contains information about the click
+*/
+- (void)mouseDown:(CPEvent)anEvent
+{
+    [_nextResponder performSelector:_cmd withObject:anEvent];
+}
+
+/*!
+    Notifies the receiver that the user has initiated a drag
+    over it. A drag is a mouse movement while the left button is down.
+    @param anEvent contains information about the drag
+*/
+- (void)mouseDragged:(CPEvent)anEvent
+{
+    [_nextResponder performSelector:_cmd withObject:anEvent];
+}
+
+/*!
+    Notifies the receiver that the user has released the left mouse button.
+    @param anEvent contains information about the release
+*/
+- (void)mouseUp:(CPEvent)anEvent
+{
+    [_nextResponder performSelector:_cmd withObject:anEvent];
+}
+
+/*!
+    Notifies the receiver that the user has moved the mouse (with no buttons down).
+    @param anEvent contains information about the movement
+*/
+- (void)mouseMoved:(CPEvent)anEvent
+{
+    [_nextResponder performSelector:_cmd withObject:anEvent];
+}
+
+- (void)mouseEntered:(CPEvent)anEvent
+{
+    [_nextResponder performSelector:_cmd withObject:anEvent];
+}
+
+/*!
+    Notifies the receiver that the mouse exited the receiver's area.
+    @param anEvent contains information about the exit
+*/
+- (void)mouseExited:(CPEvent)anEvent
+{
+    [_nextResponder performSelector:_cmd withObject:anEvent];
+}
+
+/*!
+    Notifies the receiver that the mouse scroll wheel has moved.
+    @param anEvent information about the scroll
+*/
+- (void)scrollWheel:(CPEvent)anEvent
+{
+    [_nextResponder performSelector:_cmd withObject:anEvent];
+}
+
+/*!
+    Notifies the receiver that the user has pressed a key.
+    @param anEvent information about the key press
+*/
+- (void)keyDown:(CPEvent)anEvent
+{
+    [_nextResponder performSelector:_cmd withObject:anEvent];
+}
+
+/*!
+    Notifies the receiver that the user has released a key.
+    @param anEvent information about the key press
+*/
+- (void)keyUp:(CPEvent)anEvent
+{
+    [_nextResponder performSelector:_cmd withObject:anEvent];
+}
+
+/*
+    FIXME This description is bad.
+    Based on \c anEvent, the receiver should simulate the event.
+    @param anEvent the event to simulate
+    @return \c YES if the event receiver simulated the  event
+*/
+- (BOOL)performKeyEquivalent:(CPEvent)anEvent
+{
+    return NO;
+}
+
+// Action Methods
+/*!
+    Insert a line break at the caret position or selection.
+    @param aSender the object requesting this
+*/
+- (void)insertLineBreak:(id)aSender
+{
+    [self insertNewline:aSender];
+}
+
+/*!
+    Insert a line break at the caret position or selection.
+    @param aSender the object requesting this
+*/
+- (void)insertNewline:(id)aSender
+{
+    [[self nextResponder] insertNewline:aSender];
+}
+
+- (void)cancel:(id)sender
+{
+}
+
+- (void)insertTab:(id)sender
+{
+}
+
+- (void)insertBackTab:(id)sender
+{
+}
+
+/*!
+    Inserts some text at the caret position or selection.
+    @param aString the string to insert
+*/
+- (void)insertText:(CPString)aString
+{
+}
+
+// Dispatch methods
+/*!
+    The receiver will attempt to perform the command,
+    if it responds to it. If not, the \c -nextResponder will be called to do it.
+    @param aSelector the command to attempt
+*/
+- (void)doCommandBySelector:(SEL)aSelector
+{
+    if ([self respondsToSelector:aSelector])
+        [self performSelector:aSelector];
+    else
+        [_nextResponder doCommandBySelector:aSelector];
+}
+
+/*!
+    The receiver will attempt to perform the command, or pass it on to the next responder if it doesn't respond to it.
+    @param aSelector the command to perform
+    @param anObject the argument to the method
+    @return \c YES if the receiver was able to perform the command, or a responder down the chain was
+    able to perform the command.
+*/
+- (BOOL)tryToPerform:(SEL)aSelector with:(id)anObject
+{
+    if([self respondsToSelector:aSelector])
+    {
+        [self performSelector:aSelector withObject:anObject];
+        
+        return YES;
+    }
+
+    return [_nextResponder tryToPerform:aSelector with:anObject];
+}
+
+// Managing a Responder's menu
+
+- (void)setMenu:(CPMenu)aMenu
+{
+    _menu = aMenu;
+}
+
+- (CPMenu)menu
+{
+    return _menu;
+}
+
+// Getting the Undo Manager
+/*!
+    Returns the undo manager for the receiver.
+*/
+- (CPUndoManager)undoManager
+{
+    return [_nextResponder performSelector:_cmd];
+}
+
+// Terminating the responder chain
+/*!
+    Called when an event finds no suitable responder.
+    @param anEventSelector the command that failed
+*/
+- (void)noResponderFor:(SEL)anEventSelector
+{
+}
+
+@end
+
+var CPResponderNextResponderKey = @"CPResponderNextResponderKey";
+
+@implementation CPResponder (CPCoding)
+
+/*!
+    Initializes the responder with data from a coder.
+    @param aCoder the coder from which data will be read
+    @return the initialized responder
+*/
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super init];
+    
+    if (self)
+        _nextResponder = [aCoder decodeObjectForKey:CPResponderNextResponderKey];
+    
+    return self;
+}
+
+/*!
+    Archives the responder to a coder.
+    @param aCoder the coder to which the responder will be archived
+*/
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    // This will come out nil on the other side with decodeObjectForKey:
+    if (_nextResponder !== nil)
+        [aCoder encodeConditionalObject:_nextResponder forKey:CPResponderNextResponderKey];
+}
+
+@end

AppKit/CPSavePanel.j

@@ -0,0 +1,67 @@
+
+@import <AppKit/CPPanel.j>
+
+
+@implementation CPSavePanel : CPPanel
+{
+    CPURL   _URL;
+
+    BOOL    _isExtensionHidden @accessors(getter=isExtensionHidden, setter=setExtensionHidden:);
+    BOOL    _canSelectHiddenExtension @accessors(property=canSelectHiddenExtension);
+    BOOL    _allowsOtherFileTypes @accessors(property=allowsOtherFileTypes);
+    BOOL    _canCreateDirectories @accessors(property=canCreateDirectories);
+
+    CPArray _allowedFileTypes @accessors(property=allowedFileTypes);
+}
+
++ (id)savePanel
+{
+    return [[CPSavePanel alloc] init];
+}
+
+- (id)init
+{
+    if (self = [super init])
+    {
+        _canCreateDirectories = YES;
+    }
+
+    return self;
+}
+
+- (CPInteger)runModal
+{
+    // FIXME: Is this correct???
+    [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
+
+    if (typeof window["cpSavePanel"] === "function")
+    {
+        var resultObject = window.cpSavePanel({
+                isExtensionHidden: _isExtensionHidden,
+                canSelectHiddenExtension: _canSelectHiddenExtension,
+                allowsOtherFileTypes: _allowsOtherFileTypes,
+                canCreateDirectories: _canCreateDirectories,
+                allowedFileTypes: _allowedFileTypes
+            }),
+            result = resultObject.button;
+
+        _URL = result ? [CPURL URLWithString:resultObject.URL] : nil;
+    }
+    else
+    {
+        // FIXME: This is not the best way to do this.
+        var documentName = window.prompt("Document Name:"),
+            result = documentName !== null;
+
+        _URL = result ? [[self class] proposedFileURLWithDocumentName:documentName] : nil;
+    }
+
+    return result;
+}
+
+- (CPURL)URL
+{
+    return _URL;
+}
+
+@end

AppKit/CPScreen.j

@@ -0,0 +1,16 @@
+
+@import <Foundation/CPObject.j>
+
+
+#import "CoreGraphics/CGGeometry.h"
+
+@implementation CPScreen : CPObject
+{
+}
+
+- (CGRect)visibleFrame
+{
+    return _CGRectMake(window.screen.availLeft, window.screen.availTop, window.screen.availWidth, window.screen.availHeight);
+}
+
+@end

AppKit/CPScrollView.j

@@ -0,0 +1,777 @@
+/*
+ * CPScrollView.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 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 "CPView.j"
+@import "CPClipView.j"
+@import "CPScroller.j"
+
+#include "CoreGraphics/CGGeometry.h"
+
+
+/*! 
+    @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;
+
+    BOOL        _hasVerticalScroller;
+    BOOL        _hasHorizontalScroller;
+    BOOL        _autohidesScrollers;
+    
+    CPScroller  _verticalScroller;
+    CPScroller  _horizontalScroller;
+    
+    int         _recursionCount;
+    
+    float       _verticalLineScroll;
+    float       _verticalPageScroll;
+    float       _horizontalLineScroll;
+    float       _horizontalPageScroll;
+}
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    self = [super initWithFrame:aFrame];
+
+    if (self)
+    {
+        _verticalLineScroll = 10.0;
+        _verticalPageScroll = 10.0;
+
+        _horizontalLineScroll = 10.0;
+        _horizontalPageScroll = 10.0;
+
+        _contentView = [[CPClipView alloc] initWithFrame:[self bounds]];
+
+        [self addSubview:_contentView];
+
+        _headerClipView = [[CPClipView alloc] init];
+
+        [self addSubview:_headerClipView];
+
+        [self setHasVerticalScroller:YES];
+        [self setHasHorizontalScroller:YES];
+    }
+
+    return self;
+}
+
+// Determining component sizes
+/*!
+    Returns the size of the scroll view's content view.
+*/
+- (CGRect)contentSize
+{
+    return [_contentView frame].size;
+}
+
+/*!
+    Returns the view that is scrolled for the user.
+*/
+- (id)documentView
+{
+    return [_contentView documentView];
+}
+
+/*!
+    Sets the content view that clips the document
+    @param aContentView the content view
+*/
+- (void)setContentView:(CPClipView)aContentView
+{
+    if (_contentView !== aContentView || !aContentView)
+        return;
+
+    var documentView = [aContentView documentView];
+
+    if (documentView)
+        [documentView removeFromSuperview];
+
+    [_contentView removeFromSuperview];
+
+    _contentView = aContentView;
+
+    [_contentView setDocumentView:documentView];
+
+    [self addSubview:_contentView];
+
+    // This will size the content view appropriately, so no need to size it in this method.
+    [self reflectScrolledClipView:_contentView];
+}
+
+/*!
+    Returns the content view that clips the document.
+*/
+- (CPClipView)contentView
+{
+    return _contentView;
+}
+
+/*!
+    Sets the view that is scrolled for the user.
+    @param aView the view that will be scrolled
+*/
+- (void)setDocumentView:(CPView)aView
+{
+    [_contentView setDocumentView:aView];
+
+    // FIXME: This should be observed.
+    [self _updateCornerAndHeaderView];
+    [self reflectScrolledClipView:_contentView];
+}
+
+/*!
+    Resizes the scroll view to contain the specified clip view.
+    @param aClipView the clip view to resize to
+*/
+- (void)reflectScrolledClipView:(CPClipView)aClipView
+{
+    if(_contentView !== aClipView)
+        return;
+
+    if (_recursionCount > 5)
+        return;
+    
+    ++_recursionCount;
+
+    var documentView = [self documentView];
+    
+    if (!documentView)
+    {
+        if (_autohidesScrollers)
+        {
+            [_verticalScroller setHidden:YES];
+            [_horizontalScroller setHidden:YES];
+        }
+        else
+        {
+//            [_verticalScroller setEnabled:NO];
+//            [_horizontalScroller setEnabled:NO];
+        }
+
+        [_contentView setFrame:[self bounds]];
+        [_headerClipView setFrame:_CGRectMakeZero()];
+
+        --_recursionCount;
+
+        return;
+    }
+
+    var documentFrame = [documentView frame], // the size of the whole document
+        contentFrame = [self bounds], // assume it takes up the entire size of the scrollview (no scrollers)
+        headerClipViewFrame = [self _headerClipViewFrame],
+        headerClipViewHeight = _CGRectGetHeight(headerClipViewFrame);
+
+    contentFrame.origin.y += headerClipViewHeight;
+    contentFrame.size.height -= headerClipViewHeight;
+
+    var difference = _CGSizeMake(_CGRectGetWidth(documentFrame) - _CGRectGetWidth(contentFrame), _CGRectGetHeight(documentFrame) - _CGRectGetHeight(contentFrame)),
+        verticalScrollerWidth = _CGRectGetWidth([_verticalScroller frame]),
+        horizontalScrollerHeight = _CGRectGetHeight([_horizontalScroller frame]),
+        hasVerticalScroll = difference.height > 0.0,
+        hasHorizontalScroll = difference.width > 0.0,
+        shouldShowVerticalScroller = _hasVerticalScroller && (!_autohidesScrollers || hasVerticalScroll),
+        shouldShowHorizontalScroller = _hasHorizontalScroller && (!_autohidesScrollers || hasHorizontalScroll);
+
+    // Now we have to account for the shown scrollers affecting the deltas.
+    if (shouldShowVerticalScroller)
+    {
+        difference.width += verticalScrollerWidth;
+        hasHorizontalScroll = difference.width > 0.0;
+        shouldShowHorizontalScroller = _hasHorizontalScroller && (!_autohidesScrollers || hasHorizontalScroll);
+    }
+
+    if (shouldShowHorizontalScroller)
+    {
+        difference.height += horizontalScrollerHeight;
+        hasVerticalScroll = difference.height > 0.0;
+        shouldShowVerticalScroller = _hasVerticalScroller && (!_autohidesScrollers || hasVerticalScroll);
+    }
+
+    // We now definitively know which scrollers are shown or not, as well as whether they are showing scroll values.
+    [_verticalScroller setHidden:!shouldShowVerticalScroller];
+    [_verticalScroller setEnabled:hasVerticalScroll];
+
+    [_horizontalScroller setHidden:!shouldShowHorizontalScroller];
+    [_horizontalScroller setEnabled:hasHorizontalScroll];
+
+    // We can thus appropriately account for them changing the content size.
+    if (shouldShowVerticalScroller)
+        contentFrame.size.width -= verticalScrollerWidth;
+
+    if (shouldShowHorizontalScroller)
+        contentFrame.size.height -= horizontalScrollerHeight;
+
+    var scrollPoint = [_contentView bounds].origin,
+        wasShowingVerticalScroller = ![_verticalScroller isHidden],
+        wasShowingHorizontalScroller = ![_horizontalScroller isHidden];
+
+    if (shouldShowVerticalScroller)
+    {
+        var verticalScrollerY = MAX(_CGRectGetHeight([self _cornerViewFrame]), headerClipViewHeight),
+            verticalScrollerHeight = _CGRectGetHeight([self bounds]) - verticalScrollerY;
+
+        if (shouldShowHorizontalScroller)
+            verticalScrollerHeight -= horizontalScrollerHeight;
+
+        [_verticalScroller setFloatValue:(difference.height <= 0.0) ? 0.0 : scrollPoint.y / difference.height];
+        [_verticalScroller setKnobProportion:_CGRectGetHeight(contentFrame) / _CGRectGetHeight(documentFrame)];
+        [_verticalScroller setFrame:_CGRectMake(_CGRectGetMaxX(contentFrame), verticalScrollerY, verticalScrollerWidth, verticalScrollerHeight)];
+    }
+    else if (wasShowingVerticalScroller)
+    {
+        [_verticalScroller setFloatValue:0.0];
+        [_verticalScroller setKnobProportion:1.0];
+    }
+    
+    if (shouldShowHorizontalScroller)
+    {
+        [_horizontalScroller setFloatValue:(difference.width <= 0.0) ? 0.0 : scrollPoint.x / difference.width];
+        [_horizontalScroller setKnobProportion:_CGRectGetWidth(contentFrame) / _CGRectGetWidth(documentFrame)];
+        [_horizontalScroller setFrame:_CGRectMake(0.0, _CGRectGetMaxY(contentFrame), _CGRectGetWidth(contentFrame), horizontalScrollerHeight)];
+    }
+    else if (wasShowingHorizontalScroller)
+    {
+        [_horizontalScroller setFloatValue:0.0];
+        [_horizontalScroller setKnobProportion:1.0];
+    }
+
+    [_contentView setFrame:contentFrame];
+    [_headerClipView setFrame:headerClipViewFrame];
+    [_cornerView setFrame:[self _cornerViewFrame]];
+
+    --_recursionCount;
+}
+
+// Managing Scrollers
+/*!
+    Sets the scroll view's horizontal scroller.
+    @param aScroller the horizontal scroller for the scroll view
+*/
+- (void)setHorizontalScroller:(CPScroller)aScroller
+{
+    if (_horizontalScroller === aScroller)
+        return;
+    
+    [_horizontalScroller removeFromSuperview];
+    [_horizontalScroller setTarget:nil];
+    [_horizontalScroller setAction:nil];
+    
+    _horizontalScroller = aScroller;
+    
+    [_horizontalScroller setTarget:self];
+    [_horizontalScroller setAction:@selector(_horizontalScrollerDidScroll:)];
+
+    [self addSubview:_horizontalScroller];
+
+    [self reflectScrolledClipView:_contentView];
+}
+
+/*!
+    Returns the scroll view's horizontal scroller
+*/
+- (CPScroller)horizontalScroller
+{
+    return _horizontalScroller;
+}
+
+/*!
+    Specifies whether the scroll view can have a horizontal scroller.
+    @param hasHorizontalScroller \c YES lets the scroll view
+    allocate a horizontal scroller if necessary.
+*/
+- (void)setHasHorizontalScroller:(BOOL)shouldHaveHorizontalScroller
+{
+    if (_hasHorizontalScroller === shouldHaveHorizontalScroller)
+        return;
+
+    _hasHorizontalScroller = shouldHaveHorizontalScroller;
+
+    if (_hasHorizontalScroller && !_horizontalScroller)
+        [self setHorizontalScroller:[[CPScroller alloc] initWithFrame:CGRectMake(0.0, 0.0, _CGRectGetWidth([self bounds]), [CPScroller scrollerWidth])]];
+
+    [self reflectScrolledClipView:_contentView];
+}
+
+/*!
+    Returns \c YES if the scroll view can have a horizontal scroller.
+*/
+- (BOOL)hasHorizontalScroller
+{
+    return _hasHorizontalScroller;
+}
+
+/*!
+    Sets the scroll view's vertical scroller.
+    @param aScroller the vertical scroller
+*/
+- (void)setVerticalScroller:(CPScroller)aScroller
+{
+    if (_verticalScroller === aScroller)
+        return;
+    
+    [_verticalScroller removeFromSuperview];
+    [_verticalScroller setTarget:nil];
+    [_verticalScroller setAction:nil];
+    
+    _verticalScroller = aScroller;
+    
+    [_verticalScroller setTarget:self];
+    [_verticalScroller setAction:@selector(_verticalScrollerDidScroll:)];
+
+    [self addSubview:_verticalScroller];
+
+    [self reflectScrolledClipView:_contentView];
+}
+
+/*!
+    Return's the scroll view's vertical scroller
+*/
+- (CPScroller)verticalScroller
+{
+    return _verticalScroller;
+}
+
+/*!
+    Specifies whether the scroll view has can have
+    a vertical scroller. It allocates it if necessary.
+    @param hasVerticalScroller \c YES allows
+    the scroll view to display a vertical scroller
+*/
+- (void)setHasVerticalScroller:(BOOL)shouldHaveVerticalScroller
+{
+    if (_hasVerticalScroller === shouldHaveVerticalScroller)
+        return;
+
+    _hasVerticalScroller = shouldHaveVerticalScroller;
+
+    if (_hasVerticalScroller && !_verticalScroller)
+        [self setVerticalScroller:[[CPScroller alloc] initWithFrame:_CGRectMake(0.0, 0.0, [CPScroller scrollerWidth], _CGRectGetHeight([self bounds]))]];
+
+    [self reflectScrolledClipView:_contentView];
+}
+
+/*!
+    Returns \c YES if the scroll view can have a vertical scroller.
+*/
+- (BOOL)hasVerticalScroller
+{
+    return _hasVerticalScroller;
+}
+
+/*!
+    Sets whether the scroll view hides its scoll bars when not needed.
+    @param autohidesScrollers \c YES causes the scroll bars
+    to be hidden when not needed.
+*/
+- (void)setAutohidesScrollers:(BOOL)autohidesScrollers
+{
+    if (_autohidesScrollers == autohidesScrollers)
+        return;
+
+    _autohidesScrollers = autohidesScrollers;
+    
+    [self reflectScrolledClipView:_contentView];
+}
+
+/*!
+    Returns \c YES if the scroll view hides its scroll
+    bars when not necessary.
+*/
+- (BOOL)autohidesScrollers
+{
+    return _autohidesScrollers;
+}
+
+- (void)_updateCornerAndHeaderView
+{
+    var documentView = [self documentView],
+        currentHeaderView = [self _headerView],
+        documentHeaderView = [documentView respondsToSelector:@selector(headerView)] ? [documentView headerView] : nil;
+
+    if (currentHeaderView !== documentHeaderView)
+    {
+        [currentHeaderView removeFromSuperview];
+        [_headerClipView setDocumentView:documentHeaderView];
+    }
+
+    var documentCornerView = [documentView respondsToSelector:@selector(cornerView)] ? [documentView cornerView] : nil;
+
+    if (_cornerView !== documentCornerView)
+    {
+        [_cornerView removeFromSuperview];
+
+        _cornerView = documentCornerView;
+
+        if (_cornerView)
+            [self addSubview:_cornerView];
+    }
+
+    [self reflectScrolledClipView:_contentView];
+}
+
+- (CPView)_headerView
+{
+    var headerClipViewSubviews = [_headerClipView subviews];
+
+    return [headerClipViewSubviews count] ? headerClipViewSubviews[0] : nil;
+}
+
+- (CGRect)_cornerViewFrame
+{
+    if (!_cornerView)
+        return _CGRectMakeZero();
+
+    var bounds = [self bounds],
+        frame = [_cornerView frame];
+
+    frame.origin.x = _CGRectGetMaxX(bounds) - _CGRectGetWidth(frame);
+    frame.origin.y = 0;
+
+    return frame;
+}
+
+- (CGRect)_headerClipViewFrame
+{
+    var headerView = [self _headerView];
+
+    if (!headerView)
+        return _CGRectMakeZero();
+
+    var frame = [self bounds];
+
+    frame.size.height = _CGRectGetHeight([headerView frame]);
+    frame.size.width -= _CGRectGetWidth([self _cornerViewFrame]);
+
+    return frame;
+}
+
+/* @ignore */
+- (void)_verticalScrollerDidScroll:(CPScroller)aScroller
+{
+   var  value = [aScroller floatValue],
+        documentFrame = [[_contentView documentView] frame];
+        contentBounds = [_contentView bounds];
+
+    switch ([_verticalScroller hitPart])
+    {
+        case CPScrollerDecrementLine:   contentBounds.origin.y -= _verticalLineScroll;
+                                        break;
+        
+        case CPScrollerIncrementLine:   contentBounds.origin.y += _verticalLineScroll;
+                                        break;
+           
+        case CPScrollerDecrementPage:   contentBounds.origin.y -= _CGRectGetHeight(contentBounds) - _verticalPageScroll;
+                                        break;
+        
+        case CPScrollerIncrementPage:   contentBounds.origin.y += _CGRectGetHeight(contentBounds) - _verticalPageScroll;
+                                        break;
+        
+        case CPScrollerKnobSlot:
+        case CPScrollerKnob:
+                                        // We want integral bounds!
+        default:                        contentBounds.origin.y = ROUND(value * (_CGRectGetHeight(documentFrame) - _CGRectGetHeight(contentBounds)));
+    }
+    
+    [_contentView scrollToPoint:contentBounds.origin];
+}
+
+/* @ignore */
+- (void)_horizontalScrollerDidScroll:(CPScroller)aScroller
+{
+   var value = [aScroller floatValue],
+       documentFrame = [[self documentView] frame],
+       contentBounds = [_contentView bounds];
+        
+    switch ([_horizontalScroller hitPart])
+    {
+        case CPScrollerDecrementLine:   contentBounds.origin.x -= _horizontalLineScroll;
+                                        break;
+        
+        case CPScrollerIncrementLine:   contentBounds.origin.x += _horizontalLineScroll;
+                                        break;
+           
+        case CPScrollerDecrementPage:   contentBounds.origin.x -= _CGRectGetWidth(contentBounds) - _horizontalPageScroll;
+                                        break;
+        
+        case CPScrollerIncrementPage:   contentBounds.origin.x += _CGRectGetWidth(contentBounds) - _horizontalPageScroll;
+                                        break;
+        
+        case CPScrollerKnobSlot:
+        case CPScrollerKnob:
+                                        // We want integral bounds!
+        default:                        contentBounds.origin.x = ROUND(value * (_CGRectGetWidth(documentFrame) - _CGRectGetWidth(contentBounds)));
+    }
+
+    [_contentView scrollToPoint:contentBounds.origin];
+    [_headerClipView scrollToPoint:CGPointMake(contentBounds.origin.x, 0.0)];
+}
+
+/*!
+    Lays out the scroll view's components.
+*/
+- (void)tile
+{
+    // yuck.
+    // RESIZE: tile->setHidden AND refl
+    // Outside Change: refl->tile->setHidden AND refl
+    // scroll: refl.
+}
+
+/*
+    @ignore
+*/
+-(void)resizeSubviewsWithOldSize:(CGSize)aSize
+{
+    [self reflectScrolledClipView:_contentView];
+}
+
+// Setting Scrolling Behavior
+/*!
+    Sets how much the document moves when scrolled. Sets the vertical and horizontal scroll.
+    @param aLineScroll the amount to move the document when scrolled
+*/
+- (void)setLineScroll:(float)aLineScroll
+{
+    [self setHorizonalLineScroll:aLineScroll];
+    [self setVerticalLineScroll:aLineScroll];
+}
+
+/*!
+    Returns how much the document moves when scrolled
+*/
+- (float)lineScroll
+{
+    return [self horizontalLineScroll];
+}
+
+/*!
+    Sets how much the document moves when scrolled horizontally.
+    @param aLineScroll the amount to move horizontally when scrolled.
+*/
+- (void)setHorizontalLineScroll:(float)aLineScroll
+{
+    _horizontalLineScroll = aLineScroll;
+}
+
+/*!
+    Returns how much the document moves horizontally when scrolled.
+*/
+- (float)horizontalLineScroll
+{
+    return _horizontalLineScroll;
+}
+
+/*!
+    Sets how much the document moves when scrolled vertically.
+    @param aLineScroll the new amount to move vertically when scrolled.
+*/
+- (void)setVerticalLineScroll:(float)aLineScroll
+{
+    _verticalLineScroll = aLineScroll;
+}
+
+/*!
+    Returns how much the document moves vertically when scrolled.
+*/
+- (float)verticalLineScroll
+{
+    return _verticalLineScroll;
+}
+
+/*!
+    Sets the horizontal and vertical page scroll amount.
+    @param aPageScroll the new horizontal and vertical page scroll amount
+*/
+- (void)setPageScroll:(float)aPageScroll
+{
+    [self setHorizontalPageScroll:aPageScroll];
+    [self setVerticalPageScroll:aPageScroll];
+}
+
+/*!
+    Returns the vertical and horizontal page scroll amount.
+*/
+- (float)pageScroll
+{
+    return [self horizontalPageScroll];
+}
+
+/*!
+    Sets the horizontal page scroll amount.
+    @param aPageScroll the new horizontal page scroll amount
+*/
+- (void)setHorizontalPageScroll:(float)aPageScroll
+{
+    _horizontalPageScroll = aPageScroll;
+}
+
+/*!
+    Returns the horizontal page scroll amount.
+*/
+- (float)horizontalPageScroll
+{
+    return _horizontalPageScroll;
+}
+
+/*!
+    Sets the vertical page scroll amount.
+    @param aPageScroll the new vertcal page scroll amount
+*/
+- (void)setVerticalPageScroll:(float)aPageScroll
+{
+    _verticalPageScroll = aPageScroll;
+}
+
+/*!
+    Returns the vertical page scroll amount.
+*/
+- (float)verticalPageScroll
+{
+    return _verticalPageScroll;
+}
+
+/*!
+    Handles a scroll wheel event from the user.
+    @param anEvent the scroll wheel event
+*/
+- (void)scrollWheel:(CPEvent)anEvent
+{
+   var documentFrame = [[self documentView] frame],
+       contentBounds = [_contentView bounds];
+
+    // We want integral bounds!
+    contentBounds.origin.x = ROUND(contentBounds.origin.x + [anEvent deltaX] * _horizontalLineScroll);
+    contentBounds.origin.y = ROUND(contentBounds.origin.y + [anEvent deltaY] * _verticalLineScroll);
+
+    [_contentView scrollToPoint:contentBounds.origin];
+    [_headerClipView scrollToPoint:CGPointMake(contentBounds.origin.x, 0.0)];
+}
+
+- (void)keyDown:(CPEvent)anEvent
+{
+    var keyCode = [anEvent keyCode],
+        documentFrame = [[self documentView] frame],
+        contentBounds = [_contentView bounds];
+    
+    switch (keyCode)
+    {
+        case 33:    /*pageup*/
+                    contentBounds.origin.y -= _CGRectGetHeight(contentBounds) - _verticalPageScroll;
+                    break;
+                    
+        case 34:    /*pagedown*/
+                    contentBounds.origin.y += _CGRectGetHeight(contentBounds) - _verticalPageScroll;
+                    break;
+                    
+        case 38:    /*up arrow*/
+                    contentBounds.origin.y -= _verticalLineScroll;
+                    break;
+
+        case 40:    /*down arrow*/
+                    contentBounds.origin.y += _verticalLineScroll;
+                    break;
+                    
+        case 37:    /*left arrow*/
+                    contentBounds.origin.x -= _horizontalLineScroll;
+                    break;
+
+        case 49:    /*right arrow*/
+                    contentBounds.origin.x += _horizontalLineScroll;
+                    break;
+                    
+        default:    return [super keyDown:anEvent];
+    }
+
+    [_contentView scrollToPoint:contentBounds.origin];
+    [_headerClipView scrollToPoint:CGPointMake(contentBounds.origin, 0)];
+}
+
+@end
+
+var CPScrollViewContentViewKey = "CPScrollViewContentView",
+    CPScrollViewVLineScrollKey = "CPScrollViewVLineScroll",
+    CPScrollViewHLineScrollKey = "CPScrollViewHLineScroll",
+    CPScrollViewVPageScrollKey = "CPScrollViewVPageScroll",
+    CPScrollViewHPageScrollKey = "CPScrollViewHPageScroll",
+    CPScrollViewHasVScrollerKey = "CPScrollViewHasVScroller",
+    CPScrollViewHasHScrollerKey = "CPScrollViewHasHScroller",
+    CPScrollViewVScrollerKey = "CPScrollViewVScroller",
+    CPScrollViewHScrollerKey = "CPScrollViewHScroller",
+    CPScrollViewAutohidesScrollerKey = "CPScrollViewAutohidesScroller";
+
+@implementation CPScrollView (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    if (self = [super initWithCoder:aCoder])
+    {
+        _verticalLineScroll     = [aCoder decodeFloatForKey:CPScrollViewVLineScrollKey];
+        _verticalPageScroll     = [aCoder decodeFloatForKey:CPScrollViewVPageScrollKey];
+
+        _horizontalLineScroll   = [aCoder decodeFloatForKey:CPScrollViewHLineScrollKey];
+        _horizontalPageScroll   = [aCoder decodeFloatForKey:CPScrollViewHPageScrollKey];
+        
+        _contentView            = [aCoder decodeObjectForKey:CPScrollViewContentViewKey];
+        
+        _verticalScroller       = [aCoder decodeObjectForKey:CPScrollViewVScrollerKey];
+        _horizontalScroller     = [aCoder decodeObjectForKey:CPScrollViewHScrollerKey];
+
+        _hasVerticalScroller    = [aCoder decodeBoolForKey:CPScrollViewHasVScrollerKey];
+        _hasHorizontalScroller  = [aCoder decodeBoolForKey:CPScrollViewHasHScrollerKey];
+        _autohidesScrollers     = [aCoder decodeBoolForKey:CPScrollViewAutohidesScrollerKey];
+        
+        // Do to the anything goes nature of decoding, our subviews may not exist yet, so layout at the end of the run loop when we're sure everything is in a correct state.
+        [[CPRunLoop currentRunLoop] performSelector:@selector(reflectScrolledClipView:) target:self argument:_contentView order:0 modes:[CPDefaultRunLoopMode]];
+    }
+    
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [super encodeWithCoder:aCoder];
+    
+    [aCoder encodeObject:_contentView           forKey:CPScrollViewContentViewKey];
+    
+    [aCoder encodeObject:_verticalScroller      forKey:CPScrollViewVScrollerKey];
+    [aCoder encodeObject:_horizontalScroller    forKey:CPScrollViewHScrollerKey];
+    
+    [aCoder encodeFloat:_verticalLineScroll     forKey:CPScrollViewVLineScrollKey];
+    [aCoder encodeFloat:_verticalPageScroll     forKey:CPScrollViewVPageScrollKey];
+    [aCoder encodeFloat:_horizontalLineScroll   forKey:CPScrollViewHLineScrollKey];
+    [aCoder encodeFloat:_horizontalPageScroll   forKey:CPScrollViewHPageScrollKey];
+    
+    [aCoder encodeBool:_hasVerticalScroller     forKey:CPScrollViewHasVScrollerKey];
+    [aCoder encodeBool:_hasHorizontalScroller   forKey:CPScrollViewHasHScrollerKey];
+    [aCoder encodeBool:_autohidesScrollers      forKey:CPScrollViewAutohidesScrollerKey];
+}
+
+@end

AppKit/CPScroller.j

@@ -0,0 +1,619 @@
+/*
+ * CPScroller.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import "CPControl.j"
+
+#include "CoreGraphics/CGGeometry.h"
+
+
+// CPScroller Constants
+CPScrollerNoPart            = 0;
+CPScrollerDecrementPage     = 1;
+CPScrollerKnob              = 2;
+CPScrollerIncrementPage     = 3;
+CPScrollerDecrementLine     = 4;
+CPScrollerIncrementLine     = 5;
+CPScrollerKnobSlot          = 6;
+
+CPScrollerIncrementArrow    = 0;
+CPScrollerDecrementArrow    = 1;
+
+CPNoScrollerParts           = 0;
+CPOnlyScrollerArrows        = 1;
+CPAllScrollerParts          = 2;
+
+/*! 
+    @ingroup appkit
+    @class CPScroller    
+*/
+
+var PARTS_ARRANGEMENT   = [CPScrollerKnobSlot, CPScrollerDecrementLine, CPScrollerIncrementLine, CPScrollerKnob],
+    NAMES_FOR_PARTS     = {},
+    PARTS_FOR_NAMES     = {};
+
+NAMES_FOR_PARTS[CPScrollerDecrementLine]    = @"decrement-line";
+NAMES_FOR_PARTS[CPScrollerIncrementLine]    = @"increment-line";
+NAMES_FOR_PARTS[CPScrollerKnobSlot]         = @"knob-slot";
+NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
+
+
+@implementation CPScroller : CPControl
+{
+    CPControlSize           _controlSize;
+    CPUsableScrollerParts   _usableParts;
+    CPArray                 _partRects;
+
+    BOOL                    _isVertical @accessors(readonly, getter=isVertical);
+    float                   _knobProportion;
+
+    CPScrollerPart          _hitPart;
+
+    CPScrollerPart          _trackingPart;
+    float                   _trackingFloatValue;
+    CGPoint                 _trackingStartPoint;
+}
+
++ (CPString)themeClass
+{
+    return "scroller";
+}
+
++ (id)themeAttributes
+{
+    return [CPDictionary dictionaryWithObjects:[    nil, nil, nil, nil,
+                                                    _CGSizeMakeZero(), _CGSizeMakeZero(), _CGInsetMakeZero(), _CGInsetMakeZero(), _CGSizeMakeZero()]
+                                       forKeys:[    @"knob-slot-color",
+                                                    @"decrement-line-color",
+                                                    @"increment-line-color",
+                                                    @"knob-color",
+                                                    @"decrement-line-size",
+                                                    @"increment-line-size",
+                                                    @"track-inset",
+                                                    @"knob-inset",
+                                                    @"minimum-knob-length"]];
+}
+
+
+// Calculating Layout
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    self = [super initWithFrame:aFrame];
+    
+    if (self)
+    {
+        _controlSize = CPRegularControlSize;
+        _partRects = [];
+
+        [self setFloatValue:0.0];
+        [self setKnobProportion:1.0];
+        
+        _hitPart = CPScrollerNoPart;
+
+        [self _calculateIsVertical];
+    }
+
+    return self;
+}
+
+// Determining CPScroller Size
+/*!
+    Returns the CPScroller's width for a CPRegularControlSize.
+*/
++ (float)scrollerWidth
+{
+    return 15.0;//[self scrollerWidthForControlSize:CPRegularControlSize];
+}
+
+/*!
+    Returns the width of a CPScroller for the specified CPControlSize.
+    @param aControlSize the size of a controller to return the width for
+*/
++ (float)scrollerWidthForControlSize:(CPControlSize)aControlSize
+{
+    return 15.0;//_CPScrollerWidths[aControlSize];
+}
+
+/*!
+    Sets the scroller's size.
+    @param aControlSize the scroller's size
+*/
+- (void)setControlSize:(CPControlSize)aControlSize
+{
+    if (_controlSize == aControlSize)
+        return;
+
+    _controlSize = aControlSize;
+
+    [self setNeedsLayout];
+    [self setNeedsDisplay:YES];
+}
+
+/*!
+    Returns the scroller's control size
+*/
+- (CPControlSize)controlSize
+{
+    return _controlSize;
+}
+
+- (void)setObjectValue:(id)aValue
+{
+    [super setObjectValue:MIN(1.0, MAX(0.0, +aValue))];
+}
+
+- (void)setKnobProportion:(float)aProportion
+{
+    _knobProportion = MIN(1.0, MAX(0.0001, aProportion));
+
+    [self setNeedsDisplay:YES];
+    [self setNeedsLayout];
+}
+
+/*!
+    Return's the knob's proportion
+*/
+- (float)knobProportion
+{
+    return _knobProportion;
+}
+
+- (id)currentValueForThemeAttribute:(CPString)anAttributeName
+{
+    var themeState = _themeState;
+    
+    if (NAMES_FOR_PARTS[_hitPart] + "-color" !== anAttributeName)
+        themeState &= ~CPThemeStateHighlighted;
+    
+    return [self valueForThemeAttribute:anAttributeName inState:themeState];
+}
+
+// Calculating Layout
+
+- (CGRect)rectForPart:(CPScrollerPart)aPart
+{
+    if (aPart == CPScrollerNoPart)
+        return _CGRectMakeZero();
+
+    return _partRects[aPart];
+}
+
+/*!
+    Returns the part of the scroller that would be hit by \c aPoint.
+    @param aPoint the simulated point hit
+    @return the part of the scroller that intersects the point
+*/
+- (CPScrollerPart)testPart:(CGPoint)aPoint
+{
+    aPoint = [self convertPoint:aPoint fromView:nil];
+    
+    // The ordering of these tests is important.  We check the knob and 
+    // page rects first since they may overlap with the arrows.
+    
+    if (CGRectContainsPoint([self rectForPart:CPScrollerKnob], aPoint))
+        return CPScrollerKnob;
+    
+    if (CGRectContainsPoint([self rectForPart:CPScrollerDecrementPage], aPoint))
+        return CPScrollerDecrementPage;
+    
+    if (CGRectContainsPoint([self rectForPart:CPScrollerIncrementPage], aPoint))
+        return CPScrollerIncrementPage;
+    
+    if (CGRectContainsPoint([self rectForPart:CPScrollerDecrementLine], aPoint))
+        return CPScrollerDecrementLine;
+    
+    if (CGRectContainsPoint([self rectForPart:CPScrollerIncrementLine], aPoint))
+        return CPScrollerIncrementLine;
+    
+    if (CGRectContainsPoint([self rectForPart:CPScrollerKnobSlot], aPoint))
+        return CPScrollerKnobSlot;
+
+    return CPScrollerNoPart;
+}
+
+/*!
+    Check if there's enough space in the scroller to display the knob
+*/
+- (void)checkSpaceForParts
+{
+    var bounds = [self bounds];
+
+    // Assume we won't be needing the arrows.
+    if (_knobProportion === 1.0)
+    {
+        _usableParts = CPNoScrollerParts;
+    
+        _partRects[CPScrollerDecrementPage] = _CGRectMakeZero();
+        _partRects[CPScrollerKnob]          = _CGRectMakeZero();
+        _partRects[CPScrollerIncrementPage] = _CGRectMakeZero();
+        _partRects[CPScrollerDecrementLine] = _CGRectMakeZero();
+        _partRects[CPScrollerIncrementLine] = _CGRectMakeZero();
+
+        // In this case, the slot is the entirety of the scroller.
+        _partRects[CPScrollerKnobSlot] = _CGRectMakeCopy(bounds);
+        
+        return;
+    }
+
+    // At this point we know we're going to need arrows.
+    _usableParts = CPAllScrollerParts;
+
+    var knobInset = [self currentValueForThemeAttribute:@"knob-inset"],
+        trackInset = [self currentValueForThemeAttribute:@"track-inset"],
+        width = _CGRectGetWidth(bounds),
+        height = _CGRectGetHeight(bounds); 
+    
+    if ([self isVertical])
+    {
+        var decrementLineSize = [self currentValueForThemeAttribute:"decrement-line-size"],
+            incrementLineSize = [self currentValueForThemeAttribute:"increment-line-size"],
+            effectiveDecrementLineHeight = decrementLineSize.height + trackInset.top,
+            effectiveIncrementLineHeight = incrementLineSize.height + trackInset.bottom,
+            slotHeight = height - effectiveDecrementLineHeight - effectiveIncrementLineHeight,
+            minimumKnobLength = [self currentValueForThemeAttribute:"minimum-knob-length"],
+            knobWidth = width - knobInset.left - knobInset.right,
+            knobHeight = MAX(minimumKnobLength, (slotHeight * _knobProportion)),
+            knobLocation = effectiveDecrementLineHeight + (slotHeight - knobHeight) * [self floatValue];
+
+        _partRects[CPScrollerDecrementPage] = _CGRectMake(0.0, effectiveDecrementLineHeight, width, knobLocation - effectiveDecrementLineHeight);
+        _partRects[CPScrollerKnob]          = _CGRectMake(knobInset.left, knobLocation, knobWidth, knobHeight);
+        _partRects[CPScrollerIncrementPage] = _CGRectMake(0.0, knobLocation + knobHeight, width, height - (knobLocation + knobHeight) - effectiveIncrementLineHeight);
+        _partRects[CPScrollerKnobSlot]      = _CGRectMake(trackInset.left, effectiveDecrementLineHeight, width - trackInset.left - trackInset.right, slotHeight);
+        _partRects[CPScrollerDecrementLine] = _CGRectMake(0.0, 0.0, decrementLineSize.width, decrementLineSize.height);
+        _partRects[CPScrollerIncrementLine] = _CGRectMake(0.0, height - incrementLineSize.height, incrementLineSize.width, incrementLineSize.height);  
+    }
+
+    else
+    {
+        var decrementLineSize = [self currentValueForThemeAttribute:"decrement-line-size"],
+            incrementLineSize = [self currentValueForThemeAttribute:"increment-line-size"],
+            effectiveDecrementLineWidth = decrementLineSize.width + trackInset.left,
+            effectiveIncrementLineWidth = incrementLineSize.width + trackInset.right;
+            slotWidth = width - effectiveDecrementLineWidth - effectiveIncrementLineWidth,
+            minimumKnobLength = [self currentValueForThemeAttribute:"minimum-knob-length"],
+            knobWidth = MAX(minimumKnobLength, (slotWidth * _knobProportion)),
+            knobHeight = height - knobInset.top - knobInset.bottom,
+            knobLocation = effectiveDecrementLineWidth + (slotWidth - knobWidth) * [self floatValue];
+
+        _partRects[CPScrollerDecrementPage] = _CGRectMake(effectiveDecrementLineWidth, 0.0, knobLocation - effectiveDecrementLineWidth, height);
+        _partRects[CPScrollerKnob]          = _CGRectMake(knobLocation, knobInset.top, knobWidth, knobHeight);
+        _partRects[CPScrollerIncrementPage] = _CGRectMake(knobLocation + knobWidth, 0.0, width - (knobLocation + knobWidth) - effectiveIncrementLineWidth, height);
+        _partRects[CPScrollerKnobSlot]      = _CGRectMake(effectiveDecrementLineWidth, trackInset.top, slotWidth, height - trackInset.top - trackInset.bottom);
+        _partRects[CPScrollerDecrementLine] = _CGRectMake(0.0, 0.0, decrementLineSize.width, decrementLineSize.height);
+        _partRects[CPScrollerIncrementLine] = _CGRectMake(width - incrementLineSize.width, 0.0, incrementLineSize.width, incrementLineSize.height);
+    }
+}
+
+/*!
+    Returns all the parts of the scroller that
+    are usable for displaying.
+*/
+- (CPUsableScrollerParts)usableParts
+{
+    return _usableParts;
+}
+
+// Drawing the Parts
+/*!
+    Draws the specified arrow and sets the highlight.
+    @param anArrow the arrow to draw
+    @param shouldHighlight sets whether the arrow should be highlighted
+*/
+- (void)drawArrow:(CPScrollerArrow)anArrow highlight:(BOOL)shouldHighlight
+{
+}
+
+/*!
+    Draws the knob
+*/
+- (void)drawKnob
+{
+}
+
+/*!
+    Draws the knob's slot
+*/
+- (void)drawKnobSlot
+{
+}
+
+- (CPView)createViewForPart:(CPScrollerPart)aPart
+{
+    var view = [[CPView alloc] initWithFrame:_CGRectMakeZero()];
+    
+    [view setHitTests:NO];
+    
+    return view;
+}
+
+- (CGRect)rectForEphemeralSubviewNamed:(CPString)aName
+{
+    return _partRects[aName];
+}
+
+- (CPView)createEphemeralSubviewNamed:(CPString)aName
+{
+    var view = [[CPView alloc] initWithFrame:_CGRectMakeZero()];
+
+    [view setHitTests:NO];
+        
+    return view;
+}
+
+- (void)layoutSubviews
+{
+    [self checkSpaceForParts];
+
+    var index = 0,
+        count = PARTS_ARRANGEMENT.length;
+
+    for (; index < count; ++index)
+    {
+        var part = PARTS_ARRANGEMENT[index];
+    
+        if (index === 0)
+            view = [self layoutEphemeralSubviewNamed:part positioned:CPWindowBelow relativeToEphemeralSubviewNamed:PARTS_ARRANGEMENT[index + 1]];
+        else
+            view = [self layoutEphemeralSubviewNamed:part positioned:CPWindowAbove relativeToEphemeralSubviewNamed:PARTS_ARRANGEMENT[index - 1]];
+        
+        if (view)
+            [view setBackgroundColor:[self currentValueForThemeAttribute:NAMES_FOR_PARTS[part] + "-color"]];
+    }
+}
+
+/*!
+    Caches images for the scroll arrow and knob.
+*/
+- (void)drawParts
+{   
+    [self drawKnobSlot];
+    [self drawKnob];
+    [self drawArrow:CPScrollerDecrementArrow highlight:NO];
+    [self drawArrow:CPScrollerIncrementArrow highlight:NO];
+}
+
+// Event Handling
+/*!
+    Returns the part of the scroller that was hit.
+*/
+- (CPScrollerPart)hitPart
+{
+    return _hitPart;
+}
+
+/*!
+    Tracks the knob.
+    @param anEvent the input event
+*/
+- (void)trackKnob:(CPEvent)anEvent
+{
+    var type = [anEvent type];
+    
+    if (type === CPLeftMouseUp)
+    {
+        _hitPart = CPScrollerNoPart;
+        
+        return;
+    }
+    
+    if (type === CPLeftMouseDown)
+    {
+        _trackingFloatValue = [self floatValue];
+        _trackingStartPoint = [self convertPoint:[anEvent locationInWindow] fromView:nil];
+    }
+    
+    else if (type === CPLeftMouseDragged)
+    {
+        var knobRect = [self rectForPart:CPScrollerKnob],
+            knobSlotRect = [self rectForPart:CPScrollerKnobSlot],
+            remainder = ![self isVertical] ? (_CGRectGetWidth(knobSlotRect) - _CGRectGetWidth(knobRect)) : (_CGRectGetHeight(knobSlotRect) - _CGRectGetHeight(knobRect));
+            
+        if (remainder <= 0)
+            [self setFloatValue:0.0];
+        else
+        {
+            var location = [self convertPoint:[anEvent locationInWindow] fromView:nil];
+                delta = ![self isVertical] ? location.x - _trackingStartPoint.x : location.y - _trackingStartPoint.y;
+
+            [self setFloatValue:_trackingFloatValue + delta / remainder];
+        }
+    }
+    
+    [CPApp setTarget:self selector:@selector(trackKnob:) forNextEventMatchingMask:CPLeftMouseDraggedMask | CPLeftMouseUpMask untilDate:nil inMode:nil dequeue:YES];
+
+    [self sendAction:[self action] to:[self target]];
+}
+
+/*!
+    Tracks the scroll button.
+    @param anEvent the input event
+*/
+- (void)trackScrollButtons:(CPEvent)anEvent
+{
+    var type = [anEvent type];
+
+    if (type === CPLeftMouseUp)
+    {
+        [self highlight:NO];
+        [CPEvent stopPeriodicEvents];
+        
+        _hitPart = CPScrollerNoPart;
+        
+        return;
+    }
+    
+    if (type === CPLeftMouseDown)
+    {
+        _trackingPart = [self hitPart];
+        
+        _trackingStartPoint = [self convertPoint:[anEvent locationInWindow] fromView:nil];
+
+        if ([anEvent modifierFlags] & CPAlternateKeyMask)
+        {
+            if (_trackingPart == CPScrollerDecrementLine)
+                _hitPart = CPScrollerDecrementPage;
+            
+            else if (_trackingPart == CPScrollerIncrementLine)
+                _hitPart = CPScrollerIncrementPage;
+            
+            else if (_trackingPart == CPScrollerDecrementPage || _trackingPart == CPScrollerIncrementPage)
+            {
+                var knobRect = [self rectForPart:CPScrollerKnob],
+                    knobWidth = ![self isVertical] ? _CGRectGetWidth(knobRect) : _CGRectGetHeight(knobRect),
+                    knobSlotRect = [self rectForPart:CPScrollerKnobSlot],
+                    remainder = (![self isVertical] ? _CGRectGetWidth(knobSlotRect) : _CGRectGetHeight(knobSlotRect)) - knobWidth;
+
+                [self setFloatValue:((![self isVertical] ? _trackingStartPoint.x - _CGRectGetMinX(knobSlotRect) : _trackingStartPoint.y - _CGRectGetMinY(knobSlotRect)) - knobWidth / 2.0) / remainder];
+                
+                _hitPart = CPScrollerKnob;
+                
+                [self sendAction:[self action] to:[self target]];        
+                
+                // Now just track the knob.
+                return [self trackKnob:anEvent];
+            }
+        }
+        
+        [self highlight:YES];
+        [self sendAction:[self action] to:[self target]];
+        
+        [CPEvent startPeriodicEventsAfterDelay:0.5 withPeriod:0.04];
+    }
+    
+    else if (type === CPLeftMouseDragged)
+    {
+        _trackingStartPoint = [self convertPoint:[anEvent locationInWindow] fromView:nil];
+        
+        if (_trackingPart == CPScrollerDecrementPage || _trackingPart == CPScrollerIncrementPage)
+        {
+            var hitPart = [self testPart:[anEvent locationInWindow]];
+            
+            if (hitPart == CPScrollerDecrementPage || hitPart == CPScrollerIncrementPage)
+            {
+                _trackingPart = hitPart;
+                _hitPart = hitPart;
+            }
+        }
+        
+        [self highlight:CGRectContainsPoint([self rectForPart:_trackingPart], _trackingStartPoint)];
+    }
+    else if (type == CPPeriodic && CGRectContainsPoint([self rectForPart:_trackingPart], _trackingStartPoint))
+        [self sendAction:[self action] to:[self target]];
+    
+    [CPApp setTarget:self selector:@selector(trackScrollButtons:) forNextEventMatchingMask:CPPeriodicMask | CPLeftMouseDraggedMask | CPLeftMouseUpMask untilDate:nil inMode:nil dequeue:YES];
+
+}
+
+- (void)_calculateIsVertical
+{
+    // Recalculate isVertical.
+    var bounds = [self bounds],
+        width = _CGRectGetWidth(bounds),
+        height = _CGRectGetHeight(bounds);
+
+    _isVertical = width < height ? 1 : (width > height ? 0 : -1);
+
+    if (_isVertical === 1)
+        [self setThemeState:CPThemeStateVertical];
+    else if (_isVertical === 0)
+        [self unsetThemeState:CPThemeStateVertical];
+}
+
+- (void)setFrameSize:(CGSize)aSize
+{
+    [super setFrameSize:aSize];
+
+    [self checkSpaceForParts];
+    [self setNeedsLayout];
+}
+
+- (void)mouseDown:(CPEvent)anEvent
+{
+    if (![self isEnabled])
+        return;
+    
+    _hitPart = [self testPart:[anEvent locationInWindow]];
+    
+    switch (_hitPart)
+    {
+        case CPScrollerKnob:            return [self trackKnob:anEvent];
+        
+        case CPScrollerDecrementLine:   
+        case CPScrollerIncrementLine:   
+        case CPScrollerDecrementPage:
+        case CPScrollerIncrementPage:   return [self trackScrollButtons:anEvent];
+    }
+}
+
+@end
+
+var CPScrollerControlSizeKey = "CPScrollerControlSize",
+    CPScrollerKnobProportionKey = "CPScrollerKnobProportion";
+
+@implementation CPScroller (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    if (self = [super initWithCoder:aCoder])
+    {
+        _controlSize = CPRegularControlSize;
+        if ([aCoder containsValueForKey:CPScrollerControlSizeKey])
+            _controlSize = [aCoder decodeIntForKey:CPScrollerControlSizeKey];
+
+        _knobProportion = 1.0;
+        if ([aCoder containsValueForKey:CPScrollerKnobProportionKey])
+            _knobProportion = [aCoder decodeFloatForKey:CPScrollerKnobProportionKey];
+
+        _partRects = [];
+        
+        _hitPart = CPScrollerNoPart;
+
+        [self _calculateIsVertical];
+    }
+    
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [super encodeWithCoder:aCoder];
+    
+    [aCoder encodeInt:_controlSize forKey:CPScrollerControlSizeKey];
+    [aCoder encodeFloat:_knobProportion forKey:CPScrollerKnobProportionKey];
+}
+
+@end
+
+@implementation CPScroller (Deprecated)
+
+/*!
+    Sets the position and proportion of the knob.
+    @param aValue the knob position (ranges from 0.0 to 1.0)
+    @param aProportion the knob's proportion (ranges from 0.0 to 1.0)
+*/
+- (void)setFloatValue:(float)aValue knobProportion:(float)aProportion
+{
+    [self setFloatValue:aValue];
+    [self setKnobProportion:aProportion];
+}
+
+@end

AppKit/CPSearchField.j

@@ -0,0 +1,742 @@
+/*
+ * CPSearchField.j
+ * AppKit
+ *
+ * Created by cacaodev.
+ * Copyright 2009.
+ *
+ * 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 "CPTextField.j"
+
+#include "Platform/Platform.h"
+
+/*!
+    @global
+    @group Menu tags
+*/
+CPSearchFieldRecentsTitleMenuItemTag = 1000;
+/*!
+    @global
+    @group Menu tags
+*/
+CPSearchFieldRecentsMenuItemTag = 1001;
+/*!
+    @global
+    @group Menu tags
+*/
+CPSearchFieldClearRecentsMenuItemTag = 1002;
+/*!
+    @global
+    @group Menu tags
+*/
+CPSearchFieldNoRecentsMenuItemTag = 1003;
+
+var CPSearchFieldSearchImage = nil,
+    CPSearchFieldFindImage = nil,
+    CPSearchFieldCancelImage = nil,
+    CPSearchFieldCancelPressedImage = nil;
+
+/*! 
+    @ingroup appkit
+    @class CPSearchField
+    The CPSearchField class defines the programmatic interface for text fields that are optimized for text-based searches. A CPSearchField object directly inherits from the CPTextField class. The search field implemented by these classes presents a standard user interface for searches, including a search button, a cancel button, and a pop-up icon menu for listing recent search strings and custom search categories.
+
+    When the user types and then pauses, the text field's action message is sent to its target. You can query the text field's string value for the current text to search for. Do not rely on the sender of the action to be an CPMenu object because the menu may change. If you need to change the menu, modify the search menu template and call the setSearchMenuTemplate: method to update.    
+*/
+@implementation CPSearchField : CPTextField
+{
+    CPButton    _searchButton;
+    CPButton    _cancelButton;
+    CPMenu      _searchMenuTemplate;
+    CPMenu      _searchMenu;
+
+    CPString    _recentsAutosaveName;
+    CPArray     _recentSearches;
+    
+    int         _maximumRecents;
+    BOOL        _sendsWholeSearchString;
+    BOOL        _sendsSearchStringImmediately;
+    CPTimer     _partialStringTimer;
+}
+
++ (void)initialize
+{
+    if (self != [CPSearchField class])
+        return;
+
+    var bundle = [CPBundle bundleForClass:self];
+    CPSearchFieldSearchImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldSearch.png"]];
+    CPSearchFieldFindImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldFind.png"]];
+    CPSearchFieldCancelImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldCancel.png"]];
+    CPSearchFieldCancelPressedImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldCancelPressed.png"]];
+}
+
+- (id)initWithFrame:(CPRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self != nil)
+    {
+        _recentSearches = [CPArray array];
+        _maximumRecents = 10;
+        _sendsWholeSearchString = NO;
+        _sendsSearchStringImmediately = NO;
+        _recentsAutosaveName = nil;
+         
+        [self setBezeled:YES];
+        [self setBezelStyle:CPTextFieldRoundedBezel];
+        [self setBordered:YES];
+        [self setEditable:YES];
+        [self setDelegate:self];
+        
+        _cancelButton = [[CPButton alloc] initWithFrame:CPMakeRect(frame.size.width - 27,(frame.size.height-22)/2,22,22)];
+        [self resetCancelButton];
+        [_cancelButton setHidden:YES];
+        [_cancelButton setAutoresizingMask:CPViewMinXMargin];
+        [self addSubview:_cancelButton];
+        
+        _searchButton = [[CPButton alloc] initWithFrame:CPMakeRect(5,(frame.size.height-25)/2,25,25)];
+        [self resetSearchButton];
+        [self addSubview:_searchButton];
+
+#if PLATFORM(DOM)
+    _cancelButton._DOMElement.style.cursor = "default";
+    _searchButton._DOMElement.style.cursor = "default";
+#endif
+          
+    }
+    
+    return self;
+}
+
+- (id)copy
+{
+    var copy = [super copy];
+    
+    [copy setCancelButton:[_cancelButton copy]];
+    [copy setSearchButton:[_searchButton copy]];
+    [copy setSendsWholeSearchString:[_sendsWholeSearchString copy]];
+    [copy setSendsSearchStringImmediately:[_sendsSearchStringImmediately copy]];
+    [copy setMaximumRecents:_maximumRecents];
+    if (_recentsAutosaveName)
+        [copy setrecentsAutosaveName:[_recentsAutosaveName copy]];
+    if (_searchMenuTemplate)
+        [copy setSearchMenutemplate:[_searchMenuTemplate copy]];
+    
+    return copy;
+}
+
+// Managing Buttons
+/*!
+    Sets the button used to display the search-button image
+    @param button The search button.
+*/
+- (void)setSearchButton:(CPButton)button
+{ 
+    _searchButton = button;
+}
+
+/*!
+    Returns the button used to display the search-button image.
+    @return The search button.
+*/
+- (CPButton)searchButton
+{
+    return _searchButton;
+}
+
+/*!
+    Resets the search button to its default attributes.
+    This method resets the target, action, regular image, and pressed image. By default, when users click the search button or press the Return key, the action defined for the receiver is sent to its designated target. This method gives you a way to customize the search button for specific situations and then reset the button defaults without having to undo changes individually.
+*/
+- (void)resetSearchButton
+{
+    var searchButtonImage, 
+        action, 
+        target,
+        button = [self searchButton];
+        
+    if (_searchMenuTemplate === nil)
+    {
+        searchButtonImage = CPSearchFieldSearchImage;
+        action = @selector(_sendAction:);
+        target = self;
+    }
+    else
+    {
+        searchButtonImage = CPSearchFieldFindImage;
+        action = @selector(_showMenu:);
+        target = self;
+    }
+    
+    [button setBordered:NO];
+    [button setImageScaling:CPScaleToFit];
+    [button setImage:searchButtonImage];
+    [button setAutoresizingMask:CPViewMaxXMargin];
+    [button setTarget:target];
+    [button setAction:action];
+}
+
+/*!
+    Sets the button object used to display the cancel-button image.
+    @param button The cancel button.
+*/
+- (void)setCancelButton:(CPButton)button
+{
+    _cancelButton = button;
+}
+
+/*!
+    Returns the button object used to display the cancel-button image.
+    @return The cancel button.
+*/
+- (CPButton)cancelButton
+{
+    return _cancelButton;
+}
+
+/*!
+    Resets the cancel button to its default attributes.
+    This method resets the target, action, regular image, and pressed image. By default, when users click the cancel button, the delete: action message is sent up the responder chain. This method gives you a way to customize the cancel button for specific situations and then reset the button defaults without having to undo changes individually.
+*/
+- (void)resetCancelButton
+{
+    var button = [self cancelButton];
+    [button setBordered:NO];
+    [button setImageScaling:CPScaleToFit];
+    [button setImage:CPSearchFieldCancelImage];
+    [button setAlternateImage:CPSearchFieldCancelPressedImage];
+    [button setAutoresizingMask:CPViewMinXMargin];
+    [button setTarget:self];
+    [button setAction:@selector(_searchFieldCancel:)];
+}
+
+// Custom Layout
+/*!
+    Modifies the bounding rectangle for the search-text field.
+    @param rect The current bounding rectangle for the search text field.
+    @return The updated bounding rectangle to use for the search text field. The default value is the value passed into the rect parameter.
+    Subclasses can override this method to return a new bounding rectangle for the text-field object. You might use this method to provide a custom layout for the search field control.
+*/
+- (CPRect)searchTextRectForBounds:(CPRect)rect
+{
+    var leftOffset = 0, width = rect.size.width;
+    
+    if (_searchButton)
+    {
+        var searchRect = [_searchButton frame];
+        leftOffset = searchRect.origin.x + searchRect.size.width;
+    }
+    
+    if (_cancelButton)
+    {
+        var cancelRect = [_cancelButton frame];
+        width = cancelRect.origin.x - leftOffset;
+    }
+    
+    return CPMakeRect(leftOffset,rect.origin.y,width,rect.size.height);
+}
+
+/*!
+    Modifies the bounding rectangle for the search button.
+    @param rect The current bounding rectangle for the search button.
+    Subclasses can override this method to return a new bounding rectangle for the search button. You might use this method to provide a custom layout for the search field control.
+*/
+- (CPRect)searchButtonRectForBounds:(CPRect)rect
+{
+    return [_searchButton frame];
+}
+
+/*!
+    Modifies the bounding rectangle for the cancel button.
+    @param rect The updated bounding rectangle to use for the cancel button. The default value is the value passed into the rect parameter.
+    Subclasses can override this method to return a new bounding rectangle for the cancel button. You might use this method to provide a custom layout for the search field control.
+*/
+- (CPRect)cancelButtonRectForBounds:(CPRect)rect
+{
+    return [_cancelButton frame];
+}
+
+// Managing Menu Templates
+/*!
+    Returns the menu template object used to dynamically construct the search pop-up icon menu.
+    @return The current menu template.
+*/
+- (CPMenu)searchMenuTemplate
+{
+    return _searchMenuTemplate;
+}
+
+/*!
+    Sets the menu template object used to dynamically construct the receiver's pop-up icon menu.
+    @param menu The menu template to use.
+    The receiver looks for the tag constants described in ŇMenu tagsÓ to determine how to populate the menu with items related to recent searches. See ŇConfiguring a Search MenuÓ for a sample of how you might set up the search menu template.
+*/
+- (void)setSearchMenuTemplate:(CPMenu)menu
+{
+    _searchMenuTemplate = menu;
+    
+    [self resetSearchButton];
+    [self _loadRecentSearchList];
+    [self _updateSearchMenu];
+}
+
+// Managing Search Modes
+/*!
+    Returns a Boolean value indicating whether the receiver sends the search action message when the user clicks the search button (or presses return) or after each keystroke.
+    @return \c YES if the action message is sent all at once when the user clicks the search button or presses return; otherwise, NO if the search string is sent after each keystroke. The default value is NO.
+*/
+- (BOOL)sendsWholeSearchString
+{ 
+    return _sendsWholeSearchString; 
+}
+
+/*!
+    Sets whether the receiver sends the search action message when the user clicks the search button (or presses return) or after each keystroke.
+    @param flag \c YES to send the action message all at once when the user clicks the search button or presses return; otherwise, NO to send the search string after each keystroke.
+*/
+- (void)setSendsWholeSearchString:(BOOL)flag
+{
+    _sendsWholeSearchString = flag;
+}
+
+/*!
+    Returns a Boolean value indicating whether the receiver sends its action immediately upon being notified of changes to the search field text or after a brief pause.
+    @return \c YES if the text field sends its action immediately upon notification of any changes to the search field; otherwise, NO.
+*/
+- (BOOL)sendsSearchStringImmediately
+{ 
+    return _sendsSearchStringImmediately; 
+}
+
+/*!
+    Sets whether the text field sends its action message to the target immediately upon notification of any changes to the search field text or after a brief pause.
+    @param flag \c YES to send the text field's action immediately upon notification of any changes to the search field; otherwise, NO if you want the text field to pause briefly before sending its action message. Pausing gives the user the opportunity to type more text into the search field before initiating the search.
+*/
+- (void)setSendsSearchStringImmediately:(BOOL)flag
+{
+    _sendsSearchStringImmediately = flag;
+}
+
+// Managing Recent Search Strings
+/*!
+    Returns the maximum number of recent search strings to display in the custom search menu.
+    @return The maximum number of search strings that can appear in the menu. This value is between 0 and 254.
+*/
+- (int)maximumRecents
+{ 
+    return _maximumRecents;
+}
+
+/*!
+    Sets the maximum number of search strings that can appear in the search menu.
+    @param maxRecents The maximum number of search strings that can appear in the menu. This value can be between 0 and 254. Specifying a value less than 0 sets the value to the default, which is 10. Specifying a value greater than 254 sets the maximum to 254.
+*/
+- (void)setMaximumRecents:(int)max
+{
+    if (max > 254)
+        max = 254;
+    else if (max < 0)
+        max = 10;
+    
+    _maximumRecents = max;
+}
+
+/*!
+    Returns the list of recent search strings for the control.
+    @return An array of \c CPString objects, each of which contains a search string either displayed in the search menu or from a recent autosave archive. If there have been no recent searches and no prior searches saved under an autosave name, this array may be empty. 
+ */
+- (CPArray)recentSearches
+{
+    return _recentSearches;
+}
+
+/*!
+    Sets the list of recent search strings to list in the pop-up icon menu of the receiver.
+    @param searches An array of CPString objects containing the search strings.
+    You might use this method to set the recent list of searches from an archived copy.
+*/
+- (void)setRecentSearches:(CPArray)searches
+{
+    var max = MIN([self maximumRecents], [searches count]),
+        searches = [searches subarrayWithRange:CPMakeRange(0, max)];
+    
+    _recentSearches = searches;    
+    [self _autosaveRecentSearchList];
+}
+
+/*!
+    Returns the key under which the prior list of recent search strings has been archived.
+    @return The autosave name, which is used as a key in the standard user defaults to save the recent searches. The default value is nil, which causes searches not to be autosaved.
+*/
+- (CPString)recentsAutosaveName
+{
+    return _recentsAutosaveName; 
+}
+
+/*!
+    Sets the autosave name under which the receiver automatically archives the list of recent search strings.
+    @param name The autosave name, which is used as a key in the standard user defaults to save the recent searches. If you specify nil or an empty string for this parameter, no autosave name is set and searches are not autosaved.
+*/
+- (void)setRecentsAutosaveName:(CPString)name
+{
+    if (_recentsAutosaveName != nil)
+        [self _deregisterForAutosaveNotification];
+        
+    _recentsAutosaveName = name;
+    
+    if (_recentsAutosaveName != nil)
+      [self _registerForAutosaveNotification];
+}
+
+// Private methods and subclassing
+
+- (CPRect)contentRectForBounds:(CPRect)bounds
+{
+    var superbounds = [super contentRectForBounds:bounds];    
+    return [self searchTextRectForBounds:superbounds];
+}
+
++ (double)_keyboardDelayForPartialSearchString:(CPString)string
+{
+    return (6 - MIN([string length],4))/10;
+}
+
+- (CPMenu)menu
+{
+    return _searchMenu;
+}
+
+- (BOOL)isOpaque
+{
+  return [super isOpaque] && [_cancelButton isOpaque] && [_searchButton isOpaque];
+}
+
+- (void)_updateCancelButtonVisibility
+{
+    [_cancelButton setHidden:([[self stringValue] length] === 0)];
+}
+
+- (void)controlTextDidChange:(CPNotification)aNotification
+{
+    if (![self sendsWholeSearchString])
+    {
+        if ([self sendsSearchStringImmediately])
+            [self _sendPartialString];
+        else
+        {
+            [_partialStringTimer invalidate];
+            var timeInterval = [CPSearchField _keyboardDelayForPartialSearchString:[self stringValue]];
+    
+            _partialStringTimer = [CPTimer scheduledTimerWithTimeInterval:timeInterval 
+                                                                   target:self 
+                                                                 selector:@selector(_sendPartialString) 
+                                                                 userInfo:nil 
+                                                                  repeats:NO];         
+        }
+    }
+    
+    [self _updateCancelButtonVisibility];
+}
+
+- (void)_sendAction:(id)sender
+{
+    [self sendAction:[self action] to:[self target]];
+}
+
+- (void)sendAction:(SEL)anAction to:(id)anObject
+{
+    [super sendAction:anAction to:anObject];
+
+    [_partialStringTimer invalidate];
+
+    [self _addStringToRecentSearches:[self stringValue]];
+    [self _updateCancelButtonVisibility];
+}
+
+- (void)_addStringToRecentSearches:(CPString)string
+{
+    if (string === nil || string === @"" || [_recentSearches containsObject:string])
+        return;
+        
+    var searches = [CPMutableArray arrayWithArray:_recentSearches];
+    [searches addObject:string];
+    [self setRecentSearches:searches];
+    [self _updateSearchMenu];
+}
+
+- (BOOL)trackMouse:(CPEvent)event
+{
+    var rect,
+        point,
+        location = [event locationInWindow];
+    
+    point = [self convertPoint:location fromView:nil];
+    
+    rect = [self searchButtonRectForBounds:[self frame]];
+    if (CPRectContainsPoint(rect,point))
+    {
+        return [[self searchButton] trackMouse:event];
+    }
+    
+    rect = [self cancelButtonRectForBounds:[self frame]];
+    if (CPRectContainsPoint(rect,point))
+    {
+        return [[self cancelButton] trackMouse:event];
+    }
+    
+    return [super trackMouse:event];
+}
+
+- (CPMenu)_defaultSearchMenuTemplate
+{
+    var template, item;
+    
+    template = [[CPMenu alloc] init];
+    
+    item = [[CPMenuItem alloc] initWithTitle:@"Recent searches" 
+                                      action:NULL 
+                               keyEquivalent:@""];
+    [item setTag:CPSearchFieldRecentsTitleMenuItemTag];
+    [item setEnabled:NO];
+    [template addItem:item];
+    
+    item = [[CPMenuItem alloc] initWithTitle:@"Recent search item" 
+                                      action:@selector(_searchFieldSearch:) 
+                               keyEquivalent:@""];
+    [item setTag:CPSearchFieldRecentsMenuItemTag];
+    [item setTarget:self];
+    [template addItem:item];
+    
+    item = [[CPMenuItem alloc] initWithTitle:@"Clear recent searches" 
+                                      action:@selector(_searchFieldClearRecents:) 
+                               keyEquivalent:@""];
+    [item setTag:CPSearchFieldClearRecentsMenuItemTag];
+    [item setTarget:self];
+    [template addItem:item];
+    
+    item = [[CPMenuItem alloc] initWithTitle:@"No recent searches" 
+                                      action:NULL 
+                               keyEquivalent:@""];
+    [item setTag:CPSearchFieldNoRecentsMenuItemTag];
+    [item setEnabled:NO];
+    [template addItem:item];
+    
+    return template;
+}
+
+- (void)_updateSearchMenu
+{
+    if (_searchMenuTemplate === nil)
+        return;
+        
+    var i, menu = [[CPMenu alloc] init],
+        countOfRecents = [_recentSearches count],
+        numberOfItems = [_searchMenuTemplate numberOfItems];
+    
+    for (i = 0; i < numberOfItems; i++)
+    {
+        var item = [_searchMenuTemplate itemAtIndex:i],
+            tag = [item tag];
+        
+        if (!(tag === CPSearchFieldRecentsTitleMenuItemTag && countOfRecents === 0) &&
+            !(tag === CPSearchFieldClearRecentsMenuItemTag && countOfRecents === 0) &&
+            !(tag === CPSearchFieldNoRecentsMenuItemTag && countOfRecents != 0)    &&
+            !(tag === CPSearchFieldRecentsMenuItemTag))
+        {
+            var itemAction, itemTarget;
+            switch (tag)
+            {
+                case CPSearchFieldRecentsTitleMenuItemTag : itemAction = NULL; itemTarget = NULL; break;
+                case CPSearchFieldClearRecentsMenuItemTag : itemAction = @selector(_searchFieldClearRecents:); itemTarget = self; break;
+                case CPSearchFieldNoRecentsMenuItemTag : itemAction = NULL; itemTarget = NULL; break;
+                default: itemAction = [item action]; itemTarget = [item target]; break;
+            }
+            
+            if (tag === CPSearchFieldClearRecentsMenuItemTag || tag === CPSearchFieldRecentsTitleMenuItemTag)
+            {
+                var separator = [CPMenuItem separatorItem];
+                [separator setEnabled:NO];
+                [menu addItem:separator];
+            }
+        
+            var templateItem = [[CPMenuItem alloc] initWithTitle:[item title] 
+                                                          action:itemAction 
+                                                   keyEquivalent:[item keyEquivalent]];
+            [templateItem setTarget:itemTarget];
+            [templateItem setEnabled:([item isEnabled] && itemAction != NULL)];
+            [templateItem setTag:tag];
+            [menu addItem:templateItem];
+        }
+        else if (tag === CPSearchFieldRecentsMenuItemTag)
+        {
+            var j;
+            for (j = 0; j < countOfRecents; j++)
+            {
+                var rencentItem = [[CPMenuItem alloc] initWithTitle:[_recentSearches objectAtIndex:j] 
+                                                             action:@selector(_searchFieldSearch:) 
+                                                      keyEquivalent:[item keyEquivalent]];
+                [rencentItem setTarget:self];
+                [menu addItem:rencentItem];
+            }
+        }
+    }    
+    _searchMenu = menu;
+}
+
+- (void)_showMenu:(id)sender
+{
+    if (_searchMenu === nil || [_searchMenu numberOfItems] === 0 || ![self isEnabled])
+        return;
+        
+    var aFrame = [[self superview] convertRect:[self frame] toView:nil],
+        location = CPMakePoint(aFrame.origin.x + 10, aFrame.origin.y + aFrame.size.height - 4);
+    
+    var anEvent = [CPEvent mouseEventWithType:CPRightMouseDown location:location modifierFlags:0 timestamp:[[CPApp currentEvent] timestamp] windowNumber:[[self window] windowNumber] context:nil eventNumber:1 clickCount:1 pressure:0];
+    
+    [CPMenu popUpContextMenu:_searchMenu withEvent:anEvent forView:sender];
+}
+
+- (void)_sendPartialString
+{
+    [[self target] performSelector:[self action] withObject:self];
+}
+
+- (void)_searchFieldCancel:(id)sender
+{   
+    [self setObjectValue:@""];
+    [self _sendPartialString];
+    [self _updateCancelButtonVisibility];
+}
+
+- (void)_searchFieldSearch:(id)sender
+{
+    var searchString = [sender title];
+    
+    if ([sender tag] != CPSearchFieldRecentsMenuItemTag)
+        [self _addStringToRecentSearches:searchString];
+    
+    [self setObjectValue:searchString];
+    [self _sendPartialString];
+
+    [self _updateCancelButtonVisibility];
+}
+
+- (void)_searchFieldClearRecents:(id)sender
+{
+    [self setRecentSearches:[CPArray array]];
+    [self _updateSearchMenu];
+ }
+
+- (void)_registerForAutosaveNotification
+{
+    [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_updateAutosavedRecents:) name:@"CPAutosavedRecentsChangedNotification" object:nil];
+}
+
+- (void)_deregisterForAutosaveNotification
+{
+    [[CPNotificationCenter defaultCenter] removeObserver:self name:@"CPAutosavedRecentsChangedNotification" object:nil];
+}
+
+- (void)_autosaveRecentSearchList
+{  
+    if (_recentsAutosaveName != nil) 
+        [[CPNotificationCenter defaultCenter] postNotificationName:@"CPAutosavedRecentsChangedNotification" object:_recentsAutosaveName];
+}
+
+- (void)_updateAutosavedRecents:(id)notification
+{
+    var list = [self recentSearches],
+        name = [notification object],
+        bundle_name = [[[CPBundle mainBundle] infoDictionary] objectForKey:"CPBundleName"],
+        cookie_name = [bundle_name lowercaseString] + "." + [notification object],
+
+        cookie = [[CPCookie alloc] initWithName:cookie_name],
+        cookie_value = [list componentsJoinedByString:@","];
+    
+    [cookie setValue:cookie_value 
+             expires:[[CPDate alloc] initWithTimeIntervalSinceNow:3600*24*365] 
+              domain:(window.location.href.hostname)];
+}
+
+- (void)_loadRecentSearchList
+{
+    var list,
+        name = [self recentsAutosaveName];
+    
+    if (name === nil)
+        return;
+
+    var bundle_name = [[[CPBundle mainBundle] infoDictionary] objectForKey:"CPBundleName"],
+        cookie_name = [bundle_name lowercaseString] + "." + name,     
+
+        cookie = [[CPCookie alloc] initWithName:cookie_name];
+
+    if (cookie != nil)
+    {
+        var cookie_value = [cookie value];
+        list = (cookie_value != @"") ? [cookie_value componentsSeparatedByString:@","] : [CPArray array];
+        _recentSearches = list;
+    }
+}
+
+@end
+
+var CPSearchButtonKey                   = @"CPSearchButtonKey",
+    CPCancelButtonKey                   = @"CPCancelButtonKey",
+    CPRecentsAutosaveNameKey            = @"CPRecentsAutosaveNameKey",
+    CPSendsWholeSearchStringKey         = @"CPSendsWholeSearchStringKey",
+    CPSendsSearchStringImmediatelyKey   = @"CPSendsSearchStringImmediatelyKey",
+    CPMaximumRecentsKey                 = @"CPMaximumRecentsKey",
+    CPSearchMenuTemplateKey             = @"CPSearchMenuTemplateKey";   
+
+@implementation CPSearchField (CPCoding)
+
+- (void)encodeWithCoder:(CPCoder)coder
+{
+    [super encodeWithCoder:coder];
+    
+    [coder encodeObject:_searchButton forKey:CPSearchButtonKey];
+    [coder encodeObject:_cancelButton forKey:CPCancelButtonKey];
+    [coder encodeBool:_sendsWholeSearchString forKey:CPSendsWholeSearchStringKey];
+    [coder encodeBool:_sendsSearchStringImmediately forKey:CPSendsSearchStringImmediatelyKey];
+    [coder encodeInt:_maximumRecents forKey:CPMaximumRecentsKey];
+    if (_recentsAutosaveName)
+        [coder encodeObject:_recentsAutosaveName forKey:CPRecentsAutosaveNameKey];
+    if (_searchMenuTemplate)
+        [coder encodeObject:_searchMenuTemplate forKey:CPSearchMenuTemplateKey];
+}
+
+- (id)initWithCoder:(CPCoder)coder
+{
+    self = [super initWithCoder:coder];
+    
+    _searchButton             = [coder decodeObjectForKey:CPSearchButtonKey];
+    _cancelButton             = [coder decodeObjectForKey:CPCancelButtonKey];
+    _recentsAutosaveName      = [coder decodeObjectForKey:CPRecentsAutosaveNameKey];
+    _sendsWholeSearchString   = [coder decodeBoolForKey:CPSendsWholeSearchStringKey];
+    _sendsSearchStringImmediately = [coder decodeBoolForKey:CPSendsSearchStringImmediatelyKey];
+    _maximumRecents           = [coder decodeIntForKey:CPMaximumRecentsKey];
+    var template              = [coder decodeObjectForKey:CPSearchMenuTemplateKey];
+    if (template)
+        [self setSearchMenuTemplate:template];
+        
+    [self setDelegate:self];
+
+    return self;
+}
+
+@end

AppKit/CPSecureTextField.j

@@ -0,0 +1,16 @@
+
+@import "CPTextField.j"
+
+/*!
+    @ingroup appkit
+*/
+@implementation CPSecureTextField : CPTextField
+{
+}
+
+- (BOOL)isSecure
+{
+    return YES;
+}
+
+@end

AppKit/CPSegmentedControl.j

@@ -0,0 +1,942 @@
+/*
+ * CPSegmentedControl.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPArray.j>
+
+@import "CPControl.j"
+
+#include "CoreGraphics/CGGeometry.h"
+
+/*
+    @global
+    @group CPSegmentSwitchTracking
+*/
+CPSegmentSwitchTrackingSelectOne = 0;
+/*
+    @global
+    @group CPSegmentSwitchTracking
+*/
+CPSegmentSwitchTrackingSelectAny = 1;
+/*
+    @global
+    @group CPSegmentSwitchTracking
+*/
+CPSegmentSwitchTrackingMomentary = 2;
+
+/*! 
+    @ingroup appkit
+    @class CPSegmentedControl
+
+    This class is a horizontal button with multiple segments.
+*/
+@implementation CPSegmentedControl : CPControl
+{
+    CPArray                 _segments;
+    CPArray                 _themeStates;
+
+    int                     _selectedSegment;
+    int                     _segmentStyle;
+    CPSegmentSwitchTracking _trackingMode;
+
+    unsigned                _trackingSegment;
+    BOOL                    _trackingHighlighted;
+}
+
++ (CPString)themeClass
+{
+    return "segmented-control";
+}
+
++ (id)themeAttributes
+{
+    return [CPDictionary dictionaryWithObjects:[CPCenterTextAlignment, CPCenterVerticalTextAlignment, CPImageLeft, CPScaleNone, _CGInsetMakeZero(), _CGInsetMakeZero(), nil, nil, nil, nil, 1.0, 24.0]
+                                       forKeys:[@"alignment", @"vertical-alignment", @"image-position", @"image-scaling", @"bezel-inset", @"content-inset", @"left-segment-bezel-color", @"right-segment-bezel-color", @"center-segment-bezel-color", @"divider-bezel-color", @"divider-thickness", @"default-height"]];
+}
+
+- (id)initWithFrame:(CGRect)aRect
+{
+    _segments = [];
+    _themeStates = [];
+    
+    self = [super initWithFrame:aRect];
+    
+    if (self)
+    {
+        _selectedSegment = -1;
+        
+        _trackingMode = CPSegmentSwitchTrackingSelectOne;
+    }
+    
+    return self;
+}
+
+/*!
+    Returns the tag of the selected segment.
+*/
+- (int)selectedTag
+{
+    return _segments[_selectedSegment].tag;
+}
+
+// Specifying the number of segments
+/*!
+    Sets the number of segments in the button.
+    @param aCount the number of segments on the button
+*/
+- (void)setSegmentCount:(unsigned)aCount
+{
+    if (_segments.length == aCount)
+        return;
+        
+    var height = CGRectGetHeight([self bounds]);
+    
+    if (_segments.length < aCount)
+    {        
+        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;
+    }
+
+    if (_selectedSegment >= _segments.length)
+        _selectedSegment = -1;
+
+    [self tileWithChangedSegment:0];
+}
+
+/*!
+    Returns the number of segments in the button.
+*/
+- (unsigned)segmentCount
+{
+    return _segments.length;
+}
+
+// Specifying Selected Segment
+/*!
+    Selects a segment.
+    @param aSegment the segment to select
+    @throws CPRangeException if \c aSegment is out of bounds
+*/
+- (void)setSelectedSegment:(unsigned)aSegment
+{
+    // setSelected:forSegment throws the exception for us (if necessary)
+    [self setSelected:YES forSegment:aSegment];
+}
+
+/*!
+    Returns the selected segment.
+*/
+- (unsigned)selectedSegment
+{
+    return _selectedSegment;
+}
+
+/*!
+    Selects the button segment with the specified tag.
+*/
+- (BOOL)selectSegmentWithTag:(int)aTag
+{
+    var index = 0;
+    
+    for (; index < _segments.length; ++index)
+        if (_segments[index].tag == aTag)
+        {
+            [self setSelectedSegment:index];
+            
+            return YES;
+        }
+    
+    return NO;
+}
+
+// Specifying Tracking Mode
+
+- (BOOL)isTracking
+{
+
+}
+
+- (void)setTrackingMode:(CPSegmentSwitchTracking)aTrackingMode
+{
+    if (_trackingMode == aTrackingMode)
+        return;
+        
+    _trackingMode = aTrackingMode;
+    
+    if (_trackingMode == CPSegmentSwitchTrackingSelectOne)
+    {
+        var index = 0,
+            selected = NO;
+        
+        for (; index < _segments.length; ++index)
+            if (_segments[index].selected)
+                if (selected)
+                    [self setSelected:NO forSegment:index];
+                else
+                    selected = YES;
+    }
+    
+    else if (_trackingMode == CPSegmentSwitchTrackingMomentary)
+    {
+        var index = 0;
+        
+        for (; index < _segments.length; ++index)
+            if (_segments[index].selected)
+                [self setSelected:NO forSegment:index];
+    }
+}
+
+/*!
+    Returns the control's tracking mode.
+*/
+- (CPSegmentSwitchTracking)trackingMode
+{
+    return _trackingMode;
+}
+
+// Working with Individual Segments
+/*!
+    Sets the width of the specified segment.
+    @param aWidth the new width for the segment
+    @param aSegment the segment to set the width for
+    @throws CPRangeException if \c aSegment is out of bounds
+*/
+- (void)setWidth:(float)aWidth forSegment:(unsigned)aSegment
+{
+    _segments[aSegment].width = aWidth;
+    
+    [self tileWithChangedSegment:aSegment];
+}
+
+/*!
+    Returns the width for the specified segment.
+    @param aSegment the segment to get the width for
+    @throws CPRangeException if \c aSegment is out of bounds
+*/
+- (float)widthForSegment:(unsigned)aSegment
+{
+    return _segments[aSegment].width;
+}
+
+/*!
+    Sets the image for the specified segment.
+    @param anImage the image for the segment
+    @param aSegment the segment to set the image on
+    @throws CPRangeException if \c aSegment is out of bounds
+*/
+- (void)setImage:(CPImage)anImage forSegment:(unsigned)aSegment
+{
+    var segment = _segments[aSegment];
+    
+    segment.image = anImage;
+
+    [self tileWithChangedSegment:aSegment];
+}
+
+/*!
+    Returns the image for the specified segment
+    @param aSegment the segment to obtain the image for
+    @throws CPRangeException if \c aSegment is out of bounds
+*/
+- (CPImage)imageForSegment:(unsigned)aSegment
+{
+    return _segments[aSegment].image;
+}
+
+/*!
+    Sets the label for the specified segment
+    @param aLabel the label for the segment
+    @param aSegment the segment to label
+    @throws CPRangeException if \c aSegment is out of bounds
+*/
+- (void)setLabel:(CPString)aLabel forSegment:(unsigned)aSegment
+{
+    var segment = _segments[aSegment];
+        
+    _segments[aSegment].label = aLabel;
+    
+    [self tileWithChangedSegment:aSegment];
+}
+
+/*!
+    Returns the label for the specified segment
+    @param the segment to obtain the label for
+    @throws CPRangeException if \c aSegment is out of bounds
+*/
+- (CPString)labelForSegment:(unsigned)aSegment
+{
+    return _segments[aSegment].label;
+}
+
+/*!
+    Sets the menu for the specified segment
+    @param aMenu the menu to set
+    @param aSegment the segment to set the menu on
+    @throws CPRangeException if \c aSegment is out of bounds
+*/
+- (void)setMenu:(CPMenu)aMenu forSegment:(unsigned)aSegment
+{
+    _segments[aSegment].menu = aMenu;
+}
+
+/*!
+    Returns the menu for the specified segment.
+    @param aSegment the segment to obtain the menu for
+    @throws CPRangeException if \c aSegment is out of bounds
+*/
+- (CPMenu)menuForSegment:(unsigned)aSegment
+{
+    return _segments[aSegment].menu;
+}
+
+/*!
+    Sets the selection for the specified segment. If only one segment
+    can be selected at a time, any other segment will be deselected.
+    @param isSelected \c YES selects the segment. \c NO deselects it.
+    @param aSegment the segment to set the selection for
+    @throws CPRangeException if \c aSegment is out of bounds
+*/
+- (void)setSelected:(BOOL)isSelected forSegment:(unsigned)aSegment
+{
+    var segment = _segments[aSegment];
+    
+    // If we're already in this state, bail.
+    if (segment.selected == isSelected)
+        return;
+    
+    segment.selected = isSelected;
+
+    _themeStates[aSegment] = isSelected ? CPThemeStateSelected : CPThemeStateNormal;
+
+    // We need to do some cleanup if we only allow one selection.
+    if (isSelected)
+    {
+        var oldSelectedSegment = _selectedSegment;
+        
+        _selectedSegment = aSegment;
+        
+        if (_trackingMode == CPSegmentSwitchTrackingSelectOne && oldSelectedSegment != aSegment && oldSelectedSegment != -1)
+        {
+            _segments[oldSelectedSegment].selected = NO;
+            _themeStates[oldSelectedSegment] = CPThemeStateNormal;
+
+            [self drawSegmentBezel:oldSelectedSegment highlight:NO];
+        }
+    }
+    
+    if (_trackingMode != CPSegmentSwitchTrackingMomentary)
+        [self drawSegmentBezel:aSegment highlight:NO];
+
+    [self setNeedsLayout];
+    [self setNeedsDisplay:YES];
+}
+
+/*!
+    Returns \c YES if the specified segment is selected.
+    @param aSegment the segment to check for selection
+    @throws CPRangeException if \c aSegment is out of bounds
+*/
+- (BOOL)isSelectedForSegment:(unsigned)aSegment
+{
+    return _segments[aSegment].selected;
+}
+
+/*!
+    Enables/diables the specified segment.
+    @param isEnabled \c YES enables the segment
+    @param aSegment the segment to enable/disble
+    @throws CPRangeException if \c aSegment is out of bounds
+*/
+- (void)setEnabled:(BOOL)isEnabled forSegment:(unsigned)aSegment
+{
+    _segments[aSegment].enabled = isEnabled;
+
+    [self setNeedsLayout];
+    [self setNeedsDisplay:YES];
+}
+
+/*!
+    Returns \c YES if the specified segment is enabled.
+    @param aSegment the segment to check
+    @throws CPRangeException if \c aSegment is out of bounds
+*/
+- (BOOL)isEnabledForSegment:(unsigned)aSegment
+{
+    return _segments[aSegment].enabled;
+}
+
+/*!
+    Sets a tag for the specified segment.
+    @param aTag the tag to set
+    @param aSegment the segment to set the tag on
+*/
+- (void)setTag:(int)aTag forSegment:(unsigned)aSegment
+{
+    _segments[aSegment].tag = aTag;
+}
+
+/*!
+    Returns the tag for the specified segment.
+    @param aSegment the segment to obtain the tag for
+*/
+- (int)tagForSegment:(unsigned)aSegment
+{
+    return _segments[aSegment].tag;
+}
+
+// Drawings
+/*!
+    Draws the specified segment bezel
+    @param aSegment the segment to draw the bezel for
+    @param shouldHighlight \c YES highlights the bezel
+*/
+- (void)drawSegmentBezel:(int)aSegment highlight:(BOOL)shouldHighlight
+{
+    if (shouldHighlight)
+        _themeStates[aSegment] |= CPThemeStateHighlighted;
+    else
+        _themeStates[aSegment] &= ~CPThemeStateHighlighted;
+
+    [self setNeedsLayout];
+    [self setNeedsDisplay:YES];
+}
+
+- (float)_leftOffsetForSegment:(unsigned)segment
+{
+    var bezelInset = [self currentValueForThemeAttribute:@"bezel-inset"];
+
+    if (segment == 0)
+        return bezelInset.left;
+
+    var thickness = [self currentValueForThemeAttribute:@"divider-thickness"];
+
+    return [self _leftOffsetForSegment:segment - 1] + [self widthForSegment:segment - 1] + thickness;
+}
+
+- (unsigned)_indexOfLastSegment
+{
+    var lastSegmentIndex = [_segments count] - 1;
+
+    if (lastSegmentIndex < 0)
+        lastSegmentIndex = 0;
+
+    return lastSegmentIndex;
+}
+
+- (CGRect)rectForEphemeralSubviewNamed:(CPString)aName
+{
+    var height = [self currentValueForThemeAttribute:@"default-height"],
+        contentInset = [self currentValueForThemeAttribute:@"content-inset"],
+        bezelInset = [self currentValueForThemeAttribute:@"bezel-inset"],
+        bounds = [self bounds];
+
+    if (aName === "left-segment-bezel")
+    {
+        return CGRectMake(bezelInset.left, bezelInset.top, contentInset.left, height);
+    }
+    else if (aName === "right-segment-bezel")
+    {
+        var lastSegmentLeftOffset = [self _leftOffsetForSegment:[self _indexOfLastSegment]];
+
+        return CPRectMake(lastSegmentLeftOffset + [self widthForSegment:[self _indexOfLastSegment]] - contentInset.right,
+                            bezelInset.top,
+                            contentInset.right,
+                            height);
+    }
+    else if (aName.substring(0, "segment-bezel".length) == "segment-bezel")
+    {
+        var segment = parseInt(aName.substring("segment-bezel-".length), 10),
+            frame = CGRectCreateCopy(_segments[segment].frame);
+
+        if (segment == 0)
+        {
+            frame.origin.x += contentInset.left;
+            frame.size.width -= contentInset.left;
+        }
+
+        if (segment == _segments.length - 1)
+            frame.size.width -= contentInset.right;
+
+        return frame;
+    }
+    else if (aName.substring(0, "divider-bezel".length) == "divider-bezel")
+    {
+        var segment = parseInt(aName.substring("divider-bezel-".length), 10),
+            width = [self widthForSegment:segment],
+            left = [self _leftOffsetForSegment:segment],
+            thickness = [self currentValueForThemeAttribute:@"divider-thickness"];
+
+        return CGRectMake(left + width, bezelInset.top, thickness, height);
+    }
+    else if (aName.substring(0, "segment-content".length) == "segment-content")
+    {
+        var segment = parseInt(aName.substring("segment-content-".length), 10);
+
+        return [self contentFrameForSegment:segment];
+    }
+
+    return [super rectForEphemeralSubviewNamed:aName];
+}
+
+- (CPView)createEphemeralSubviewNamed:(CPString)aName
+{
+    if (aName.substring(0, "segment-content".length) == "segment-content")
+        return [[_CPImageAndTextView alloc] initWithFrame:_CGRectMakeZero()];
+
+    return [[CPView alloc] initWithFrame:_CGRectMakeZero()];
+}
+
+- (void)layoutSubviews
+{
+    if (_segments.length <= 0)
+        return;
+
+    var leftCapColor = [self valueForThemeAttribute:@"left-segment-bezel-color" 
+                                            inState:_themeStates[0]];
+
+    var leftBezelView = [self layoutEphemeralSubviewNamed:@"left-segment-bezel"
+                                               positioned:CPWindowBelow
+                          relativeToEphemeralSubviewNamed:nil];
+
+    [leftBezelView setBackgroundColor:leftCapColor];
+
+    var rightCapColor = [self valueForThemeAttribute:@"right-segment-bezel-color" 
+                                             inState:_themeStates[_themeStates.length - 1]];
+
+    var rightBezelView = [self layoutEphemeralSubviewNamed:@"right-segment-bezel"
+                                               positioned:CPWindowBelow
+                          relativeToEphemeralSubviewNamed:nil];
+
+    [rightBezelView setBackgroundColor:rightCapColor];
+
+    for (var i=0, count = _themeStates.length; i<count; i++)
+    {
+        var themeState = _themeStates[i];
+
+        themeState |= _themeState & CPThemeStateDisabled;
+
+        var bezelColor = [self valueForThemeAttribute:@"center-segment-bezel-color" 
+                                              inState:themeState];
+
+        var bezelView = [self layoutEphemeralSubviewNamed:"segment-bezel-"+i 
+                                               positioned:CPWindowBelow 
+                          relativeToEphemeralSubviewNamed:nil];
+
+        [bezelView setBackgroundColor:bezelColor];
+
+
+        //layout image/title views
+        var segment = _segments[i];
+
+
+        var contentView = [self layoutEphemeralSubviewNamed:@"segment-content-"+i
+                                                 positioned:CPWindowAbove
+                            relativeToEphemeralSubviewNamed:@"segment-bezel-"+i];
+
+        [contentView setText:segment.label];
+        [contentView setImage:segment.image];
+
+        [contentView setFont:[self valueForThemeAttribute:@"font" inState:themeState]];
+        [contentView setTextColor:[self valueForThemeAttribute:@"text-color" inState:themeState]];
+        [contentView setAlignment:[self valueForThemeAttribute:@"alignment" inState:themeState]];
+        [contentView setVerticalAlignment:[self valueForThemeAttribute:@"vertical-alignment" inState:themeState]];
+        [contentView setLineBreakMode:[self valueForThemeAttribute:@"line-break-mode" inState:themeState]];
+        [contentView setTextShadowColor:[self valueForThemeAttribute:@"text-shadow-color" inState:themeState]];
+        [contentView setTextShadowOffset:[self valueForThemeAttribute:@"text-shadow-offset" inState:themeState]];
+        [contentView setImageScaling:[self valueForThemeAttribute:@"image-scaling" inState:themeState]];        
+        
+        if (segment.image && segment.label)
+            [contentView setImagePosition:[self valueForThemeAttribute:@"image-position" inState:themeState]];
+        else if (segment.image)
+            [contentView setImagePosition:CPImageOnly];
+
+        if (i == count - 1)
+            continue;
+
+        var borderState = _themeStates[i] | _themeStates[i+1];
+        
+        borderState = (borderState & CPThemeStateSelected & ~CPThemeStateHighlighted) ? CPThemeStateSelected : CPThemeStateNormal;
+
+        borderState |= _themeState & CPThemeStateDisabled;
+
+        var borderColor = [self valueForThemeAttribute:@"divider-bezel-color"
+                                               inState:borderState];
+
+        var borderView = [self layoutEphemeralSubviewNamed:"divider-bezel-"+i 
+                                                positioned:CPWindowBelow 
+                           relativeToEphemeralSubviewNamed:nil];
+
+        [borderView setBackgroundColor:borderColor];
+    }
+}
+
+
+/*!
+    Draws the specified segment
+    @param aSegment the segment to draw
+    @param shouldHighlight \c YES highlights the bezel
+*/
+- (void)drawSegment:(int)aSegment highlight:(BOOL)shouldHighlight
+{
+}
+
+- (void)tileWithChangedSegment:(unsigned)aSegment
+{
+    if (aSegment >= _segments.length)
+        return;
+
+    var segment = _segments[aSegment],
+        segmentWidth = segment.width,
+        themeState = _themeStates[aSegment] | (_themeState & CPThemeStateDisabled),
+        contentInset = [self valueForThemeAttribute:@"content-inset" inState:themeState],
+        font = [self valueForThemeAttribute:@"font" inState:themeState];
+
+    if (!segmentWidth)
+    {
+        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;
+    }
+
+    var delta = segmentWidth - CGRectGetWidth(segment.frame);
+
+    if (!delta)
+        return;
+
+    // Update Contorl Size
+    var frame = [self frame];
+    
+    [self setFrameSize:CGSizeMake(CGRectGetWidth(frame) + delta, CGRectGetHeight(frame))];
+
+    // Update Segment Width
+    segment.width = segmentWidth;
+    segment.frame = [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 setNeedsLayout];
+    [self setNeedsDisplay:YES];
+}
+
+/*!
+    Returns the bounding rectangle for the specified segment.
+    @param aSegment the segment to get the rectangle for
+*/
+- (CGRect)frameForSegment:(unsigned)aSegment
+{
+    return [self bezelFrameForSegment:aSegment];
+}
+
+- (CGRect)bezelFrameForSegment:(unsigned)aSegment
+{
+    var height = [self currentValueForThemeAttribute:@"default-height"],
+        bezelInset = [self currentValueForThemeAttribute:@"bezel-inset"],
+        width = [self widthForSegment:aSegment],
+        left = [self _leftOffsetForSegment:aSegment];
+
+    return CGRectMake(left, bezelInset.top, width, height);
+}
+
+- (CGRect)contentFrameForSegment:(unsigned)aSegment
+{
+    var height = [self currentValueForThemeAttribute:@"default-height"],
+        contentInset = [self currentValueForThemeAttribute:@"content-inset"],
+        width = [self widthForSegment:aSegment],
+        left = [self _leftOffsetForSegment:aSegment];
+
+    return CGRectMake(left + contentInset.left, contentInset.top, width - contentInset.left - contentInset.right, height - contentInset.top - contentInset.bottom);
+}
+
+/*!
+    Returns the segment that is hit by the specified point.
+    @param aPoint the point to test for a segment hit
+    @return the intersecting segment
+*/
+- (unsigned)testSegment:(CGPoint)aPoint
+{
+    var location = [self convertPoint:aPoint fromView:nil],
+        count = _segments.length;
+    
+    while (count--)
+        if (CGRectContainsPoint(_segments[count].frame, aPoint))
+            return count;
+    
+    return -1;
+}
+
+- (void)mouseDown:(CPEvent)anEvent
+{
+    if (![self isEnabled])
+        return;
+    
+    [self trackSegment:anEvent];
+}
+
+// FIXME: this should be fixed way up in cpbutton/cpcontrol.
+- (void)mouseUp:(CPEvent)anEvent
+{
+}
+
+/*!
+    Handles events for the segment
+    @param anEvent the event to handle
+*/
+- (void)trackSegment:(CPEvent)anEvent
+{     
+    var type = [anEvent type],
+        location = [self convertPoint:[anEvent locationInWindow] fromView:nil];
+        
+    if (type == CPLeftMouseUp)
+    {
+        if (_trackingSegment == -1)
+            return;
+
+        if (CGRectContainsPoint(_segments[_trackingSegment].frame, location))
+        {
+            if (_trackingMode == CPSegmentSwitchTrackingSelectAny)
+            {
+                [self setSelected:![self isSelectedForSegment:_trackingSegment] forSegment:_trackingSegment];
+                
+                // With ANY, _selectedSegment means last pressed.
+                _selectedSegment = _trackingSegment;
+            }
+            else
+                [self setSelected:YES forSegment:_trackingSegment];
+        
+            [self sendAction:[self action] to:[self target]];
+            
+            if (_trackingMode == CPSegmentSwitchTrackingMomentary)
+            {
+                [self setSelected:NO forSegment:_trackingSegment];
+                
+                _selectedSegment = -1;
+            }
+        }
+
+        [self drawSegmentBezel:_trackingSegment highlight:NO];
+        
+        _trackingSegment = -1;
+        
+        return;
+    }
+    
+    if (type == CPLeftMouseDown)
+    {
+        _trackingHighlighted = YES;
+        _trackingSegment = [self testSegment:location];
+        
+        [self drawSegmentBezel:_trackingSegment highlight:YES];
+    }
+    
+    else if (type == CPLeftMouseDragged)
+    {
+        if (_trackingSegment == -1)
+            return;
+
+        var highlighted = CGRectContainsPoint(_segments[_trackingSegment].frame, location);
+        
+        if (highlighted != _trackingHighlighted)
+        {
+            _trackingHighlighted = highlighted;
+            
+            [self drawSegmentBezel:_trackingSegment highlight:_trackingHighlighted];
+        }
+    }
+    
+    [CPApp setTarget:self selector:@selector(trackSegment:) forNextEventMatchingMask:CPLeftMouseDraggedMask | CPLeftMouseUpMask untilDate:nil inMode:nil dequeue:YES];
+}
+
+- (void)setFont:(CPFont)aFont
+{
+    [super setFont:aFont];
+    
+    [self tileWithChangedSegment:0];
+}
+
+@end
+
+var CPSegmentedControlSegmentsKey       = "CPSegmentedControlSegmentsKey",
+    CPSegmentedControlSelectedKey       = "CPSegmentedControlSelectedKey",
+    CPSegmentedControlSegmentStyleKey   = "CPSegmentedControlSegmentStyleKey",
+    CPSegmentedControlTrackingModeKey   = "CPSegmentedControlTrackingModeKey";
+
+@implementation CPSegmentedControl (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super initWithCoder:aCoder];
+    
+    if (self)
+    {
+        var frame = [self frame],
+            originalWidth = frame.size.width;
+        
+        frame.size.width = 0;
+
+        [self setFrame:frame];
+
+        _segments       = [aCoder decodeObjectForKey:CPSegmentedControlSegmentsKey];
+        _segmentStyle   = [aCoder decodeIntForKey:CPSegmentedControlSegmentStyleKey];
+        _themeStates  = [];
+
+        if ([aCoder containsValueForKey:CPSegmentedControlSelectedKey])
+            _selectedSegment = [aCoder decodeIntForKey:CPSegmentedControlSelectedKey];
+        else    
+            _selectedSegment = -1;
+        
+        if ([aCoder containsValueForKey:CPSegmentedControlTrackingModeKey])
+            _trackingMode = [aCoder decodeIntForKey:CPSegmentedControlTrackingModeKey];
+        else
+            _trackingMode = CPSegmentSwitchTrackingSelectOne;
+        
+        // HACK
+
+        for (var i = 0; i < _segments.length; i++)
+        {
+            _themeStates[i] = _segments[i].selected ? CPThemeStateSelected : CPThemeStateNormal;
+            [self tileWithChangedSegment:i];
+        }
+
+        var difference = MAX(originalWidth - [self frame].size.width, 0.0),
+            remainingWidth = FLOOR(difference / _segments.length);
+
+        for (var i=0; i < _segments.length; i++)
+            [self setWidth:_segments[i].width + remainingWidth forSegment:i];
+
+        [self tileWithChangedSegment:0];
+    }
+    
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [super encodeWithCoder:aCoder];
+    
+    [aCoder encodeObject:_segments forKey:CPSegmentedControlSegmentsKey];
+    [aCoder encodeInt:_selectedSegment forKey:CPSegmentedControlSelectedKey];
+    [aCoder encodeInt:_segmentStyle forKey:CPSegmentedControlSegmentStyleKey];
+    [aCoder encodeInt:_trackingMode forKey:CPSegmentedControlTrackingModeKey];
+}
+
+@end
+
+
+@implementation _CPSegmentItem : CPObject
+{
+    CPImage     image;
+    CPString    label;
+    CPMenu      menu;
+    BOOL        selected;
+    BOOL        enabled;
+    int         tag;
+    int         width;
+
+    CGRect      frame;
+}
+
+- (id)init
+{
+    if (self = [super init])
+    {
+        image        = nil;
+        label        = @"";
+        menu         = nil;
+        selected     = NO;
+        enabled      = NO;
+        tag          = 0;
+        width        = 0;
+
+        frame        = CGRectMakeZero();
+    }
+    return self;
+}
+
+@end
+
+var CPSegmentItemImageKey       = "CPSegmentItemImageKey",
+    CPSegmentItemLabelKey       = "CPSegmentItemLabelKey",
+    CPSegmentItemMenuKey        = "CPSegmentItemMenuKey",
+    CPSegmentItemSelectedKey    = "CPSegmentItemSelectedKey",
+    CPSegmentItemEnabledKey     = "CPSegmentItemEnabledKey",
+    CPSegmentItemTagKey         = "CPSegmentItemTagKey",
+    CPSegmentItemWidthKey       = "CPSegmentItemWidthKey";
+
+@implementation _CPSegmentItem (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super init];
+    
+    if (self)
+    {
+        image        = [aCoder decodeObjectForKey:CPSegmentItemImageKey];
+        label        = [aCoder decodeObjectForKey:CPSegmentItemLabelKey];
+        menu         = [aCoder decodeObjectForKey:CPSegmentItemMenuKey];
+        selected     = [aCoder decodeBoolForKey:CPSegmentItemSelectedKey];
+        enabled      = [aCoder decodeBoolForKey:CPSegmentItemEnabledKey];
+        tag          = [aCoder decodeIntForKey:CPSegmentItemTagKey];
+        width        = [aCoder decodeFloatForKey:CPSegmentItemWidthKey];
+
+        frame        = CGRectMakeZero();
+    }
+    
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [aCoder encodeObject:image  forKey:CPSegmentItemImageKey];
+    [aCoder encodeObject:label  forKey:CPSegmentItemLabelKey];
+    [aCoder encodeObject:menu   forKey:CPSegmentItemMenuKey];
+    [aCoder encodeBool:selected forKey:CPSegmentItemSelectedKey];
+    [aCoder encodeBool:enabled  forKey:CPSegmentItemEnabledKey];
+    [aCoder encodeInt:tag       forKey:CPSegmentItemTagKey];
+    [aCoder encodeFloat:width   forKey:CPSegmentItemWidthKey];
+}
+
+@end
+

AppKit/CPShadow.j

@@ -0,0 +1,102 @@
+/*
+ * CPShadow.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPObject.j>
+
+
+/*! 
+    @deprecated 
+    @class CPShadow
+
+    Instances of this class contain the attributes of a drop shadow used in Cappuccino.
+*/
+@implementation CPShadow : CPObject
+{
+    CPSize      _offset;
+    float       _blurRadius;
+    CPColor     _color;
+    
+    CPString    _cssString;
+}
+
+/*!
+    Creates a shadow with the specified attributes.
+    @param anOffset the shadow's offset
+    @param aBlurRadius the shadow's blur radius
+    @param aColor the shadow's color
+    @return the new shadow
+*/
++ (id)shadowWithOffset:(CGSize)anOffset blurRadius:(float)aBlurRadius color:(CPColor)aColor
+{
+    return [[CPShadow alloc] _initWithOffset:anOffset blurRadius:aBlurRadius color:aColor];
+}
+
+/* @ignore */
+- (id)_initWithOffset:(CPSize)anOffset blurRadius:(float)aBlurRadius color:(CPColor)aColor
+{
+    self = [super init];
+    
+    if (self)
+    {
+        _offset = anOffset;
+        _blurRadius = aBlurRadius;
+        _color = aColor;
+        
+        _cssString = [_color cssString] + " " + Math.round(anOffset.width) + @"px " + Math.round(anOffset.height) + @"px " + Math.round(_blurRadius) + @"px";
+    }
+    
+    return self;
+}
+
+/*!
+    Returns the shadow's offset.
+*/
+- (CGSize)shadowOffset
+{
+    return _offset;
+}
+
+/*!
+    Returns the shadow's blur radius
+*/
+- (float)shadowBlurRadius
+{
+    return _blurRadius;
+}
+
+/*!
+    Returns the shadow's color.
+*/
+- (CPColor)shadowColor
+{
+    return _color;
+}
+
+/*!
+    Returns a CSS string representation of the shadow.
+*/
+- (CPString)cssString
+{
+    return _cssString;
+}
+
+@end

AppKit/CPShadowView.j

@@ -0,0 +1,180 @@
+/*
+ * CPShadowView.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPBundle.j>
+
+@import "CGGeometry.j"
+@import "CPImage.j"
+@import "CPImageView.j"
+@import "CPView.j"
+
+
+#include "CoreGraphics/CGGeometry.h"
+
+CPLightShadow   = 0;
+CPHeavyShadow   = 1;
+
+var CPShadowViewLightBackgroundColor    = nil,
+    CPShadowViewHeavyBackgroundColor    = nil;
+    
+var LIGHT_LEFT_INSET    = 3.0,
+    LIGHT_RIGHT_INSET   = 3.0,
+    LIGHT_TOP_INSET     = 3.0,
+    LIGHT_BOTTOM_INSET  = 5.0,
+    
+    HEAVY_LEFT_INSET    = 7.0,
+    HEAVY_RIGHT_INSET   = 7.0,
+    HEAVY_TOP_INSET     = 5.0,
+    HEAVY_BOTTOM_INSET  = 5.0;
+
+/*!
+    @ingroup appkit
+*/
+
+@implementation CPShadowView : CPView
+{
+    CPShadowWeight  _weight;
+}
+
++ (void)initialize
+{
+    if (self != [CPShadowView class])
+        return;
+
+    var bundle = [CPBundle bundleForClass:[self class]];
+    
+    CPShadowViewLightBackgroundColor = [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:
+        [
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightTopLeft.png"] size:CGSizeMake(9.0, 9.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightTop.png"] size:CGSizeMake(1.0, 9.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightTopRight.png"] size:CGSizeMake(9.0, 9.0)],
+            
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightLeft.png"] size:CGSizeMake(9.0, 1.0)],
+            nil,
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightRight.png"] size:CGSizeMake(9.0, 1.0)],
+            
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightBottomLeft.png"] size:CGSizeMake(9.0, 9.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightBottom.png"] size:CGSizeMake(1.0, 9.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightBottomRight.png"] size:CGSizeMake(9.0, 9.0)]
+        ]]];
+        
+    CPShadowViewHeavyBackgroundColor = [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:
+        [
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyTopLeft.png"] size:CGSizeMake(17.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyTop.png"] size:CGSizeMake(1.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyTopRight.png"] size:CGSizeMake(17.0, 17.0)],
+            
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyLeft.png"] size:CGSizeMake(17.0, 1.0)],
+            nil,
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyRight.png"] size:CGSizeMake(17.0, 1.0)],
+            
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyBottomLeft.png"] size:CGSizeMake(17.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyBottom.png"] size:CGSizeMake(1.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyBottomRight.png"] size:CGSizeMake(17.0, 17.0)]
+        ]]];
+}
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    self = [super initWithFrame:aFrame];
+    
+    if (self)
+    {
+        _weight = CPLightShadow;
+        
+        [self setBackgroundColor:CPShadowViewLightBackgroundColor];
+        
+        [self setHitTests:NO];
+    }
+    
+    return self;
+}
+
+- (void)setWeight:(CPShadowWeight)aWeight
+{
+    if (_weight == aWeight)
+        return;
+    
+    _weight = aWeight;
+    
+    if (_weight == CPLightShadow)
+        [self setBackgroundColor:CPShadowViewLightBackgroundColor];
+
+    else
+        [self setBackgroundColor:CPShadowViewHeavyBackgroundColor];
+}
+
+- (float)leftInset
+{
+    return _weight == CPLightShadow ? LIGHT_LEFT_INSET : HEAVY_LEFT_INSET;
+}
+
+- (float)rightInset
+{
+    return _weight == CPLightShadow ? LIGHT_RIGHT_INSET : HEAVY_RIGHT_INSET;
+}
+
+- (float)topInset
+{
+    return _weight == CPLightShadow ? LIGHT_TOP_INSET : HEAVY_TOP_INSET;
+}
+
+- (float)bottomInset
+{
+    return _weight == CPLightShadow ? LIGHT_BOTTOM_INSET : HEAVY_BOTTOM_INSET;
+}
+
+- (float)horizontalInset
+{
+    if (_weight == CPLightShadow)
+        return LIGHT_LEFT_INSET + LIGHT_RIGHT_INSET;
+    
+    return HEAVY_LEFT_INSET + HEAVY_RIGHT_INSET;
+}
+
+- (float)verticalInset
+{
+    if (_weight == CPLightShadow)
+        return LIGHT_TOP_INSET + LIGHT_BOTTOM_INSET;
+    
+    return HEAVY_TOP_INSET + HEAVY_BOTTOM_INSET;
+}
+
++ (CGRect)frameForContentFrame:(CGRect)aFrame withWeight:(CPShadowWeight)aWeight
+{
+    if (aWeight == CPLightShadow)
+        return CGRectMake(_CGRectGetMinX(aFrame) - LIGHT_LEFT_INSET, _CGRectGetMinY(aFrame) - LIGHT_TOP_INSET, _CGRectGetWidth(aFrame) + LIGHT_LEFT_INSET + LIGHT_RIGHT_INSET, _CGRectGetHeight(aFrame) + LIGHT_TOP_INSET + LIGHT_BOTTOM_INSET);
+    else
+        return CGRectMake(_CGRectGetMinX(aFrame) - HEAVY_LEFT_INSET, _CGRectGetMinY(aFrame) - HEAVY_TOP_INSET, _CGRectGetWidth(aFrame) + HEAVY_LEFT_INSET + HEAVY_RIGHT_INSET, _CGRectGetHeight(aFrame) + HEAVY_TOP_INSET + HEAVY_BOTTOM_INSET);
+}
+
+- (CGRect)frameForContentFrame:(CGRect)aFrame
+{
+    return [[self class] frameForContentFrame:aFrame withWeight:_weight];
+}
+
+- (void)setFrameForContentFrame:(CGRect)aFrame
+{
+    [self setFrame:[self frameForContentFrame:aFrame]];
+}
+
+@end

AppKit/CPSlider.j

@@ -0,0 +1,456 @@
+/*
+ * CPSlider.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2009, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import "CPControl.j"
+
+#include "CoreGraphics/CGGeometry.h"
+
+/*! SLIDER STATES */
+
+CPLinearSlider      = 0;
+CPCircularSlider    = 1;
+
+/*!
+    @ingroup appkit
+*/
+
+@implementation CPSlider : CPControl
+{
+    double          _minValue;
+    double          _maxValue;
+    double          _altIncrementValue;
+
+    BOOL            _isVertical;
+}
+
++ (CPString)themeClass
+{
+    return "slider";
+}
+
++ (id)themeAttributes
+{
+    return [CPDictionary dictionaryWithObjects:[nil, _CGSizeMakeZero(), 0.0, nil]
+                                       forKeys:[@"knob-color", @"knob-size", @"track-width", @"track-color"]];
+}
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    self = [super initWithFrame:aFrame];
+
+    if (self)
+    {
+        _minValue = 0.0;
+        _maxValue = 100.0;
+        
+        [self setObjectValue:50.0];
+        
+        [self setContinuous:YES];
+
+        [self _recalculateIsVertical];
+    }
+    
+    return self;
+}
+
+- (void)setMinValue:(float)aMinimumValue
+{
+    if (_minValue === aMinimumValue)
+        return;
+    
+    _minValue = aMinimumValue;
+
+    var doubleValue = [self doubleValue];
+    
+    if (doubleValue < _minValue)
+        [self setDoubleValue:_minValue];
+
+    // The relative position may have (did) change.
+    [self setNeedsLayout];
+    [self setNeedsDisplay:YES];
+}
+
+- (float)minValue
+{
+    return _minValue;
+}
+
+- (void)setMaxValue:(float)aMaximumValue
+{
+    if (_maxValue === aMaximumValue)
+        return;
+    
+    _maxValue = aMaximumValue;
+    
+    var doubleValue = [self doubleValue];
+    
+    if (doubleValue > _maxValue)
+        [self setDoubleValue:_maxValue];
+
+    // The relative position may have (did) change.
+    [self setNeedsLayout];
+    [self setNeedsDisplay:YES];
+}
+
+- (float)maxValue
+{
+    return _maxValue;
+}
+
+- (void)setObjectValue:(id)aValue
+{
+    [super setObjectValue:MIN(MAX(aValue, _minValue), _maxValue)];
+
+    [self setNeedsLayout];
+    [self setNeedsDisplay:YES];
+}
+
+- (void)setSliderType:(CPSliderType)aSliderType
+{
+    if (aSliderType === CPCircularSlider)
+        [self setThemeState:CPThemeStateCircular];
+    else
+        [self unsetThemeState:CPThemeStateCircular];
+}
+
+- (CPSliderType)sliderType
+{
+    return [self hasThemeState:CPThemeStateCircular] ? CPCircularSlider : CPLinearSlider;
+}
+
+- (CGRect)trackRectForBounds:(CGRect)bounds
+{
+    if ([self hasThemeState:CPThemeStateCircular])
+    {
+        var originalBounds = CGRectCreateCopy(bounds);
+
+        bounds.size.width = MIN(bounds.size.width, bounds.size.height);
+        bounds.size.height = bounds.size.width;
+
+        if (bounds.size.width < originalBounds.size.width)
+            bounds.origin.x += (originalBounds.size.width - bounds.size.width) / 2.0;
+        else
+            bounds.origin.y += (originalBounds.size.height - bounds.size.height) / 2.0;
+    }
+    else
+    {
+        var trackWidth = [self currentValueForThemeAttribute:@"track-width"];
+
+        if (trackWidth <= 0)
+            return _CGRectMakeZero();
+
+        if ([self isVertical])
+        {
+            bounds.origin.x = (_CGRectGetWidth(bounds) - trackWidth) / 2.0;
+            bounds.size.width = trackWidth;
+        }
+        else
+        {
+            bounds.origin.y = (_CGRectGetHeight(bounds) - trackWidth) / 2.0;
+            bounds.size.height = trackWidth;
+        }
+    }
+    
+    return bounds;
+}
+
+- (CGRect)knobRectForBounds:(CGRect)bounds
+{
+    var knobSize = [self currentValueForThemeAttribute:@"knob-size"];
+    
+    if (knobSize.width <= 0 || knobSize.height <= 0)
+        return _CGRectMakeZero();
+    
+    var knobRect = _CGRectMake(0.0, 0.0, knobSize.width, knobSize.height),
+        trackRect = [self trackRectForBounds:bounds];
+    
+    // No track, do our best to approximate a place for this thing.
+    if (!trackRect || _CGRectIsEmpty(trackRect))
+        trackRect = bounds;
+
+    if ([self hasThemeState:CPThemeStateCircular])
+    {
+        var angle = 3*PI_2 - (1.0 - [self doubleValue] - _minValue) / (_maxValue - _minValue) * PI2,
+            radius = CGRectGetWidth(trackRect) / 2.0 - 8.0;
+
+        knobRect.origin.x = radius * COS(angle) + CGRectGetMidX(trackRect) - 3.0;
+        knobRect.origin.y = radius * SIN(angle) + CGRectGetMidY(trackRect) - 2.0;
+    }
+    else if ([self isVertical])
+    {
+        knobRect.origin.x = _CGRectGetMidX(trackRect) - knobSize.width / 2.0;
+        knobRect.origin.y = (([self doubleValue] - _minValue) / (_maxValue - _minValue)) * (_CGRectGetHeight(trackRect) - knobSize.height);
+    }
+    else
+    {
+        knobRect.origin.x = (([self doubleValue] - _minValue) / (_maxValue - _minValue)) * (_CGRectGetWidth(trackRect) - knobSize.width);
+        knobRect.origin.y = _CGRectGetMidY(trackRect) - knobSize.height / 2.0;
+    }
+
+    return knobRect;
+}
+
+- (CGRect)rectForEphemeralSubviewNamed:(CPString)aName
+{
+    if (aName === "track-view")
+        return [self trackRectForBounds:[self bounds]];
+    
+    else if (aName === "knob-view")
+        return [self knobRectForBounds:[self bounds]];
+    
+    return [super rectForEphemeralSubviewNamed:aName];
+}
+
+- (CPView)createEphemeralSubviewNamed:(CPString)aName
+{
+    if (aName === "track-view" || aName === "knob-view")
+    {
+        var view = [[CPView alloc] init];
+        
+        [view setHitTests:NO];
+        
+        return view;
+    }
+    
+    return [super createEphemeralSubviewNamed:aName];
+}
+
+- (void)setAltIncrementValue:(float)anAltIncrementValue
+{
+    _altIncrementValue = anAltIncrementValue;
+}
+
+- (float)altIncrementValue
+{
+    return _altIncrementValue;
+}
+
+- (void)setFrameSize:(CGSize)aSize
+{
+    [super setFrameSize:aSize];
+    [self _recalculateIsVertical];
+}
+
+- (void)_recalculateIsVertical
+{
+    // Recalculate isVertical.
+    var bounds = [self bounds],
+        width = _CGRectGetWidth(bounds),
+        height = _CGRectGetHeight(bounds);
+    
+    _isVertical = width < height ? 1 : (width > height ? 0 : -1);
+
+    if (_isVertical === 1)
+        [self setThemeState:CPThemeStateVertical];
+    else if (_isVertical === 0)
+        [self unsetThemeState:CPThemeStateVertical];
+}
+
+- (int)isVertical
+{
+    return _isVertical;
+}
+
+- (void)layoutSubviews
+{
+    var trackView = [self layoutEphemeralSubviewNamed:@"track-view"
+                                           positioned:CPWindowBelow
+                      relativeToEphemeralSubviewNamed:@"knob-view"];
+
+    if (trackView)
+        [trackView setBackgroundColor:[self currentValueForThemeAttribute:@"track-color"]];
+
+    var knobView = [self layoutEphemeralSubviewNamed:@"knob-view"
+                                          positioned:CPWindowAbove
+                     relativeToEphemeralSubviewNamed:@"track-view"];
+      
+    if (knobView)
+        [knobView setBackgroundColor:[self currentValueForThemeAttribute:"knob-color"]];
+}
+
+- (BOOL)tracksMouseOutsideOfFrame
+{
+    return YES;
+}
+
+- (float)_valueAtPoint:(CGPoint)aPoint
+{
+    var bounds = [self bounds],
+        knobRect = [self knobRectForBounds:bounds],
+        trackRect = [self trackRectForBounds:bounds];
+
+    if ([self hasThemeState:CPThemeStateCircular])
+    {
+        var knobWidth = _CGRectGetWidth(knobRect);
+
+        trackRect.origin.x += knobWidth / 2;
+        trackRect.size.width -= knobWidth;
+
+        var minValue = [self minValue],
+            dx = aPoint.x - _CGRectGetMidX(trackRect),
+            dy = aPoint.y - _CGRectGetMidY(trackRect);
+
+        return MAX(0.0, MIN(1.0, 1.0 - (3 * PI_2 - ATAN2(dy, dx)) % PI2 / PI2)) * ([self maxValue] - minValue) + minValue;
+    }
+    else if ([self isVertical])
+    {
+        var knobHeight = _CGRectGetHeight(knobRect);
+
+        trackRect.origin.y += knobHeight / 2;
+        trackRect.size.height -= knobHeight;
+
+        var minValue = [self minValue];
+
+        return MAX(0.0, MIN(1.0, (aPoint.y - _CGRectGetMinY(trackRect)) / _CGRectGetHeight(trackRect))) * ([self maxValue] - minValue) + minValue;
+    }
+    else
+    {
+        var knobWidth = _CGRectGetWidth(knobRect);
+
+        trackRect.origin.x += knobWidth / 2;
+        trackRect.size.width -= knobWidth;
+
+        var minValue = [self minValue];
+
+        return MAX(0.0, MIN(1.0, (aPoint.x - _CGRectGetMinX(trackRect)) / _CGRectGetWidth(trackRect))) * ([self maxValue] - minValue) + minValue;
+    }
+}
+
+- (BOOL)startTrackingAt:(CGPoint)aPoint
+{
+    var bounds = [self bounds],
+        knobRect = [self knobRectForBounds:_CGRectMakeCopy(bounds)];
+    
+    if (_CGRectContainsPoint(knobRect, aPoint))
+        _dragOffset = _CGSizeMake(_CGRectGetMidX(knobRect) - aPoint.x, _CGRectGetMidY(knobRect) - aPoint.y);
+    
+    else 
+    {
+        var trackRect = [self trackRectForBounds:bounds];
+        
+        if (trackRect && _CGRectContainsPoint(trackRect, aPoint))
+        {
+            _dragOffset = _CGSizeMakeZero();
+            
+            [self setObjectValue:[self _valueAtPoint:aPoint]];
+        }
+    
+        else
+            return NO;
+    }
+    
+    [self setHighlighted:YES];
+    
+    [self setNeedsLayout];
+    [self setNeedsDisplay:YES];
+    
+    return YES;   
+}
+
+- (BOOL)continueTracking:(CGPoint)lastPoint at:(CGPoint)aPoint
+{
+    [self setObjectValue:[self _valueAtPoint:_CGPointMake(aPoint.x + _dragOffset.width, aPoint.y + _dragOffset.height)]];
+    
+    return YES;
+}
+
+- (void)stopTracking:(CGPoint)lastPoint at:(CGPoint)aPoint mouseIsUp:(BOOL)mouseIsUp
+{
+    [self setHighlighted:NO];
+    
+    if ([_target respondsToSelector:@selector(sliderDidFinish:)])
+        [_target sliderDidFinish:self];
+
+    [self setNeedsLayout];
+    [self setNeedsDisplay:YES];
+}
+
+/*!
+    @ignore
+    shoudl we have _continuous?
+*/
+- (void)setContinuous:(BOOL)flag
+{
+    if (flag)
+        _sendActionOn |= CPLeftMouseDraggedMask;
+    else 
+        _sendActionOn &= ~CPLeftMouseDraggedMask;
+}
+
+@end
+
+var CPSliderMinValueKey             = "CPSliderMinValueKey",
+    CPSliderMaxValueKey             = "CPSliderMaxValueKey",
+    CPSliderAltIncrValueKey         = "CPSliderAltIncrValueKey";
+
+@implementation CPSlider (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    _minValue = [aCoder decodeDoubleForKey:CPSliderMinValueKey];
+    _maxValue = [aCoder decodeDoubleForKey:CPSliderMaxValueKey];
+
+    self = [super initWithCoder:aCoder];
+
+    if (self)
+    {
+        _altIncrementValue = [aCoder decodeDoubleForKey:CPSliderAltIncrValueKey];
+
+        [self setContinuous:YES];
+
+        [self _recalculateIsVertical];
+
+        [self setNeedsLayout];
+        [self setNeedsDisplay:YES];
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [super encodeWithCoder:aCoder];
+
+    [aCoder encodeDouble:_minValue forKey:CPSliderMinValueKey];
+    [aCoder encodeDouble:_maxValue forKey:CPSliderMaxValueKey];
+    [aCoder encodeDouble:_altIncrementValue forKey:CPSliderAltIncrValueKey];
+}
+
+@end
+
+@implementation CPSlider (Deprecated)
+
+- (id)value
+{
+    CPLog.warn("[CPSlider value] is deprecated, use doubleValue or objectValue instead.");
+    
+    return [self doubleValue];    
+}
+
+- (void)setValue:(id)aValue
+{
+    CPLog.warn("[CPSlider setValue:] is deprecated, use setDoubleValue: or setObjectValue: instead.");
+    
+    [self setObjectValue:aValue];
+}
+
+@end

AppKit/CPSliderColorPicker.j

@@ -0,0 +1,416 @@
+/*
+ * CPApplication.j
+ * AppKit
+ *
+ * Created by Ross Boucher.
+ * Copyright 2008, 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 "CPColorPicker.j"
+
+/*
+    @ignore
+*/
+@implementation CPSliderColorPicker : CPColorPicker
+{    
+    CPView      _contentView;
+    
+    CPSlider    _redSlider;
+    CPSlider    _greenSlider;
+    CPSlider    _blueSlider;
+    CPSlider    _hueSlider;
+    CPSlider    _saturationSlider;
+    CPSlider    _brightnessSlider;
+    
+    CPTextField _rgbLabel;
+    CPTextField _hsbLabel;
+    CPTextField _redLabel;
+    CPTextField _greenLabel;
+    CPTextField _blueLabel;
+    CPTextField _hueLabel;
+    CPTextField _saturationLabel;
+    CPTextField _brightnessLabel;
+    CPTextField _hexLabel;
+    
+    DOMElement  _redValue;
+    DOMElement  _greenValue;
+    DOMElement  _blueValue;
+    DOMElement  _hueValue;
+    DOMElement  _saturationValue;
+    DOMElement  _brightnessValue;
+    DOMElement  _hexValue;    
+}
+
+- (id)initWithPickerMask:(int)mask colorPanel:(CPColorPanel)owningColorPanel 
+{
+    return [super initWithPickerMask:mask colorPanel: owningColorPanel];
+}
+  
+-(id)initView
+{
+    aFrame = CPRectMake(0, 0, CPColorPickerViewWidth, CPColorPickerViewHeight);    
+    
+    _contentView = [[CPView alloc] initWithFrame:aFrame];
+    [_contentView setAutoresizingMask:CPViewWidthSizable|CPViewHeightSizable];
+    
+    _rgbLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 10, 100, 20)];
+    [_rgbLabel setStringValue: "Red, Green, Blue"];
+    [_rgbLabel setTextColor:[CPColor blackColor]];
+
+    _redLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 35, 15, 20)];
+    [_redLabel setStringValue: "R"];
+    [_redLabel setTextColor:[CPColor blackColor]];
+    
+    _redSlider = [[CPSlider alloc] initWithFrame: CPRectMake(15, 35, aFrame.size.width - 70, 20)];
+    [_redSlider setMaxValue: 1.0];
+    [_redSlider setMinValue: 0.0];
+    [_redSlider setTarget: self];
+    [_redSlider setAction: @selector(sliderChanged:)];
+    [_redSlider setAutoresizingMask: CPViewWidthSizable];
+    
+    var updateFunction = function(aDOMEvent) 
+    { 
+        if(isNaN(this.value))
+            return;
+           
+        switch(this)
+        {
+            case _redValue:        [_redSlider setFloatValue:MAX(MIN(ROUND(this.value), 255) / 255.0, 0)]; 
+                                   //[self sliderChanged: _redSlider];
+                                   break;
+                                   
+            case _greenValue:      [_greenSlider setFloatValue:MAX(MIN(ROUND(this.value), 255) / 255.0, 0)]; 
+                                   //[self sliderChanged: _greenSlider];
+                                   break;
+                                   
+            case _blueValue:       [_blueSlider setFloatValue:MAX(MIN(ROUND(this.value), 255) / 255.0, 0)]; 
+                                   //[self sliderChanged: _blueSlider];
+                                   break;
+
+            case _hueValue:        [_hueSlider setFloatValue:MAX(MIN(ROUND(this.value), 360), 0)]; 
+                                   //[self sliderChanged: _hueSlider];
+                                   break;
+                                   
+            case _saturationValue: [_saturationSlider setFloatValue:MAX(MIN(ROUND(this.value), 100), 0)]; 
+                                   //[self sliderChanged: _saturationSlider];
+                                   break;
+
+            case _brightnessValue: [_brightnessSlider setFloatValue:MAX(MIN(ROUND(this.value), 100), 0)]; 
+                                   //[self sliderChanged: _brightnessSlider];
+                                   break;
+        }
+        
+        this.blur();
+    };
+
+    var keypressFunction = function(aDOMEvent)
+    {
+        aDOMEvent = aDOMEvent || window.event;
+        if (aDOMEvent.keyCode == 13) 
+        { 
+            updateFunction(aDOMEvent);
+            
+            if(aDOMEvent.preventDefault)
+                aDOMEvent.preventDefault(); 
+            else if(aDOMEvent.stopPropagation)
+                aDOMEvent.stopPropagation();
+        } 
+    }
+
+    //red value input box
+    var redValue = [[CPView alloc] initWithFrame: CPRectMake(aFrame.size.width - 45, 35, 45, 20)];
+    [redValue setAutoresizingMask: CPViewMinXMargin];
+    
+    _redValue = document.createElement("input");
+    _redValue.style.width = "40px";
+    _redValue.style.backgroundColor = "transparent";
+    _redValue.style.border = "1px solid black";
+    _redValue.style.color = "black";
+    _redValue.style.position = "absolute";
+    _redValue.style.top = "0px";
+    _redValue.style.left = "0px";
+    _redValue.onchange = updateFunction;
+    
+    redValue._DOMElement.appendChild(_redValue);
+    [_contentView addSubview: redValue];
+
+    _greenLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 58, 15, 20)];
+    [_greenLabel setStringValue: "G"];
+    [_greenLabel setTextColor:[CPColor blackColor]];
+
+    _greenSlider = [[CPSlider alloc] initWithFrame: CPRectMake(15, 58, aFrame.size.width - 70, 20)];
+    [_greenSlider setMaxValue: 1.0];
+    [_greenSlider setMinValue: 0.0];
+    [_greenSlider setTarget: self];
+    [_greenSlider setAction: @selector(sliderChanged:)];
+    [_greenSlider setAutoresizingMask: CPViewWidthSizable];
+
+    //green value input box
+    var greenValue = [[CPView alloc] initWithFrame: CPRectMake(aFrame.size.width - 45, 58, 45, 20)];
+    [greenValue setAutoresizingMask: CPViewMinXMargin];
+
+    _greenValue = _redValue.cloneNode(false);
+    _greenValue.onchange = updateFunction;
+    
+    greenValue._DOMElement.appendChild(_greenValue);
+    [_contentView addSubview: greenValue];
+
+    _blueLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 81, 15, 20)];
+    [_blueLabel setStringValue: "B"];
+    [_blueLabel setTextColor:[CPColor blackColor]];
+
+    _blueSlider = [[CPSlider alloc] initWithFrame: CPRectMake(15, 81, aFrame.size.width - 70, 20)];
+    [_blueSlider setMaxValue: 1.0];
+    [_blueSlider setMinValue: 0.0];
+    [_blueSlider setTarget: self];
+    [_blueSlider setAction: @selector(sliderChanged:)];
+    [_blueSlider setAutoresizingMask: CPViewWidthSizable];
+
+    //blue value input box
+    var blueValue = [[CPView alloc] initWithFrame: CPRectMake(aFrame.size.width - 45, 81, 45, 20)];
+    [blueValue setAutoresizingMask: CPViewMinXMargin];
+
+    _blueValue = _redValue.cloneNode(false);
+    _blueValue.onchange = updateFunction;
+
+    blueValue._DOMElement.appendChild(_blueValue);
+    [_contentView addSubview: blueValue];
+
+    _hsbLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 120, 190, 20)];
+    [_hsbLabel setStringValue: "Hue, Saturation, Brightness"];
+    [_hsbLabel setTextColor:[CPColor blackColor]];
+
+    _hueLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 145, 15, 20)];
+    [_hueLabel setStringValue: "H"];
+    [_hueLabel setTextColor:[CPColor blackColor]];
+    
+    _hueSlider = [[CPSlider alloc] initWithFrame: CPRectMake(15, 145, aFrame.size.width - 70, 20)];
+    [_hueSlider setMaxValue: 359.0];
+    [_hueSlider setMinValue: 0.0];
+    [_hueSlider setTarget: self];
+    [_hueSlider setAction: @selector(sliderChanged:)];
+    [_hueSlider setAutoresizingMask: CPViewWidthSizable];
+
+    //red value input box
+    var hueValue = [[CPView alloc] initWithFrame: CPRectMake(aFrame.size.width - 45, 145, 45, 20)];
+    [hueValue setAutoresizingMask: CPViewMinXMargin];
+
+    _hueValue = _redValue.cloneNode(false);
+    _hueValue.onchange = updateFunction;
+
+    hueValue._DOMElement.appendChild(_hueValue);
+    [_contentView addSubview: hueValue];
+    
+    _saturationLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 168, 15, 20)];
+    [_saturationLabel setStringValue: "S"];
+    [_saturationLabel setTextColor:[CPColor blackColor]];
+
+    _saturationSlider = [[CPSlider alloc] initWithFrame: CPRectMake(15, 168, aFrame.size.width - 70, 20)];
+    [_saturationSlider setMaxValue: 100.0];
+    [_saturationSlider setMinValue: 0.0];
+    [_saturationSlider setTarget: self];
+    [_saturationSlider setAction: @selector(sliderChanged:)];
+    [_saturationSlider setAutoresizingMask: CPViewWidthSizable];
+
+    //green value input box
+    var saturationValue = [[CPView alloc] initWithFrame: CPRectMake(aFrame.size.width - 45, 168, 45, 20)];
+    [saturationValue setAutoresizingMask: CPViewMinXMargin];
+
+    _saturationValue = _redValue.cloneNode(false);
+    _saturationValue.onchange = updateFunction;
+
+    saturationValue._DOMElement.appendChild(_saturationValue);
+    [_contentView addSubview: saturationValue];
+
+    _brightnessLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 191, 15, 20)];
+    [_brightnessLabel setStringValue: "B"];
+    [_brightnessLabel setTextColor:[CPColor blackColor]];
+
+    _brightnessSlider = [[CPSlider alloc] initWithFrame: CPRectMake(15, 191, aFrame.size.width - 70, 20)];
+    [_brightnessSlider setMaxValue: 100.0];
+    [_brightnessSlider setMinValue: 0.0];
+    [_brightnessSlider setTarget: self];
+    [_brightnessSlider setAction: @selector(sliderChanged:)];
+    [_brightnessSlider setAutoresizingMask: CPViewWidthSizable];
+
+    //blue value input box
+    var brightnessValue = [[CPView alloc] initWithFrame: CPRectMake(aFrame.size.width - 45, 191, 45, 20)];
+    [brightnessValue setAutoresizingMask: CPViewMinXMargin];
+
+    _brightnessValue = _redValue.cloneNode(false);
+    _brightnessValue.onchange = updateFunction;
+
+    brightnessValue._DOMElement.appendChild(_brightnessValue);
+    [_contentView addSubview: brightnessValue];
+
+    _hexLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 230, 30, 20)];
+    [_hexLabel setStringValue: "Hex"];
+    [_hexLabel setTextColor:[CPColor blackColor]];
+    
+    //hex input box
+    _hexValue = _redValue.cloneNode(false);
+    _hexValue.style.top = "228px";
+    _hexValue.style.width = "80px";
+    _hexValue.style.left = "35px";
+    _hexValue.onkeypress = function(aDOMEvent) 
+    { 
+        aDOMEvent = aDOMEvent || window.event;
+        if (aDOMEvent.keyCode == 13) 
+        { 
+            var newColor = [CPColor colorWithHexString: this.value];
+            
+            if(newColor)
+            {
+                [self setColor: newColor];
+                [[self colorPanel] setColor: newColor];
+            }
+            
+            if(aDOMEvent.preventDefault)
+                aDOMEvent.preventDefault(); 
+            else if(aDOMEvent.stopPropagation)
+                aDOMEvent.stopPropagation();
+            
+            this.blur();
+        } 
+    };
+
+    _contentView._DOMElement.appendChild(_hexValue);
+    
+    [_contentView addSubview: _rgbLabel];
+    [_contentView addSubview: _redLabel];
+    [_contentView addSubview: _greenLabel];
+    [_contentView addSubview: _blueLabel];
+    [_contentView addSubview: _redSlider];
+    [_contentView addSubview: _greenSlider];
+    [_contentView addSubview: _blueSlider];
+    
+    [_contentView addSubview: _hsbLabel];
+    [_contentView addSubview: _hueLabel];
+    [_contentView addSubview: _saturationLabel];
+    [_contentView addSubview: _brightnessLabel];
+    [_contentView addSubview: _hueSlider];
+    [_contentView addSubview: _saturationSlider];
+    [_contentView addSubview: _brightnessSlider];
+    
+    [_contentView addSubview: _hexLabel];
+}
+
+- (CPView)provideNewView:(BOOL)initialRequest 
+{
+    if (initialRequest) 
+        [self initView];
+    
+    return _contentView;
+}
+
+- (int)currentMode 
+{
+    return CPSliderColorPickerMode;
+}
+
+- (BOOL)supportsMode:(int)mode 
+{
+    return (mode == CPSliderColorPickerMode) ? YES : NO;
+}
+
+-(void)sliderChanged:(id)sender
+{
+    var newColor,
+        colorPanel = [self colorPanel],
+        alpha = [colorPanel opacity];
+
+    switch(sender)
+    {
+        case    _hueSlider:
+        case    _saturationSlider:
+        case    _brightnessSlider:      newColor = [CPColor colorWithHue: [_hueSlider floatValue]
+                                                              saturation: [_saturationSlider floatValue]
+                                                              brightness: [_brightnessSlider floatValue]
+                                                                   alpha: alpha];
+                                                              
+                                        [self updateRGBSliders: newColor];
+                                        break;
+                                        
+        case    _redSlider:
+        case    _greenSlider:
+        case    _blueSlider:            newColor = [CPColor colorWithCalibratedRed: [_redSlider floatValue]
+                                                                             green: [_greenSlider floatValue]
+                                                                              blue: [_blueSlider floatValue]
+                                                                             alpha: alpha];
+                                                              
+                                        [self updateHSBSliders: newColor];
+                                        break;
+    }
+        
+    [self updateLabels];
+    [self updateHex: newColor];
+    [colorPanel setColor: newColor];
+}
+
+-(void)setColor:(CPColor)aColor
+{
+    [self updateRGBSliders: aColor];
+    [self updateHSBSliders: aColor];
+    [self updateHex: aColor];
+    [self updateLabels];
+}
+
+-(void)updateHSBSliders:(CPColor)aColor
+{
+    var hsb = [aColor hsbComponents];
+        
+    [_hueSlider setFloatValue:hsb[0]];
+    [_saturationSlider setFloatValue:hsb[1]];
+    [_brightnessSlider setFloatValue:hsb[2]];
+}
+
+- (void)updateHex:(CPColor)aColor
+{
+    _hexValue.value = [aColor hexString];
+}
+
+- (void)updateRGBSliders:(CPColor)aColor
+{
+    var rgb = [aColor components];
+
+    [_redSlider setFloatValue:rgb[0]];
+    [_greenSlider setFloatValue:rgb[1]];
+    [_blueSlider setFloatValue:rgb[2]];
+}
+
+- (void)updateLabels
+{
+    _hueValue.value        = ROUND([_hueSlider floatValue]);      
+    _saturationValue.value = ROUND([_saturationSlider floatValue]);
+    _brightnessValue.value = ROUND([_brightnessSlider floatValue]);
+    
+    _redValue.value        = ROUND([_redSlider floatValue] * 255);
+    _greenValue.value      = ROUND([_greenSlider floatValue] * 255);
+    _blueValue.value       = ROUND([_blueSlider floatValue] * 255);
+}
+
+- (CPImage)provideNewButtonImage
+{
+    return [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:CPColorPicker] pathForResource:"slider_button.png"] size:CGSizeMake(32, 32)];
+}
+
+- (CPImage)provideNewAlternateButtonImage
+{
+    return [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:CPColorPicker] pathForResource:"slider_button_h.png"] size:CGSizeMake(32, 32)];
+}
+
+@end

AppKit/CPSplitView.j

@@ -0,0 +1,605 @@
+/*
+ * CPSplitView.j
+ * AppKit
+ *
+ * Created by Thomas Robinson.
+ * Copyright 2008, 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 "CPImage.j"
+@import "CPView.j"
+
+#include "CoreGraphics/CGGeometry.h"
+#include "Platform/Platform.h"
+#include "Platform/DOM/CPDOMDisplayServer.h"
+
+
+CPSplitViewDidResizeSubviewsNotification = @"CPSplitViewDidResizeSubviewsNotification";
+CPSplitViewWillResizeSubviewsNotification = @"CPSplitViewWillResizeSubviewsNotification";
+
+var CPSplitViewHorizontalImage = nil,
+    CPSplitViewVerticalImage = nil;
+
+/*!
+    @ingroup appkit
+*/
+
+@implementation CPSplitView : CPView
+{
+    id          _delegate;
+    BOOL        _isVertical;
+    BOOL        _isPaneSplitter;
+    
+    int         _currentDivider;
+    float       _initialOffset;
+    
+    CPString    _originComponent;
+    CPString    _sizeComponent;
+    
+    CPArray     _DOMDividerElements;
+    CPString    _dividerImagePath;
+    int         _drawingDivider;
+    
+    BOOL        _needsResizeSubviews;
+}
+
+/*
+    @ignore
+*/
++ (void)initialize
+{
+    if (self != [CPSplitView class])
+        return;
+
+    var bundle = [CPBundle bundleForClass:self];
+    CPSplitViewHorizontalImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSplitView/CPSplitViewHorizontal.png"] size:CPSizeMake(5.0, 10.0)];
+    CPSplitViewVerticalImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSplitView/CPSplitViewVertical.png"] size:CPSizeMake(10.0, 5.0)];
+}
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    if (self = [super initWithFrame:aFrame])
+    {
+        _currentDivider = CPNotFound;
+        
+        _DOMDividerElements = [];
+        
+        [self _setVertical:YES];
+    }
+    
+    return self;
+}
+
+- (float)dividerThickness
+{
+    return _isPaneSplitter ? 1.0 : 10.0;
+}
+
+- (BOOL)isVertical
+{
+    return _isVertical;
+}
+
+- (void)setVertical:(BOOL)shouldBeVertical
+{
+    if (![self _setVertical:shouldBeVertical])
+        return;
+    
+    // Just re-adjust evenly.
+    var frame = [self frame],
+        dividerThickness = [self dividerThickness];
+    
+    [self _postNotificationWillResize];
+    
+    var eachSize = ROUND((frame.size[_sizeComponent] - dividerThickness * (_subviews.length - 1)) / _subviews.length),
+        index = 0,
+        count = _subviews.length;
+
+    if ([self isVertical])
+        for (; index < count; ++index)
+            [_subviews[index] setFrame:CGRectMake(ROUND((eachSize + dividerThickness) * index), 0, eachSize, frame.size.height)];
+    else
+        for (; index < count; ++index)
+            [_subviews[index] setFrame:CGRectMake(0, ROUND((eachSize + dividerThickness) * index), frame.size.width, eachSize)];
+    
+    [self setNeedsDisplay:YES];
+    
+    [self _postNotificationDidResize];
+
+}
+
+- (BOOL)_setVertical:(BOOL)shouldBeVertical
+{
+    var changed = (_isVertical != shouldBeVertical);
+    
+    _isVertical = shouldBeVertical;
+    
+    _originComponent = [self isVertical] ? "x" : "y";
+    _sizeComponent = [self isVertical] ? "width" : "height";
+    _dividerImagePath = [self isVertical] ? [CPSplitViewVerticalImage filename] : [CPSplitViewHorizontalImage filename];
+    
+    return changed;
+}
+
+- (BOOL)isPaneSplitter
+{
+    return _isPaneSplitter;
+}
+
+- (void)setIsPaneSplitter:(BOOL)shouldBePaneSplitter
+{
+    if (_isPaneSplitter == shouldBePaneSplitter)
+        return;
+    
+    _isPaneSplitter = shouldBePaneSplitter;
+
+#if PLATFORM(DOM)
+    _DOMDividerElements = [];
+#endif
+
+    // The divider changes size when pane splitter mode is toggled, so the 
+    // subviews need to change size too.
+    _needsResizeSubviews = YES;
+    [self setNeedsDisplay:YES];
+}
+
+- (void)didAddSubview:(CPView)aSubview
+{
+    _needsResizeSubviews = YES;
+//    [self adjustSubviews];
+}
+
+- (BOOL)isSubviewCollapsed:(CPView)subview
+{
+    return [subview frame].size[_sizeComponent] < 1 ? YES : NO;
+}
+
+- (CGRect)rectOfDividerAtIndex:(int)aDivider
+{
+    var frame = [_subviews[aDivider] frame],
+        rect = CGRectMakeZero();
+    
+    rect.size = [self frame].size;
+    
+    rect.size[_sizeComponent] = [self dividerThickness];
+    rect.origin[_originComponent] = frame.origin[_originComponent] + frame.size[_sizeComponent];
+
+    return rect;
+}
+
+- (CGRect)effectiveRectOfDividerAtIndex:(int)aDivider
+{
+    var realRect = [self rectOfDividerAtIndex:aDivider];
+    
+    var padding = 2;
+    
+    realRect.size[_sizeComponent] += padding * 2;
+    realRect.origin[_originComponent] -= padding;
+    
+    return realRect;
+}
+
+- (void)drawRect:(CGRect)rect
+{
+    var count = [_subviews count] - 1;
+    
+    while ((count--) > 0)
+    {
+        _drawingDivider = count;
+        [self drawDividerInRect:[self rectOfDividerAtIndex:count]];
+    }
+}
+
+- (void)drawDividerInRect:(CGRect)aRect
+{
+#if PLATFORM(DOM)
+    if (!_DOMDividerElements[_drawingDivider])
+    {
+        _DOMDividerElements[_drawingDivider] = document.createElement("div");
+        _DOMDividerElements[_drawingDivider].style.cursor = "move";
+        _DOMDividerElements[_drawingDivider].style.position = "absolute";
+        _DOMDividerElements[_drawingDivider].style.backgroundRepeat = "repeat";
+
+        CPDOMDisplayServerAppendChild(_DOMElement, _DOMDividerElements[_drawingDivider]);
+
+        if (_isPaneSplitter)
+        {
+            _DOMDividerElements[_drawingDivider].style.backgroundColor = "#A5A5A5";
+            _DOMDividerElements[_drawingDivider].style.backgroundImage = "";
+        }
+        else
+        {
+            _DOMDividerElements[_drawingDivider].style.backgroundColor = "";
+            _DOMDividerElements[_drawingDivider].style.backgroundImage = "url('"+_dividerImagePath+"')";
+        }
+    }    
+
+    CPDOMDisplayServerSetStyleLeftTop(_DOMDividerElements[_drawingDivider], NULL, _CGRectGetMinX(aRect), _CGRectGetMinY(aRect));
+    CPDOMDisplayServerSetStyleSize(_DOMDividerElements[_drawingDivider], _CGRectGetWidth(aRect), _CGRectGetHeight(aRect));
+#endif
+}
+
+- (void)viewWillDraw
+{
+    [self _adjustSubviewsWithCalculatedSize];
+}
+
+- (void)_adjustSubviewsWithCalculatedSize
+{
+    if (!_needsResizeSubviews)
+        return;
+    
+    _needsResizeSubviews = NO;
+        
+    var subviews = [self subviews],
+        count = subviews.length,
+        oldSize = CGSizeMakeZero();
+    
+    if ([self isVertical])
+    {
+        oldSize.width += [self dividerThickness] * (count - 1);
+        oldSize.height = CGRectGetHeight([self frame]);
+    }
+    else
+    {
+        oldSize.width = CGRectGetWidth([self frame]);
+        oldSize.height += [self dividerThickness] * (count - 1);
+    }
+        
+    while (count--)
+        oldSize[_sizeComponent] += [subviews[count] frame].size[_sizeComponent];
+    
+    [self resizeSubviewsWithOldSize:oldSize];
+}
+
+- (BOOL)cursorAtPoint:(CPPoint)aPoint hitDividerAtIndex:(int)anIndex
+{
+    var frame = [_subviews[anIndex] frame],
+        startPosition = frame.origin[_originComponent] + frame.size[_sizeComponent],
+        effectiveRect = [self effectiveRectOfDividerAtIndex:anIndex],
+        additionalRect = null;
+    
+    if ([_delegate respondsToSelector:@selector(splitView:effectiveRect:forDrawnRect:ofDividerAtIndex:)])
+        effectiveRect = [_delegate splitView:self effectiveRect:effectiveRect forDrawnRect:effectiveRect ofDividerAtIndex:anIndex];
+    
+    if ([_delegate respondsToSelector:@selector(splitView:additionalEffectiveRectOfDividerAtIndex:)])
+        additionalRect = [_delegate splitView:self additionalEffectiveRectOfDividerAtIndex:anIndex];
+
+    return CGRectContainsPoint(effectiveRect, aPoint) || (additionalRect && CGRectContainsPoint(additionalRect, aPoint));
+}
+
+- (CPView)hitTest:(CGPoint)aPoint
+{
+    if ([self isHidden] || ![self hitTests] || !CGRectContainsPoint([self frame], aPoint))
+        return nil;
+    
+    var point = [self convertPoint:aPoint fromView:[self superview]];
+    
+    var count = [_subviews count] - 1;
+    for (var i = 0; i < count; i++)
+    {
+        if ([self cursorAtPoint:point hitDividerAtIndex:i])
+            return self;
+    }
+    
+    return [super hitTest:aPoint];
+}
+
+/*
+    Tracks the divider.
+    @param anEvent the input event
+*/
+- (void)trackDivider:(CPEvent)anEvent
+{
+    var type = [anEvent type];
+
+    if (type == CPLeftMouseUp)
+    {
+        if (_currentDivider != CPNotFound)
+        {
+            _currentDivider = CPNotFound;
+            [self _postNotificationDidResize];
+        }
+        
+        return;
+    }
+    
+    if (type == CPLeftMouseDown)
+    {
+        var point = [self convertPoint:[anEvent locationInWindow] fromView:nil];
+
+        _currentDivider = CPNotFound;
+        var count = [_subviews count] - 1;
+        for (var i = 0; i < count; i++)
+        {
+            var frame = [_subviews[i] frame],
+                startPosition = frame.origin[_originComponent] + frame.size[_sizeComponent];
+
+            if ([self cursorAtPoint:point hitDividerAtIndex:i])
+            {
+                if ([anEvent clickCount] == 2 &&
+                    [_delegate respondsToSelector:@selector(splitView:canCollapseSubview:)] &&
+                    [_delegate respondsToSelector:@selector(splitView:shouldCollapseSubview:forDoubleClickOnDividerAtIndex:)])
+                {    
+                    var minPosition = [self minPossiblePositionOfDividerAtIndex:i],
+                        maxPosition = [self maxPossiblePositionOfDividerAtIndex:i];
+
+                    if ([_delegate splitView:self canCollapseSubview:_subviews[i]] && [_delegate splitView:self shouldCollapseSubview:_subviews[i] forDoubleClickOnDividerAtIndex:i])
+                    {
+                        if ([self isSubviewCollapsed:_subviews[i]])
+                            [self setPosition:(minPosition + (maxPosition - minPosition) / 2) ofDividerAtIndex:i];
+                        else
+                            [self setPosition:minPosition ofDividerAtIndex:i];
+                    }
+                    else if ([_delegate splitView:self canCollapseSubview:_subviews[i+1]] && [_delegate splitView:self shouldCollapseSubview:_subviews[i+1] forDoubleClickOnDividerAtIndex:i])
+                    {
+                        if ([self isSubviewCollapsed:_subviews[i+1]])
+                            [self setPosition:(minPosition + (maxPosition - minPosition) / 2) ofDividerAtIndex:i];
+                        else
+                            [self setPosition:maxPosition ofDividerAtIndex:i];
+                    }
+                }
+                else
+                {
+                    _currentDivider = i;
+                    _initialOffset = startPosition - point[_originComponent];
+
+                    [self _postNotificationWillResize];
+                }
+            }
+        }
+
+        if (_currentDivider === CPNotFound)
+            return;
+    }
+    
+    else if (type == CPLeftMouseDragged && _currentDivider != CPNotFound)
+    {
+        var point = [self convertPoint:[anEvent locationInWindow] fromView:nil];
+        
+        [self setPosition:(point[_originComponent] + _initialOffset) ofDividerAtIndex:_currentDivider];
+    }
+    
+    [CPApp setTarget:self selector:@selector(trackDivider:) forNextEventMatchingMask:CPLeftMouseDraggedMask | CPLeftMouseUpMask untilDate:nil inMode:nil dequeue:YES];
+}
+
+- (void)mouseDown:(CPEvent)anEvent
+{
+    // FIXME: This should not trap events if not on a divider!
+    [self trackDivider:anEvent];
+}
+
+- (float)maxPossiblePositionOfDividerAtIndex:(int)dividerIndex
+{
+    var frame = [_subviews[dividerIndex + 1] frame];
+    
+    if (dividerIndex + 1 < [_subviews count] - 1)
+        return frame.origin[_originComponent] + frame.size[_sizeComponent] - [self dividerThickness];
+    else    
+        return [self frame].size[_sizeComponent] - [self dividerThickness];
+}
+
+- (float)minPossiblePositionOfDividerAtIndex:(int)dividerIndex
+{
+    if (dividerIndex > 0)
+    {
+        var frame = [_subviews[dividerIndex - 1] frame];
+        
+        return frame.origin[_originComponent] + frame.size[_sizeComponent] + [self dividerThickness];
+    }
+    else    
+        return 0;
+}
+
+- (void)setPosition:(float)position ofDividerAtIndex:(int)dividerIndex
+{
+    [self _adjustSubviewsWithCalculatedSize];
+        
+    // not sure where this should override other positions?
+    if ([_delegate respondsToSelector:@selector(splitView:constrainSplitPosition:ofSubviewAt:)])
+        position = [_delegate splitView:self constrainSplitPosition:position ofSubviewAt:dividerIndex];
+
+    var proposedMax = [self maxPossiblePositionOfDividerAtIndex:dividerIndex],
+        proposedMin = [self minPossiblePositionOfDividerAtIndex:dividerIndex],
+        actualMax = proposedMax,
+        actualMin = proposedMin;
+        
+    if([_delegate respondsToSelector:@selector(splitView:constrainMinCoordinate:ofSubviewAt:)])
+        actualMin = [_delegate splitView:self constrainMinCoordinate:proposedMin ofSubviewAt:dividerIndex];
+        
+    if([_delegate respondsToSelector:@selector(splitView:constrainMaxCoordinate:ofSubviewAt:)])
+        actualMax = [_delegate splitView:self constrainMaxCoordinate:proposedMax ofSubviewAt:dividerIndex];
+
+    var frame = [self frame],
+        viewA = _subviews[dividerIndex],
+        frameA = [viewA frame],
+        viewB = _subviews[dividerIndex + 1],
+        frameB = [viewB frame];
+
+    var realPosition = MAX(MIN(position, actualMax), actualMin);
+    
+    if (position <  proposedMin + (actualMin - proposedMin) / 2)
+        if ([_delegate respondsToSelector:@selector(splitView:canCollapseSubview:)])
+            if ([_delegate splitView:self canCollapseSubview:viewA])
+                realPosition = proposedMin;
+    
+    frameA.size[_sizeComponent] = realPosition - frameA.origin[_originComponent];
+    [_subviews[dividerIndex] setFrame:frameA];
+    
+    frameB.size[_sizeComponent] = frameB.origin[_originComponent] + frameB.size[_sizeComponent] - realPosition - [self dividerThickness];
+    frameB.origin[_originComponent] = realPosition + [self dividerThickness];
+    [_subviews[dividerIndex + 1] setFrame:frameB];
+    
+    [self setNeedsDisplay:YES];
+}
+
+- (void)setFrameSize:(CGSize)aSize
+{
+    [self _adjustSubviewsWithCalculatedSize];
+        
+    [super setFrameSize:aSize];
+    
+    [self setNeedsDisplay:YES];
+}
+
+- (void)resizeSubviewsWithOldSize:(CPSize)oldSize
+{   
+    if ([_delegate respondsToSelector:@selector(splitView:resizeSubviewsWithOldSize:)])
+    {
+        [_delegate splitView:self resizeSubviewsWithOldSize:oldSize];
+        return;
+    }
+
+    [self _postNotificationWillResize];
+    
+    var index = 0,
+        count = [_subviews count],
+        bounds = [self bounds],
+        dividerThickness = [self dividerThickness],
+        totalDividers = count - 1,
+        totalSizableSpace = 0,
+        nonSizableSpace = 0,
+        lastSizableIndex = -1,
+        totalSizablePanes = 0,
+        isVertical = [self isVertical];
+
+    for (index = 0; index < count; ++index)
+    {
+        var view = _subviews[index],
+            isSizable = isVertical ? [view autoresizingMask] & CPViewWidthSizable : [view autoresizingMask] & CPViewHeightSizable;
+
+        if (isSizable)
+        {
+            totalSizableSpace += [view frame].size[_sizeComponent];
+            lastSizableIndex = index;
+            totalSizablePanes++;
+        }
+    }
+
+    if (totalSizablePanes === count)
+        totalSizableSpace = 0;
+
+    var nonSizableSpace = totalSizableSpace ? bounds.size[_sizeComponent] - totalSizableSpace : 0,
+        remainingFlexibleSpace = bounds.size[_sizeComponent] - oldSize[_sizeComponent],
+        oldDimension = (oldSize[_sizeComponent]- totalDividers*dividerThickness - nonSizableSpace),
+        ratio = oldDimension <= 0 ? 0 : (bounds.size[_sizeComponent] - totalDividers*dividerThickness - nonSizableSpace) / oldDimension;
+
+    for (index = 0; index < count; ++index)
+    {
+        var view = _subviews[index],
+            viewFrame = CGRectMakeCopy(bounds),
+            isSizable = isVertical ? [view autoresizingMask] & CPViewWidthSizable : [view autoresizingMask] & CPViewHeightSizable;
+
+            if (index + 1 == count)
+                viewFrame.size[_sizeComponent] = bounds.size[_sizeComponent] - viewFrame.origin[_originComponent];
+            else if (totalSizableSpace && isSizable && lastSizableIndex === index)
+                viewFrame.size[_sizeComponent] = MAX(0, ROUND([view frame].size[_sizeComponent] + remainingFlexibleSpace))
+            else if (isSizable || !totalSizableSpace)
+            {
+                viewFrame.size[_sizeComponent] = MAX(0, ROUND(ratio * [view frame].size[_sizeComponent]));
+                remainingFlexibleSpace -= (viewFrame.size[_sizeComponent] - [view frame].size[_sizeComponent]);
+            }
+            else if (totalSizableSpace && !isSizable)
+                viewFrame.size[_sizeComponent] = [view frame].size[_sizeComponent];
+            else
+                alert("SHOULD NEVER GET HERE");
+
+        bounds.origin[_originComponent] += viewFrame.size[_sizeComponent] + dividerThickness;        
+
+        [view setFrame:viewFrame];
+    }
+
+    [self _postNotificationDidResize];
+}
+
+- (void)setDelegate:(id)delegate
+{
+    if ([_delegate respondsToSelector:@selector(splitViewDidResizeSubviews:)])
+        [[CPNotificationCenter defaultCenter] removeObserver:_delegate name:CPSplitViewDidResizeSubviewsNotification object:self];
+    if ([_delegate respondsToSelector:@selector(splitViewWillResizeSubviews:)])
+        [[CPNotificationCenter defaultCenter] removeObserver:_delegate name:CPSplitViewWillResizeSubviewsNotification object:self];
+    
+   _delegate = delegate;
+
+   if ([_delegate respondsToSelector:@selector(splitViewDidResizeSubviews:)])
+       [[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];
+}
+
+- (void)_postNotificationWillResize
+{
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPSplitViewWillResizeSubviewsNotification object:self];
+}
+
+- (void)_postNotificationDidResize
+{
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPSplitViewDidResizeSubviewsNotification object:self];
+}
+
+@end
+
+var CPSplitViewDelegateKey          = "CPSplitViewDelegateKey",
+    CPSplitViewIsVerticalKey        = "CPSplitViewIsVerticalKey",
+    CPSplitViewIsPaneSplitterKey    = "CPSplitViewIsPaneSplitterKey";
+
+@implementation CPSplitView (CPCoding)
+
+/*
+    Initializes the split view by unarchiving data from \c aCoder.
+    @param aCoder the coder containing the archived CPSplitView.
+*/
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super initWithCoder:aCoder];
+    
+    if (self)
+    {
+        _currentDivider = CPNotFound;
+        
+        _DOMDividerElements = [];
+        
+        _delegate = [aCoder decodeObjectForKey:CPSplitViewDelegateKey];;
+        
+        _isPaneSplitter = [aCoder decodeBoolForKey:CPSplitViewIsPaneSplitterKey];
+        [self _setVertical:[aCoder decodeBoolForKey:CPSplitViewIsVerticalKey]];
+    }
+    
+    return self;
+}
+
+/*
+    Archives this split view into the provided coder.
+    @param aCoder the coder to which the button's instance data will be written.
+*/
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [super encodeWithCoder:aCoder];
+    
+    [aCoder encodeConditionalObject:_delegate forKey:CPSplitViewDelegateKey];
+    
+    [aCoder encodeBool:_isVertical forKey:CPSplitViewIsVerticalKey];
+    [aCoder encodeBool:_isPaneSplitter forKey:CPSplitViewIsPaneSplitterKey];
+}
+
+@end

AppKit/CPStringDrawing.j

@@ -0,0 +1,48 @@
+/*
+ * CPStringDrawing.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPString.j>
+
+@import "CPPlatformString.j"
+
+
+@implementation CPString (CPStringDrawing)
+
+/*!
+    Returns the string
+*/
+- (CPString)cssString
+{
+    return self;
+}
+
+- (CGSize)sizeWithFont:(CPFont)aFont
+{
+    return [self sizeWithFont:aFont inWidth:NULL];
+}
+
+- (CGSize)sizeWithFont:(CPFont)aFont inWidth:(float)aWidth
+{
+    return [CPPlatformString sizeOfString:self withFont:aFont forWidth:aWidth];
+}
+
+@end

AppKit/CPTabView.j

@@ -0,0 +1,790 @@
+/*
+ * CPTabView.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 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 "CPImageView.j"
+@import "CPTabViewItem.j"
+@import "CPView.j"
+
+#include "CoreGraphics/CGGeometry.h"
+
+
+/*
+    Places tabs on top with a bezeled border.
+    @global
+    @group CPTabViewType
+*/
+CPTopTabsBezelBorder     = 0;
+//CPLeftTabsBezelBorder    = 1;
+//CPBottomTabsBezelBorder  = 2;
+//CPRightTabsBezelBorder   = 3;
+/*
+    Displays no tabs and has a bezeled border.
+    @global
+    @group CPTabViewType
+*/
+CPNoTabsBezelBorder      = 4;
+/*
+    Has no tabs and displays a line border.
+    @global
+    @group CPTabViewType
+*/
+CPNoTabsLineBorder       = 5;
+/*
+    Displays no tabs and no border.
+    @global
+    @group CPTabViewType
+*/
+CPNoTabsNoBorder         = 6;
+
+var CPTabViewBezelBorderLeftImage       = nil,
+    CPTabViewBackgroundCenterImage      = nil,
+    CPTabViewBezelBorderRightImage      = nil,
+    CPTabViewBezelBorderColor           = nil,
+    CPTabViewBezelBorderBackgroundColor = nil;
+
+var LEFT_INSET  = 7.0,
+    RIGHT_INSET = 7.0;
+    
+var CPTabViewDidSelectTabViewItemSelector           = 1,
+    CPTabViewShouldSelectTabViewItemSelector        = 2,
+    CPTabViewWillSelectTabViewItemSelector          = 4,
+    CPTabViewDidChangeNumberOfTabViewItemsSelector  = 8;
+
+/*! 
+    @ingroup appkit
+    @class CPTabView
+
+    This class represents a view that has multiple subviews (CPTabViewItem) presented as individual tabs.
+    Only one CPTabViewItem is shown at a time, and other CPTabViewItems can be made visible
+    (one at a time) by clicking on the CPTabViewItem's tab at the top of the tab view.
+    
+    THe currently selected CPTabViewItem is the view that is displayed.
+*/
+@implementation CPTabView : CPView
+{
+    CPView          _labelsView;
+    CPView          _backgroundView;
+    CPView          _separatorView;
+    
+    CPView          _auxiliaryView;
+    CPView          _contentView;
+    
+    CPArray         _tabViewItems;
+    CPTabViewItem   _selectedTabViewItem;
+
+    CPTabViewType   _tabViewType;
+    
+    id              _delegate;
+    unsigned        _delegateSelectors;
+}
+
+/*
+    @ignore
+*/
++ (void)initialize
+{
+    if (self != CPTabView)
+        return;
+    
+    var bundle = [CPBundle bundleForClass:self],
+        
+        emptyImage = [[CPImage alloc] initByReferencingFile:@"" size:CGSizeMake(7.0, 0.0)],
+        backgroundImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPTabView/CPTabViewBezelBackgroundCenter.png"] size:CGSizeMake(1.0, 1.0)],
+        
+        bezelBorderLeftImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPTabView/CPTabViewBezelBorderLeft.png"] size:CGSizeMake(7.0, 1.0)],
+        bezerBorderImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPTabView/CPTabViewBezelBorder.png"] size:CGSizeMake(1.0, 1.0)],
+        bezelBorderRightImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPTabView/CPTabViewBezelBorderRight.png"] size:CGSizeMake(7.0, 1.0)];
+    
+    CPTabViewBezelBorderBackgroundColor = [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:
+        [
+            emptyImage, 
+            emptyImage, 
+            emptyImage,
+
+            bezelBorderLeftImage,
+            backgroundImage,
+            bezelBorderRightImage,
+
+            bezelBorderLeftImage,
+            bezerBorderImage,
+            bezelBorderRightImage
+        ]]];
+    
+    CPTabViewBezelBorderColor = [CPColor colorWithPatternImage:bezerBorderImage];
+}
+
+/*
+    @ignore
+*/
++ (CPColor)bezelBorderColor
+{
+    return CPTabViewBezelBorderColor;
+}
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    self = [super initWithFrame:aFrame];
+    
+    if (self)
+    {
+        _tabViewType = CPTopTabsBezelBorder;
+        _tabViewItems = [];
+    }
+    
+    return self;
+}
+
+- (void)viewDidMoveToWindow
+{
+    if (_tabViewType != CPTopTabsBezelBorder || _labelsView)
+        return;
+        
+    [self _createBezelBorder];
+    [self layoutSubviews];
+}
+
+/* @ignore */
+- (void)_createBezelBorder
+{
+    var bounds = [self bounds];
+    
+    _labelsView = [[_CPTabLabelsView alloc] initWithFrame:CGRectMake(0.0, 0.0, CGRectGetWidth(bounds), 0.0)];
+
+    [_labelsView setTabView:self];
+    [_labelsView setAutoresizingMask:CPViewWidthSizable];
+
+    [self addSubview:_labelsView];
+
+    _backgroundView = [[CPView alloc] initWithFrame:CGRectMakeZero()];        
+    
+    [_backgroundView setBackgroundColor:CPTabViewBezelBorderBackgroundColor];
+
+    [_backgroundView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
+    
+    [self addSubview:_backgroundView];
+    
+    _separatorView = [[CPView alloc] initWithFrame:CGRectMakeZero()];
+
+    [_separatorView setBackgroundColor:[[self class] bezelBorderColor]];
+    [_separatorView setAutoresizingMask:CPViewWidthSizable | CPViewMaxYMargin];
+    
+    [self addSubview:_separatorView];
+}
+
+/*
+    Lays out the subviews
+    @ignore
+*/
+- (void)layoutSubviews
+{
+    if (_tabViewType == CPTopTabsBezelBorder)
+    {
+        var backgroundRect = [self bounds],
+            labelsViewHeight = [_CPTabLabelsView height];
+        
+        backgroundRect.origin.y += labelsViewHeight;
+        backgroundRect.size.height -= labelsViewHeight;
+        
+        [_backgroundView setFrame:backgroundRect];
+        
+        var auxiliaryViewHeight = 5.0;
+        
+        if (_auxiliaryView)
+        {
+            auxiliaryViewHeight = CGRectGetHeight([_auxiliaryView frame]);
+            
+            [_auxiliaryView setFrame:CGRectMake(LEFT_INSET, labelsViewHeight, CGRectGetWidth(backgroundRect) - LEFT_INSET - RIGHT_INSET, auxiliaryViewHeight)];
+        }
+        
+        [_separatorView setFrame:CGRectMake(LEFT_INSET, labelsViewHeight + auxiliaryViewHeight, CGRectGetWidth(backgroundRect) - LEFT_INSET - RIGHT_INSET, 1.0)];
+    }
+
+    // CPNoTabsNoBorder
+    [_contentView setFrame:[self contentRect]];
+}
+
+// Adding and Removing Tabs
+/*!
+    Adds a CPTabViewItem to the tab view.
+    @param aTabViewItem the item to add
+*/
+- (void)addTabViewItem:(CPTabViewItem)aTabViewItem
+{
+    [self insertTabViewItem:aTabViewItem atIndex:[_tabViewItems count]];
+}
+
+/*!
+    Inserts a CPTabViewItem into the tab view
+    at the specified index.
+    @param aTabViewItem the item to insert
+    @param anIndex the index for the item
+*/
+- (void)insertTabViewItem:(CPTabViewItem)aTabViewItem atIndex:(unsigned)anIndex
+{
+    if (!_labelsView && _tabViewType == CPTopTabsBezelBorder)
+        [self _createBezelBorder];
+    
+    [_tabViewItems insertObject:aTabViewItem atIndex:anIndex];
+    
+    [_labelsView tabView:self didAddTabViewItem:aTabViewItem];
+    
+    if ([_tabViewItems count] == 1)
+        [self selectFirstTabViewItem:self];
+
+    if (_delegateSelectors & CPTabViewDidChangeNumberOfTabViewItemsSelector)
+        [_delegate tabViewDidChangeNumberOfTabViewItems:self];
+}
+
+/*!
+    Removes the specified tab view item from the tab view.
+    @param aTabViewItem the item to remove
+*/
+- (void)removeTabViewItem:(CPTabViewItem)aTabViewItem
+{
+    var index = [self indexOfTabViewItem:aTabViewItem];
+
+    [_tabViewItems removeObjectIdenticalTo:aTabViewItem];
+
+    [_labelsView tabView:self didRemoveTabViewItemAtIndex:index];
+    
+    if (_delegateSelectors & CPTabViewDidChangeNumberOfTabViewItemsSelector)
+        [_delegate tabViewDidChangeNumberOfTabViewItems:self];
+}
+
+// Accessing Tabs
+/*!
+    Returns the index of the specified item
+    @param aTabViewItem the item to find the index for
+*/
+- (int)indexOfTabViewItem:(CPTabViewItem)aTabViewItem
+{
+    return [_tabViewItems indexOfObjectIdenticalTo:aTabViewItem];
+}
+
+/*!
+    Returns the index of the CPTabViewItem with the specified identifier.
+    @param anIdentifier the identifier of the item
+*/
+- (int)indexOfTabViewItemWithIdentifier:(CPString)anIdentifier
+{
+    var index = 0,
+        count = [_tabViewItems count];
+        
+    for (; index < count; ++index)
+        if ([[_tabViewItems[index] identifier] isEqual:anIdentifier])
+            return index;
+
+    return index;
+}
+
+/*!
+    Returns the number of items in the tab view.
+*/
+- (unsigned)numberOfTabViewItems
+{
+    return [_tabViewItems count];
+}
+
+/*!
+    Returns the CPTabViewItem at the specified index.
+*/
+- (CPTabViewItem)tabViewItemAtIndex:(unsigned)anIndex
+{
+    return _tabViewItems[anIndex];
+}
+
+/*!
+    Returns the array of items that backs this tab view.
+*/
+- (CPArray)tabViewItems
+{
+    return _tabViewItems;
+}
+
+// Selecting a Tab
+/*!
+    Sets the first tab view item in the array to be displayed to the user.
+    @param aSender the object making this request
+*/
+- (void)selectFirstTabViewItem:(id)aSender
+{
+    var count = [_tabViewItems count];
+    
+    if (count)
+        [self selectTabViewItemAtIndex:0];
+}
+
+/*!
+    Sets the last tab view item in the array to be displayed to the user.
+    @param aSender the object making this request
+*/
+- (void)selectLastTabViewItem:(id)aSender
+{
+    var count = [_tabViewItems count];
+    
+    if (count)
+        [self selectTabViewItemAtIndex:count - 1];
+}
+
+/*!
+    Sets the next tab item in the array to be displayed.
+    @param aSender the object making this request
+*/
+- (void)selectNextTabViewItem:(id)aSender
+{
+    if (!_selectedTabViewItem)
+        return;
+    
+    var index = [self indexOfTabViewItem:_selectedTabViewItem],
+        count = [_tabViewItems count];
+    
+    [self selectTabViewItemAtIndex:index + 1 % count];
+}
+
+/*!
+    Selects the previous item in the array for display.
+    @param aSender the object making this request
+*/
+- (void)selectPreviousTabViewItem:(id)aSender
+{
+    if (!_selectedTabViewItem)
+        return;
+    
+    var index = [self indexOfTabViewItem:_selectedTabViewItem],
+        count = [_tabViewItems count];
+    
+    [self selectTabViewItemAtIndex:index == 0 ? count : index - 1];
+}
+
+/*!
+    Displays the specified item in the tab view.
+    @param aTabViewItem the item to display
+*/
+- (void)selectTabViewItem:(CPTabViewItem)aTabViewItem
+{
+    if ((_delegateSelectors & CPTabViewShouldSelectTabViewItemSelector) && ![_delegate tabView:self shouldSelectTabViewItem:aTabViewItem])
+        return;
+        
+    if (_delegateSelectors & CPTabViewWillSelectTabViewItemSelector)
+        [_delegate tabView:self willSelectTabViewItem:aTabViewItem];
+
+    if (_selectedTabViewItem)
+    {
+        _selectedTabViewItem._tabState = CPBackgroundTab;
+        [_labelsView tabView:self didChangeStateOfTabViewItem:_selectedTabViewItem];
+        
+        [_contentView removeFromSuperview];
+        [_auxiliaryView removeFromSuperview];
+    }
+    _selectedTabViewItem = aTabViewItem;
+    
+    _selectedTabViewItem._tabState = CPSelectedTab;
+        
+    _contentView = [_selectedTabViewItem view];
+    [_contentView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
+    
+    _auxiliaryView = [_selectedTabViewItem auxiliaryView];
+    [_auxiliaryView setAutoresizingMask:CPViewWidthSizable];
+    
+    [self addSubview:_contentView];
+
+    if (_auxiliaryView)
+        [self addSubview:_auxiliaryView];
+    
+    [_labelsView tabView:self didChangeStateOfTabViewItem:_selectedTabViewItem];
+    
+    [self layoutSubviews];
+    
+    if (_delegateSelectors & CPTabViewDidSelectTabViewItemSelector)
+        [_delegate tabView:self didSelectTabViewItem:aTabViewItem];
+}
+
+/*!
+    Selects the item at the specified index.
+    @param anIndex the index of the item to display.
+*/
+- (void)selectTabViewItemAtIndex:(unsigned)anIndex
+{
+    [self selectTabViewItem:_tabViewItems[anIndex]];
+}
+
+/*!
+    Returns the current item being displayed.
+*/
+- (CPTabViewItem)selectedTabViewItem
+{
+    return _selectedTabViewItem;
+}
+
+// 
+/*!
+    Sets the tab view type.
+    @param aTabViewType the view type
+*/
+- (void)setTabViewType:(CPTabViewType)aTabViewType
+{
+    if (_tabViewType == aTabViewType)
+        return;
+    
+    _tabViewType = aTabViewType;
+    
+    if (_tabViewType == CPNoTabsBezelBorder || _tabViewType == CPNoTabsLineBorder || _tabViewType == CPNoTabsNoBorder)
+        [_labelsView removeFromSuperview];
+    else if (![_labelsView superview])
+        [self addSubview:_labelsView];
+        
+    if (_tabViewType == CPNoTabsLineBorder || _tabViewType == CPNoTabsNoBorder)
+        [_backgroundView removeFromSuperview];
+    else if (![_backgroundView superview])
+        [self addSubview:_backgroundView];
+    
+    [self layoutSubviews];
+}
+
+/*!
+    Returns the tab view type.
+*/
+- (CPTabViewType)tabViewType
+{
+    return _tabViewType;
+}
+
+// Determining the Size
+/*!
+    Returns the content rectangle.
+*/
+- (CGRect)contentRect
+{
+    var contentRect = CGRectMakeCopy([self bounds]);
+    
+    if (_tabViewType == CPTopTabsBezelBorder)
+    {
+        var labelsViewHeight = [_CPTabLabelsView height],
+            auxiliaryViewHeight = _auxiliaryView ? CGRectGetHeight([_auxiliaryView frame]) : 5.0,
+            separatorViewHeight = 1.0;
+
+        contentRect.origin.y += labelsViewHeight + auxiliaryViewHeight + separatorViewHeight;
+        contentRect.size.height -= labelsViewHeight + auxiliaryViewHeight + separatorViewHeight * 2.0; // 2 for the bottom border as well.
+        
+        contentRect.origin.x += LEFT_INSET;
+        contentRect.size.width -= LEFT_INSET + RIGHT_INSET;
+    }
+
+    return contentRect;
+}
+
+/*!
+    Sets the delegate for this tab view.
+    @param aDelegate the tab view's delegate
+*/
+- (void)setDelegate:(id)aDelegate
+{
+    if (_delegate == aDelegate)
+        return;
+    
+    _delegate = aDelegate;
+    
+    _delegateSelectors = 0;
+
+    if ([_delegate respondsToSelector:@selector(tabView:shouldSelectTabViewItem:)])
+        _delegateSelectors |= CPTabViewShouldSelectTabViewItemSelector;
+
+    if ([_delegate respondsToSelector:@selector(tabView:willSelectTabViewItem:)])
+        _delegateSelectors |= CPTabViewWillSelectTabViewItemSelector;
+
+    if ([_delegate respondsToSelector:@selector(tabView:didSelectTabViewItem:)])
+        _delegateSelectors |= CPTabViewDidSelectTabViewItemSelector;
+
+    if ([_delegate respondsToSelector:@selector(tabViewDidChangeNumberOfTabViewItems:)])
+        _delegateSelectors |= CPTabViewDidChangeNumberOfTabViewItemsSelector;    
+}
+
+//
+
+- (void)mouseDown:(CPEvent)anEvent
+{
+    var location = [_labelsView convertPoint:[anEvent locationInWindow] fromView:nil],
+        tabViewItem = [_labelsView representedTabViewItemAtPoint:location];
+        
+    if (tabViewItem)
+        [self selectTabViewItem:tabViewItem];
+}
+
+@end
+
+var CPTabViewItemsKey               = "CPTabViewItemsKey",
+    CPTabViewSelectedItemKey        = "CPTabViewSelectedItemKey",
+    CPTabViewTypeKey                = "CPTabViewTypeKey",
+    CPTabViewDelegateKey            = "CPTabViewDelegateKey";
+
+@implementation CPTabView (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    if (self = [super initWithCoder:aCoder])
+    {
+        _tabViewType    = [aCoder decodeIntForKey:CPTabViewTypeKey];
+        _tabViewItems   = [];
+        
+        // FIXME: this is somewhat hacky
+        [self _createBezelBorder];
+        
+        var items = [aCoder decodeObjectForKey:CPTabViewItemsKey];
+        for (var i = 0; items && i < items.length; i++)
+            [self insertTabViewItem:items[i] atIndex:i];
+    
+        var selected = [aCoder decodeObjectForKey:CPTabViewSelectedItemKey];
+        if (selected)
+            [self selectTabViewItem:selected];
+        
+        [self setDelegate:[aCoder decodeObjectForKey:CPTabViewDelegateKey]];
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    var actualSubviews = _subviews;
+    _subviews = [];
+    [super encodeWithCoder:aCoder];
+    _subviews = actualSubviews;
+    
+    [aCoder encodeObject:_tabViewItems forKey:CPTabViewItemsKey];;
+    [aCoder encodeObject:_selectedTabViewItem forKey:CPTabViewSelectedItemKey];
+    
+    [aCoder encodeInt:_tabViewType forKey:CPTabViewTypeKey];
+    
+    [aCoder encodeConditionalObject:_delegate forKey:CPTabViewDelegateKey];
+}
+
+@end
+
+
+var _CPTabLabelsViewBackgroundColor = nil,
+    _CPTabLabelsViewInsideMargin    = 10.0,
+    _CPTabLabelsViewOutsideMargin   = 15.0;
+
+/* @ignore */
+@implementation _CPTabLabelsView : CPView
+{
+    CPTabView       _tabView;
+    CPDictionary    _tabLabels;
+}
+
++ (void)initialize
+{
+    if (self != [_CPTabLabelsView class])
+        return;
+
+    var bundle = [CPBundle bundleForClass:self];
+    
+    _CPTabLabelsViewBackgroundColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
+        [
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPTabView/_CPTabLabelsViewLeft.png"] size:CGSizeMake(12.0, 26.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPTabView/_CPTabLabelsViewCenter.png"] size:CGSizeMake(1.0, 26.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPTabView/_CPTabLabelsViewRight.png"] size:CGSizeMake(12.0, 26.0)]
+        ] isVertical:NO]];
+}
+
++ (float)height
+{
+    return 26.0;
+}
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    self = [super initWithFrame:aFrame];
+    
+    if (self)
+    {
+        _tabLabels = [];
+        
+        [self setBackgroundColor:_CPTabLabelsViewBackgroundColor];
+
+        [self setFrameSize:CGSizeMake(CGRectGetWidth(aFrame), 26.0)];
+    }
+    
+    return self;
+}
+
+- (void)setTabView:(CPTabView)aTabView
+{
+    _tabView = aTabView;
+}
+
+- (CPTabView)tabView
+{
+    return _tabView;
+}
+
+- (void)tabView:(CPTabView)aTabView didAddTabViewItem:(CPTabViewItem)aTabViewItem
+{
+    var label = [[_CPTabLabel alloc] initWithFrame:CGRectMakeZero()];
+    
+    [label setTabViewItem:aTabViewItem];
+    
+    _tabLabels.push(label);
+    
+    [self addSubview:label];
+        
+    [self layoutSubviews];
+}
+
+- (void)tabView:(CPTabView)aTabView didRemoveTabViewItemAtIndex:(unsigned)index
+{
+    var label = _tabLabels[index];
+    
+    [_tabLabels removeObjectAtIndex:index];
+
+    [label removeFromSuperview];
+    
+    [self layoutSubviews];
+}
+
+ -(void)tabView:(CPTabView)aTabView didChangeStateOfTabViewItem:(CPTabViewItem)aTabViewItem
+ {
+    [_tabLabels[[aTabView indexOfTabViewItem:aTabViewItem]] setTabState:[aTabViewItem tabState]];
+ }
+
+- (CPTabViewItem)representedTabViewItemAtPoint:(CGPoint)aPoint
+{
+    var index = 0,
+        count = _tabLabels.length;
+        
+    for (; index < count; ++index)
+    {
+        var label = _tabLabels[index];
+    
+        if (CGRectContainsPoint([label frame], aPoint))
+            return [label tabViewItem];
+    }
+
+    return nil;
+}
+
+- (void)layoutSubviews
+{
+    var index = 0,
+        count = _tabLabels.length,
+        width = (_CGRectGetWidth([self bounds]) - (count - 1) * _CPTabLabelsViewInsideMargin - 2 * _CPTabLabelsViewOutsideMargin) / count,
+        x = _CPTabLabelsViewOutsideMargin;
+    
+    for (; index < count; ++index)
+    {
+        var label = _tabLabels[index],
+            frame = _CGRectMake(x, 8.0, width, 18.0);
+        
+        [label setFrame:frame];
+        
+        x = _CGRectGetMaxX(frame) + _CPTabLabelsViewInsideMargin;
+    }
+}
+
+- (void)setFrameSize:(CGSize)aSize
+{
+    if (CGSizeEqualToSize([self frame].size, aSize))
+        return;
+    
+    [super setFrameSize:aSize];
+    
+    [self layoutSubviews];
+}
+
+@end
+
+var _CPTabLabelBackgroundColor          = nil,
+    _CPTabLabelSelectedBackgroundColor  = nil;
+
+/* @ignore */
+@implementation _CPTabLabel : CPView
+{
+    CPTabViewItem   _tabViewItem;
+    CPTextField     _labelField;
+}
+
++ (void)initialize
+{
+    if (self != [_CPTabLabel class])
+        return;
+
+    var bundle = [CPBundle bundleForClass:self];
+    
+    _CPTabLabelBackgroundColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
+        [
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPTabView/_CPTabLabelBackgroundLeft.png"] size:CGSizeMake(6.0, 18.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPTabView/_CPTabLabelBackgroundCenter.png"] size:CGSizeMake(1.0, 18.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPTabView/_CPTabLabelBackgroundRight.png"] size:CGSizeMake(6.0, 18.0)]
+        ] isVertical:NO]];
+    
+    _CPTabLabelSelectedBackgroundColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
+        [
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPTabView/_CPTabLabelSelectedLeft.png"] size:CGSizeMake(3.0, 18.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPTabView/_CPTabLabelSelectedCenter.png"] size:CGSizeMake(1.0, 18.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPTabView/_CPTabLabelSelectedRight.png"] size:CGSizeMake(3.0, 18.0)]
+        ] isVertical:NO]];
+}
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    self = [super initWithFrame:aFrame];
+    
+    if (self)
+    {   
+        _labelField = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
+        
+        [_labelField setAlignment:CPCenterTextAlignment];
+        [_labelField setFrame:CGRectMake(5.0, 0.0, CGRectGetWidth(aFrame) - 10.0, 20.0)];
+        [_labelField setAutoresizingMask:CPViewWidthSizable];
+        [_labelField setFont:[CPFont boldSystemFontOfSize:11.0]];
+        
+        [self addSubview:_labelField];
+        
+        [self setTabState:CPBackgroundTab];
+    }
+    
+    return self;
+}
+
+- (void)setTabState:(CPTabState)aTabState
+{
+    [self setBackgroundColor:aTabState == CPSelectedTab ? _CPTabLabelSelectedBackgroundColor : _CPTabLabelBackgroundColor];
+}
+
+- (void)setTabViewItem:(CPTabViewItem)aTabViewItem
+{
+    _tabViewItem = aTabViewItem;
+    
+    [self update];
+}
+
+- (CPTabViewItem)tabViewItem
+{
+    return _tabViewItem;
+}
+
+- (void)update
+{
+    [_labelField setStringValue:[_tabViewItem label]];
+}
+
+@end

AppKit/CPTabViewItem.j

@@ -0,0 +1,206 @@
+/*
+ * CPTabViewItem.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPObject.j>
+
+@import <AppKit/CPView.j>
+
+
+/*
+    The tab is currently selected.
+    @global
+    @group CPTabState
+*/
+CPSelectedTab   = 0;
+/*
+    The tab is currently in the background (not selected).
+    @global
+    @group CPTabState
+*/
+CPBackgroundTab = 1;
+/*
+    The tab of this item is currently being pressed by the user.
+    @global
+    @group CPTabState
+*/
+CPPressedTab    = 2;
+
+/*! 
+    @ingroup appkit
+    @class CPTabViewItem
+
+    The class representation of an item in a CPTabView. One tab view item
+    can be shown at a time in a CPTabView.
+*/
+@implementation CPTabViewItem : CPObject
+{
+    id          _identifier;
+    CPString    _label;
+    
+    CPView      _view;
+    CPView      _auxiliaryView;
+}
+
+- (id)init
+{
+    return [self initWithIdentifier:@""];
+}
+
+/*!
+    Initializes the tab view item with the specified identifier.
+    @return the initialized CPTabViewItem
+*/
+- (id)initWithIdentifier:(id)anIdentifier
+{
+    self = [super init];
+    
+    if (self)
+        _identifier = anIdentifier;
+        
+    return self;
+}
+
+// Working With Labels
+/*!
+    Sets the CPTabViewItem's label.
+    @param aLabel the label for the item
+*/
+- (void)setLabel:(CPString)aLabel
+{
+    _label = aLabel;
+}
+
+/*!
+    Returns the CPTabViewItem's label
+*/
+- (CPString)label
+{
+    return _label;
+}
+
+// Checking the Tab Display State
+/*!
+    Returns the tab's current state.
+*/
+- (CPTabState)tabState
+{
+    return _tabState;
+}
+
+// Assigning an Identifier Object
+/*!
+    Sets the item's identifier.
+    @param anIdentifier the new identifier for the item
+*/
+- (void)setIdentifier:(id)anIdentifier
+{
+    _identifier = anIdentifier;
+}
+
+/*!
+    Returns the tab's identifier.
+*/
+- (id)identifier
+{
+    return _identifier;
+}
+
+// Assigning a View
+/*!
+    Sets the view that gets displayed in this tab.
+*/
+- (void)setView:(CPView)aView
+{
+    _view = aView;
+}
+
+/*!
+    Returns the tab's view.
+*/
+- (CPView)view
+{
+    return _view;
+}
+
+// Assigning an Auxiliary View
+/*!
+    Sets the tab's auxillary view.
+    @param anAuxillaryView the new auxillary view
+*/
+- (void)setAuxiliaryView:(CPView)anAuxiliaryView
+{
+    _auxiliaryView = anAuxiliaryView;
+}
+
+/*!
+    Returns the tab's auxillary view
+*/
+- (CPView)auxiliaryView
+{
+    return _auxiliaryView;
+}
+
+// Accessing the Parent Tab View
+/*!
+    Returns the tab view that contains this item.
+*/
+- (CPTabView)tabView
+{
+    return _tabView;
+}
+
+@end
+
+var CPTabViewItemIdentifierKey  = "CPTabViewItemIdentifierKey",
+    CPTabViewItemLabelKey       = "CPTabViewItemLabelKey",
+    CPTabViewItemViewKey        = "CPTabViewItemViewKey",
+    CPTabViewItemAuxViewKey     = "CPTabViewItemAuxViewKey";
+
+
+@implementation CPTabViewItem (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super init];
+    
+    if (self)
+    {
+        _identifier     = [aCoder decodeObjectForKey:CPTabViewItemIdentifierKey];
+        _label          = [aCoder decodeObjectForKey:CPTabViewItemLabelKey];
+        
+        _view           = [aCoder decodeObjectForKey:CPTabViewItemViewKey];
+        _auxiliaryView  = [aCoder decodeObjectForKey:CPTabViewItemAuxViewKey];
+    }
+    
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [aCoder encodeObject:_identifier    forKey:CPTabViewItemIdentifierKey];
+    [aCoder encodeObject:_label         forKey:CPTabViewItemLabelKey];
+    
+    [aCoder encodeObject:_view          forKey:CPTabViewItemViewKey];
+    [aCoder encodeObject:_auxiliaryView forKey:CPTabViewItemAuxViewKey];
+}
+
+@end

AppKit/CPTableColumn.j

@@ -0,0 +1,435 @@
+/*
+ * CPTableColumn.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2009, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPDictionary.j>
+@import <Foundation/CPObject.j>
+@import <Foundation/CPSortDescriptor.j>
+@import <Foundation/CPString.j>
+
+@import "CPTableHeaderView.j"
+
+
+/*
+    @global
+    @class CPTableColumn
+*/
+CPTableColumnNoResizing         = 0;
+/*
+    @global
+    @class CPTableColumn
+*/
+CPTableColumnAutoresizingMask   = 1;
+/*
+    @global
+    @class CPTableColumn
+*/
+CPTableColumnUserResizingMask   = 2;
+
+@implementation CPTableColumn : CPObject
+{
+    CPTableView         _tableView;
+    CPView              _headerView;
+    CPView              _dataView;
+    Object              _dataViewData;
+
+    float               _width;
+    float               _minWidth;
+    float               _maxWidth;
+
+    id                  _identifier;
+    BOOL                _isEditable;
+    CPSortDescriptor    _sortDescriptorPrototype;
+    BOOL                _isHidden;
+    CPString            _headerToolTip;
+}
+
+- (id)init
+{
+    return [self initWithIdentifier:@""];
+}
+
+- (id)initWithIdentifier:(id)anIdentifier
+{
+    self = [super init];
+
+    if (self)
+    {
+        _dataViewData = { };
+
+        _width = 100.0;
+        _minWidth = 10.0;
+        _maxWidth = 1000000.0;
+
+        [self setIdentifier:anIdentifier];
+        [self setHeaderView:[CPTextField new]];
+        [self setDataView:[CPTextField new]];
+    }
+
+    return self;
+}
+
+- (void)setTableView:(CPTableView)aTableView
+{
+    _tableView = aTableView;
+}
+
+- (CPTableView)tableView
+{
+    return _tableView;
+}
+
+- (void)setWidth:(float)aWidth
+{
+    aWidth = +aWidth;
+
+    if (_width === aWidth)
+        return;
+
+    var newWidth = MIN(MAX(aWidth, [self minWidth]), [self maxWidth]);
+
+    if (_width === newWidth)
+        return;
+
+    var oldWidth = _width;
+
+    _width = newWidth;
+
+    var tableView = [self tableView];
+
+    if (tableView)
+    {
+        var index = [[tableView tableColumns] indexOfObjectIdenticalTo:self];
+
+        // FIXME: THIS IS HORRIBLE. Don't just reload everything when a table column changes, just relayout the changed widths.
+        tableView._reloadAllRows = YES;
+        tableView._dirtyTableColumnRangeIndex = tableView._dirtyTableColumnRangeIndex < 0 ? index : MIN(index,  tableView._dirtyTableColumnRangeIndex);
+
+        [tableView tile];
+
+        [[CPNotificationCenter defaultCenter]
+            postNotificationName:CPTableViewColumnDidResizeNotification
+                          object:tableView
+                        userInfo:[CPDictionary dictionaryWithObjects:[self, oldWidth] forKeys:[@"CPTableColumn", "CPOldWidth"]]];
+    }
+}
+
+- (float)width
+{
+    return _width;
+}
+
+- (void)setMinWidth:(float)aMinWidth
+{
+    aMinWidth = +aMinWidth;
+
+    if (_minWidth === aMinWidth)
+        return;
+
+    _minWidth = aMinWidth;
+
+    var width = [self width],
+        newWidth = MAX(width, [self minWidth]);
+
+    if (width !== newWidth)
+        [self setWidth:newWidth];
+}
+
+- (float)minWidth
+{
+    return _minWidth;
+}
+
+- (void)setMaxWidth:(float)aMaxWidth
+{
+    aMaxWidth = +aMaxWidth;
+
+    if (_maxWidth === aMaxWidth)
+        return;
+
+    _maxWidth = aMaxWidth;
+
+    var width = [self width],
+        newWidth = MAX(width, [self maxWidth]);
+
+    if (width !== newWidth)
+        [self setWidth:newWidth];
+}
+
+- (float)maxWidth
+{
+    return _maxWidth;
+}
+
+- (void)setResizingMask:(unsigned)aResizingMask
+{
+    _resizingMask = aResizingMask;
+}
+
+- (float)resizingMask
+{
+    return _resizingMask;
+}
+
+- (void)sizeToFit
+{
+    var width = _CGRectGetWidth([_headerView frame]);
+
+    if (width < [self minWidth])
+        [self setMinWidth:width];
+    else if (width > [self maxWidth])
+        [self setMaxWidth:width]
+
+    if (_width !== width)
+        [self setWidth:width];
+}
+
+//Setting Component Cells
+- (void)setHeaderView:(CPView)aView
+{
+    if (!aView)
+        [CPException raise:CPInvalidArgumentException reason:@"Attempt to set nil header view on " + [self description]];
+
+    _headerView = aView;
+
+    var tableHeaderView = [_tableView headerView];
+
+    [tableHeaderView setNeedsLayout];
+    [tableHeaderView setNeedsDisplay:YES];
+}
+
+- (CPView)headerView
+{
+    return _headerView;
+}
+
+- (void)setDataView:(CPView)aView
+{
+    if (_dataView === aView)
+        return;
+
+    if (_dataView)
+        _dataViewData[[_dataView UID]] = nil;
+
+    _dataView = aView;
+    _dataViewData[[aView UID]] = [CPKeyedArchiver archivedDataWithRootObject:aView];
+}
+
+- (CPView)dataView
+{
+    return _dataView;
+}
+
+/*
+    Returns the CPView object used by the CPTableView to draw values for the receiver.
+
+    By default, this method just calls dataView. Subclassers can override if they need to
+    potentially use different cells for different rows. Subclasses should expect this method
+    to be invoked with row equal to -1 in cases where no actual row is involved but the table
+    view needs to get some generic cell info.
+*/
+- (id)dataViewForRow:(int)aRowIndex
+{
+    return [self dataView];
+}
+
+- (id)_newDataViewForRow:(int)aRowIndex
+{
+    var dataView = [self dataViewForRow:aRowIndex],
+        dataViewUID = [dataView UID];
+
+var x = [self tableView]._cachedDataViews[dataViewUID];
+if (x && x.length)
+return x.pop();
+
+    // if we haven't cached an archive of the data view, do it now
+    if (!_dataViewData[dataViewUID])
+        _dataViewData[dataViewUID] = [CPKeyedArchiver archivedDataWithRootObject:dataView];
+
+    // unarchive the data view cache
+    var newDataView = [CPKeyedUnarchiver unarchiveObjectWithData:_dataViewData[dataViewUID]];
+newDataView.identifier = dataViewUID;
+    return newDataView;
+}
+
+//Setting the Identifier
+
+/*
+    Sets the receiver identifier to anIdentifier.
+*/
+- (void)setIdentifier:(id)anIdentifier
+{
+    _identifier = anIdentifier;
+}
+
+/*
+    Returns the object used by the data source to identify the attribute corresponding to the receiver.
+*/
+- (id)identifier
+{
+    return _identifier;
+}
+
+//Controlling Editability
+
+/*
+    Controls whether the user can edit cells in the receiver by double-clicking them.
+*/
+- (void)setEditable:(BOOL)shouldBeEditable
+{
+    _isEditable = shouldBeEditable;
+}
+
+/*
+    Returns YES if the user can edit cells associated with the receiver by double-clicking the 
+    column in the NSTableView, NO otherwise.
+*/
+- (BOOL)isEditable
+{
+    return _isEditable;
+}
+
+//Sorting
+- (void)setSortDescriptorPrototype:(CPSortDescriptor)aSortDescriptor
+{
+    _sortDescriptorPrototype = aSortDescriptor;
+}
+
+- (CPSortDescriptor)sortDescriptorPrototype
+{
+    return _sortDescriptorPrototype;
+}
+
+//Setting Column Visibility
+
+- (void)setHidden:(BOOL)shouldBeHidden
+{
+    _isHidden = shouldBeHidden;
+}
+
+- (BOOL)isHidden
+{
+    return _isHidden;
+}
+
+//Setting Tool Tips
+
+/*
+    Sets the tooltip string that is displayed when the cursor pauses over the 
+    header cell of the receiver.
+*/
+- (void)setHeaderToolTip:(CPString)aToolTip
+{
+    _headerToolTip = aToolTip;
+}
+
+- (CPString)headerToolTip
+{
+    return _headerToolTip;
+}
+
+@end
+
+var CPTableColumnIdentifierKey   = @"CPTableColumnIdentifierKey",
+    CPTableColumnHeaderViewKey   = @"CPTableColumnHeaderViewKey",
+    CPTableColumnDataViewKey     = @"CPTableColumnDataViewKey",
+    CPTableColumnWidthKey        = @"CPTableColumnWidthKey",
+    CPTableColumnMinWidthKey     = @"CPTableColumnMinWidthKey",
+    CPTableColumnMaxWidthKey     = @"CPTableColumnMaxWidthKey",
+    CPTableColumnResizingMaskKey = @"CPTableColumnResizingMaskKey";
+
+@implementation CPTableColumn (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super init];
+
+    if (self)
+    {
+        _dataViewData = { };
+
+        _width = [aCoder decodeFloatForKey:CPTableColumnWidthKey];
+        _minWidth = [aCoder decodeFloatForKey:CPTableColumnMinWidthKey];
+        _maxWidth = [aCoder decodeFloatForKey:CPTableColumnMaxWidthKey];
+
+        [self setIdentifier:[aCoder decodeObjectForKey:CPTableColumnIdentifierKey]];
+    //    [self setHeaderView:[aCoder decodeObjectForKey:CPTableColumnHeaderViewKey]];
+    //    [self setDataView:[aCoder decodeObjectForKey:CPTableColumnDataViewKey]];
+
+        [self setHeaderView:[CPTextField new]];
+        [self setDataView:[CPTextField new]];
+
+
+    //    _resizingMask  = [aCoder decodeBoolForKey:CPTableColumnResizingMaskKey];
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [aCoder encodeObject:_identifier forKey:CPTableColumnIdentifierKey];
+
+    [aCoder encodeObject:_width forKey:CPTableColumnWidthKey];
+    [aCoder encodeObject:_minWidth forKey:CPTableColumnMinWidthKey];
+    [aCoder encodeObject:_maxWidth forKey:CPTableColumnMaxWidthKey];
+
+//    [aCoder encodeObject:_headerView forKey:CPTableColumnHeaderViewKey];
+//    [aCoder encodeObject:_dataView forKey:CPTableColumnDataViewKey];
+
+//    [aCoder encodeObject:_resizingMask forKey:CPTableColumnResizingMaskKey];
+}
+
+@end
+
+@implementation CPTableColumn (NSInCompatibility)
+
+- (void)setHeaderCell:(CPView)aView
+{
+    [CPException raise:CPUnsupportedMethodException
+                reason:@"setHeaderCell: is not supported. -setHeaderCell:aView instead."];
+}
+
+- (CPView)headerCell
+{
+    [CPException raise:CPUnsupportedMethodException
+                reason:@"headCell is not supported. -headerView instead."];
+}
+
+- (void)setDataCell:(CPView)aView
+{
+    [CPException raise:CPUnsupportedMethodException
+                reason:@"setDataCell: is not supported. Use -setHeaderCell:aView instead."];
+}
+
+- (CPView)dataCell
+{
+    [CPException raise:CPUnsupportedMethodException
+                reason:@"dataCell is not supported. Use -dataCell instead."];
+}
+
+- (id)dataCellForRow:(int)row
+{
+    [CPException raise:CPUnsupportedMethodException
+                reason:@"dataCellForRow: is not supported. Use -dataViewForRow:row instead."];
+}
+
+@end

AppKit/CPTableHeaderView.j

@@ -0,0 +1,145 @@
+/*
+ * CPTableHeaderView.j
+ * AppKit
+ *
+ * Created by Ross Boucher.
+ * Copyright 2009 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 "CPTableColumn.j"
+@import "CPTableView.j"
+@import "CPView.j"
+
+
+@implementation CPTableHeaderView : CPView
+{
+    int _resizedColumn @accessors(readonly, property=resizedColumn);
+    int _draggedColumn @accessors(readonly, property=draggedColumn);
+    
+    float _draggedDistance @accessors(readonly, property=draggedDistance);
+    
+    CPTableView _tableView @accessors(property=tableView);
+}
+
+- (void)initWithFrame:(CGRect)aFrame
+{
+    self = [super initWithFrame:aFrame];
+
+    if (self)
+    {
+        _resizedColumn = CPNotFound;
+        _draggedColumn = CPNotFound;
+        _draggedDistance = 0.0;
+    }
+
+    return self;
+}
+
+- (int)columnAtPoint:(CGPoint)aPoint
+{
+    if (!CGRectContainsPoint([self bounds], aPoint))
+        return CPNotFound;
+
+    // at this point, we can essentially ignore height, because all columns have equal heights
+    // and that height is equal to the height of our own bounds, which we know we are inside of
+
+    var index = 0,
+        count = [[_tableView tableColumns] count],
+        tableSpacing = [_tableView intercellSpacing],
+        tableColumns = [_tableView tableColumns],
+        leftOffset = 0,
+        pointX = aPoint.x;
+
+    for (; index < count; index++)
+    {
+        var width = [tableColumns[index] width] + tableSpacing.width;
+
+        if (pointX >= leftOffset && pointX < leftOffset + width)
+            return index;
+
+        leftOffset += width;
+    }
+
+    return CPNotFound;
+}
+
+- (CGRect)headerRectOfColumn:(int)aColumnIndex
+{
+    var tableColumns = [_tableView tableColumns],
+        tableSpacing = [_tableView intercellSpacing],
+        bounds = [self bounds];
+
+    if (aColumnIndex < 0 || aColumnIndex > [tableColumns count])
+        [CPException raise:"invalid" reason:"tried to get headerRectOfColumn: on invalid column"];
+
+    bounds.size.width = [tableColumns[aColumnIndex] width] + tableSpacing.width;
+
+    while (--aColumnIndex >= 0)
+        bounds.origin.x += [tableColumns[aColumnIndex] width] + tableSpacing.width;
+
+    return bounds;
+}
+
+- (void)layoutSubviews
+{
+    var tableColumns    = [_tableView tableColumns],
+        count = [tableColumns count],
+        columnRect = [self bounds],
+        spacing = [_tableView intercellSpacing];
+ 
+    for (i = 0; i < count; ++i) 
+    {
+        var column = [tableColumns objectAtIndex:i],
+            headerView = [column headerView];
+
+        columnRect.size.width = [column width] + spacing.width;
+
+        [headerView setFrame:columnRect];
+
+        columnRect.origin.x += [column width] + spacing.width;
+
+        [self addSubview:headerView];
+    }
+}
+
+- (void)drawRect:(CGRect)aRect
+{
+    [[_tableView gridColor] setStroke];
+
+    var context = [[CPGraphicsContext currentContext] graphicsPort],
+        exposedColumnIndexes = exposedColumnIndexes = [_tableView columnIndexesInRect:aRect],
+        columnsArray = [];
+
+    [exposedColumnIndexes getIndexes:columnsArray maxCount:-1 inIndexRange:nil];
+
+    var columnArrayIndex = 0,
+        columnArrayCount = columnsArray.length;
+
+    for(; columnArrayIndex < columnArrayCount; ++columnArrayIndex)
+    {
+        // grab each column rect and add horizontal lines
+        var columnToStroke = [self headerRectOfColumn:columnArrayIndex];
+
+        CGContextBeginPath(context);
+        CGContextMoveToPoint(context, ROUND(columnToStroke.origin.x + columnToStroke.size.width) - 0.5, ROUND(columnToStroke.origin.y) - 0.5);
+        CGContextAddLineToPoint(context, ROUND(columnToStroke.origin.x + columnToStroke.size.width) - 0.5, ROUND(columnToStroke.origin.y + columnToStroke.size.height) - 0.5);
+        CGContextSetLineWidth(context, 1);
+        CGContextStrokePath(context);
+    }
+}
+
+@end

AppKit/CPTheme.j

@@ -0,0 +1,588 @@
+/*
+ * CPTheme.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2009, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPObject.j>
+@import <Foundation/CPString.j>
+
+
+var CPThemesByName      = { },
+    CPThemeDefaultTheme = nil;
+
+
+/*!
+    @ingroup appkit
+*/
+
+@implementation CPTheme : CPObject
+{
+    CPString        _name;
+    CPDictionary    _attributes;
+}
+
++ (void)setDefaultTheme:(CPTheme)aTheme
+{
+    CPThemeDefaultTheme = aTheme;
+}
+
++ (CPTheme)defaultTheme
+{
+    return CPThemeDefaultTheme;
+}
+
++ (CPTheme)themeNamed:(CPString)aName
+{
+    return CPThemesByName[aName];
+}
+
+- (id)initWithName:(CPString)aName
+{
+    self = [super init];
+
+    if (self)
+    {
+        _name = aName;
+        _attributes = [CPDictionary dictionary];
+
+        CPThemesByName[_name] = self;
+    }
+
+    return self;
+}
+
+- (CPString)name
+{
+    return _name;
+}
+
+- (_CPThemeAttribute)_attributeWithName:(CPString)aName forClass:(CPString)aClass
+{
+    var attributes = [_attributes objectForKey:aClass];
+
+    if (!attributes)
+        return nil;
+
+    return [attributes objectForKey:aName];
+}
+
+- (void)takeThemeFromObject:(id)anObject
+{
+    var attributes = [anObject _themeAttributeDictionary],
+        attributeName = nil,
+        attributeNames = [attributes keyEnumerator],
+        objectThemeClass = [[anObject class] themeClass];
+
+    while (attributeName = [attributeNames nextObject])
+        [self _recordAttribute:[attributes objectForKey:attributeName] forClass:objectThemeClass];
+}
+
+- (void)_recordAttribute:(_CPThemeAttribute)anAttribute forClass:(CPString)aClass
+{
+    if (![anAttribute hasValues])
+        return;
+
+    var attributes = [_attributes objectForKey:aClass];
+
+    if (!attributes)
+    {
+        attributes = [CPDictionary dictionary];
+
+        [_attributes setObject:attributes forKey:aClass];
+    }
+
+    var name = [anAttribute name],
+        existingAttribute = [attributes objectForKey:name];
+
+    if (existingAttribute)
+        [attributes setObject:[existingAttribute attributeMergedWithAttribute:anAttribute] forKey:name];
+    else
+        [attributes setObject:anAttribute forKey:name];
+}
+
+@end
+
+var CPThemeNameKey          = @"CPThemeNameKey",
+    CPThemeAttributesKey    = @"CPThemeAttributesKey";
+
+@implementation CPTheme (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super init];
+
+    if (self)
+    {
+        _name = [aCoder decodeObjectForKey:CPThemeNameKey];
+        _attributes = [aCoder decodeObjectForKey:CPThemeAttributesKey];
+
+        CPThemesByName[_name] = self;
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [aCoder encodeObject:_name forKey:CPThemeNameKey];
+    [aCoder encodeObject:_attributes forKey:CPThemeAttributesKey];
+}
+
+@end
+
+@implementation _CPThemeKeyedUnarchiver : CPKeyedUnarchiver
+{
+    CPBundle    _bundle;
+}
+
+- (id)initForReadingWithData:(CPData)data bundle:(CPBundle)aBundle
+{
+    self = [super initForReadingWithData:data];
+
+    if (self)
+        _bundle = aBundle;
+
+    return self;
+}
+
+- (CPBundle)bundle
+{
+    return _bundle;
+}
+
+- (BOOL)awakenCustomResources
+{
+    return YES;
+}
+
+@end
+
+var CPThemeStates       = {},
+    CPThemeStateNames   = {},
+    CPThemeStateCount   = 0;
+
+function CPThemeState(aStateName)
+{
+    var state = CPThemeStates[aStateName];
+
+    if (state === undefined)
+    {
+        if (aStateName.indexOf('+') === -1)
+            state = 1 << CPThemeStateCount++;
+        else
+        {
+            var state = 0,
+                states = aStateName.split('+'),
+                count = states.length;
+
+            while (count--)
+            {
+                var stateName = states[count],
+                    individualState = CPThemeStates[stateName];
+
+                if (individualState === undefined)
+                {
+                    individualState = 1 << CPThemeStateCount++;
+                    CPThemeStates[stateName] = individualState;
+                    CPThemeStateNames[individualState] = stateName;
+                }
+
+                state |= individualState;
+            }
+        }
+
+        CPThemeStates[aStateName] = state;
+        CPThemeStateNames[state] = aStateName;
+    }
+
+    return state;
+}
+
+function CPThemeStateName(aState)
+{
+    var name = CPThemeStateNames[aState];
+
+    if (name !== undefined)
+        return name;
+
+    if (!(aState & (aState - 1)))
+        return "";
+
+    var state = 1,
+        name = "";
+
+    for (; state < aState; state <<= 1)
+        if (aState & state)
+            name += (name.length === 0 ? '' : '+') + CPThemeStateNames[state];
+
+    CPThemeStateNames[aState] = name;
+
+    return name;
+}
+
+CPThemeStateNames[0]        = "normal";
+CPThemeStateNormal          = CPThemeStates["normal"] = 0;
+CPThemeStateDisabled        = CPThemeState("disabled");
+CPThemeStateHighlighted     = CPThemeState("highlighted");
+CPThemeStateSelected        = CPThemeState("selected");
+CPThemeStateBezeled         = CPThemeState("bezeled");
+CPThemeStateBordered        = CPThemeState("bordered");
+CPThemeStateEditable        = CPThemeState("editable");
+CPThemeStateEditing         = CPThemeState("editing");
+CPThemeStateVertical        = CPThemeState("vertical");
+CPThemeStateDefault         = CPThemeState("default");
+CPThemeStateCircular        = CPThemeState("circular");
+
+@implementation _CPThemeAttribute : CPObject
+{
+    CPString            _name;
+    id                  _defaultValue;
+    CPDictionary        _values;
+
+    JSObject            _cache;
+    CPThemeAttribute    _parentAttribute;
+}
+
+- (id)initWithName:(CPString)aName defaultValue:(id)aDefaultValue
+{
+    self = [super init];
+
+    if (self)
+    {
+        _cache = { };
+        _name = aName;
+        _defaultValue = aDefaultValue;
+        _values = [CPDictionary dictionary];
+    }
+
+    return self;
+}
+
+- (CPString)name
+{
+    return _name;
+}
+
+- (id)defaultValue
+{
+    return _defaultValue;
+}
+
+- (BOOL)hasValues
+{
+    return [_values count] > 0;
+}
+
+- (BOOL)isTrivial
+{
+    return ([_values count] === 1) && (Number([_values allKeys][0]) === CPThemeStateNormal);
+}
+
+- (void)setValue:(id)aValue
+{
+    _cache = {};
+
+    if (aValue === undefined || aValue === nil)
+        _values = [CPDictionary dictionary];
+    else
+        _values = [CPDictionary dictionaryWithObject:aValue forKey:String(CPThemeStateNormal)];
+}
+
+- (void)setValue:(id)aValue forState:(CPThemeState)aState
+{
+    _cache = { };
+
+    if ((aValue === undefined) || (aValue === nil))
+        [_values removeObjectForKey:String(aState)];
+    else
+        [_values setObject:aValue forKey:String(aState)];
+}
+
+- (id)value
+{
+    return [self valueForState:CPThemeStateNormal];
+}
+
+- (id)valueForState:(CPThemeState)aState
+{
+    var value = _cache[aState];
+
+    // This can be nil.
+    if (value !== undefined)
+        return value;
+
+    value = [_values objectForKey:String(aState)];
+
+    // If we don't have a value, and we have a non-normal state...
+    if ((value === undefined || value === nil) && aState !== CPThemeStateNormal)
+    {
+        // If this is a composite state (not a power of 2), find the closest partial subset match.
+        if (aState & (aState - 1))
+        {
+            var highestOneCount = 0,
+                states = [_values allKeys],
+                count = states.length;
+
+            while (count--)
+            {
+                // states[count] is a string!
+                var state = Number(states[count]);
+
+                // A & B = A iff A < B
+                if ((state & aState) === state)
+                {
+                    var oneCount = cachedNumberOfOnes[state];
+
+                    if (oneCount === undefined)
+                        oneCount = numberOfOnes(state);
+
+                    if (oneCount > highestOneCount)
+                    {
+                        highestOneCount = oneCount;
+                        value = [_values objectForKey:String(state)];
+                    }
+                }
+            }
+        }
+
+        // Still don't have a value? OK, let's use the normal value.
+        if (value === undefined || value === nil)
+            value = [_values objectForKey:String(CPThemeStateNormal)];
+    }
+
+    if (value === undefined || value === nil)
+        value = [_parentAttribute valueForState:aState];
+
+    if (value === undefined || value === nil)
+        value = _defaultValue;
+
+    _cache[aState] = value;
+
+    return value;
+}
+
+- (void)setParentAttribute:(CPThemeAttribute)anAttribute
+{
+    if (_parentAttribute === anAttribute)
+        return;
+
+    _cache = { };
+    _parentAttribute = anAttribute;
+}
+
+- (CPThemeAttribute)attributeMergedWithAttribute:(_CPThemeAttribute)anAttribute
+{
+    var mergedAttribute = [[_CPThemeAttribute alloc] initWithName:_name defaultValue:_defaultValue];
+
+    mergedAttribute._values = [_values copy];
+    [mergedAttribute._values addEntriesFromDictionary:anAttribute._values];
+
+    return mergedAttribute;
+}
+
+@end
+
+@implementation _CPThemeAttribute (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super init];
+
+    if (self)
+    {
+        _cache = {};
+
+        _name = [aCoder decodeObjectForKey:@"name"];
+        _values = [CPDictionary dictionary];
+
+        if ([aCoder containsValueForKey:@"value"])
+        {
+            var state = CPThemeStateNormal;
+
+            if ([aCoder containsValueForKey:@"state"])
+                state = CPThemeState([aCoder decodeObjectForKey:@"state"]);
+
+            [_values setObject:[aCoder decodeObjectForKey:"value"] forKey:state];
+        }
+        else
+        {
+            var encodedValues = [aCoder decodeObjectForKey:@"values"],
+                keys = [encodedValues allKeys],
+                count = keys.length;
+
+            while (count--)
+            {
+                var key = keys[count];
+
+                [_values setObject:[encodedValues objectForKey:key] forKey:CPThemeState(key)];
+            }
+        }
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [aCoder encodeObject:_name forKey:@"name"];
+
+    var keys = [_values allKeys],
+        count = keys.length;
+
+    if (count === 1)
+    {
+        var onlyKey = keys[0];
+
+        if (Number(onlyKey) !== CPThemeStateNormal)
+            [aCoder encodeObject:CPThemeStateName(Number(onlyKey)) forKey:@"state"];
+
+        [aCoder encodeObject:[_values objectForKey:onlyKey] forKey:@"value"];
+    }
+    else
+    {
+        var encodedValues = [CPDictionary dictionary];
+
+        while (count--)
+        {
+            var key = keys[count];
+
+            [encodedValues setObject:[_values objectForKey:key] forKey:CPThemeStateName(Number(key))];
+        }
+
+        [aCoder encodeObject:encodedValues forKey:@"values"];
+    }
+}
+
+@end
+
+var cachedNumberOfOnes = [  0 /*000000*/, 1 /*000001*/, 1 /*000010*/, 2 /*000011*/, 1 /*000100*/, 2 /*000101*/, 2 /*000110*/, 
+                            3 /*000111*/, 1 /*001000*/, 2 /*001001*/, 2 /*001010*/, 3 /*001011*/, 2 /*001100*/, 3 /*001101*/, 
+                            3 /*001110*/, 4 /*001111*/, 1 /*010000*/, 2 /*010001*/, 2 /*010010*/, 3 /*010011*/, 2 /*010100*/, 
+                            3 /*010101*/, 3 /*010110*/, 4 /*010111*/, 2 /*011000*/, 3 /*011001*/, 3 /*011010*/, 4 /*011011*/, 
+                            3 /*011100*/, 4 /*011101*/, 4 /*011110*/, 5 /*011111*/, 1 /*100000*/, 2 /*100001*/, 2 /*100010*/, 
+                            3 /*100011*/, 2 /*100100*/, 3 /*100101*/, 3 /*100110*/, 4 /*100111*/, 2 /*101000*/, 3 /*101001*/, 
+                            3 /*101010*/, 4 /*101011*/, 3 /*101100*/, 4 /*101101*/, 4 /*101110*/, 5 /*101111*/, 2 /*110000*/, 
+                            3 /*110001*/, 3 /*110010*/, 4 /*110011*/, 3 /*110100*/, 4 /*110101*/, 4 /*110110*/, 5 /*110111*/, 
+                            3 /*111000*/, 4 /*111001*/, 4 /*111010*/, 5 /*111011*/, 4 /*111100*/, 5 /*111101*/, 5 /*111110*/, 
+                            6 /*111111*/ ];
+
+var numberOfOnes = function(aNumber)
+{
+    var count = 0,
+        slot = aNumber;
+
+    while (aNumber)
+    {
+        ++count;
+        aNumber &= (aNumber - 1);
+    }
+
+    cachedNumberOfOnes[slot] = count;
+
+    return count;
+}
+
+numberOfOnes.displayName = "numberOfOnes";
+
+function CPThemeAttributeEncode(aCoder, aThemeAttribute)
+{
+    var values = aThemeAttribute._values,
+        count = [values count],
+        key = "$a" + [aThemeAttribute name];
+
+    if (count === 1)
+    {
+        var state = [values allKeys][0];
+
+        if (Number(state) === 0)
+        {
+            [aCoder encodeObject:[values objectForKey:state] forKey:key];
+
+            return YES;
+        }
+    }
+
+    if (count >= 1)
+    {
+        [aCoder encodeObject:aThemeAttribute forKey:key];
+
+        return YES;
+    }
+
+    return NO;
+}
+
+function CPThemeAttributeDecode(aCoder, anAttributeName, aDefaultValue, aTheme, aClass)
+{
+    var key = "$a" + anAttributeName;
+
+    if (![aCoder containsValueForKey:key])
+        var attribute = [[_CPThemeAttribute alloc] initWithName:anAttributeName defaultValue:aDefaultValue];
+
+    else
+    {
+        var attribute = [aCoder decodeObjectForKey:key];
+
+        if (!attribute.isa || ![attribute isKindOfClass:[_CPThemeAttribute class]])
+        {
+            var themeAttribute = [[_CPThemeAttribute alloc] initWithName:anAttributeName defaultValue:aDefaultValue];
+
+            [themeAttribute setValue:attribute];
+
+            attribute = themeAttribute;
+        }
+    }
+
+    if (aTheme && aClass)
+        [attribute setParentAttribute:[aTheme _attributeWithName:anAttributeName forClass:aClass]];
+
+    return attribute;
+}
+
+/* TO AUTO CREATE THESE:
+function bit_count(bits)
+    {
+        var count = 0;
+
+        while (bits)
+        {
+            ++count;
+            bits &= (bits - 1);
+        }
+
+        return count ;
+    }
+
+zeros = "000000000";
+
+function pad(string, digits)
+{
+    return zeros.substr(0, digits - string.length) + string;
+}
+
+var str = ""
+str += '[';
+for (i = 0;i < Math.pow(2,6);++i)
+{
+    str += bit_count(i) + " /*" + pad(i.toString(2),6) + "*" + "/, ";
+}
+print(str+']');
+
+*/

AppKit/CPThemeBlend.j

@@ -0,0 +1,79 @@
+/*
+ * CPThemeBlend.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2009, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPObject.j>
+
+@import <AppKit/CPTheme.j>
+@import <AppKit/_CPCibCustomResource.j>
+@import <AppKit/_CPCibKeyedUnarchiver.j>
+
+/*!
+    @ingroup appkit
+*/
+
+@implementation CPThemeBlend : CPObject
+{
+    CPBundle    _bundle;
+    CPArray     _themes @accessors(readonly, getter=themes);
+    id          _loadDelegate;
+}
+
+- (id)initWithContentsOfURL:(CPURL)aURL
+{
+    self = [super init];
+    
+    if (self)
+    {
+        _bundle = [[CPBundle alloc] initWithPath:aURL + "/Info.plist"];
+    }
+    
+    return self;
+}
+
+- (void)loadWithDelegate:(id)aDelegate
+{
+    _loadDelegate = aDelegate;
+    
+    [_bundle loadWithDelegate:self];
+}
+
+- (void)bundleDidFinishLoading:(CPBundle)aBundle
+{
+    var themes = [_bundle objectForInfoDictionaryKey:@"CPKeyedThemes"],
+        count = themes.length;
+
+    while (count--)
+    {
+        var path = [aBundle pathForResource:themes[count]],
+            unarchiver = [[_CPThemeKeyedUnarchiver alloc]
+                            initForReadingWithData:[CPData dataWithString:objj_files[path].contents]
+                            bundle:_bundle];
+
+        [unarchiver decodeObjectForKey:@"root"];
+
+        [unarchiver finishDecoding];
+    }
+
+    [_loadDelegate blendDidFinishLoading:self];
+}
+
+@end

AppKit/CPToolbarItem.j

@@ -0,0 +1,565 @@
+/*
+ * CPToolbarItem.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPObject.j>
+@import <Foundation/CPString.j>
+
+@import <AppKit/CPImage.j>
+@import <AppKit/CPView.j>
+
+
+/*
+    @global
+    @class CPToolbarItem
+*/
+CPToolbarItemVisibilityPriorityStandard = 0;
+/*
+    @global
+    @class CPToolbarItem
+*/
+CPToolbarItemVisibilityPriorityLow      = -1000;
+/*
+    @global
+    @class CPToolbarItem
+*/
+CPToolbarItemVisibilityPriorityHigh     = 1000;
+/*
+    @global
+    @class CPToolbarItem
+*/
+CPToolbarItemVisibilityPriorityUser     = 2000;
+
+CPToolbarSeparatorItemIdentifier        = @"CPToolbarSeparatorItemIdentifier";
+CPToolbarSpaceItemIdentifier            = @"CPToolbarSpaceItemIdentifier";
+CPToolbarFlexibleSpaceItemIdentifier    = @"CPToolbarFlexibleSpaceItemIdentifier";
+CPToolbarShowColorsItemIdentifier       = @"CPToolbarShowColorsItemIdentifier";
+CPToolbarShowFontsItemIdentifier        = @"CPToolbarShowFontsItemIdentifier";
+CPToolbarCustomizeToolbarItemIdentifier = @"CPToolbarCustomizeToolbarItemIdentifier";
+CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItemIdentifier";
+
+/*! 
+    @ingroup appkit
+    @class CPToolbarItem
+
+    A representation of an item in a CPToolbar.
+*/
+@implementation CPToolbarItem : CPObject
+{
+    CPString    _itemIdentifier;
+
+    CPToolbar   _toolbar;
+
+    CPString    _label;
+    CPString    _paletteLabel;
+    CPString    _toolTip;
+    int         _tag;
+    id          _target;
+    SEL         _action;
+    BOOL        _isEnabled;
+    CPImage     _image;
+    CPImage     _alternateImage;
+
+    CPView      _view;
+
+    CGSize      _minSize;
+    CGSize      _maxSize;    
+
+    int         _visibilityPriority;
+
+    BOOL        _autovalidates;
+}
+
+- (id)init
+{
+    return [self initWithItemIdentifier:@""];
+}
+
+// Creating a Toolbar Item
+/*!
+    Initializes the toolbar item with a specified identifier.
+    @param anItemIdentifier the item's identifier
+    @return the initialized toolbar item
+*/
+- (id)initWithItemIdentifier:(CPString)anItemIdentifier
+{
+    self = [super init];
+    
+    if (self)
+    {
+        _itemIdentifier = anItemIdentifier;
+     
+        _tag = 0;
+        _isEnabled = YES;
+     
+        _minSize = CGSizeMakeZero();
+        _maxSize = CGSizeMakeZero();
+     
+        _visibilityPriority = CPToolbarItemVisibilityPriorityStandard;
+    }
+    
+    return self;
+}
+
+// Managing Attributes
+/*!
+    Returns the item's identifier.
+*/
+- (CPString)itemIdentifier
+{
+    return _itemIdentifier;
+}
+
+/*!
+    Returns the toolbar of which this item is a part.
+*/
+- (CPToolbar)toolbar
+{
+    return _toolbar;
+}
+
+/*!
+    Returns the item's label
+*/
+- (CPString)label
+{
+    return _label;
+}
+
+/*!
+    Sets the item's label.
+    @param aLabel the new label for the item
+*/
+- (void)setLabel:(CPString)aLabel
+{
+    _label = aLabel;
+}
+
+/*!
+    Returns the palette label.
+*/
+- (CPString)paletteLabel
+{
+    return _paletteLabel;
+}
+
+/*!
+    Sets the palette label
+    @param aPaletteLabel the new palette label
+*/
+- (void)setPaletteLabel:(CPString)aPaletteLabel
+{
+    _paletteLabel = aPaletteLabel;
+}
+
+/*!
+    Returns the item's tooltip. A tooltip pops up
+    next to the cursor when the user hovers over
+    the item with the mouse.
+*/
+- (CPString)toolTip
+{
+    if ([_view respondsToSelector:@selector(toolTip)])
+        return [_view toolTip];
+    
+    return _toolTip;
+}
+
+/*!
+    Sets the item's tooltip. A tooltip pops up next to the cursor when the user hovers over the item with the mouse.
+    @param aToolTip the new item tool tip
+*/
+- (void)setToolTip:(CPString)aToolTip
+{
+    if ([_view respondsToSelector:@selector(setToolTip:)])
+        [view setToolTip:aToolTip];
+    
+    _toolTip = aToolTip;
+}
+
+/*!
+    Returns the item's tag.
+*/
+- (int)tag
+{
+    if ([_view respondsToSelector:@selector(tag)])
+        return [_view tag];
+    
+    return _tag;
+}
+
+/*!
+    Sets the item's tag.
+    @param aTag the new tag for the item
+*/
+- (void)setTag:(int)aTag
+{
+    if ([_view respondsToSelector:@selector(setTag:)])
+        [_view setTag:aTag];
+    
+    _tag = aTag;
+}
+
+/*!
+    Returns the item's action target.
+*/
+- (id)target
+{
+    if (_view)
+        return [_view respondsToSelector:@selector(target)] ? [_view target] : nil;
+    
+    return _target;
+}
+
+/*!
+    Sets the target of the action that is triggered when the user clicks this item. \c nil will cause 
+    the action to be passed on to the first responder.
+    @param aTarget the new target
+*/
+- (void)setTarget:(id)aTarget
+{
+    if (!_view)
+        _target = aTarget;
+    
+    else if ([_view respondsToSelector:@selector(setTarget:)])
+        [_view setTarget:aTarget];
+}
+
+/*!
+    Returns the action that is triggered when the user clicks this item.
+*/
+- (SEL)action
+{
+    if (_view)
+        return [_view respondsToSelector:@selector(action)] ? [_view action] : nil;
+    
+    return _action;
+}
+
+/*!
+    Sets the action that is triggered when the user clicks this item.
+    @param anAction the new action
+*/
+- (void)setAction:(SEL)anAction
+{
+    if (!_view)
+        _action = anAction;
+
+    else if ([_view respondsToSelector:@selector(setAction:)])
+        [_view setAction:anAction];
+}
+
+/*!
+    Returns \c YES if the item is enabled.
+*/
+- (BOOL)isEnabled
+{
+    if ([_view respondsToSelector:@selector(isEnabled)])
+        return [_view isEnabled];
+    
+    return _isEnabled;
+}
+
+/*!
+    Sets whether the item is enabled.
+    @param aFlag \c YES enables the item
+*/
+- (void)setEnabled:(BOOL)shouldBeEnabled
+{
+    if ([_view respondsToSelector:@selector(setEnabled:)])
+        [_view setEnabled:shouldBeEnabled];
+    
+    _isEnabled = shouldBeEnabled;
+}
+
+/*!
+    Returns the item's image
+*/
+- (CPImage)image
+{
+    if ([_view respondsToSelector:@selector(image)])
+        return [_view image];
+        
+    return _image;
+}
+
+/*!
+    Sets the item's image.
+    @param anImage the new item image
+*/
+- (void)setImage:(CPImage)anImage
+{
+    if ([_view respondsToSelector:@selector(setImage:)])
+        [_view setImage:anImage];
+
+    _image = anImage;
+    
+    if (!_image)
+        return;
+    
+    if (_minSize.width == 0 && _minSize.height == 0 && 
+        _maxSize.width == 0 && _maxSize.height == 0)
+    {
+        var imageSize = [_image size];
+
+        if (imageSize.width > 0 || imageSize.height > 0)
+        {
+            [self setMinSize:imageSize];
+            [self setMaxSize:imageSize];
+        }
+    }
+}
+
+/*!
+    Sets the alternate image. This image is displayed on the item when the user is clicking it.
+    @param anImage the new alternate image
+*/
+- (void)setAlternateImage:(CPImage)anImage
+{
+    if ([_view respondsToSelector:@selector(setAlternateImage:)])
+        [_view setAlternateImage:anImage];
+    
+    _alternateImage = anImage;
+}
+
+/*!
+    Returns the alternate image. This image is displayed on the item when the user is clicking it.
+*/
+- (CPImage)alternateImage
+{
+    if ([_view respondsToSelector:@selector(alternateIamge)])
+        return [_view alternateImage];
+    
+    return _alternateImage;
+}
+
+/*!
+    Returns the item's view.
+*/
+- (CPView)view
+{
+    return _view;
+}
+
+/*!
+    Sets the item's view
+    @param aView the item's new view
+*/
+- (void)setView:(CPView)aView
+{
+    if (_view == aView)
+        return;
+    
+    _view = aView;
+
+    if (_view)
+    {
+        // Tags get forwarded.
+        if (_tag !== 0 && [_view respondsToSelector:@selector(setTag:)])
+            [_view setTag:_tag];
+        
+        _target = nil;
+        _action = nil;
+    }
+}
+
+/*!
+    Returns the item's minimum size.
+*/
+- (CGSize)minSize
+{
+    return _minSize;
+}
+
+/*!
+    Sets the item's minimum size.
+    @param aMinSize the new minimum size
+*/
+- (void)setMinSize:(CGSize)aMinSize
+{
+    _minSize = CGSizeMakeCopy(aMinSize);
+    
+    // Try to provide some sanity: Make maxSize >= minSize
+    _maxSize = CGSizeMake(MAX(_minSize.width, _maxSize.width), MAX(_minSize.height, _maxSize.height));
+}
+
+/*!
+    Returns the item's maximum size.
+*/
+- (CGSize)maxSize
+{
+    return _maxSize;
+}
+
+/*!
+    Sets the item's new maximum size.
+    @param aMaxSize the new maximum size
+*/
+- (void)setMaxSize:(CGSize)aMaxSize
+{
+    _maxSize = CGSizeMakeCopy(aMaxSize);
+    
+    // Try to provide some sanity: Make minSize <= maxSize
+    _minSize = CGSizeMake(MIN(_minSize.width, _maxSize.width), MIN(_minSize.height, _maxSize.height));
+}
+
+// Visibility Priority
+/*!
+    Returns the item's visibility priority. The value will be one of:
+<pre>
+CPToolbarItemVisibilityPriorityStandard
+CPToolbarItemVisibilityPriorityLow
+CPToolbarItemVisibilityPriorityHigh
+CPToolbarItemVisibilityPriorityUser
+</pre>
+*/
+- (int)visibilityPriority
+{
+    return _visibilityPriority;
+}
+
+/*!
+    Sets the item's visibility priority. The value must be one of:
+<pre>
+CPToolbarItemVisibilityPriorityStandard
+CPToolbarItemVisibilityPriorityLow
+CPToolbarItemVisibilityPriorityHigh
+CPToolbarItemVisibilityPriorityUser
+</pre>
+    @param aVisiblityPriority the priority
+*/
+- (void)setVisibilityPriority:(int)aVisibilityPriority
+{
+    _visibilityPriority = aVisibilityPriority;
+}
+
+- (void)validate
+{
+    // View items do not do any target-action analysis.
+    if (_view)
+    {
+        if ([target respondsToSelector:@selector(validateToolbarItem:)])
+            [self setEnabled:[target validateToolbarItem:self]];
+
+        return;
+    }
+
+    var action = [self action];
+
+    if (!action)
+        return [self setEnabled:NO];
+
+    var target = [self target];
+
+    if (target && ![target respondsToSelector:action])
+        return [self setEnabled:NO];
+
+    target = [CPApp targetForAction:action to:target from:self];
+
+    if (!target)
+        return [self setEnabled:NO];
+
+    if ([target respondsToSelector:@selector(validateToolbarItem:)])
+        [self setEnabled:[target validateToolbarItem:self]];
+    else
+        [self setEnabled:YES];
+}
+
+- (BOOL)autovalidates
+{
+    return _autovalidates;
+}
+
+- (void)setAutovalidates:(BOOL)shouldAutovalidate
+{
+    _autovalidates = !!shouldAutovalidate;
+}
+
+@end
+
+@implementation CPToolbarItem (CPCopying)
+
+- (id)copy
+{
+    var copy = [[[self class] alloc] initWithItemIdentifier:_itemIdentifier];
+    
+    if (_view)
+        [copy setView:[CPKeyedUnarchiver unarchiveObjectWithData:[CPKeyedArchiver archivedDataWithRootObject:_view]]];
+    
+    [copy setLabel:_label];
+    [copy setPaletteLabel:_paletteLabel];
+    [copy setToolTip:[self toolTip]];
+
+    [copy setTag:[self tag]];
+    [copy setTarget:[self target]];
+    [copy setAction:[self action]];
+    
+    [copy setEnabled:[self isEnabled]];
+
+    [copy setImage:[self image]];
+    [copy setAlternateImage:[self alternateImage]];
+
+    [copy setMinSize:_minSize];
+    [copy setMaxSize:_maxSize];
+    
+    [copy setVisibilityPriority:_visibilityPriority];
+    
+    return copy;
+}
+
+@end
+
+// Standard toolbar identifiers
+
+@implementation CPToolbarItem (Standard)
+
+/* @ignore */
++ (CPToolbarItem)_standardItemWithItemIdentifier:(CPString)anItemIdentifier
+{
+    var item = [[CPToolbarItem alloc] initWithItemIdentifier:anItemIdentifier];                                                        
+
+    switch (anItemIdentifier)
+    {
+        case CPToolbarSeparatorItemIdentifier:          [item setMinSize:CGSizeMake(2.0, 0.0)];
+                                                        [item setMaxSize:CGSizeMake(2.0, 100000.0)];
+                                                        
+                                                        return item;
+
+        case CPToolbarSpaceItemIdentifier:              [item setMinSize:CGSizeMake(32.0, 32.0)];
+                                                        [item setMaxSize:CGSizeMake(32.0, 32.0)];
+                                                        
+                                                        return item;
+                                                        
+        case CPToolbarFlexibleSpaceItemIdentifier:      [item setMinSize:CGSizeMake(32.0, 32.0)];
+                                                        [item setMaxSize:CGSizeMake(10000.0, 32.0)];
+                                                        
+                                                        return item;
+                                                        
+        case CPToolbarShowColorsItemIdentifier:         return nil;
+        case CPToolbarShowFontsItemIdentifier:          return nil;
+        case CPToolbarCustomizeToolbarItemIdentifier:   return nil;
+        case CPToolbarPrintItemIdentifier:              return nil;
+    }
+    
+    return nil;
+}
+
+@end

AppKit/CPTreeNode.j

@@ -0,0 +1,82 @@
+
+@import <Foundation/CPObject.j>
+
+
+@implementation CPTreeNode : CPObject
+{
+    id              _representedObject @accessors(readonly, property=representedObject);
+    
+    CPTreeNode      _parentNode @accessors(readonly, property=parentNode);
+    CPMutableArray  _childNodes @accessors(readonly, property=childNodes);
+}
+
++ (id)treeNodeWithRepresentedObject:(id)anObject
+{
+    return [[self alloc] initWithRepresentedObject:anObject];
+}
+
+- (id)initWithRepresentedObject:(id)anObject
+{
+    self = [super init];
+
+    if (self)
+    {
+        _representedObject = anObject;
+        _childNodes = [];
+    }
+
+    return self;
+}
+
+- (BOOL)isLeaf
+{
+    return [_childNodes count] <= 0;
+}
+
+- (CPMutableArray)mutableChildNodes
+{
+    return [self mutableArrayValueForKey:@"childNodes"];
+}
+
+- (void)insertObject:(id)anObject inChildNodesAtIndex:(CPInteger)anIndex
+{
+    anObject._parentNode = self;
+
+    [_childNodes addObject:anObject];
+}
+
+- (void)removeObjectFromChildNodesAtIndex:(CPInteger)anIndex
+{
+    [_childNodes objectAtIndex:anIndex]._parentNode = nil;
+
+    [_childNodes removeObjectAtIndex:anIndex];
+}
+
+- (void)replaceObjectFromChildNodesAtIndex:(CPInteger)anIndex withObject:(id)anObject
+{
+    var oldObject = [_childNodes objectAtIndex:anIndex];
+
+    oldObject._parentNode = nil;
+
+    [_childNodes replaceObjectAtIndex:anIndex withObject:anObject];
+}
+
+- (id)objectInChildNodesAtIndex:(CPInteger)anIndex
+{
+    return _childNodes[anIndex];
+}
+
+- (void)sortWithSortDescriptors:(CPArray)sortDescriptors recursively:(BOOL)shouldSortRecursively
+{
+    [_childNodes sortUsingDescriptors:sortDescriptors];
+
+    if (!shouldSortRecursively)
+        return;
+
+    var count = [_childNodes count];
+
+    while (count--)
+        [_childNodes[count] sortWithSortDescriptors:sortDescriptors recursively:YES];
+}
+
+@end

AppKit/CPViewController.j

@@ -0,0 +1,225 @@
+/*
+ * CPViewController.j
+ * AppKit
+ *
+ * Created by Nicholas Small and Francisco Tolmasky.
+ * Copyright 2009, 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 <AppKit/CPResponder.j>
+
+var CPViewControllerCachedCibs;
+
+/*! @class CPViewController
+    The CPViewController class provides the fundamental view-management controller for Cappuccino applications.
+    The basic view controller class supports the presentation of an associated view in addition to basic support
+    for managing modal views and, in the future, animations. Subclasses such as CPNavigationController and
+    CPTabBarController provide additional behavior for managing complex hierarchies of view controllers and views.
+
+    You use each instance of CPViewController to manage a single view (and hierarchy). For a simple view controller,
+    this entails managing the view hierarchy responsible for presenting your application content.
+    A typical view hierarchy consists of a root viewŃa reference to which is available in the view property of this classŃ
+    and one or more subviews presenting the actual content. In the case of navigation and tab bar controllers, the view
+    controller manages not only the high-level view hierarchy (which provides the navigation controls) but also one
+    or more additional view controllers that handle the presentation of the application content.
+
+    Unlike UIViewController in Cocoa Touch, a CPViewController does not represent an entire screen of content. You
+    will add your root view to an existing view or window's content view. You can manage many view controllers
+    on screen at once. CPViewController is also the preferred way of working with Cibs.
+
+    Subclasses can override -loadView to create their custom view hierarchy, or specify a cib name to be loaded automatically.
+    It has methods that are called when a view appears or disappears.
+    This class is also a good place for delegate & datasource methods, and other controller stuff.
+*/
+@implementation CPViewController : CPResponder
+{
+    CPView          _view;
+
+    id              _representedObject @accessors(property=representedObject);
+    CPString        _title @accessors(property=title);
+
+    CPString        _cibName @accessors(property=cibName, readonly);
+    CPBundle        _cibBundle @accessors(property=cibBundle, readonly);
+    CPDictionary    _cibExternalNameTable @accessors(property=cibExternalNameTable, readonly);
+}
+
++ (void)initialize
+{
+    if (self === CPViewController)
+        CPViewControllerCachedCibs = [CPDictionary dictionary];
+}
+
+/*!
+    Convenience initializer calls -initWithCibName:bundle: with nil for both parameters.
+*/
+- (id)init
+{
+    return [self initWithCibName:nil bundle:nil];
+}
+
+- (id)initWithCibName:(CPString)aCibNameOrNil bundle:(CPBundle)aCibBundleOrNil
+{
+    return [self initWithCibName:aCibNameOrNil bundle:aCibBundleOrNil externalNameTable:nil];
+}
+
+- (id)initWithCibName:(CPString)aCibNameOrNil bundle:(CPBundle)aCibBundleOrNil owner:(id)anOwner
+{
+    return [self initWithCibName:aCibNameOrNil bundle:aCibBundleOrNil externalNameTable:[CPDictionary dictionaryWithObject:anOwner forKey:CPCibOwner]];
+}
+
+/*!
+    The designated initializer. If you subclass CPViewController, you must call the super implementation of this method, even if you aren't using a Cib.
+    In the specified Cib, the File's Owner proxy should have its class set to your view controller subclass, with the view outlet connected to the main view.
+    If you pass in a nil Cib name, then you must either call -setView: before -view is invoked, or override -loadView to set up your views.
+
+    @param cibNameOrNil The path to the cib to load for the root view or nil to programmatically create views.
+    @param cibBundleOrNil The bundle that the cib is located in or nil for the main bundle.
+*/
+- (id)initWithCibName:(CPString)aCibNameOrNil bundle:(CPBundle)aCibBundleOrNil externalNameTable:(CPDictionary)anExternalNameTable
+{
+    self = [super init];
+
+    if (self)
+    {
+        // Don't load the cib until someone actually requests the view. The user may just be intending to use setView:.
+        _cibName = aCibNameOrNil;
+        _cibBundle = aCibBundleOrNil || [CPBundle mainBundle];
+        _cibExternalNameTable = anExternalNameTable || [CPDictionary dictionaryWithObject:self forKey:CPCibOwner];
+    }
+
+    return self;
+}
+
+/*!
+    Programmatically creates the view that the controller manages.
+    You should never call this method directly. The view controller calls this method when the view property is requested but is nil.
+
+    If you create your views manually, you must override this method and use it to create your view and assign it to the view property.
+    The default implementation for programmatic views is to create a plain view. You can invoke super to utilize this view.
+
+    If you use Interface Builder to create your views and initialize the view controllerŃthat is, you initialize the view using the
+    initWithCibName:bundle: methodŃthen you must not override this method. The consequences risk shattering the space-time continuum.
+
+    Note: The cib loading system is currently asynchronous.
+*/
+- (void)loadView
+{
+    if (_view)
+        return;
+    
+    // check if a cib is already cached for the current _cibName
+    var cib = [CPViewControllerCachedCibs objectForKey:_cibName];
+
+    if (!cib)
+    {
+        // if the cib isn't cached yet : fetch it and cache it
+        cib = [[CPCib alloc] initWithContentsOfURL:[_cibBundle pathForResource:_cibName + @".cib"]];
+        [CPViewControllerCachedCibs setObject:cib forKey:_cibName];
+    }
+
+    [cib instantiateCibWithExternalNameTable:_cibExternalNameTable];
+}
+
+/*!
+    Returns the view that the controller manages.
+    If this property is nil, the controller sends loadView to itself to create the view that it manages.
+    Subclasses should override the loadView method to create any custom views. The default value is nil.
+
+    Note: An error will not be thrown if after -loadView, the view property is still nil. -view will simply return nil, but will continue to call -loadView on subsequent calls.
+*/
+- (CPView)view
+{
+    if (!_view)
+    {
+        var cibOwner = [_cibExternalNameTable objectForKey:CPCibOwner];
+
+        if ([cibOwner respondsToSelector:@selector(viewControllerWillLoadCib:)])
+            [cibOwner viewControllerWillLoadCib:self];
+
+        [self loadView];
+
+        if (_view === nil && [cibOwner isKindOfClass:[CPDocument class]])
+            [self setView:[cibOwner valueForKey:@"view"]];
+
+        if ([cibOwner respondsToSelector:@selector(viewControllerDidLoadCib:)])
+            [cibOwner viewControllerDidLoadCib:self];
+    }
+
+    return _view;
+}
+
+
+/*!
+    Manually sets the view that the controller manages.
+    Setting to nil will cause -loadView to be called on all subsequent calls of -view.
+
+    @param aView The view this controller should represent.
+*/
+- (void)setView:(CPView)aView
+{
+    _view = aView;
+}
+
+@end
+
+
+var CPViewControllerViewKey     = @"CPViewControllerViewKey",
+    CPViewControllerTitleKey    = @"CPViewControllerTitleKey",
+    CPViewControllerCibNameKey  = @"CPViewControllerCibNameKey",
+    CPViewControllerBundleKey   = @"CPViewControllerBundleKey";
+
+@implementation CPViewController (CPCoding)
+
+/*!
+    Initializes the view controller by unarchiving data from a coder.
+    @param aCoder the coder from which the data will be unarchived
+    @return the initialized view controller
+*/
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super initWithCoder:aCoder];
+
+    if (self)
+    {
+        _view = [aCoder decodeObjectForKey:CPViewControllerViewKey];
+        _title = [aCoder decodeObjectForKey:CPViewControllerTitleKey];
+        _cibName = [aCoder decodeObjectForKey:CPViewControllerCibNameKey];
+
+        var bundlePath = [aCoder decodeObjectForKey:CPViewControllerBundleKey];
+        _cibBundle = bundlePath ? [CPBundle bundleWithPath:bundlePath] : [CPBundle mainBundle];
+
+        _cibExternalNameTable = [CPDictionary dictionaryWithObject:self forKey:CPCibOwner];
+    }
+
+    return self;
+}
+
+/*!
+    Archives the view controller to the provided coder.
+    @param aCoder the coder to which the view controller should be archived
+*/
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [super encodeWithCoder:aCoder];
+
+    [aCoder encodeObject:_view forKey:CPViewControllerViewKey];
+    [aCoder encodeObject:_title forKey:CPViewControllerTitleKey];
+    [aCoder encodeObject:_cibName forKey:CPViewControllerCibNameKey];
+    [aCoder encodeObject:[_cibBundle bundlePath] forKey:CPViewControllerBundleKey];
+}
+
+@end

AppKit/CPWebView.j

@@ -0,0 +1,620 @@
+/*
+ * CPWebView.j
+ * AppKit
+ *
+ * Created by Thomas Robinson.
+ * Copyright 2008, 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 <AppKit/CPView.j>
+
+#include "Platform/Platform.h"
+
+
+// FIXME: implement these where possible:
+/*
+CPWebViewDidBeginEditingNotification            = "CPWebViewDidBeginEditingNotification";
+CPWebViewDidChangeNotification                  = "CPWebViewDidChangeNotification";
+CPWebViewDidChangeSelectionNotification         = "CPWebViewDidChangeSelectionNotification";
+CPWebViewDidChangeTypingStyleNotification       = "CPWebViewDidChangeTypingStyleNotification";
+CPWebViewDidEndEditingNotification              = "CPWebViewDidEndEditingNotification";
+CPWebViewProgressEstimateChangedNotification    = "CPWebViewProgressEstimateChangedNotification";
+*/
+CPWebViewProgressStartedNotification            = "CPWebViewProgressStartedNotification";
+CPWebViewProgressFinishedNotification           = "CPWebViewProgressFinishedNotification";
+
+CPWebViewScrollAppKit                           = 1;
+CPWebViewScrollNative                           = 2;
+
+// FIXME: somehow make CPWebView work with CPScrollView instead of native scrollbars (is this even possible?)
+
+/*!
+    @ingroup appkit
+*/
+
+@implementation CPWebView : CPView
+{
+    CPScrollView    _scrollView;
+    CPView          _frameView;
+    
+    IFrame      _iframe;
+    CPString    _mainFrameURL;
+    CPArray     _backwardStack;
+    CPArray     _forwardStack;
+    
+    BOOL        _ignoreLoadStart;
+    BOOL        _ignoreLoadEnd;
+    
+    id          _downloadDelegate;
+    id          _frameLoadDelegate;
+    id          _policyDelegate;
+    id          _resourceLoadDelegate;
+    id          _UIDelegate;
+    
+    CPWebScriptObject _wso;
+    
+    CPString    _url;
+    CPString    _html;
+    
+    Function    _loadCallback;
+    
+    int         _scrollMode;
+    CGSize      _scrollSize;
+}
+
+- (id)initWithFrame:(CPRect)frameRect frameName:(CPString)frameName groupName:(CPString)groupName
+{
+    if (self = [self initWithFrame:frameRect])
+    {
+        _iframe.name = frameName;
+    }
+    return self
+}
+
+- (id)initWithFrame:(CPRect)aFrame
+{
+    if (self = [super initWithFrame:aFrame])
+    {
+        _mainFrameURL   = nil;
+        _backwardStack  = [];
+        _forwardStack   = [];
+        _scrollMode     = CPWebViewScrollNative;
+        
+        [self _initDOMWithFrame:aFrame];
+    }
+    
+    return self;
+}
+
+- (id)_initDOMWithFrame:(CPRect)aFrame
+{
+    _ignoreLoadStart = YES;
+    _ignoreLoadEnd  = YES;
+    
+    _iframe = document.createElement("iframe");
+    _iframe.name = "iframe_" + Math.floor(Math.random()*10000);
+    _iframe.style.width = "100%";
+    _iframe.style.height = "100%";
+    _iframe.style.borderWidth = "0px";
+    
+    [self setDrawsBackground:YES];
+    
+    _loadCallback = function() {
+	    // HACK: this block handles the case where we don't know about loads initiated by the user clicking a link
+	    if (!_ignoreLoadStart)
+	    {
+	        // post the start load notification
+	        [self _startedLoading];
+	        
+	        if (_mainFrameURL)
+	            [_backwardStack addObject:_mainFrameURL];
+	            
+	        // FIXME: this doesn't actually get the right URL for different domains. Not possible due to browser security restrictions.
+            _mainFrameURL = _iframe.src;
+            _mainFrameURL = _iframe.src;
+            
+            // clear the forward
+	        [_forwardStack removeAllObjects];
+	    }
+	    else
+            _ignoreLoadStart = NO;
+	    
+	    if (!_ignoreLoadEnd)
+	    {
+            [self _finishedLoading];
+	    }
+	    else
+	        _ignoreLoadEnd = NO;
+        
+        [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
+	}
+	
+	if (_iframe.addEventListener)
+	    _iframe.addEventListener("load", _loadCallback, false);
+	else if (_iframe.attachEvent)
+		_iframe.attachEvent("onload", _loadCallback);
+	
+	
+    _frameView = [[CPView alloc] initWithFrame:[self bounds]];
+    [_frameView setAutoresizingMask:CPViewWidthSizable|CPViewHeightSizable];
+
+    _scrollView = [[CPScrollView alloc] initWithFrame:[self bounds]];
+    [_scrollView setAutohidesScrollers:YES];
+    [_scrollView setAutoresizingMask:CPViewWidthSizable|CPViewHeightSizable];
+    [_scrollView setDocumentView:_frameView];
+	
+    _frameView._DOMElement.appendChild(_iframe);
+    
+    [self _setScrollMode:_scrollMode];
+
+    [self addSubview:_scrollView];
+}
+
+
+- (void)setFrameSize:(CPSize)aSize
+{   
+    [super setFrameSize:aSize];
+    [self _resizeWebFrame];
+}
+
+- (BOOL)_resizeWebFrame
+{
+    if (_scrollMode === CPWebViewScrollAppKit)
+    {
+        if (_scrollSize)
+        {
+            [_frameView setFrameSize:_scrollSize];
+        }
+        else
+        {
+            [_frameView setFrameSize:[_scrollView contentSize]];
+            
+            // try to get the document size so we can correctly set the frame
+            var win = null;
+            try { win = [self DOMWindow]; } catch (e) {}
+
+            if (win && win.document)
+            {
+                var width = win.document.body.scrollWidth,
+                    height = win.document.body.scrollHeight;
+
+                _iframe.setAttribute("width", width);
+                _iframe.setAttribute("height", height);
+
+                [_frameView setFrameSize:CGSizeMake(width, height)];
+            }
+            else
+            {
+                CPLog.warn("using default size 800*1600");
+            
+                [_frameView setFrameSize:CGSizeMake(800, 1600)];
+            }
+        }
+    }
+}
+
+- (void)setScrollMode:(int)aScrollMode
+{
+    if (_scrollMode == aScrollMode)
+        return;
+        
+    [self _setScrollMode:aScrollMode];
+}
+
+- (void)_setScrollMode:(int)aScrollMode
+{
+    _scrollMode = aScrollMode;
+        
+    _ignoreLoadStart = YES;
+    _ignoreLoadEnd  = YES;
+
+    var parent = _iframe.parentNode;
+    parent.removeChild(_iframe);
+
+    if (_scrollMode === CPWebViewScrollAppKit)
+    {
+        [_scrollView setHasHorizontalScroller:YES];
+        [_scrollView setHasVerticalScroller:YES];
+        
+        _iframe.setAttribute("scrolling", "no");
+    }
+    else
+    {
+        [_scrollView setHasHorizontalScroller:NO];
+        [_scrollView setHasVerticalScroller:NO];
+        
+        _iframe.setAttribute("scrolling", "auto");
+        
+        [_frameView setFrameSize:[_scrollView bounds].size];
+    }
+
+    parent.appendChild(_iframe);
+}
+
+- (void)loadHTMLString:(CPString)aString
+{
+    [self loadHTMLString:aString baseURL:nil];
+}
+
+- (void)loadHTMLString:(CPString)aString baseURL:(CPURL)URL
+{
+    // FIXME: do something with baseURL?
+
+    [self _setScrollMode:CPWebViewScrollAppKit];
+
+    [self _startedLoading];
+    
+    _ignoreLoadStart = YES;
+    _ignoreLoadEnd = NO;
+    
+    _url = null;
+    _html = aString;
+    
+    [self _load];
+}
+
+- (void)_loadMainFrameURL
+{
+    [self _setScrollMode:CPWebViewScrollNative];
+
+    [self _startedLoading];
+    
+    _ignoreLoadStart = YES;
+    _ignoreLoadEnd = NO;
+    
+    _url = _mainFrameURL;
+    _html = null;
+    
+    [self _load];
+}
+
+- (void)_load
+{
+    if (_url)
+    {
+        _iframe.src = _url;
+    }
+    else if (_html)
+    {
+        // clear the iframe
+        _iframe.src = "";
+
+        // need to give the browser a chance to reset iframe, otherwise we'll be document.write()-ing the previous document 
+        window.setTimeout(function() {
+            var win = [self DOMWindow];
+            
+            win.document.write(_html);
+
+            window.setTimeout(_loadCallback, 1);
+        }, 0);
+    }
+}
+
+- (void)_startedLoading
+{
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPWebViewProgressStartedNotification object:self];
+
+    if ([_frameLoadDelegate respondsToSelector:@selector(webView:didStartProvisionalLoadForFrame:)])
+        [_frameLoadDelegate webView:self didStartProvisionalLoadForFrame:nil]; // FIXME: give this a frame somehow?
+}
+
+- (void)_finishedLoading
+{
+    [self _resizeWebFrame];
+    
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPWebViewProgressFinishedNotification object:self];
+
+    if ([_frameLoadDelegate respondsToSelector:@selector(webView:didFinishLoadForFrame:)])
+        [_frameLoadDelegate webView:self didFinishLoadForFrame:nil]; // FIXME: give this a frame somehow?
+}
+
+- (CPString)mainFrameURL
+{
+    return _mainFrameURL;
+}
+
+- (void)setMainFrameURL:(CPString)URLString
+{    
+    if (_mainFrameURL)
+        [_backwardStack addObject:_mainFrameURL];
+    _mainFrameURL = URLString;
+    [_forwardStack removeAllObjects];
+
+    [self _loadMainFrameURL];
+}
+
+- (BOOL)goBack
+{
+    if (_backwardStack.length > 0)
+    {
+        if (_mainFrameURL)
+            [_forwardStack addObject:_mainFrameURL];
+        _mainFrameURL = [_backwardStack lastObject];
+        [_backwardStack removeLastObject];
+        
+        [self _loadMainFrameURL];
+        
+        return YES;
+    }
+    return NO;
+}
+
+- (BOOL)goForward
+{
+    if (_forwardStack.length > 0)
+    {
+        if (_mainFrameURL)
+            [_backwardStack addObject:_mainFrameURL];
+        _mainFrameURL = [_forwardStack lastObject];
+        [_forwardStack removeLastObject];
+        
+        [self _loadMainFrameURL];
+        
+        return YES;
+    }
+    return NO;
+}
+
+- (BOOL)canGoBack
+{
+    return (_backwardStack.length > 0);
+}
+
+- (BOOL)canGoForward
+{
+    return (_forwardStack.length > 0);
+}
+
+- (WebBackForwardList)backForwardList
+{
+    // FIXME: return a real WebBackForwardList?
+    return { back: _backwardStack, forward: _forwardStack };
+}
+
+- (void)close
+{
+    _iframe.parentNode.removeChild(_iframe);
+}
+
+- (DOMWindow)DOMWindow
+{
+    return (_iframe.contentDocument && _iframe.contentDocument.defaultView) || _iframe.contentWindow;
+}
+
+- (CPWebScriptObject)windowScriptObject
+{
+    var win = [self DOMWindow];
+    if (!_wso || win != [_wso window])
+    {
+        if (win)
+            _wso = [[CPWebScriptObject alloc] initWithWindow:win];
+        else
+            _wso = nil;
+    }
+    return _wso;
+}
+
+- (CPString)stringByEvaluatingJavaScriptFromString:(CPString)script
+{
+    var result = [self objectByEvaluatingJavaScriptFromString:script];
+    return result ? String(result) : nil;
+}
+
+- (JSObject)objectByEvaluatingJavaScriptFromString:(CPString)script
+{
+    return [[self windowScriptObject] evaluateWebScript:script];
+}
+
+- (DOMCSSStyleDeclaration)computedStyleForElement:(DOMElement)element pseudoElement:(CPString)pseudoElement
+{
+    var win = [[self windowScriptObject] window];
+    if (win)
+    {
+        // FIXME: IE version?
+        return win.document.defaultView.getComputedStyle(element, pseudoElement);
+    }
+    return nil;
+}
+
+
+
+- (BOOL)drawsBackground
+{
+    return _iframe.style.backgroundColor != "";
+}
+
+- (void)setDrawsBackground:(BOOL)drawsBackround
+{
+    _iframe.style.backgroundColor = drawsBackround ? "white" : "";
+}
+
+
+
+// IBActions
+
+- (IBAction)takeStringURLFrom:(id)sender
+{
+    [self setMainFrameURL:[sender stringValue]];
+}
+
+- (IBAction)goBack:(id)sender
+{
+    [self goBack];
+}
+
+- (IBAction)goForward:(id)sender
+{
+    [self goForward];
+}
+
+- (IBAction)stopLoading:(id)sender
+{
+    // FIXME: what to do?
+}
+
+- (IBAction)reload:(id)sender
+{
+    [self _loadMainFrameURL];
+}
+
+- (IBAction)print:(id)sender
+{
+    try
+    {
+        [self DOMWindow].print();
+    }
+    catch (e)
+    {
+        alert('Please click the webpage and select "Print" from the "File" menu');
+    }
+}
+
+
+// Delegates:
+
+// FIXME: implement more delegates, though most of these will likely never work with the iframe implementation
+
+- (id)downloadDelegate
+{
+    return _downloadDelegate;
+}
+- (void)setDownloadDelegate:(id)anObject
+{
+    _downloadDelegate = anObject;
+}
+- (id)frameLoadDelegate
+{
+    return _frameLoadDelegate;
+}
+- (void)setFrameLoadDelegate:(id)anObject
+{
+    _frameLoadDelegate = anObject;
+}
+- (id)policyDelegate
+{
+    return _policyDelegate;
+}
+- (void)setPolicyDelegate:(id)anObject
+{
+    _policyDelegate = anObject;
+}
+- (id)resourceLoadDelegate
+{
+    return _resourceLoadDelegate;
+}
+- (void)setResourceLoadDelegate:(id)anObject
+{
+    _resourceLoadDelegate = anObject;
+}
+- (id)UIDelegate
+{
+    return _UIDelegate;
+}
+- (void)setUIDelegate:(id)anObject
+{
+    _UIDelegate = anObject;
+}
+
+@end
+
+
+@implementation CPWebScriptObject : CPObject
+{
+    Window _window;
+}
+
+- (id)initWithWindow:(Window)aWindow
+{
+    if (self = [super init])
+    {
+        _window = aWindow;
+    }
+    return self;
+}
+
+- (id)callWebScriptMethod:(CPString)methodName withArguments:(CPArray)args
+{
+    // Would using "with" be better here?
+    if (typeof _window[methodName] == "function")
+    {
+        try {
+            return _window[methodName].apply(args);
+        } catch (e) {
+        }
+    }
+    return undefined;
+}
+
+- (id)evaluateWebScript:(CPString)script
+{
+    try {
+        return _window.eval(script);
+    } catch (e) {
+    }
+    return undefined;
+}
+
+- (Window)window
+{
+    return _window;
+}
+
+@end
+
+
+@implementation CPWebView (CPCoding)
+
+/*!
+    Initializes the web view from the data in a coder.
+    @param aCoder the coder from which to read the data
+    @return the initialized web view
+*/
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super initWithCoder:aCoder];
+    
+    if (self)
+    {
+        // FIXME: encode/decode these?
+        _mainFrameURL   = nil;
+        _backwardStack  = [];
+        _forwardStack   = [];
+        _scrollMode     = CPWebViewScrollNative;
+        
+#if PLATFORM(DOM)
+        [self _initDOMWithFrame:[self frame]];
+#endif
+
+        [self setBackgroundColor:[CPColor whiteColor]];
+    }
+    
+    return self;
+}
+
+/*!
+    Writes out the web view's instance information to a coder.
+    @param aCoder the coder to which to write the data
+*/
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    var actualSubviews = _subviews;
+    _subviews = [];
+    [super encodeWithCoder:aCoder];
+    _subviews = actualSubviews;
+}
+
+@end

AppKit/CPWindow/_CPBorderlessBridgeWindowView.j

@@ -0,0 +1,82 @@
+/*
+ * _CPBorderlessWindowView.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 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 "_CPWindowView.j"
+
+
+var _CPToolbarViewBackgroundColor = nil;
+
+@implementation _CPBorderlessBridgeWindowView : _CPWindowView
+{
+    CPView  _toolbarBackgroundView;
+}
+
++ (CPColor)toolbarBackgroundColor
+{
+    if (!_CPToolbarViewBackgroundColor)
+        _CPToolbarViewBackgroundColor = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[_CPBorderlessBridgeWindowView class]] pathForResource:@"_CPToolbarView/_CPToolbarViewBackground.png"] size:CGSizeMake(1.0, 59.0)]];
+
+    return _CPToolbarViewBackgroundColor;
+}
+
+- (void)setShowsResizeIndicator:(BOOL)shouldShowResizeIndicator
+{
+    // We don't ever want to show the resize indicator.
+}
+
+- (void)tile
+{
+    [super tile];
+    
+    var theWindow = [self window],
+        bounds = [self bounds];
+        
+    [[theWindow contentView] setFrame:CGRectMake(0.0, [self toolbarMaxY], CGRectGetWidth(bounds), CGRectGetHeight(bounds) - [self toolbarMaxY])];
+    
+    if (![[theWindow toolbar] isVisible])
+    {
+        [_toolbarBackgroundView removeFromSuperview];
+    
+        _toolbarBackgroundView = nil;
+    
+        return;
+    }
+    
+    if (!_toolbarBackgroundView)
+    {
+        _toolbarBackgroundView = [[CPView alloc] initWithFrame:CGRectMakeZero()];
+    
+        [_toolbarBackgroundView setBackgroundColor:[[self class] toolbarBackgroundColor]];
+        [_toolbarBackgroundView setAutoresizingMask:CPViewWidthSizable];
+    
+        [self addSubview:_toolbarBackgroundView positioned:CPWindowBelow relativeTo:nil];
+    }
+            
+    var frame = CGRectMakeZero();
+    
+    frame.origin = CGPointMakeCopy([self toolbarOffset]);
+    frame.size = [_toolbarView frame].size;
+    
+    [_toolbarBackgroundView setFrame:frame];
+}
+
+@end

AppKit/CPWindow/_CPBorderlessWindowView.j

@@ -0,0 +1,29 @@
+/*
+ * _CPBorderlessWindowView.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 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 "_CPWindowView.j"
+
+
+@implementation _CPBorderlessWindowView : _CPWindowView
+{
+}
+@end

AppKit/CPWindow/_CPDocModalWindowView.j

@@ -0,0 +1,50 @@
+
+@import "_CPWindowView.j"
+
+var _CPStandardWindowViewBodyBackgroundColor = nil;
+
+@implementation _CPDocModalWindowView : _CPWindowView
+{
+    CPView _bodyView;
+}
+
++ (CPColor)bodyBackgroundColor
+{
+    if (!_CPStandardWindowViewBodyBackgroundColor)
+        _CPStandardWindowViewBodyBackgroundColor = [CPColor colorWithWhite:0.96 alpha:0.9];
+        
+    return _CPStandardWindowViewBodyBackgroundColor;    
+}
+
+- (id)initWithFrame:(CPRect)aFrame styleMask:(unsigned)aStyleMask
+{
+    self = [super initWithFrame:aFrame styleMask:aStyleMask];
+    
+    if (self)
+    {
+        var theClass = [self class],
+              bounds = [self bounds];
+        
+       _bodyView = [[CPView alloc] initWithFrame:CGRectMake(0.0, 0.0, CGRectGetWidth(bounds), CGRectGetHeight(bounds))];
+        
+        [_bodyView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
+        [_bodyView setBackgroundColor:[theClass bodyBackgroundColor]];
+        [_bodyView setHitTests:NO];
+        
+        [self addSubview:_bodyView];
+     }
+
+    return self;    
+}
+
+- (CGRect)contentRectForFrameRect:(CGRect)aFrameRect
+{
+    return aFrameRect;
+}
+
+- (CGRect)frameRectForContentRect:(CGRect)aContentRect
+{
+    return aContentRect;
+}
+
+@end

AppKit/CPWindow/_CPHUDWindowView.j

@@ -0,0 +1,214 @@
+/*
+ * _CPHUDWindowView.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 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
+ */
+ 
+var _CPHUDWindowViewBackgroundColor = nil,
+    
+    CPHUDCloseButtonImage           = nil;
+
+var HUD_TITLEBAR_HEIGHT             = 26.0;
+
+@implementation _CPHUDWindowView : _CPWindowView
+{
+    CPView              _toolbarView;
+    
+    CPTextField         _titleField;
+    CPButton            _closeButton;
+}
+
++ (void)initialize
+{
+    if (self != [_CPHUDWindowView class])
+        return;
+    
+    var bundle = [CPBundle bundleForClass:self];
+    
+    _CPHUDWindowViewBackgroundColor = [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:
+        [        
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/HUD/CPWindowHUDBackground0.png"] size:CPSizeMake(6.0, 78.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/HUD/CPWindowHUDBackground1.png"] size:CPSizeMake(1.0, 78.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/HUD/CPWindowHUDBackground2.png"] size:CPSizeMake(6.0, 78.0)],
+            
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/HUD/CPWindowHUDBackground3.png"] size:CPSizeMake(6.0, 1.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/HUD/CPWindowHUDBackground4.png"] size:CPSizeMake(5.0, 5.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/HUD/CPWindowHUDBackground5.png"] size:CPSizeMake(6.0, 1.0)],
+            
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/HUD/CPWindowHUDBackground6.png"] size:CPSizeMake(6.0, 6.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/HUD/CPWindowHUDBackground7.png"] size:CPSizeMake(6.0, 6.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/HUD/CPWindowHUDBackground8.png"] size:CPSizeMake(6.0, 6.0)]
+        ]]];
+
+    _CPHUDWindowViewCloseImage        = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"HUDTheme/WindowClose.png"] size:CPSizeMake(20.0, 20.0)];
+    _CPHUDWindowViewCloseActiveImage  = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"HUDTheme/WindowCloseActive.png"] size:CPSizeMake(20.0, 20.0)];
+}
+
++ (CGRect)contentRectForFrameRect:(CGRect)aFrameRect
+{
+    var contentRect = CGRectMakeCopy(aFrameRect),
+        titleBarHeight = HUD_TITLEBAR_HEIGHT;
+        
+    contentRect.origin.y += titleBarHeight;
+    contentRect.size.height -= titleBarHeight;
+
+    return contentRect;
+}
+
++ (CGRect)frameRectForContentRect:(CGRect)aContentRect
+{
+    var frameRect = CGRectMakeCopy(aContentRect),
+        titleBarHeight = HUD_TITLEBAR_HEIGHT;
+    
+    frameRect.origin.y -= titleBarHeight;
+    frameRect.size.height += titleBarHeight;
+    
+    return frameRect;
+}
+
+- (CGRect)contentRectForFrameRect:(CGRect)aFrameRect
+{
+    var contentRect = [[self class] contentRectForFrameRect:aFrameRect];
+    
+    if ([[[self window] toolbar] isVisible])
+    {
+        toolbarHeight = CGRectGetHeight([[self toolbarView] frame]);
+        
+        contentRect.origin.y += toolbarHeight;
+        contentRect.size.height -= toolbarHeight;
+    }
+    
+    return contentRect;
+}
+
+- (CGRect)frameRectForContentRect:(CGRect)aContentRect
+{
+    var frameRect = [[self class] frameRectForContentRect:aContentRect];
+    
+    if ([[[self window] toolbar] isVisible])
+    {
+        toolbarHeight = CGRectGetHeight([[self toolbarView] frame]);
+        
+        frameRect.origin.y -= toolbarHeight;
+        frameRect.size.height += toolbarHeight;
+    }
+    
+    return frameRect;
+}
+
+- (id)initWithFrame:(CPRect)aFrame styleMask:(unsigned)aStyleMask
+{
+    self = [super initWithFrame:aFrame styleMask:aStyleMask];
+    
+    if (self)
+    {
+        var bounds = [self bounds];
+        
+        [self setBackgroundColor:_CPHUDWindowViewBackgroundColor];
+        
+        _titleField = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
+        
+        [_titleField setHitTests:NO];
+        [_titleField setFont:[CPFont systemFontOfSize:11.0]];
+        [_titleField setTextColor:[CPColor whiteColor]];
+        [_titleField setTextShadowColor:[CPColor blackColor]];
+        [_titleField setTextShadowOffset:CGSizeMake(0.0, 1.0)];
+        [_titleField setAutoresizingMask:CPViewWidthSizable];
+        
+        // FIXME: Make this to CPLineBreakByTruncatingMiddle once it's implemented.
+        [_titleField setLineBreakMode:CPLineBreakByTruncatingTail];
+        [_titleField setAlignment:CPCenterTextAlignment];
+        
+        [_titleField setStringValue:@"Untitled"];
+        [_titleField sizeToFit];
+        [_titleField setAutoresizingMask:CPViewWidthSizable];
+        [_titleField setStringValue:@""];
+        
+        [_titleField setFrame:CGRectMake(20.0, 3.0, CGRectGetWidth([self bounds]) - 40.0, CGRectGetHeight([_titleField frame]))];
+        
+        [self addSubview:_titleField];
+        
+        if (_styleMask & CPClosableWindowMask)
+        {
+            var closeSize = [_CPHUDWindowViewCloseImage size];
+            
+            _closeButton = [[CPButton alloc] initWithFrame:CGRectMake(4.0, 4.0, closeSize.width, closeSize.height)];
+            
+            [_closeButton setBordered:NO];
+            
+            [_closeButton setImage:_CPHUDWindowViewCloseImage];
+            [_closeButton setAlternateImage:_CPHUDWindowViewCloseActiveImage];
+            
+            [self addSubview:_closeButton];
+        }
+        
+        [self setResizeIndicatorOffset:CGSizeMake(5.0, 5.0)];
+    }
+    
+    return self;
+}
+
+- (void)viewDidMoveToWindow
+{
+    [_closeButton setTarget:[self window]];
+    [_closeButton setAction:@selector(performClose:)];
+}
+
+- (void)setTitle:(CPString)aTitle
+{
+    [_titleField setStringValue:aTitle];
+}
+
+- (_CPToolbarView)toolbarView
+{
+    return _toolbarView;
+}
+
+- (CPColor)toolbarLabelColor
+{
+    return [CPColor whiteColor];
+}
+
+- (CPColor)toolbarLabelShadowColor
+{
+    return [CPColor blackColor];
+}
+
+- (CGSize)toolbarOffset
+{
+    return CGSizeMake(0.0, HUD_TITLEBAR_HEIGHT);
+}
+
+- (void)tile
+{
+    [super tile];
+
+    var theWindow = [self window],
+        bounds = [self bounds],
+        width = CGRectGetWidth(bounds);
+
+    [_titleField setFrame:CGRectMake(20.0, 3.0, width - 40.0, CGRectGetHeight([_titleField frame]))];
+
+    var maxY = [self toolbarMaxY];
+
+    [[theWindow contentView] setFrameOrigin:CGPointMake(0.0, maxY, width, CGRectGetHeight(bounds) - maxY)];
+}
+
+@end
+

AppKit/CPWindow/_CPStandardWindowView.j

@@ -0,0 +1,408 @@
+/*
+ * _CPStandardWindowView.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 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 "_CPWindowView.j"
+
+var GRADIENT_HEIGHT = 41.0;
+
+var _CPTexturedWindowHeadGradientColor  = nil,
+    _CPTexturedWindowHeadSolidColor     = nil;
+
+@implementation _CPTexturedWindowHeadView : CPView
+{
+    CPView  _gradientView;
+    CPView  _solidView;
+    CPView  _dividerView;
+}
+
++ (CPColor)gradientColor
+{
+    if (!_CPTexturedWindowHeadGradientColor)
+    {
+        var bundle = [CPBundle bundleForClass:[_CPWindowView class]];
+        
+        _CPTexturedWindowHeadGradientColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
+            [
+                [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/Standard/CPWindowStandardTop0.png"] size:CGSizeMake(6.0, 41.0)],
+                [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/Standard/CPWindowStandardTop1.png"] size:CGSizeMake(1.0, 41.0)],
+                [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/Standard/CPWindowStandardTop2.png"] size:CGSizeMake(6.0, 41.0)]
+            ]
+            isVertical:NO
+        ]];
+    }
+    
+    return _CPTexturedWindowHeadGradientColor;
+}
+
++ (CPColor)solidColor
+{
+    if (!_CPTexturedWindowHeadSolidColor)
+        _CPTexturedWindowHeadSolidColor = [CPColor colorWithCalibratedRed:195.0 / 255.0 green:195.0 / 255.0 blue:195.0 / 255.0 alpha:1.0];
+    
+    return _CPTexturedWindowHeadSolidColor;
+}
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    self = [super initWithFrame:aFrame];
+    
+    if (self)
+    {
+        var theClass = [self class],
+            bounds = [self bounds];
+        
+        _gradientView = [[CPView alloc] initWithFrame:CGRectMake(0.0, 0.0, CGRectGetWidth(bounds), GRADIENT_HEIGHT)];
+        [_gradientView setBackgroundColor:[theClass gradientColor]];
+        
+        [self addSubview:_gradientView];
+        
+        _solidView = [[CPView alloc] initWithFrame:CGRectMake(0.0, GRADIENT_HEIGHT, CGRectGetWidth(bounds), CGRectGetHeight(bounds) - GRADIENT_HEIGHT)];
+        [_solidView setBackgroundColor:[theClass solidColor]];
+    
+        [self addSubview:_solidView];
+    }
+    
+    return self;
+}
+
+- (void)resizeSubviewsWithOldSize:(CGSize)aSize
+{
+    var bounds = [self bounds];
+    
+    [_gradientView setFrameSize:CGSizeMake(CGRectGetWidth(bounds), GRADIENT_HEIGHT)];
+    [_solidView setFrameSize:CGSizeMake(CGRectGetWidth(bounds), CGRectGetHeight(bounds) - GRADIENT_HEIGHT)];
+}
+
+@end
+
+var _CPStandardWindowViewBodyBackgroundColor                = nil,
+    _CPStandardWindowViewDividerBackgroundColor             = nil,
+    _CPStandardWindowViewTitleBackgroundColor               = nil,
+    _CPStandardWindowViewCloseButtonImage                   = nil,
+    _CPStandardWindowViewCloseButtonHighlightedImage        = nil,
+    _CPStandardWindowViewCloseButtonUnsavedImage            = nil,
+    _CPStandardWindowViewCloseButtonUnsavedHighlightedImage = nil,
+    _CPStandardWindowViewMinimizeButtonImage                = nil,
+    _CPStandardWindowViewMinimizeButtonHighlightedImage     = nil;
+
+var STANDARD_GRADIENT_HEIGHT                    = 41.0;
+    STANDARD_TITLEBAR_HEIGHT                    = 25.0;
+
+@implementation _CPStandardWindowView : _CPWindowView
+{
+    _CPTexturedWindowHeadView   _headView;
+    CPView                      _dividerView;
+    CPView                      _bodyView;
+    CPView                      _toolbarView;
+    
+    CPTextField                 _titleField;
+    CPButton                    _closeButton;
+    CPButton                    _minimizeButton;
+
+    BOOL                        _isDocumentEdited;
+}
+
++ (CPColor)bodyBackgroundColor
+{
+    if (!_CPStandardWindowViewBodyBackgroundColor)
+        _CPStandardWindowViewBodyBackgroundColor = [CPColor colorWithWhite:0.96 alpha:1.0];
+        
+    return _CPStandardWindowViewBodyBackgroundColor;    
+}
+
++ (CPColor)dividerBackgroundColor
+{
+    if (!_CPStandardWindowViewDividerBackgroundColor)
+        _CPStandardWindowViewDividerBackgroundColor = [CPColor colorWithCalibratedRed:125.0 / 255.0 green:125.0 / 255.0 blue:125.0 / 255.0 alpha:1.0];
+    
+    return _CPStandardWindowViewDividerBackgroundColor;
+}
+
++ (CPColor)titleColor
+{
+    if (!_CPStandardWindowViewTitleBackgroundColor)
+        _CPStandardWindowViewTitleBackgroundColor = [CPColor colorWithCalibratedRed:44.0 / 255.0 green:44.0 / 255.0 blue:44.0 / 255.0 alpha:1.0];
+    
+    return _CPStandardWindowViewTitleBackgroundColor;
+}
+
++ (CGRect)contentRectForFrameRect:(CGRect)aFrameRect
+{
+    var contentRect = CGRectMakeCopy(aFrameRect),
+        titleBarHeight = [self titleBarHeight] + 1.0;
+        
+    contentRect.origin.y += titleBarHeight;
+    contentRect.size.height -= titleBarHeight;
+
+    return contentRect;
+}
+
++ (CGRect)frameRectForContentRect:(CGRect)aContentRect
+{
+    var frameRect = CGRectMakeCopy(aContentRect),
+        titleBarHeight = [self titleBarHeight] + 1.0;
+    
+    frameRect.origin.y -= titleBarHeight;
+    frameRect.size.height += titleBarHeight;
+    
+    return frameRect;
+}
+
++ (float)titleBarHeight
+{
+    return STANDARD_TITLEBAR_HEIGHT;
+}
+
+- (CGRect)contentRectForFrameRect:(CGRect)aFrameRect
+{
+    var contentRect = [[self class] contentRectForFrameRect:aFrameRect],
+        theToolbar = [[self window] toolbar];
+    
+    if ([theToolbar isVisible])
+    {
+        toolbarHeight = CGRectGetHeight([[theToolbar _toolbarView] frame]);
+        
+        contentRect.origin.y += toolbarHeight;
+        contentRect.size.height -= toolbarHeight;
+    }
+    
+    return contentRect;
+}
+
+- (CGRect)frameRectForContentRect:(CGRect)aContentRect
+{
+    var frameRect = [[self class] frameRectForContentRect:aContentRect],
+        theToolbar = [[self window] toolbar];
+    
+    if ([theToolbar isVisible])
+    {
+        toolbarHeight = CGRectGetHeight([[theToolbar _toolbarView] frame]);
+        
+        frameRect.origin.y -= toolbarHeight;
+        frameRect.size.height += toolbarHeight;
+    }
+    
+    return frameRect;
+}
+
+- (id)initWithFrame:(CPRect)aFrame styleMask:(unsigned)aStyleMask
+{
+    self = [super initWithFrame:aFrame styleMask:aStyleMask];
+    
+    if (self)
+    {
+        var theClass = [self class],
+            bounds = [self bounds];
+        
+        _headView = [[_CPTexturedWindowHeadView alloc] initWithFrame:CGRectMake(0.0, 0.0, CGRectGetWidth(bounds), [[self class] titleBarHeight])];
+          
+        [_headView setAutoresizingMask:CPViewWidthSizable];;
+        [_headView setHitTests:NO];
+        
+        [self addSubview:_headView];
+        
+        _dividerView = [[CPView alloc] initWithFrame:CGRectMake(0.0, CGRectGetMaxY([_headView frame]), CGRectGetWidth(bounds), 1.0)];
+        
+        [_dividerView setAutoresizingMask:CPViewWidthSizable];
+        [_dividerView setBackgroundColor:[theClass dividerBackgroundColor]];
+        [_dividerView setHitTests:NO];
+        
+        [self addSubview:_dividerView];
+        
+        var y = CGRectGetMaxY([_dividerView frame]);
+        
+        _bodyView = [[CPView alloc] initWithFrame:CGRectMake(0.0, y, CGRectGetWidth(bounds), CGRectGetHeight(bounds) - y)];
+        
+        [_bodyView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
+        [_bodyView setBackgroundColor:[theClass bodyBackgroundColor]];
+        [_bodyView setHitTests:NO];
+        
+        [self addSubview:_bodyView];
+
+        [self setResizeIndicatorOffset:CGSizeMake(2.0, 2.0)];
+        
+        _titleField = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
+        
+        [_titleField setFont:[CPFont boldSystemFontOfSize:12.0]];
+        [_titleField setAutoresizingMask:CPViewWidthSizable];
+        
+        // FIXME: Make this to CPLineBreakByTruncatingMiddle once it's implemented.
+        [_titleField setLineBreakMode:CPLineBreakByTruncatingTail];
+        [_titleField setAlignment:CPCenterTextAlignment];
+        [_titleField setTextShadowColor:[CPColor whiteColor]];
+        [_titleField setTextShadowOffset:CGSizeMake(0.0, 1.0)];
+        
+        [_titleField setStringValue:@"Untitled"];
+        [_titleField sizeToFit];
+        [_titleField setAutoresizingMask:CPViewWidthSizable];
+        [_titleField setStringValue:@""];
+        
+        [self addSubview:_titleField];
+        
+        if (_styleMask & CPClosableWindowMask)
+        {
+            if (!_CPStandardWindowViewCloseButtonImage)
+            {
+                var bundle = [CPBundle bundleForClass:[CPWindow class]];
+
+                _CPStandardWindowViewCloseButtonImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/Standard/CPWindowStandardCloseButton.png"] size:CGSizeMake(16.0, 16.0)];
+                _CPStandardWindowViewCloseButtonHighlightedImage  = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/Standard/CPWindowStandardCloseButtonHighlighted.png"] size:CGSizeMake(16.0, 16.0)];
+                _CPStandardWindowViewCloseButtonUnsavedImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/Standard/CPWindowStandardCloseButtonUnsaved.png"] size:CGSizeMake(16.0, 16.0)];
+                _CPStandardWindowViewCloseButtonUnsavedHighlightedImage  = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/Standard/CPWindowStandardCloseButtonUnsavedHighlighted.png"] size:CGSizeMake(16.0, 16.0)];
+            }
+
+            _closeButton = [[CPButton alloc] initWithFrame:CGRectMake(8.0, 7.0, 16.0, 16.0)];
+
+            [_closeButton setBordered:NO];
+            [self _updateCloseButton];
+
+            [self addSubview:_closeButton];
+        }
+
+        if (_styleMask & CPMiniaturizableWindowMask && ![CPPlatform isBrowser])
+        {
+            if (!_CPStandardWindowViewMinimizeButtonImage)
+            {
+                var bundle = [CPBundle bundleForClass:[CPWindow class]];
+
+                _CPStandardWindowViewMinimizeButtonImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/Standard/CPWindowStandardMinimizeButton.png"] size:CGSizeMake(16.0, 16.0)];
+                _CPStandardWindowViewMinimizeButtonHighlightedImage  = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/Standard/CPWindowStandardMinimizeButtonHighlighted.png"] size:CGSizeMake(16.0, 16.0)];
+            }
+
+            _minimizeButton = [[CPButton alloc] initWithFrame:CGRectMake(27.0, 7.0, 16.0, 16.0)];
+
+            [_minimizeButton setBordered:NO];
+
+            [_minimizeButton setImage:_CPStandardWindowViewMinimizeButtonImage];
+            [_minimizeButton setAlternateImage:_CPStandardWindowViewMinimizeButtonHighlightedImage];
+
+            [self addSubview:_minimizeButton];
+        }
+
+        [self tile];
+    }
+
+    return self;
+}
+
+- (void)viewDidMoveToWindow
+{
+    [_closeButton setTarget:[self window]];
+    [_closeButton setAction:@selector(performClose:)];
+
+    [_minimizeButton setTarget:[self window]];
+    [_minimizeButton setAction:@selector(performMiniaturize:)];
+}
+
+- (CGSize)toolbarOffset
+{
+    return CGSizeMake(0.0, [[self class] titleBarHeight]);
+}
+
+- (void)tile
+{
+    [super tile];
+
+    var theWindow = [self window],
+        bounds = [self bounds],
+        width = CGRectGetWidth(bounds);
+
+    [_headView setFrameSize:CGSizeMake(width, [self toolbarMaxY])];
+    [_dividerView setFrame:CGRectMake(0.0, CGRectGetMaxY([_headView frame]), width, 1.0)];
+
+    var dividerMaxY = CGRectGetMaxY([_dividerView frame]);
+
+    [_bodyView setFrame:CGRectMake(0.0, dividerMaxY, width, CGRectGetHeight(bounds) - dividerMaxY)];
+
+    var leftOffset = 8;
+
+    if (_closeButton)
+        leftOffset += 19.0;
+    if (_minimizeButton)
+        leftOffset += 19.0;
+
+    [_titleField setFrame:CGRectMake(leftOffset, 5.0, width - leftOffset*2.0, CGRectGetHeight([_titleField frame]))];
+
+    [[theWindow contentView] setFrameOrigin:CGPointMake(0.0, CGRectGetMaxY([_dividerView frame]))];
+}
+/*
+- (void)setAnimatingToolbar:(BOOL)isAnimatingToolbar
+{
+    [super setAnimatingToolbar:isAnimatingToolbar];
+
+    if ([self isAnimatingToolbar])
+    {
+        [[self toolbarView] setAutoresizingMask:CPViewHeightSizable];
+
+        [_headView setAutoresizingMask:CPViewHeightSizable];
+        [_dividerView setAutoresizingMask:CPViewMinYMargin];
+        [_bodyView setAutoresizingMask:CPViewMinYMargin];
+
+        [[[self window] contentView] setAutoresizingMask:CPViewNotSizable];
+    }
+    else
+    {
+        [[self toolbarView] setAutoresizingMask:CPViewWidthSizable];
+
+        [_headView setAutoresizingMask:CPViewWidthSizable];
+        [_dividerView setAutoresizingMask:CPViewWidthSizable];
+        [_bodyView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
+
+        [[[self window] contentView] setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
+    }
+}
+*/
+
+- (void)_updateCloseButton
+{
+    if (_isDocumentEdited)
+    {
+        [_closeButton setImage:_CPStandardWindowViewCloseButtonUnsavedImage];
+        [_closeButton setAlternateImage:_CPStandardWindowViewCloseButtonUnsavedHighlightedImage];
+    }
+    else
+    {
+        [_closeButton setImage:_CPStandardWindowViewCloseButtonImage];
+        [_closeButton setAlternateImage:_CPStandardWindowViewCloseButtonHighlightedImage];
+    }
+}
+
+- (void)setDocumentEdited:(BOOL)isEdited
+{
+    _isDocumentEdited = isEdited;
+    [self _updateCloseButton];
+}
+
+- (void)setTitle:(CPString)aTitle
+{
+    [_titleField setStringValue:aTitle];
+}
+
+- (void)mouseDown:(CPEvent)anEvent
+{
+    if (CGRectContainsPoint([_headView frame], [self convertPoint:[anEvent locationInWindow] fromView:nil]))
+        return [self trackMoveWithEvent:anEvent];
+
+    [super mouseDown:anEvent];
+}
+
+@end

AppKit/CPWindow/_CPWindowView.j

@@ -0,0 +1,366 @@
+/*
+ * _CPWindowView.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 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 "CPView.j"
+@import "CPImageView.j"
+
+#include "../CoreGraphics/CGGeometry.h"
+
+
+var _CPWindowViewResizeIndicatorImage = nil;
+
+@implementation _CPWindowView : CPView
+{
+    unsigned    _styleMask;
+    
+    CPImageView _resizeIndicator;
+    CGSize      _resizeIndicatorOffset;
+    
+    CPView      _toolbarView;
+//    BOOL        _isAnimatingToolbar;
+    
+    CGRect      _resizeFrame;
+    CGPoint     _mouseDraggedPoint;
+
+    CGRect      _cachedScreenFrame;
+}
+
++ (void)initialize
+{
+    if (self != [_CPWindowView class])
+        return;
+    
+    _CPWindowViewResizeIndicatorImage = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPWindow class]] pathForResource:@"_CPWindowView/_CPWindowViewResizeIndicator.png"] size:CGSizeMake(12.0, 12.0)];
+}
+
++ (CGRect)contentRectForFrameRect:(CGRect)aFrameRect
+{
+    return CGRectMakeCopy(aFrameRect);
+}
+
++ (CGRect)frameRectForContentRect:(CGRect)aContentRect
+{
+    return CGRectMakeCopy(aContentRect);
+}
+
+- (CGRect)contentRectForFrameRect:(CGRect)aFrameRect
+{
+    return [[self class] contentRectForFrameRect:aFrameRect];
+}
+
+- (CGRect)frameRectForContentRect:(CGRect)aContentRect
+{
+    return [[self class] frameRectForContentRect:aContentRect];
+}
+
+- (id)initWithFrame:(CPRect)aFrame styleMask:(unsigned)aStyleMask
+{
+    self = [super initWithFrame:aFrame];
+    
+    if (self)
+    {
+        _styleMask = aStyleMask;
+        _resizeIndicatorOffset = CGSizeMake(0.0, 0.0);
+        _toolbarOffset = CGSizeMake(0.0, 0.0);
+    }
+    
+    return self;
+}
+
+- (void)setDocumentEdited:(BOOL)isEdited
+{
+}
+
+- (void)setTitle:(CPString)aTitle
+{
+}
+
+- (BOOL)acceptsFirstMouse:(CPEvent)anEvent
+{
+    return YES;
+}
+
+- (void)mouseDown:(CPEvent)anEvent
+{
+    var theWindow = [self window];
+
+    if ((_styleMask & CPResizableWindowMask) && _resizeIndicator)
+    {
+        // FIXME: This should be better
+        var frame = [_resizeIndicator frame];
+        
+        if (CGRectContainsPoint(frame, [self convertPoint:[anEvent locationInWindow] fromView:nil]))
+            return [self trackResizeWithEvent:anEvent];
+    }
+    
+    if ([theWindow isMovableByWindowBackground])
+        [self trackMoveWithEvent:anEvent];
+        
+    else
+        [super mouseDown:anEvent];
+}
+
+- (void)trackResizeWithEvent:(CPEvent)anEvent
+{
+    var location = [anEvent locationInWindow],
+        type = [anEvent type];
+        
+    if (type === CPLeftMouseUp)
+        return;
+    
+    var theWindow = [self window];
+    
+    if (type === CPLeftMouseDown)
+    {
+        var frame = [theWindow frame];
+        
+        _resizeFrame = CGRectMake(location.x, location.y, CGRectGetWidth(frame), CGRectGetHeight(frame));
+    }
+    
+    else if (type === CPLeftMouseDragged)
+    {	
+    	var newSize = CGSizeMake(CGRectGetWidth(_resizeFrame) + location.x - CGRectGetMinX(_resizeFrame), CGRectGetHeight(_resizeFrame) + location.y - CGRectGetMinY(_resizeFrame));
+        
+        if (theWindow._isSheet && theWindow._parentView && (theWindow._frame.size.width !== newSize.width))
+    	[theWindow._parentView _setAttachedSheetFrameOrigin];
+		
+		[theWindow setFrameSize:newSize];
+    }
+    
+    [CPApp setTarget:self selector:@selector(trackResizeWithEvent:) forNextEventMatchingMask:CPLeftMouseDraggedMask | CPLeftMouseUpMask untilDate:nil inMode:nil dequeue:YES];
+}
+
+- (CGPoint)_pointWithinScreenFrame:(CGPoint)aPoint
+{
+    // FIXME: this is WRONG, all of this is WRONG
+    if (![CPPlatform isBrowser])
+        return aPoint;
+
+    var visibleFrame = _cachedScreenFrame;
+
+    if (!visibleFrame)
+        visibleFrame = [[CPPlatformWindow primaryPlatformWindow] visibleFrame];
+
+    var restrictedPoint = CGPointMake(0, 0);
+
+    restrictedPoint.x = MIN(MAX(aPoint.x, -_frame.size.width + 4.0), CGRectGetMaxX(visibleFrame) - 4.0);
+    restrictedPoint.y = MIN(MAX(aPoint.y, 0.0), CGRectGetMaxY(visibleFrame) - 8.0);
+
+    return restrictedPoint;
+}
+
+- (void)trackMoveWithEvent:(CPEvent)anEvent
+{
+    var type = [anEvent type];
+
+    if (type === CPLeftMouseUp)
+    {
+        _cachedScreenFrame = nil;
+        return;
+    }
+
+    else if (type === CPLeftMouseDown)
+    {
+        _mouseDraggedPoint = [[self window] convertBaseToGlobal:[anEvent locationInWindow]];
+        _cachedScreenFrame = [[CPPlatformWindow primaryPlatformWindow] visibleFrame];
+    }
+
+    else if (type === CPLeftMouseDragged)
+    {
+        var theWindow = [self window],
+            frame = [theWindow frame],
+            location = [theWindow convertBaseToGlobal:[anEvent locationInWindow]],
+            origin = [self _pointWithinScreenFrame:CGPointMake(_CGRectGetMinX(frame) + (location.x - _mouseDraggedPoint.x), 
+                                                               _CGRectGetMinY(frame) + (location.y - _mouseDraggedPoint.y))];
+
+        [theWindow setFrameOrigin:origin];
+
+        _mouseDraggedPoint = [self _pointWithinScreenFrame:location];
+    }
+    
+    [CPApp setTarget:self selector:@selector(trackMoveWithEvent:) forNextEventMatchingMask:CPLeftMouseDraggedMask | CPLeftMouseUpMask untilDate:nil inMode:nil dequeue:YES];
+}
+
+- (void)setShowsResizeIndicator:(BOOL)shouldShowResizeIndicator
+{
+    if (shouldShowResizeIndicator)
+    {
+        var size = [_CPWindowViewResizeIndicatorImage size],
+            boundsSize = [self frame].size;
+        
+        _resizeIndicator = [[CPImageView alloc] initWithFrame:CGRectMake(boundsSize.width - size.width - _resizeIndicatorOffset.width, boundsSize.height - size.height - _resizeIndicatorOffset.height, size.width, size.height)];
+        
+        [_resizeIndicator setImage:_CPWindowViewResizeIndicatorImage];
+        [_resizeIndicator setAutoresizingMask:CPViewMinXMargin | CPViewMinYMargin];
+
+        [self addSubview:_resizeIndicator];
+    }
+    else
+    {
+        [_resizeIndicator removeFromSuperview];
+
+        _resizeIndicator = nil;
+    }
+}
+
+- (CPImage)showsResizeIndicator
+{
+    return _resizeIndicator !== nil;
+}
+
+- (void)setResizeIndicatorOffset:(CGSize)anOffset
+{
+    if (CGSizeEqualToSize(_resizeIndicatorOffset, anOffset))
+        return;
+    
+    _resizeIndicatorOffset = anOffset;
+    
+    if (!_resizeIndicator)
+        return;
+
+    var size = [_resizeIndicator frame].size,
+        boundsSize = [self frame].size;
+    
+    [_resizeIndicator setFrameOrigin:CGPointMake(boundsSize.width - size.width - anOffset.width, boundsSize.height - size.height - anOffset.height)];
+}
+
+- (CGSize)resizeIndicatorOffset
+{
+    return _resizeIndicatorOffset;
+}
+
+- (void)windowDidChangeDocumentEdited
+{
+}
+
+- (void)windowDidChangeDocumentSaving
+{
+}
+
+- (BOOL)showsToolbar
+{
+    return YES;
+}
+
+- (CGSize)toolbarOffset
+{
+    return CGSizeMakeZero();
+}
+
+- (CPColor)toolbarLabelColor
+{
+    return [CPColor blackColor];
+}
+
+- (float)toolbarMaxY
+{
+    if (!_toolbarView || [_toolbarView isHidden])
+        return [self toolbarOffset].height;
+    
+    return CGRectGetMaxY([_toolbarView frame]);
+}
+
+- (_CPToolbarView)toolbarView
+{
+    return _toolbarView;
+}
+
+- (void)tile
+{
+    var theWindow = [self window],
+        bounds = [self bounds],
+        width = CGRectGetWidth(bounds);
+        
+    if ([[theWindow toolbar] isVisible])
+    {
+        var toolbarView = [self toolbarView],
+            toolbarOffset = [self toolbarOffset];
+        
+        [toolbarView setFrame:CGRectMake(toolbarOffset.width, toolbarOffset.height, width, CGRectGetHeight([toolbarView frame]))];
+    }
+    
+    if ([self showsResizeIndicator])
+    {
+        var size = [_resizeIndicator frame].size,
+            boundsSize = [self bounds].size;
+        
+        [_resizeIndicator setFrameOrigin:CGPointMake(boundsSize.width - size.width - _resizeIndicatorOffset.width, boundsSize.height - size.height - _resizeIndicatorOffset.height)];
+    }
+}
+
+- (void)noteToolbarChanged
+{
+    var theWindow = [self window],
+        toolbar = [theWindow toolbar],
+        toolbarView = [toolbar _toolbarView];
+    
+    if (_toolbarView !== toolbarView)
+    {
+        [_toolbarView removeFromSuperview];
+            
+        if (toolbarView)
+        {
+            [toolbarView removeFromSuperview];
+            [toolbarView FIXME_setIsHUD:_styleMask & CPHUDBackgroundWindowMask];
+
+            [self addSubview:toolbarView];
+        }
+        
+        _toolbarView = toolbarView;
+    }
+
+    [toolbarView setHidden:![self showsToolbar] || ![toolbar isVisible]];
+
+    if (theWindow)
+    {
+        var contentRect = [self convertRect:[[theWindow contentView] frame] toView:nil];
+
+        contentRect.origin = [theWindow convertBaseToGlobal:contentRect.origin];
+
+        [self setAutoresizesSubviews:NO];
+        [theWindow setFrame:[theWindow frameRectForContentRect:contentRect]];
+        [self setAutoresizesSubviews:YES];
+    }
+
+    [self tile];
+}
+/*
+- (void)setAnimatingToolbar:(BOOL)isAnimatingToolbar
+{
+    _isAnimatingToolbar = isAnimatingToolbar;
+}
+
+- (BOOL)isAnimatingToolbar
+{
+    return _isAnimatingToolbar;
+}
+*/
+
+- (void)didAddSubview:(CPView)aView
+{
+    if (!_resizeIndicator || aView === _resizeIndicator)
+        return;
+
+    [self addSubview:_resizeIndicator];
+}
+
+@end

AppKit/CPWindowController.j

@@ -0,0 +1,472 @@
+/*
+ * CPWindowController.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPObject.j>
+@import <Foundation/CPString.j>
+
+@import "CPResponder.j"
+@import "CPWindow.j"
+@import "CPDocument.j"
+
+#include "Platform/Platform.h"
+
+
+/*! 
+    @ingroup appkit
+    @class CPWindowController
+
+    An instance of a CPWindowController manages a CPWindow. It has methods
+    that get called when the window is loading, and after the window has loaded. In the
+    Model-View-Controller method of program design, the CPWindowController would be
+    considered the 'Controller' and the CPWindow the 'Model.'
+*/
+@implementation CPWindowController : CPResponder
+{
+    CPWindow            _window;
+
+    CPArray             _documents;
+    CPDocument          _document;
+    BOOL                _shouldCloseDocument;
+    BOOL                _supportsMultipleDocuments;
+
+    id                  _cibOwner;
+    CPString            _windowCibName;
+    CPString            _windowCibPath;
+
+    CPViewController    _viewController;
+    CPView              _viewControllerContainerView;
+}
+
+- (id)init
+{
+    return [self initWithWindow:nil];
+}
+
+/*!
+    Initializes the controller with a window.
+    @param aWindow the window to control
+    @return the initialzed window controller
+*/
+- (id)initWithWindow:(CPWindow)aWindow
+{
+    self = [super init];
+
+    if (self)
+    {
+        [self setWindow:aWindow];
+        [self setShouldCloseDocument:NO];
+
+        [self setNextResponder:CPApp];
+
+        _documents = [];
+    }
+
+    return self;
+}
+
+/*!
+    Initializes the controller with a Capppuccino Interface Builder name.
+    @param aWindowCibName the cib name of the window to control
+    @return the initialized window controller
+*/
+- (id)initWithWindowCibName:(CPString)aWindowCibName
+{
+    return [self initWithWindowCibName:aWindowCibName owner:self];
+}
+
+/*!
+    Initializes the controller with a cafe name.
+    @param aWindowCibName the cib name of the window to control
+    @param anOwner the owner of the cib file
+    @return the initialized window controller
+*/
+- (id)initWithWindowCibName:(CPString)aWindowCibName owner:(id)anOwner
+{
+    self = [self initWithWindow:nil];
+
+    if (self)
+    {
+        _cibOwner = anOwner;
+        _windowCibName = aWindowCibName;
+    }
+
+    return self;
+}
+
+- (id)initWithWindowCibPath:(CPString)aWindowCibPath owner:(id)anOwner
+{
+    self = [self initWithWindow:nil];
+
+    if (self)
+    {
+        _cibOwner = anOwner;
+        _windowCibPath = aWindowCibPath;
+    }
+
+    return self;
+}
+
+/*!
+    Loads the window
+*/
+- (void)loadWindow
+{
+    if (_window)
+        return;
+
+    [[CPBundle bundleForClass:[_cibOwner class]] loadCibFile:[self windowCibPath] externalNameTable:[CPDictionary dictionaryWithObject:_cibOwner forKey:CPCibOwner]];
+}
+
+/*!
+    Shows the window.
+    @param aSender the object requesting the show
+*/
+- (@action)showWindow:(id)aSender
+{
+    var theWindow = [self window];
+
+    if ([theWindow respondsToSelector:@selector(becomesKeyOnlyIfNeeded)] && [theWindow becomesKeyOnlyIfNeeded])
+        [theWindow orderFront:aSender];
+    else
+        [theWindow makeKeyAndOrderFront:aSender];
+}
+
+/*!
+    Returns \c YES if the window has been loaded. Specifically,
+    if loadWindow has been called.
+*/
+- (BOOL)isWindowLoaded
+{
+    return _window !== nil;
+}
+
+/*!
+    Returns the window this object controls.
+*/
+- (CPWindow)window
+{
+    if (!_window)
+    {
+        [self windowWillLoad];
+        [_document windowControllerWillLoadCib:self];
+
+        [self loadWindow];
+
+        if (_window === nil && [_cibOwner isKindOfClass:[CPDocument class]])
+            [self setWindow:[_cibOwner valueForKey:@"window"]];
+        
+        if (!_window) 
+        {
+            var reason = [CPString stringWithFormat:@"Window for %@ could not be loaded from Cib or no window specified. \
+                                                        Override loadWindow to load the window manually.", self];
+
+            [CPException raise:CPInternalInconsistencyException reason:reason];
+        }
+
+        [self windowDidLoad];
+        [_document windowControllerDidLoadCib:self];
+
+        [self synchronizeWindowTitleWithDocumentName];
+    }
+
+    return _window;
+}
+
+/*!
+    Sets the window to be controlled.
+    @param aWindow the new window to control
+*/
+- (void)setWindow:(CPWindow)aWindow
+{
+    [_window setWindowController:nil];
+
+    _window = aWindow;
+
+    [_window setWindowController:self];
+    [_window setNextResponder:self];
+}
+
+/*!
+    The method notifies the controller that it's window has loaded.
+*/
+- (void)windowDidLoad
+{
+}
+
+/*!
+    The method notifies the controller that it's window is about to load.
+*/
+- (void)windowWillLoad
+{
+}
+
+/*!
+    Sets the document that is inside the controlled window.
+    @param aDocument the document in the controlled window
+*/
+- (void)setDocument:(CPDocument)aDocument
+{
+    if (_document === aDocument)
+        return;
+
+    var defaultCenter = [CPNotificationCenter defaultCenter];
+
+    if (_document)
+    {
+        if (![self supportsMultipleDocuments])
+            [self removeDocument:_document];
+        
+        [defaultCenter removeObserver:self
+                                 name:CPDocumentWillSaveNotification
+                               object:_document];
+
+        [defaultCenter removeObserver:self
+                                 name:CPDocumentDidSaveNotification
+                               object:_document];
+
+        [defaultCenter removeObserver:self
+                                 name:CPDocumentDidFailToSaveNotification
+                               object:_document];
+    }
+
+    _document = aDocument;
+
+    if (_document)
+    {
+        [self addDocument:_document];
+
+        [defaultCenter addObserver:self
+                          selector:@selector(_documentWillSave:)
+                              name:CPDocumentWillSaveNotification
+                            object:_document];
+
+        [defaultCenter addObserver:self
+                          selector:@selector(_documentDidSave:)
+                              name:CPDocumentDidSaveNotification
+                            object:_document];
+
+        [defaultCenter addObserver:self
+                          selector:@selector(_documentDidFailToSave:)
+                              name:CPDocumentDidFailToSaveNotification
+                            object:_document];
+
+        [self setDocumentEdited:[_document isDocumentEdited]];
+    }
+
+    var viewController = [_document viewControllerForWindowController:self];
+
+    if (viewController)
+        [self setViewController:viewController];
+
+    [self synchronizeWindowTitleWithDocumentName];
+}
+
+- (void)setSupportsMultipleDocuments:(BOOL)shouldSupportMultipleDocuments
+{
+    _supportsMultipleDocuments = shouldSupportMultipleDocuments;
+}
+
+- (BOOL)supportsMultipleDocuments
+{
+    return _supportsMultipleDocuments;
+}
+
+- (void)addDocument:(CPDocument)aDocument
+{
+    if (aDocument && ![_documents containsObject:aDocument])
+        [_documents addObject:aDocument];
+}
+
+- (void)removeDocument:(CPDocument)aDocument
+{
+    var index = [_documents indexOfObjectIdenticalTo:aDocument];
+
+    if (index === CPNotFound)
+        return;
+
+    [_documents removeObjectAtIndex:index];
+
+    if (_document === aDocument && [_documents count])
+        [self setDocument:[_documents objectAtIndex:MIN(index, [_documents count] - 1)]];
+}
+
+- (void)removeDocumentAndCloseIfNecessary:(CPDocument)aDocument
+{
+    [self removeDocument:aDocument];
+
+    if (![_documents count])
+        [self close];
+}
+
+- (CPArray)documents
+{
+    return _documents;
+}
+
+- (void)setViewController:(CPViewController)aViewController
+{
+    var containerView = [self viewControllerContainerView] || [[self window] contentView],
+        view = [_viewController view],
+        frame = view ? [view frame] : [containerView bounds];
+
+    [view removeFromSuperview];
+
+    _viewController = aViewController;
+
+    view = [_viewController view];
+
+    if (view)
+    {
+        [view setFrame:frame];
+        [containerView addSubview:view];
+    }
+}
+
+- (void)setViewControllerContainerView:(CPView)aView
+{
+    _viewControllerContainerView = aView;
+}
+
+- (void)viewControllerContainerView
+{
+    return _viewControllerContainerView;
+}
+
+- (void)setViewController:(CPViewController)aViewController
+{
+    var containerView = [self viewControllerContainerView] || [[self window] contentView],
+        view = [_viewController view],
+        frame = view ? [view frame] : [containerView bounds];
+
+    [view removeFromSuperview];
+
+    _viewController = aViewController;
+
+    view = [_viewController view];
+
+    if (view)
+    {
+        [view setFrame:frame];
+        [containerView addSubview:view];
+    }
+}
+
+- (CPViewController)viewController
+{
+    return _viewController;
+}
+
+/* @ignore */
+- (void)_documentWillSave:(CPNotification)aNotification
+{
+    [[self window] setDocumentSaving:YES];
+}
+
+/* @ignore */
+- (void)_documentDidSave:(CPNotification)aNotification
+{
+    [[self window] setDocumentSaving:NO];
+}
+
+/* @ignore */
+- (void)_documentDidFailToSave:(CPNotification)aNotification
+{
+    [[self window] setDocumentSaving:NO];
+}
+
+/*!
+    Returns the document in the controlled window.
+*/
+- (CPDocument)document
+{
+    return _document;
+}
+
+/*!
+    Sets whether the document has unsaved changes. The window can use this as a hint to 
+    @param isEdited \c YES means the document has unsaved changes.
+*/
+- (void)setDocumentEdited:(BOOL)isEdited
+{
+    [[self window] setDocumentEdited:isEdited];
+}
+
+- (void)close
+{
+    [[self window] close];
+}
+
+- (void)setShouldCloseDocument:(BOOL)shouldCloseDocument
+{
+    _shouldCloseDocument = shouldCloseDocument;
+}
+
+- (BOOL)shouldCloseDocument
+{
+    return _shouldCloseDocument;
+}
+
+- (id)owner
+{
+    return _cibOwner;
+}
+
+- (CPString)windowCibName
+{
+    if (_windowCibName)
+        return _windowCibName;
+
+    return [[_windowCibPath lastPathComponent] stringByDeletingPathExtension];
+}
+
+- (CPString)windowCibPath
+{
+    if (_windowCibPath)
+        return _windowCibPath;
+
+    return [[CPBundle bundleForClass:[_cibOwner class]] pathForResource:_windowCibName + @".cib"];
+}
+
+// Setting and Getting Window Attributes
+
+/*!
+    Sets the title of the window as the name of the document.
+*/
+- (void)synchronizeWindowTitleWithDocumentName
+{
+    if (!_document || !_window)
+        return;
+
+    // [_window setRepresentedFilename:];
+    [_window setTitle:[self windowTitleForDocumentDisplayName:[_document displayName]]];
+}
+
+/*!
+    Returns the window title based on the document's name.
+    @param aDisplayName the document's filename
+*/
+- (CPString)windowTitleForDocumentDisplayName:(CPString)aDisplayName
+{
+    return aDisplayName;
+}
+
+@end

AppKit/Cib/CPCib.j

@@ -0,0 +1,192 @@
+/*
+ * CPCib.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPObject.j>
+@import <Foundation/CPURLConnection.j>
+@import <Foundation/CPURLRequest.j>
+
+@import "_CPCibClassSwapper.j"
+@import "_CPCibCustomObject.j"
+@import "_CPCibCustomResource.j"
+@import "_CPCibCustomView.j"
+@import "_CPCibKeyedUnarchiver.j"
+@import "_CPCibObjectData.j"
+@import "_CPCibProxyObject.j"
+@import "_CPCibWindowTemplate.j"
+
+
+CPCibOwner              = @"CPCibOwner",
+CPCibTopLevelObjects    = @"CPCibTopLevelObjects",
+CPCibReplacementClasses = @"CPCibReplacementClasses",
+CPCibExternalObjects    = @"CPCibExternalObjects";
+    
+var CPCibObjectDataKey  = @"CPCibObjectDataKey";
+
+/*!
+    @ingroup appkit
+*/
+
+@implementation CPCib : CPObject
+{
+    CPData      _data;
+    CPBundle    _bundle;
+    BOOL        _awakenCustomResources;
+
+    id          _loadDelegate;
+}
+
+- (id)initWithContentsOfURL:(CPURL)aURL
+{
+    self = [super init];
+
+    if (self)
+    {
+        _data = [CPURLConnection sendSynchronousRequest:[CPURLRequest requestWithURL:aURL] returningResponse:nil error:nil];
+        _awakenCustomResources = YES;
+    }
+
+    return self;
+}
+
+- (id)initWithContentsOfURL:(CPURL)aURL loadDelegate:(id)aLoadDelegate
+{
+    self = [super init];
+
+    if (self)
+    {
+        [CPURLConnection connectionWithRequest:[CPURLRequest requestWithURL:aURL] delegate:self];
+
+        _awakenCustomResources = YES;
+
+        _loadDelegate = aLoadDelegate;
+    }
+
+    return self;
+}
+
+- (id)initWithCibNamed:(CPString)aName bundle:(CPBundle)aBundle
+{
+    if (![aName hasSuffix:@".cib"])
+        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]];
+
+    if (self)
+        _bundle = aBundle;
+
+    return self;
+}
+
+- (id)initWithCibNamed:(CPString)aName bundle:(CPBundle)aBundle loadDelegate:(id)aLoadDelegate
+{
+    if (![aName hasSuffix:@".cib"])
+        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];
+
+    if (self)
+        _bundle = aBundle;
+
+    return self;
+}
+
+- (void)_setAwakenCustomResources:(BOOL)shouldAwakenCustomResources
+{
+    _awakenCustomResources = shouldAwakenCustomResources;
+}
+
+- (BOOL)_awakenCustomResources
+{
+    return _awakenCustomResources;
+}
+
+- (BOOL)instantiateCibWithExternalNameTable:(CPDictionary)anExternalNameTable
+{
+    var bundle = _bundle,
+        owner = [anExternalNameTable objectForKey:CPCibOwner];
+
+    if (!bundle && owner)
+        bundle = [CPBundle bundleForClass:[owner class]];
+
+    var unarchiver = [[_CPCibKeyedUnarchiver alloc] initForReadingWithData:_data bundle:bundle awakenCustomResources:_awakenCustomResources],
+        replacementClasses = [anExternalNameTable objectForKey:CPCibReplacementClasses];
+
+    if (replacementClasses)
+    {
+        var key = nil,
+            keyEnumerator = [replacementClasses keyEnumerator];
+
+        while (key = [keyEnumerator nextObject])
+            [unarchiver setClass:[replacementClasses objectForKey:key] forClassName:key];
+    }
+
+    [unarchiver setExternalObjectsForProxyIdentifiers:[anExternalNameTable objectForKey:CPCibExternalObjects]];
+
+    var objectData = [unarchiver decodeObjectForKey:CPCibObjectDataKey];
+
+    if (!objectData || ![objectData isKindOfClass:[_CPCibObjectData class]])
+        return NO;
+
+    var topLevelObjects = [anExternalNameTable objectForKey:CPCibTopLevelObjects];
+
+    [objectData instantiateWithOwner:owner topLevelObjects:topLevelObjects]
+    [objectData establishConnectionsWithOwner:owner topLevelObjects:topLevelObjects];
+    [objectData awakeWithOwner:owner topLevelObjects:topLevelObjects];
+
+    // Display Visible Windows.
+    [objectData displayVisibleWindows];
+
+    return YES;
+}
+
+- (BOOL)instantiateCibWithOwner:(id)anOwner topLevelObjects:(CPArray)topLevelObjects
+{
+    return [self instantiateCibWithExternalNameTable:[CPDictionary dictionaryWithObjectsAndKeys:anOwner, CPCibOwner, topLevelObjects, CPCibTopLevelObjects]];
+}
+
+@end
+
+@implementation CPCib (CPURLConnectionDelegate)
+
+- (void)connection:(CPURLConnection)aConnection didReceiveData:(CPString)data
+{
+    _data = [CPData dataWithString:data];
+}
+
+- (void)connection:(CPURLConnection)aConnection didFailWithError:(CPError)anError
+{
+    alert("cib: connection failed.");
+
+    _loadDelegate = nil;
+}
+
+- (void)connectionDidFinishLoading:(CPURLConnection)aConnection
+{
+    if ([_loadDelegate respondsToSelector:@selector(cibDidFinishLoading:)])
+        [_loadDelegate cibDidFinishLoading:self];
+
+    _loadDelegate = nil;
+}
+
+@end

AppKit/Cib/CPCibConnector.j

@@ -0,0 +1,88 @@
+/*
+ * CPCibConnector.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPObject.j>
+@import <Foundation/CPKeyValueCoding.j>
+
+
+var _CPCibConnectorSourceKey        = @"_CPCibConnectorSourceKey",
+    _CPCibConnectorDestinationKey   = @"_CPCibConnectorDestinationKey",
+    _CPCibConnectorLabelKey         = @"_CPCibConnectorLabelKey";
+
+@implementation CPCibConnector : CPObject
+{
+    id          _source @accessors(property=source);
+    id          _destination @accessors(property=destination);
+    CPString    _label @accessors(property=label);
+}
+
+- (void)replaceObject:(id)anObject withObject:(id)anotherObject
+{
+    if (_source === anObject)
+        _source = anotherObject;
+
+    if (_destination === anObject)
+        _destination = anotherObject;
+}
+
+- (void)replaceObjects:(Object)replacementObjects
+{
+    var replacement = replacementObjects[[_source UID]];
+
+    if (replacement !== undefined)
+        _source = replacement;
+
+    replacement = replacementObjects[[_destination UID]];
+
+    if (replacement !== undefined)
+        _destination = replacement;
+}
+
+@end
+
+@implementation CPCibConnector (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super init];
+    
+    if (self)
+    {
+        _source = [aCoder decodeObjectForKey:_CPCibConnectorSourceKey];
+        _destination = [aCoder decodeObjectForKey:_CPCibConnectorDestinationKey];
+        _label = [aCoder decodeObjectForKey:_CPCibConnectorLabelKey];
+    }
+    
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [aCoder encodeObject:_source forKey:_CPCibConnectorSourceKey];
+    [aCoder encodeObject:_destination forKey:_CPCibConnectorDestinationKey];
+    [aCoder encodeObject:_label forKey:_CPCibConnectorLabelKey];
+}
+
+@end
+
+// For backwards compatibility.
+@implementation _CPCibConnector : CPCibConnector { } @end

AppKit/Cib/CPCibControlConnector.j

@@ -0,0 +1,76 @@
+/*
+ * CPCibControlConnector.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 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 "CPCibConnector.j"
+
+
+@implementation CPCibControlConnector : CPCibConnector
+{
+}
+
+- (void)establishConnection
+{
+    var selectorName = _label,
+        selectorNameLength = [selectorName length];
+
+    if (selectorNameLength && selectorName[selectorNameLength - 1] !== ':')
+        selectorName += ':';
+
+    var selector = CPSelectorFromString(selectorName);
+
+    // Not having a selector is a fatal error.
+    if (!selector)
+        [CPException
+            raise:CPInvalidArgumentException
+           reason:@"-[" + [self className] + ' ' + _cmd + @"] selector "  + selectorName + @" does not exist."];
+
+    // If the destination doesn't respond to this selector, warn but don't die.
+    if (_destination && ![_destination respondsToSelector:selector])
+    {
+        CPLog.warn(@"Could not connect the action " + selector + @" to target of class " + [_destination className]);
+
+        return;
+    }
+
+    // Not being able to set the action is a fatal error.
+    if ([_source respondsToSelector:@selector(setAction:)])
+        objj_msgSend(_source, @selector(setAction:), selector);
+
+    else
+        [CPException
+            raise:CPInvalidArgumentException
+           reason:@"-[" + [self className] + ' ' + _cmd + @"] " + [_source description] + " does not respond to setAction:"];
+
+    // Not being able to set the target is a fatal error.
+    if ([_source respondsToSelector:@selector(setTarget:)])
+        objj_msgSend(_source, @selector(setTarget:), _destination);
+
+    else
+        [CPException
+            raise:CPInvalidArgumentException
+           reason:@"-[" + [self className] + ' ' + _cmd + @"] " + [_source description] + " does not respond to setTarget:"];
+}
+
+@end
+
+@implementation _CPCibControlConnector : CPCibControlConnector { } @end
+

AppKit/Cib/CPCibLoading.j

@@ -0,0 +1,101 @@
+/*
+ * _CPCibLoading.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPBundle.j>
+@import <Foundation/CPDictionary.j>
+@import <Foundation/CPString.j>
+
+
+var CPCibOwner = @"CPCibOwner";
+
+var LoadInfoForCib = {};
+
+@implementation CPObject (CPCibLoading)
+
+- (void)awakeFromCib
+{
+}
+
+@end
+
+@implementation CPBundle (CPCibLoading)
+
++ (void)loadCibFile:(CPString)anAbsolutePath externalNameTable:(CPDictionary)aNameTable
+{
+    [[[CPCib alloc] initWithContentsOfURL:anAbsolutePath] instantiateCibWithExternalNameTable:aNameTable];
+}
+
++ (void)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];
+
+    [self loadCibFile:path externalNameTable:[CPDictionary dictionaryWithObject:anOwner forKey:CPCibOwner]];
+}
+
+- (void)loadCibFile:(CPString)aFileName externalNameTable:(CPDictionary)aNameTable
+{
+    [[[CPCib alloc] initWithContentsOfURL:aFileName] instantiateCibWithExternalNameTable:aNameTable];
+}
+
++ (void)loadCibFile:(CPString)anAbsolutePath externalNameTable:(CPDictionary)aNameTable loadDelegate:aDelegate
+{
+    var cib = [[CPCib alloc] initWithContentsOfURL:anAbsolutePath loadDelegate:self];
+
+    LoadInfoForCib[[cib UID]] = { loadDelegate:aDelegate, externalNameTable:aNameTable };
+}
+
++ (void)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];
+    
+    [self loadCibFile:path externalNameTable:[CPDictionary dictionaryWithObject:anOwner forKey:CPCibOwner] loadDelegate:aDelegate];
+}
+
+- (void)loadCibFile:(CPString)aFileName externalNameTable:(CPDictionary)aNameTable loadDelegate:(id)aDelegate
+{
+    var cib = [[CPCib alloc] initWithCibNamed:aFileName bundle:self loadDelegate:[self class]];
+
+    LoadInfoForCib[[cib UID]] = { loadDelegate:aDelegate, externalNameTable:aNameTable };
+}
+
++ (void)cibDidFinishLoading:(CPCib)aCib
+{
+    var loadInfo = LoadInfoForCib[[aCib UID]];
+    
+    delete LoadInfoForCib[[aCib UID]];
+    
+    [aCib instantiateCibWithExternalNameTable:loadInfo.externalNameTable];
+    
+    [loadInfo.loadDelegate cibDidFinishLoading:aCib];
+}
+
+@end

AppKit/Cib/CPCibOutletConnector.j

@@ -0,0 +1,48 @@
+/*
+ * CPCibOutletConnector.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 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 "CPCibConnector.j"
+
+
+@implementation CPCibOutletConnector : CPCibConnector
+{
+}
+
+- (void)establishConnection
+{
+    try
+    {
+        [_source setValue:_destination forKey:_label];
+    }
+    catch (anException)
+    {
+        if ([anException name] === CPUndefinedKeyException)
+            CPLog.warn(@"Could not connect the outlet " + _label + @" of target of class " + [_source className]);
+
+        else
+            throw anException;
+    }
+}
+
+@end
+
+@implementation _CPCibOutletConnector : CPCibOutletConnector { } @end

AppKit/Cib/_CPCibClassSwapper.j

@@ -0,0 +1,76 @@
+/*
+ * _CPCibClassSwapper.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2009, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPObject.j>
+@import <Foundation/CPString.j>
+
+
+var _CPCibClassSwapperClassNameKey          = @"_CPCibClassSwapperClassNameKey",
+    _CPCibClassSwapperOriginalClassNameKey  = @"_CPCibClassSwapperOriginalClassNameKey";
+
+@implementation _CPCibClassSwapper : CPObject
+{
+}
+
++ (void)allocObjectWithCoder:(CPCoder)aCoder className:(CPString)aClassName
+{
+    // FIXME: Also check class classForClassName:
+    var theClass = [aCoder classForClassName:aClassName];
+
+    if (!theClass)
+    {
+        theClass = objj_lookUpClass(aClassName);
+
+        if (!theClass)
+            return nil;
+    }
+
+    return [theClass alloc];
+}
+
++ (id)allocWithCoder:(CPCoder)aCoder
+{
+    if ([aCoder respondsToSelector:@selector(usesOriginalClasses)] && [aCoder usesOriginalClasses])
+    {
+        var theClassName = [aCoder decodeObjectForKey:_CPCibClassSwapperOriginalClassNameKey],
+            object = [self allocObjectWithCoder:aCoder className:theClassName];
+    }
+    else
+    {
+        var theClassName = [aCoder decodeObjectForKey:_CPCibClassSwapperClassNameKey],
+            object = [self allocObjectWithCoder:aCoder className:theClassName];
+
+        if (!object)
+        {
+            CPLog.error("Unable to find class " + theClassName + " in cib file.");
+
+            object = [self allocObjectWithCoder:aCoder className:[aCoder decodeObjectForKey:_CPCibClassSwapperOriginalClassNameKey]];
+        }
+    }
+
+    if (!object)
+        [CPException raise:CPInvalidArgumentException reason:@"Unable to find class " + theClassName + " in cib file."];
+
+    return object;
+}
+
+@end

AppKit/Cib/_CPCibCustomObject.j

@@ -0,0 +1,72 @@
+
+@import <Foundation/CPObject.j>
+
+
+var _CPCibCustomObjectClassName = @"_CPCibCustomObjectClassName";
+
+@implementation _CPCibCustomObject : CPObject
+{
+    CPString _className;
+}
+
+- (CPString)customClassName
+{
+    return _className;
+}
+
+- (void)setCustomClassName:(CPString)aClassName
+{
+    _className = aClassName;
+}
+
+- (CPString)description
+{
+    return [super description] + " (" + [self customClassName] + ')';
+}
+
+@end
+
+@implementation _CPCibCustomObject (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super init];
+
+    if (self)
+        _className = [aCoder decodeObjectForKey:_CPCibCustomObjectClassName];
+    
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [aCoder encodeObject:_className forKey:_CPCibCustomObjectClassName];
+}
+
+- (id)_cibInstantiate
+{
+    var theClass = CPClassFromString(_className);
+
+    // Hey this is us!
+    if (theClass === [self class])
+    {
+        _className = @"CPObject";
+
+        return self;
+    }
+
+    if (!theClass)
+    {
+#if DEBUG
+        CPLog("Unknown class \"" + _className + "\" in cib file");
+#endif
+        theClass = [CPObject class];
+    }
+
+    if (theClass === [CPApplication class])
+        return [CPApplication sharedApplication];
+    
+    return [[theClass alloc] init];
+}
+
+@end

AppKit/Cib/_CPCibCustomResource.j

@@ -0,0 +1,115 @@
+/*
+ * _CPCibCustomResource.j
+ * AppKit
+ *
+ * Portions based on NSCustomResource.m (01/08/2009) in Cocotron (http://www.cocotron.org/)
+ * Copyright (c) 2006-2007 Christopher J. W. Lloyd
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2009, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPObject.j>
+@import <Foundation/CPString.j>
+
+
+var _CPCibCustomResourceClassNameKey    = @"_CPCibCustomResourceClassNameKey",
+    _CPCibCustomResourceResourceNameKey = @"_CPCibCustomResourceResourceNameKey",
+    _CPCibCustomResourcePropertiesKey   = @"_CPCibCustomResourcePropertiesKey";
+
+@implementation _CPCibCustomResource : CPObject
+{
+    CPString        _className;
+    CPString        _resourceName;
+    CPDictionary    _properties;
+}
+
++ (id)imageResourceWithName:(CPString)aResourceName size:(CGSize)aSize
+{
+    return [[self alloc] initWithClassName:@"CPImage" resourceName:aResourceName properties:[CPDictionary dictionaryWithObject:aSize forKey:@"size"]];
+}
+
+- (id)initWithClassName:(CPString)aClassName resourceName:(CPString)aResourceName properties:(CPDictionary)properties
+{
+    self = [super init];
+    
+    if (self)
+    {
+        _className = aClassName;
+        _resourceName = aResourceName;
+        _properties = properties;
+    }
+    
+    return self;
+}
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super init];
+    
+    if (self)
+    {
+        _className = [aCoder decodeObjectForKey:_CPCibCustomResourceClassNameKey];
+        _resourceName = [aCoder decodeObjectForKey:_CPCibCustomResourceResourceNameKey];
+        _properties = [aCoder decodeObjectForKey:_CPCibCustomResourcePropertiesKey];
+    }
+    
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [aCoder encodeObject:_className forKey:_CPCibCustomResourceClassNameKey];
+    [aCoder encodeObject:_resourceName forKey:_CPCibCustomResourceResourceNameKey];
+    [aCoder encodeObject:_properties forKey:_CPCibCustomResourcePropertiesKey];
+}
+
+- (id)awakeAfterUsingCoder:(CPCoder)aCoder
+{
+    if ([aCoder respondsToSelector:@selector(bundle)] && 
+        (![aCoder respondsToSelector:@selector(awakenCustomResources)] || [aCoder awakenCustomResources]))
+        if (_className === @"CPImage")
+            return [[CPImage alloc] initWithContentsOfFile:[[aCoder bundle] pathForResource:_resourceName] size:[_properties objectForKey:@"size"]];
+
+    return self;
+}
+
+@end
+
+@implementation _CPCibCustomResource (CPImage)
+
+- (CPString)filename
+{
+    return [[CPBundle mainBundle] pathForResource:_resourceName];
+}
+
+- (CGSize)size
+{
+    return [_properties objectForKey:@"size"];
+}
+
+- (BOOL)isThreePartImage
+{
+    return NO;
+}
+
+- (BOOL)isNinePartImage
+{
+    return NO;
+}
+
+@end

AppKit/Cib/_CPCibCustomView.j

@@ -0,0 +1,124 @@
+/*
+ * _CPCibCustomView.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 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 "CPView.j"
+
+
+/* @ignore */
+
+@implementation _CPCibCustomView : CPView
+{
+    CPString    _className;
+}
+
+- (CPString)customClassName
+{
+    return _className;
+}
+
+- (void)setCustomClassName:(CPString)aClassName
+{
+    _className = aClassName;
+}
+
+@end
+
+var _CPCibCustomViewClassNameKey    = @"_CPCibCustomViewClassNameKey";
+
+@implementation _CPCibCustomView (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super initWithCoder:aCoder];
+
+    if (self)
+        _className = [aCoder decodeObjectForKey:_CPCibCustomViewClassNameKey];
+
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [super encodeWithCoder:aCoder];
+
+    [aCoder encodeObject:_className forKey:_CPCibCustomViewClassNameKey];
+}
+
+- (CPString)customClassName
+{
+    return _className;
+}
+
+- (id)_cibInstantiate
+{
+    var theClass = CPClassFromString(_className);
+
+    // If we don't have this class, just use CPView.
+    // FIXME: Should we instead throw an exception?
+    if (!theClass)
+    {
+#if DEBUG
+        CPLog("Unknown class \"" + _className + "\" in cib file, using CPView instead.");
+#endif        
+        theClass = [CPView class];
+    }
+
+    // Hey this is us!
+    if (theClass === [self class])
+    {
+        _className = @"CPView";
+
+        return self;
+    }
+
+    var view = [[theClass alloc] initWithFrame:[self frame]];
+        
+    if (view)
+    {
+        [view setBounds:[self bounds]];
+        
+        // Since the object replacement logic hasn't had a chance to kick in yet, we need to do it manually:
+        
+        // we need to copy subviews since each time we add a subview to a different view its removed from the original subviews array
+        var subviews = [[self subviews] copy],
+            index = 0,
+            count = subviews.length;
+        
+        for (; index < count; ++index)
+            [view addSubview:subviews[index]];
+
+        [view setAutoresizingMask:[self autoresizingMask]];
+        [view setAutoresizesSubviews:[self autoresizesSubviews]];
+
+        [view setHitTests:[self hitTests]];
+        [view setHidden:[self isHidden]];
+        [view setAlphaValue:[self alphaValue]];
+        
+        [_superview replaceSubview:self with:view];
+
+        [view setBackgroundColor:[self backgroundColor]];
+    }
+
+    return view;
+}
+
+@end

AppKit/Cib/_CPCibKeyedUnarchiver.j

@@ -0,0 +1,57 @@
+
+@import <Foundation/CPKeyedUnarchiver.j>
+
+
+@implementation _CPCibKeyedUnarchiver : CPKeyedUnarchiver
+{
+    CPBundle        _bundle;
+    BOOL            _awakenCustomResources;
+    CPDictionary    _externalObjectsForProxyIdentifiers;
+}
+
+- (id)initForReadingWithData:(CPData)data bundle:(CPBundle)aBundle awakenCustomResources:(BOOL)shouldAwakenCustomResources
+{
+    self = [super initForReadingWithData:data];
+    
+    if (self)
+    {
+        _bundle = aBundle;
+        _awakenCustomResources = shouldAwakenCustomResources;
+        
+        [self setDelegate:self];
+    }
+    
+    return self;
+}
+
+- (CPBundle)bundle
+{
+    return _bundle;
+}
+
+- (BOOL)awakenCustomResources
+{
+    return _awakenCustomResources;
+}
+
+- (void)setExternalObjectsForProxyIdentifiers:(CPDictionary)externalObjectsForProxyIdentifiers
+{
+    _externalObjectsForProxyIdentifiers = externalObjectsForProxyIdentifiers;
+}
+
+- (id)externalObjectForProxyIdentifier:(CPString)anIdentifier
+{
+    return [_externalObjectsForProxyIdentifiers objectForKey:anIdentifier];
+}
+
+- (void)replaceObjectAtUID:(int)aUID withObject:(id)anObject
+{
+    _objects[aUID] = anObject;
+}
+
+- (id)objectAtUID:(int)aUID
+{
+    return _objects[aUID];
+}
+
+@end

AppKit/Cib/_CPCibObjectData.j

@@ -0,0 +1,291 @@
+/*
+ * _CPCibObjectData.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPArray.j>
+@import <Foundation/CPObject.j>
+@import <Foundation/CPString.j>
+
+@import "CPCib.j"
+@import "CPCibConnector.j"
+@import "CPCibControlConnector.j"
+@import "CPCibOutletConnector.j"
+
+
+@implementation _CPCibObjectData : CPObject
+{
+    CPArray             _namesKeys;
+    CPArray             _namesValues;
+    
+    CPArray             _accessibilityConnectors;
+    CPArray             _accessibilityOidsKeys;
+    CPArray             _accessibilityOidsValues;
+    
+    CPArray             _classesKeys;
+    CPArray             _classesValues;
+    
+    CPArray             _connections;
+    
+    id                  _fontManager;
+    
+    CPString            _framework;
+    
+    int                 _nextOid;
+    
+    CPArray             _objectsKeys;
+    CPArray             _objectsValues;
+    
+    CPArray             _oidKeys;
+    CPArray             _oidValues;
+    
+    _CPCibCustomObject  _fileOwner;
+    
+    CPSet               _visibleWindows;
+
+    JSObject            _replacementObjects;
+}
+
+- (id)init
+{
+    self = [super init];
+
+    if (self)
+    {
+        _namesKeys = [];
+        _namesValues = [];
+
+        //CPArray         _accessibilityConnectors;
+        //CPArray         _accessibilityOidsKeys;
+        //CPArray         _accessibilityOidsValues;
+
+        _classesKeys = [];
+        _classesValues = [];
+
+        _connections = [];
+        //id              _fontManager;
+
+        _framework = @"";
+
+        _nextOid = [];
+
+        _objectsKeys = [];
+        _objectsValues = [];
+
+        _oidKeys = [];
+        _oidValues = [];
+
+        _fileOwner = nil;
+
+        _visibleWindows = [CPSet set];
+    }
+
+    return self;
+}
+
+- (void)displayVisibleWindows
+{
+    var object = nil,
+        objectEnumerator = [_visibleWindows objectEnumerator];
+
+    while (object = [objectEnumerator nextObject])
+        [_replacementObjects[[object UID]] makeKeyAndOrderFront:self];
+}
+
+@end
+
+var _CPCibObjectDataNamesKeysKey                = @"_CPCibObjectDataNamesKeysKey",
+    _CPCibObjectDataNamesValuesKey              = @"_CPCibObjectDataNamesValuesKey",
+    
+    _CPCibObjectDataAccessibilityConnectorsKey  = @"_CPCibObjectDataAccessibilityConnectors",
+    _CPCibObjectDataAccessibilityOidsKeysKey    = @"_CPCibObjectDataAccessibilityOidsKeys",
+    _CPCibObjectDataAccessibilityOidsValuesKey  = @"_CPCibObjectDataAccessibilityOidsValues",
+
+    _CPCibObjectDataClassesKeysKey              = @"_CPCibObjectDataClassesKeysKey",
+    _CPCibObjectDataClassesValuesKey            = @"_CPCibObjectDataClassesValuesKey",
+    
+    _CPCibObjectDataConnectionsKey              = @"_CPCibObjectDataConnectionsKey",
+    
+    _CPCibObjectDataFontManagerKey              = @"_CPCibObjectDataFontManagerKey",
+    
+    _CPCibObjectDataFrameworkKey                = @"_CPCibObjectDataFrameworkKey",
+
+    _CPCibObjectDataNextOidKey                  = @"_CPCibObjectDataNextOidKey",
+    
+    _CPCibObjectDataObjectsKeysKey              = @"_CPCibObjectDataObjectsKeysKey",
+    _CPCibObjectDataObjectsValuesKey            = @"_CPCibObjectDataObjectsValuesKey",
+    
+    _CPCibObjectDataOidKeysKey                  = @"_CPCibObjectDataOidKeysKey",
+    _CPCibObjectDataOidValuesKey                = @"_CPCibObjectDataOidValuesKey",
+    
+    _CPCibObjectDataFileOwnerKey                = @"_CPCibObjectDataFileOwnerKey",
+    _CPCibObjectDataVisibleWindowsKey           = @"_CPCibObjectDataVisibleWindowsKey";
+
+@implementation _CPCibObjectData (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super init];
+
+    if (self)
+    {
+        _replacementObjects = {};
+
+        _namesKeys = [aCoder decodeObjectForKey:_CPCibObjectDataNamesKeysKey];
+        _namesValues = [aCoder decodeObjectForKey:_CPCibObjectDataNamesValuesKey];
+
+        //CPArray         _accessibilityConnectors;
+        //CPArray         _accessibilityOidsKeys;
+        //CPArray         _accessibilityOidsValues;
+
+        _classesKeys = [aCoder decodeObjectForKey:_CPCibObjectDataClassesKeysKey];
+        _classesValues = [aCoder decodeObjectForKey:_CPCibObjectDataClassesValuesKey];
+
+        _connections = [aCoder decodeObjectForKey:_CPCibObjectDataConnectionsKey];
+        //id              _fontManager;
+
+        _framework = [aCoder decodeObjectForKey:_CPCibObjectDataFrameworkKey];
+
+        _nextOid = [aCoder decodeIntForKey:_CPCibObjectDataNextOidKey];
+
+        _objectsKeys = [aCoder decodeObjectForKey:_CPCibObjectDataObjectsKeysKey];
+        _objectsValues = [aCoder decodeObjectForKey:_CPCibObjectDataObjectsValuesKey];
+
+        _oidKeys = [aCoder decodeObjectForKey:_CPCibObjectDataOidKeysKey];
+        _oidValues = [aCoder decodeObjectForKey:_CPCibObjectDataOidValuesKey];
+
+        _fileOwner = [aCoder decodeObjectForKey:_CPCibObjectDataFileOwnerKey];
+
+        _visibleWindows = [aCoder decodeObjectForKey:_CPCibObjectDataVisibleWindowsKey];
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [aCoder encodeObject:_namesKeys forKey:_CPCibObjectDataNamesKeysKey];
+    [aCoder encodeObject:_namesValues forKey:_CPCibObjectDataNamesValuesKey];
+
+    //CPArray         _accessibilityConnectors;
+    //CPArray         _accessibilityOidsKeys;
+    //CPArray         _accessibilityOidsValues;
+
+    [aCoder encodeObject:_classesKeys forKey:_CPCibObjectDataClassesKeysKey];
+    [aCoder encodeObject:_classesValues forKey:_CPCibObjectDataClassesValuesKey];
+
+    [aCoder encodeObject:_connections forKey:_CPCibObjectDataConnectionsKey];
+
+    //id              _fontManager;
+    
+    [aCoder encodeObject:_framework forKey:_CPCibObjectDataFrameworkKey];
+
+    [aCoder encodeInt:_nextOid forKey:_CPCibObjectDataNextOidKey];
+    
+    [aCoder encodeObject:_objectsKeys forKey:_CPCibObjectDataObjectsKeysKey];
+    [aCoder encodeObject:_objectsValues forKey:_CPCibObjectDataObjectsValuesKey];
+    
+    [aCoder encodeObject:_oidKeys forKey:_CPCibObjectDataOidKeysKey];
+    [aCoder encodeObject:_oidValues forKey:_CPCibObjectDataOidValuesKey];
+    
+    [aCoder encodeObject:_fileOwner forKey:_CPCibObjectDataFileOwnerKey];
+//    CPCustomObject  _fileOwner;
+
+    [aCoder encodeObject:_visibleWindows forKey:_CPCibObjectDataVisibleWindowsKey];
+}
+
+- (void)instantiateWithOwner:(id)anOwner topLevelObjects:(CPMutableArray)topLevelObjects
+{
+    // _objectsValues -> parent
+    // _objectsKeys -> child
+    var count = [_objectsKeys count];
+
+    while (count--)
+    {
+        var object = _objectsKeys[count],
+            parent = _objectsValues[count],
+            instantiatedObject = object;
+
+        if ([object respondsToSelector:@selector(_cibInstantiate)])
+        {
+            var instantiatedObject = [object _cibInstantiate];
+
+            if (instantiatedObject !== object)
+            {
+                _replacementObjects[[object UID]] = instantiatedObject;
+
+                if ([instantiatedObject isKindOfClass:[CPView class]])
+                {
+                    var clipView = [instantiatedObject superview];
+
+                    if ([clipView isKindOfClass:[CPClipView class]])
+                    {
+                        var scrollView = [clipView superview];
+
+                        if ([scrollView isKindOfClass:[CPScrollView class]])
+                            [scrollView setDocumentView:instantiatedObject];
+                    }
+                }
+            }
+        }
+
+        if (topLevelObjects && parent === _fileOwner && object !== _fileOwner)
+            topLevelObjects.push(instantiatedObject);
+    }
+}
+
+- (void)establishConnectionsWithOwner:(id)anOwner topLevelObjects:(CPMutableArray)topLevelObjects
+{
+    _replacementObjects[[_fileOwner UID]] = anOwner;
+
+    var index = 0,
+        count = _connections.length;
+
+    for (; index < count; ++index)
+    {
+        var connection = _connections[index];
+
+        [connection replaceObjects:_replacementObjects];
+        [connection establishConnection];
+    }
+}
+
+- (void)awakeWithOwner:(id)anOwner topLevelObjects:(CPMutableArray)topLevelObjects
+{
+    var count = [_objectsKeys count];
+
+    while (count--)
+    {
+        var object = _objectsKeys[count],
+            instantiatedObject = _replacementObjects[[object UID]];
+
+        if (instantiatedObject)
+            object = instantiatedObject;
+
+        // Don't use _fileOwner, by this point its been replaced with anOwner.
+        if (object !== anOwner && [object respondsToSelector:@selector(awakeFromCib)])
+            [object awakeFromCib];
+    }
+
+    if ([anOwner respondsToSelector:@selector(awakeFromCib)])
+        [anOwner awakeFromCib];
+}
+
+@end

AppKit/Cib/_CPCibProxyObject.j

@@ -0,0 +1,33 @@
+
+@import <Foundation/CPObject.j>
+
+
+@implementation _CPCibProxyObject : CPObject
+{
+    CPString _identifier;
+}
+@end
+
+var _CPCibProxyObjectIdentifierKey  = @"CPIdentifier";
+
+@implementation _CPCibProxyObject (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super init];
+
+    if (self)
+        _identifier = [aCoder decodeObjectForKey:_CPCibProxyObjectIdentifierKey];
+
+    if ([aCoder respondsToSelector:@selector(externalObjectForProxyIdentifier:)])
+        return [aCoder externalObjectForProxyIdentifier:_identifier];
+
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [aCoder encodeObject:_identifier forKey:_CPCibProxyObjectIdentifierKey];
+}
+
+@end

AppKit/Cib/_CPCibWindowTemplate.j

@@ -0,0 +1,159 @@
+
+@import <Foundation/CPObject.j>
+
+
+var _CPCibWindowTemplateMinSizeKey                  = @"_CPCibWindowTemplateMinSizeKey",
+    _CPCibWindowTemplateMaxSizeKey                  = @"_CPCibWindowTemplateMaxSizeKey",
+    
+    _CPCibWindowTemplateViewClassKey                = @"_CPCibWindowTemplateViewClassKey",
+    _CPCibWindowTemplateWindowClassKey              = @"_CPCibWindowTemplateWindowClassKey",
+    
+    _CPCibWindowTemplateWindowRectKey               = @"_CPCibWindowTemplateWindowRectKey",
+    _CPCibWindowTemplateWindowStyleMaskKey          = @"_CPCibWindowTempatStyleMaskKey",
+    _CPCibWindowTemplateWindowTitleKey              = @"_CPCibWindowTemplateWindowTitleKey",
+    _CPCibWindowTemplateWindowViewKey               = @"_CPCibWindowTemplateWindowViewKey",
+
+    _CPCibWindowTemplateWindowAutorecalculatesKeyViewLoop = @"_CPCibWindowTemplateWindowAutorecalculatesKeyViewLoop";
+    _CPCibWindowTemplateWindowIsFullPlatformWindowKey     = @"_CPCibWindowTemplateWindowIsFullPlatformWindowKey";
+
+@implementation _CPCibWindowTemplate : CPObject
+{
+    CGSize      _minSize;
+    CGSize      _maxSize;
+    //CGSize      _screenRect;
+
+    id          _viewClass;
+    //unsigned  _wtFlags;
+    CPString    _windowClass;
+    CGRect      _windowRect;
+    unsigned    _windowStyleMask;
+
+    CPString    _windowTitle;
+    CPView      _windowView;
+
+    BOOL        _windowAutorecalculatesKeyViewLoop;
+    BOOL        _windowIsFullPlatformWindow;
+}
+
+- (id)init
+{
+    self = [super init];
+
+    if (self)
+    {
+        _windowClass = @"CPWindow";
+        _windowRect = CGRectMake(0.0, 0.0, 400.0, 200.0);
+        _windowStyleMask = CPTitledWindowMask | CPClosableWindowMask | CPMiniaturizableWindowMask | CPResizableWindowMask;
+
+        _windowTitle = @"Window";
+        _windowView = [[CPView alloc] initWithFrame:CGRectMake(0.0, 0.0, 400.0, 200.0)];
+
+        _windowIsFullPlatformWindow = NO;
+    }
+
+    return self;
+}
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super init];
+    
+    if (self)
+    {
+        if ([aCoder containsValueForKey:_CPCibWindowTemplateMinSizeKey])
+            _minSize = [aCoder decodeSizeForKey:_CPCibWindowTemplateMinSizeKey];
+        if ([aCoder containsValueForKey:_CPCibWindowTemplateMaxSizeKey])
+            _maxSize = [aCoder decodeSizeForKey:_CPCibWindowTemplateMaxSizeKey];
+    
+        _viewClass = [aCoder decodeObjectForKey:_CPCibWindowTemplateViewClassKey];
+        
+        _windowClass = [aCoder decodeObjectForKey:_CPCibWindowTemplateWindowClassKey];
+        _windowRect = [aCoder decodeRectForKey:_CPCibWindowTemplateWindowRectKey];
+        _windowStyleMask = [aCoder decodeIntForKey:_CPCibWindowTemplateWindowStyleMaskKey];
+        
+        _windowTitle = [aCoder decodeObjectForKey:_CPCibWindowTemplateWindowTitleKey];
+        _windowView = [aCoder decodeObjectForKey:_CPCibWindowTemplateWindowViewKey];
+
+        _windowAutorecalculatesKeyViewLoop = !![aCoder decodeObjectForKey:_CPCibWindowTemplateWindowAutorecalculatesKeyViewLoop];
+        _windowIsFullPlatformWindow = !![aCoder decodeObjectForKey:_CPCibWindowTemplateWindowIsFullPlatformWindowKey];
+    }
+    
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    if (_minSize)
+        [aCoder encodeSize:_minSize forKey:_CPCibWindowTemplateMinSizeKey];
+    if (_maxSize)
+        [aCoder encodeSize:_maxSize forKey:_CPCibWindowTemplateMaxSizeKey];
+    
+    [aCoder encodeObject:_viewClass forKey:_CPCibWindowTemplateViewClassKey];
+    
+    [aCoder encodeObject:_windowClass forKey:_CPCibWindowTemplateWindowClassKey];
+    [aCoder encodeRect:_windowRect forKey:_CPCibWindowTemplateWindowRectKey];
+    [aCoder encodeInt:_windowStyleMask forKey:_CPCibWindowTemplateWindowStyleMaskKey];
+    
+    [aCoder encodeObject:_windowTitle forKey:_CPCibWindowTemplateWindowTitleKey];
+    [aCoder encodeObject:_windowView forKey:_CPCibWindowTemplateWindowViewKey];
+
+    if (_windowAutorecalculatesKeyViewLoop)
+        [aCoder encodeObject:_windowAutorecalculatesKeyViewLoop forKey:_CPCibWindowTemplateWindowAutorecalculatesKeyViewLoop];
+
+    if (_windowIsFullPlatformWindow)
+        [aCoder encodeObject:_windowIsFullPlatformWindow forKey:_CPCibWindowTemplateWindowIsFullPlatformWindowKey];
+}
+
+- (CPString)customClassName
+{
+    return _windowClass;
+}
+
+
+- (void)setCustomClassName:(CPString)aClassName
+{
+    _windowClass = aClassName;
+}
+
+- (CPString)windowClass
+{
+    return _windowClass;
+}
+
+- (id)_cibInstantiate
+{
+    var windowClass = CPClassFromString([self windowClass]);
+    
+/*    if (!windowClass)
+        [NSException raise:NSInvalidArgumentException format:@"Unable to locate NSWindow class %@, using NSWindow",_windowClass];
+        class=[NSWindow class];*/
+        
+    var theWindow = [[windowClass alloc] initWithContentRect:_windowRect styleMask:_windowStyleMask];
+    
+    if (_minSize)
+        [theWindow setMinSize:_minSize];
+    if (_maxSize)
+        [theWindow setMaxSize:_maxSize];
+
+    //[result setHidesOnDeactivate:(_wtFlags&0x80000000)?YES:NO];
+    [theWindow setTitle:_windowTitle];
+
+    // FIXME: we can't autoresize yet...
+    [_windowView setAutoresizesSubviews:NO];
+
+    [theWindow setContentView:_windowView];
+
+    [_windowView setAutoresizesSubviews:YES];
+    
+    if ([_viewClass isKindOfClass:[CPToolbar class]])
+    {
+       [theWindow setToolbar:_viewClass];
+    }
+
+    [theWindow setAutorecalculatesKeyViewLoop:_windowAutorecalculatesKeyViewLoop];
+    [theWindow setFullBridge:_windowIsFullPlatformWindow];
+
+    return theWindow;
+}
+
+@end

AppKit/CoreAnimation/CAAnimation.j

@@ -0,0 +1,257 @@
+/*
+ * CAAnimation.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPObject.j>
+@import <Foundation/CPString.j>
+
+@import "CAMediaTimingFunction.j"
+
+/*
+    This is an animation class.
+*/
+@implementation CAAnimation : CPObject
+{
+    BOOL    _isRemovedOnCompletion;
+    id      _delegate;
+}
+
+/*!
+    Creates a new CAAnimation instance
+    @return a new CAAnimation instance
+*/
++ (id)animation
+{
+    return [[self alloc] init];
+}
+
+- (id)init
+{
+    self = [super init];
+    
+    if (self)
+        _isRemovedOnCompletion = YES;
+        
+    return self;
+}
+
+/*!
+    Returns \c YES
+    @return \c YES
+*/
+- (void)shouldArchiveValueForKey:(CPString)aKey
+{
+    return YES;
+}
+
+/*!
+    Returns \c nil
+    @return \c nil
+*/
++ (id)defaultValueForKey:(CPString)aKey
+{
+    return nil;
+}
+
+/*!
+    Specifies whether this animation should be removed after it has completed.
+    @param \c YES means the animation should be removed
+*/
+- (void)setRemovedOnCompletion:(BOOL)isRemovedOnCompletion
+{
+    _isRemovedOnCompletion = isRemovedOnCompletion;
+}
+
+/*!
+    Returns \c YES if the animation is removed after completion
+*/
+- (BOOL)removedOnCompletion
+{
+    return _isRemovedOnCompletion;
+}
+
+/*!
+    Returns \c YES if the animation is removed after completion
+*/
+- (BOOL)isRemovedOnCompletion
+{
+    return _isRemovedOnCompletion;
+}
+
+/*!
+    Returns the animation's timing function. If \c nil, then it has a linear pacing.
+*/
+- (CAMediaTimingFunction)timingFunction
+{
+    // Linear Pacing
+    return nil;
+}
+
+/*!
+    Sets the animation delegate
+    @param aDelegate the new delegate
+*/
+- (void)setDelegate:(id)aDelegate
+{
+    _delegate = aDelegate;
+}
+
+/*!
+    Returns the animation's delegate
+*/
+- (id)delegate
+{
+    return _delegate;
+}
+
+- (void)runActionForKey:(CPString)aKey object:(id)anObject arguments:(CPDictionary)arguments
+{
+    [anObject addAnimation:self forKey:aKey];
+}
+
+@end
+
+/*
+    
+*/
+@implementation CAPropertyAnimation : CAAnimation
+{
+    CPString    _keyPath;
+    
+    BOOL        _isCumulative;
+    BOOL        _isAdditive;
+}
+
++ (id)animationWithKeyPath:(CPString)aKeyPath
+{
+    var animation = [self animation];
+    
+    [animation setKeyPath:aKeyPath];
+    
+    return animation;
+}
+
+- (void)setKeyPath:(CPString)aKeyPath
+{
+    _keyPath = aKeyPath;
+}
+
+- (CPString)keyPath
+{
+    return _keyPath;
+}
+
+- (void)setCumulative:(BOOL)isCumulative
+{
+    _isCumulative = isCumulative;
+}
+
+- (BOOL)cumulative
+{
+    return _isCumulative;
+}
+
+- (BOOL)isCumulative
+{
+    return _isCumulative;
+}
+
+- (void)setAdditive:(BOOL)isAdditive
+{
+    _isAdditive = isAdditive;
+}
+
+- (BOOL)additive
+{
+    return _isAdditive;
+}
+
+- (BOOL)isAdditive
+{
+    return _isAdditive;
+}
+
+@end
+
+/*!
+    A CABasicAnimation is a simple animation that moves a
+    CALayer from one point to another over a specified
+    period of time.
+*/
+@implementation CABasicAnimation : CAPropertyAnimation
+{
+    id  _fromValue;
+    id  _toValue;
+    id  _byValue;
+}
+
+/*!
+    Sets the starting position for the animation.
+    @param aValue the animation starting position
+*/
+- (void)setFromValue:(id)aValue
+{
+    _fromValue = aValue;
+}
+
+/*!
+    Returns the animation's starting position.
+*/
+- (id)fromValue
+{
+    return _fromValue;
+}
+
+/*!
+    Sets the ending position for the animation.
+    @param aValue the animation ending position
+*/
+- (void)setToValue:(id)aValue
+{
+    _toValue = aValue;
+}
+
+/*!
+    Returns the animation's ending position.
+*/
+- (id)toValue
+{
+    return _toValue;
+}
+
+/*!
+    Sets the optional byValue for animation interpolation.
+    @param aValue the byValue
+*/
+- (void)setByValue:(id)aValue
+{
+    _byValue = aValue;
+}
+
+/*!
+    Returns the animation's byValue.
+*/
+- (id)byValue
+{
+    return _byValue;
+}
+
+@end