From b01e6947c83f6c2b5739b765819a610efdfcf9c2 Mon Sep 17 00:00:00 2001
From: Thomas Goddard <ohmygoddard@gmail.com>
Date: Thu, 10 May 2012 13:18:29 -0700
Subject: [PATCH] Adding cmake Xcode project generation.

This will work for generating an Xcode project from cmake.  Still in
progress, but initial working version.
---
 client/Mac/AppDelegate.h  |  19 +
 client/Mac/AppDelegate.m  |  26 ++
 client/Mac/CMakeLists.txt | 137 +++++++
 client/Mac/Credits.rtf    |  21 +
 client/Mac/Info.plist     |  34 ++
 client/Mac/MRDPCursor.h   |   2 +-
 client/Mac/MRDPView.m     | 324 ++++++++--------
 client/Mac/MainMenu.xib   | 796 ++++++++++++++++++++++++++++++++++++++
 client/Mac/main.m         |  14 +
 9 files changed, 1211 insertions(+), 162 deletions(-)
 create mode 100644 client/Mac/AppDelegate.h
 create mode 100644 client/Mac/AppDelegate.m
 create mode 100644 client/Mac/CMakeLists.txt
 create mode 100755 client/Mac/Credits.rtf
 create mode 100644 client/Mac/Info.plist
 create mode 100755 client/Mac/MainMenu.xib
 create mode 100644 client/Mac/main.m

diff --git a/client/Mac/AppDelegate.h b/client/Mac/AppDelegate.h
new file mode 100644
index 000000000..5af060d1c
--- /dev/null
+++ b/client/Mac/AppDelegate.h
@@ -0,0 +1,19 @@
+//
+//  AppDelegate.h
+//  MacFreeRDP
+//
+//  Created by Thomas Goddard on 5/8/12.
+//  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+#import "MRDPView.h"
+
+@interface AppDelegate : NSObject <NSApplicationDelegate>
+
+@property (assign) IBOutlet MRDPView *mrdpView;
+@property (assign) IBOutlet NSWindow *window;
+
+
+int rdp_connect();
+@end
diff --git a/client/Mac/AppDelegate.m b/client/Mac/AppDelegate.m
new file mode 100644
index 000000000..3b7658d80
--- /dev/null
+++ b/client/Mac/AppDelegate.m
@@ -0,0 +1,26 @@
+//
+//  AppDelegate.m
+//  MacFreeRDP
+//
+//  Created by Thomas Goddard on 5/8/12.
+//  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
+//
+
+#import "AppDelegate.h"
+
+@implementation AppDelegate
+
+//@synthesize window = _window;
+//@synthesize mrdpView;
+
+- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
+{
+	rdp_connect();
+}
+
+- (void) applicationWillTerminate:(NSNotification *)notification
+{
+    //[mrdpView releaseResources];
+}
+
+@end
diff --git a/client/Mac/CMakeLists.txt b/client/Mac/CMakeLists.txt
new file mode 100644
index 000000000..3a6f477d3
--- /dev/null
+++ b/client/Mac/CMakeLists.txt
@@ -0,0 +1,137 @@
+
+cmake_minimum_required (VERSION 2.8) 
+project (MacFreeRDP) 
+set(CMAKE_COLOR_MAKEFILE ON)
+
+include(CheckIncludeFiles)
+include(CheckLibraryExists)
+include(CheckStructHasMember)
+include(FindPkgConfig)
+include(TestBigEndian)
+
+# Include our extra modules
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/../../cmake/)
+
+include(AutoVersioning)
+include(ConfigOptions)
+include(FindOptionalPackage)
+include(CheckCCompilerFlag)
+include(GNUInstallDirsWrapper)
+
+# Default to release build type
+if(NOT CMAKE_BUILD_TYPE)
+   set(CMAKE_BUILD_TYPE "Debug")
+endif()
+
+# Default to build shared libs
+if(NOT DEFINED BUILD_SHARED_LIBS)
+    set(BUILD_SHARED_LIBS ON)
+endif()
+
+# Compiler-specific flags
+if(CMAKE_COMPILER_IS_GNUCC)
+	if(CMAKE_BUILD_TYPE STREQUAL "Release")
+		set(CMAKE_C_FLAGS_RELEASE "-DNDEBUG")
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2")
+	endif()
+	if(WITH_SSE2_TARGET)
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2")
+	endif()
+endif()
+
+# Libraries that we have a hard dependency on
+if(NOT DEFINED OPENSSL_INCLUDE_DIR OR NOT DEFINED OPENSSL_LIBRARIES)
+find_required_package(OpenSSL)
+endif()
+
+# Mac OS X
+if(APPLE)
+	# Set the include files for FreeRDP to the relative path
+	set(FREERDP_INCLUDE_PATH ${CMAKE_SOURCE_DIR}/../../include/)
+	set(FRAMEWORK_HEADERS_PATH /System/Library/Frameworks/Cocoa.framework/Versions/A/Headers/)
+	include_directories (${FREERDP_INCLUDE_PATH} ${FRAMEWORK_HEADERS_PATH} /System/Library/Frameworks) 
+	
+	# set(CMAKE_OSX_SYSROOT MacOSX10.7.sdk) uncomment to specify SDK version
+	set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -mmacosx-version-min=10.4")
+	set(GUI_TYPE MACOSX_BUNDLE)
+	
+	find_library(FOUNDATION_LIBRARY Foundation)
+	message("+ Using foundation library ${FOUNDATION_LIBRARY}")
+	find_library(COCOA_LIBRARY Cocoa)
+	message("+ Using cocoa library ${COCOA_LIBRARY}")
+	find_library(APPKIT_LIBRARY AppKit)
+	message("+ Using appkit library ${APPKIT_LIBRARY}")
+	
+	message(" Current source dir: ${CMAKE_CURRENT_SOURCE_DIR}")
+	# Set the OS X Bundle specific CMake variables which will be used to populate the plist for
+	# the application bundle
+	set(MACOSX_BUNDLE_INFO_STRING "${PROJECT_NAME}")
+	set(MACOSX_BUNDLE_GUI_IDENTIFIER "com.freerdp.mac")
+	set(MACOSX_BUNDLE_BUNDLE_IDENTIFIER "FreeRDP.Mac")
+	set(MACOSX_BUNDLE_LONG_VERSION_STRING "${PROJECT_NAME} Version 1.0.1")
+	set(MACOSX_BUNDLE_BUNDLE_NAME ${PROJECT_NAME})
+	set(MACOSX_BUNDLE_SHORT_VERSION_STRING 1.0.1)
+	set(MACOSX_BUNDLE_BUNDLE_VERSION 1.0.1)
+	set(MACOSX_BUNDLE_COPYRIGHT "Copyright 2012. All Rights Reserved.")
+
+	# These variables are specific to our plist and are NOT standard CMake variables
+	set(MACOSX_BUNDLE_NSMAIN_NIB_FILE "MainMenu")
+	set(MACOSX_BUNDLE_NSPRINCIPAL_CLASS "NSApplication")
+
+	
+	mark_as_advanced(COCOA_LIBRARY
+						FOUNDATION_LIBRARY
+						APPKIT_LIBRARY)
+	set(EXTRA_LIBS ${COCOA_LIBRARY} ${FOUNDATION_LIBRARY} ${APPKIT_LIBRARY})
+	set(APP_TYPE MACOSX_BUNDLE)
+endif()
+
+# Configure files
+# set(XCODE_ATTRIBUTE_REFCOUNT "Object-C Automatic Reference Counting")
+
+# these are the OS X Interface Builder Files
+set (MacFreeRDP_XIBS
+  	MainMenu.xib
+	Credits.rtf
+)
+
+# the headers
+set (MacFreeRDP_Headers
+	MRDPCursor.h
+	MRDPView.h 
+	AppDelegate.h)
+
+set (MacFreeRDP_Source
+	MRDPCursor.m 
+	MRDPView.m
+	AppDelegate.m
+	main.m)
+
+add_executable(MacFreeRDP 
+	${APP_TYPE} 
+	${MacFreeRDP_Headers}
+	${MacFreeRDP_Source}
+	${MacFreeRDP_XIBS})
+
+# This is necessary for the xib file part below
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Info.plist ${CMAKE_CURRENT_BINARY_DIR}/Info.plist)
+# This allows for automatic xib to nib ibitool
+set_target_properties(MacFreeRDP PROPERTIES RESOURCE "${MacFreeRDP_XIBS}")
+set_target_properties(MacFreeRDP PROPERTIES XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES)
+set_target_properties(MacFreeRDP PROPERTIES XCODE_ATTRIBUTE_GCC_VERSION com.apple.compilers.llvmgcc42)
+
+
+set_target_properties(MacFreeRDP PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_BINARY_DIR}/Info.plist)
+
+if(NOT WIN32)
+	find_optional_package(MacAudio)
+endif()
+
+
+target_link_libraries(MacFreeRDP ${EXTRA_LIBS})
+target_link_libraries(MacFreeRDP ${CMAKE_SOURCE_DIR}/../../xcode/libfreerdp-core/Debug/libfreerdp-core.dylib)
+target_link_libraries(MacFreeRDP ${CMAKE_SOURCE_DIR}/../../xcode/libfreerdp-channels/Debug/libfreerdp-channels.dylib)
+target_link_libraries(MacFreeRDP ${CMAKE_SOURCE_DIR}/../../xcode/libfreerdp-cache/Debug/libfreerdp-cache.dylib)
+target_link_libraries(MacFreeRDP ${CMAKE_SOURCE_DIR}/../../xcode/libfreerdp-gdi/Debug/libfreerdp-gdi.dylib)
+target_link_libraries(MacFreeRDP ${CMAKE_SOURCE_DIR}/../../xcode/libfreerdp-utils/Debug/libfreerdp-utils.dylib)
+target_link_libraries(MacFreeRDP ${CMAKE_SOURCE_DIR}/../../xcode/libfreerdp-codec/Debug/libfreerdp-codec.dylib)
diff --git a/client/Mac/Credits.rtf b/client/Mac/Credits.rtf
new file mode 100755
index 000000000..41b9f4014
--- /dev/null
+++ b/client/Mac/Credits.rtf
@@ -0,0 +1,21 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf320
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\vieww9600\viewh8400\viewkind0
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
+
+\f0\b\fs24 \cf0 Engineering:
+\b0 \
+	Jay sorg\
+         Marc-Andre Moreau\
+         Vic Lee\
+         Otvaio Salvador \
+         Laxmikant Rashinkar\
+         and others\
+\
+
+\b Human Interface Design:
+\b0 \
+	Laxmikant Rashinkar\
+         Jay Sorg\
+}
\ No newline at end of file
diff --git a/client/Mac/Info.plist b/client/Mac/Info.plist
new file mode 100644
index 000000000..530ecb9a7
--- /dev/null
+++ b/client/Mac/Info.plist
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>FreeRDP.Mac</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2012 __MyCompanyName__. All rights reserved.</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>
diff --git a/client/Mac/MRDPCursor.h b/client/Mac/MRDPCursor.h
index 844769ef8..56ebe0ce9 100644
--- a/client/Mac/MRDPCursor.h
+++ b/client/Mac/MRDPCursor.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2012 FreeRDP.org All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
+#import <Cocoa/Cocoa.h>
 
 #define boolean int
 
diff --git a/client/Mac/MRDPView.m b/client/Mac/MRDPView.m
index df2a9754f..c1b0f0ced 100644
--- a/client/Mac/MRDPView.m
+++ b/client/Mac/MRDPView.m
@@ -25,6 +25,166 @@ MRDPView *g_mrdpview;
 
 @synthesize is_connected;
 
+struct kkey g_keys[256] =
+{
+    { 0x1e, 0 }, // a           0
+    { 0x1f, 0 }, // s
+    { 0x20, 0 }, // d
+    { 0x21, 0 }, // f
+    { 0x23, 0 }, // h
+    { 0x22, 0 }, // g
+    { 0x2c, 0 }, // z
+    { 0x2d, 0 }, // x
+    { 0x2e, 0 }, // c
+    { 0x2f, 0 }, // v
+    { 0x00, 0 }, //             10
+    { 0x30, 0 }, // b
+    { 0x10, 0 }, // q
+    { 0x11, 0 }, // w
+    { 0x12, 0 }, // e
+    { 0x13, 0 }, // r
+    { 0x15, 0 }, // y
+    { 0x14, 0 }, // t
+    { 0x02, 0 }, // 1
+    { 0x03, 0 }, // 2
+    { 0x04, 0 }, // 3           20
+    { 0x05, 0 }, // 4
+    { 0x07, 0 }, // 6
+    { 0x06, 0 }, // 5
+    { 0x0d, 0 }, // = or +
+    { 0x0a, 0 }, // 9
+    { 0x08, 0 }, // 7
+    { 0x0c, 0 }, // - or _
+    { 0x09, 0 }, // 8
+    { 0x0b, 0 }, // 0
+    { 0x1b, 0 }, // ] or }      30
+    { 0x18, 0 }, // o
+    { 0x16, 0 }, // u
+    { 0x1a, 0 }, // [ or {
+    { 0x17, 0 }, // i
+    { 0x19, 0 }, // p
+    { 0x1c, 0 }, // enter
+    { 0x26, 0 }, // l
+    { 0x24, 0 }, // j
+    { 0x28, 0 }, // ' or "
+    { 0x25, 0 }, // k           40
+    { 0x27, 0 }, // ; or :
+    { 0x2b, 0 }, // \ or |
+    { 0x33, 0 }, // , or <
+    { 0x35, 0 }, // / or ?
+    { 0x31, 0 }, // n
+    { 0x32, 0 }, // m
+    { 0x34, 0 }, // . or >
+    { 0x0f, 0 }, // tab
+    { 0x39, 0 }, // space
+    { 0x29, 0 }, // ` or ~      50
+    { 0x0e, 0 }, // backspace
+    { 0x00, 0 }, //
+    { 0x01, 0 }, // esc
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 }, //             60
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x53, 0 }, // KP.
+    { 0x00, 0 },
+    { 0x37, 0 }, // KP*
+    { 0x00, 0 },
+    { 0x4e, 0 }, // KP+
+    { 0x00, 0 }, //             70
+    { 0x45, 0 }, // num lock
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x35, 1 }, // KP/
+    { 0x1c, 1 }, // KPEnter
+    { 0x00, 0 },
+    { 0x4a, 0 }, // KP-
+    { 0x00, 0 },
+    { 0x00, 0 }, //             80
+    { 0x00, 0 },
+    { 0x52, 0 }, // KP0
+    { 0x4f, 0 }, // KP1
+    { 0x50, 0 }, // KP2
+    { 0x51, 0 }, // KP3
+    { 0x4b, 0 }, // KP4
+    { 0x4c, 0 }, // KP5
+    { 0x4d, 0 }, // KP6
+    { 0x47, 0 }, // KP7
+    { 0x00, 0 }, //             90
+    { 0x48, 0 }, // KP8
+    { 0x49, 0 }, // KP9
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 }, //             100
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x5d, 1 }, // menu        110
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x52, 1 }, // Insert
+    { 0x47, 1 }, // Home
+    { 0x49, 1 }, // PgUp
+    { 0x53, 1 }, // Delete
+    { 0x00, 0 },
+    { 0x4f, 1 }, // End
+    { 0x00, 0 }, //             120
+    { 0x51, 1 }, // PgDown
+    { 0x3b, 0 }, // f1
+    { 0x4b, 1 }, // left
+    { 0x4d, 1 }, // right
+    { 0x50, 1 }, // down
+    { 0x48, 1 }, // up
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+    { 0x00, 0 },
+};
+
 /************************************************************************
                          methods we override
 ************************************************************************/
@@ -292,7 +452,7 @@ MRDPView *g_mrdpview;
 - (void) keyUp:(NSEvent *) event
 {
     int key;
-    
+ 
     if (!is_connected) {
         return;
     }
@@ -421,7 +581,8 @@ MRDPView *g_mrdpview;
 
 - (void) releaseResources
 {
-    for (int i = 0; i < argc; i++)
+	int i;
+    for (i = 0; i < argc; i++)
     {
         if (argv[i])
             free(argv[i]);
@@ -1356,164 +1517,5 @@ void cliprdr_send_supported_format_list(freerdp *inst)
     freerdp_channels_send_event(inst->context->channels, (RDP_EVENT*) event);
 }
 
-struct kkey g_keys[256] =
-{
-    { 0x1e, 0 }, // a           0
-    { 0x1f, 0 }, // s
-    { 0x20, 0 }, // d
-    { 0x21, 0 }, // f
-    { 0x23, 0 }, // h
-    { 0x22, 0 }, // g
-    { 0x2c, 0 }, // z
-    { 0x2d, 0 }, // x
-    { 0x2e, 0 }, // c
-    { 0x2f, 0 }, // v
-    { 0x00, 0 }, //             10
-    { 0x30, 0 }, // b
-    { 0x10, 0 }, // q
-    { 0x11, 0 }, // w
-    { 0x12, 0 }, // e
-    { 0x13, 0 }, // r
-    { 0x15, 0 }, // y
-    { 0x14, 0 }, // t
-    { 0x02, 0 }, // 1
-    { 0x03, 0 }, // 2
-    { 0x04, 0 }, // 3           20
-    { 0x05, 0 }, // 4
-    { 0x07, 0 }, // 6
-    { 0x06, 0 }, // 5
-    { 0x0d, 0 }, // = or +
-    { 0x0a, 0 }, // 9
-    { 0x08, 0 }, // 7
-    { 0x0c, 0 }, // - or _
-    { 0x09, 0 }, // 8
-    { 0x0b, 0 }, // 0
-    { 0x1b, 0 }, // ] or }      30
-    { 0x18, 0 }, // o
-    { 0x16, 0 }, // u
-    { 0x1a, 0 }, // [ or {
-    { 0x17, 0 }, // i
-    { 0x19, 0 }, // p
-    { 0x1c, 0 }, // enter
-    { 0x26, 0 }, // l
-    { 0x24, 0 }, // j
-    { 0x28, 0 }, // ' or "
-    { 0x25, 0 }, // k           40
-    { 0x27, 0 }, // ; or :
-    { 0x2b, 0 }, // \ or |
-    { 0x33, 0 }, // , or <
-    { 0x35, 0 }, // / or ?
-    { 0x31, 0 }, // n
-    { 0x32, 0 }, // m
-    { 0x34, 0 }, // . or >
-    { 0x0f, 0 }, // tab
-    { 0x39, 0 }, // space
-    { 0x29, 0 }, // ` or ~      50
-    { 0x0e, 0 }, // backspace
-    { 0x00, 0 }, //
-    { 0x01, 0 }, // esc
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 }, //             60
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x53, 0 }, // KP.
-    { 0x00, 0 },
-    { 0x37, 0 }, // KP*
-    { 0x00, 0 },
-    { 0x4e, 0 }, // KP+
-    { 0x00, 0 }, //             70
-    { 0x45, 0 }, // num lock
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x35, 1 }, // KP/
-    { 0x1c, 1 }, // KPEnter
-    { 0x00, 0 },
-    { 0x4a, 0 }, // KP-
-    { 0x00, 0 },
-    { 0x00, 0 }, //             80
-    { 0x00, 0 },
-    { 0x52, 0 }, // KP0
-    { 0x4f, 0 }, // KP1
-    { 0x50, 0 }, // KP2
-    { 0x51, 0 }, // KP3
-    { 0x4b, 0 }, // KP4
-    { 0x4c, 0 }, // KP5
-    { 0x4d, 0 }, // KP6
-    { 0x47, 0 }, // KP7
-    { 0x00, 0 }, //             90
-    { 0x48, 0 }, // KP8
-    { 0x49, 0 }, // KP9
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 }, //             100
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x5d, 1 }, // menu        110
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x52, 1 }, // Insert
-    { 0x47, 1 }, // Home
-    { 0x49, 1 }, // PgUp
-    { 0x53, 1 }, // Delete
-    { 0x00, 0 },
-    { 0x4f, 1 }, // End
-    { 0x00, 0 }, //             120
-    { 0x51, 1 }, // PgDown
-    { 0x3b, 0 }, // f1
-    { 0x4b, 1 }, // left
-    { 0x4d, 1 }, // right
-    { 0x50, 1 }, // down
-    { 0x48, 1 }, // up
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-    { 0x00, 0 },
-};
 
 @end
diff --git a/client/Mac/MainMenu.xib b/client/Mac/MainMenu.xib
new file mode 100755
index 000000000..bff95a9d5
--- /dev/null
+++ b/client/Mac/MainMenu.xib
@@ -0,0 +1,796 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1070</int>
+		<string key="IBDocument.SystemVersion">11D50b</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2177</string>
+		<string key="IBDocument.AppKitVersion">1138.32</string>
+		<string key="IBDocument.HIToolboxVersion">568.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">2177</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>NSView</string>
+			<string>NSMenu</string>
+			<string>NSWindowTemplate</string>
+			<string>NSMenuItem</string>
+			<string>NSCustomView</string>
+			<string>IBNSLayoutConstraint</string>
+			<string>NSCustomObject</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1048">
+			<object class="NSCustomObject" id="1021">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSCustomObject" id="1014">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="1050">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSMenu" id="649796088">
+				<string key="NSTitle">AMainMenu</string>
+				<array class="NSMutableArray" key="NSMenuItems">
+					<object class="NSMenuItem" id="694149608">
+						<reference key="NSMenu" ref="649796088"/>
+						<string key="NSTitle">FreeRDP</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<object class="NSCustomResource" key="NSOnImage" id="35465992">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">NSMenuCheckmark</string>
+						</object>
+						<object class="NSCustomResource" key="NSMixedImage" id="502551668">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">NSMenuMixedState</string>
+						</object>
+						<string key="NSAction">submenuAction:</string>
+						<object class="NSMenu" key="NSSubmenu" id="110575045">
+							<string key="NSTitle">FreeRDP</string>
+							<array class="NSMutableArray" key="NSMenuItems">
+								<object class="NSMenuItem" id="238522557">
+									<reference key="NSMenu" ref="110575045"/>
+									<string key="NSTitle">About FreeRDP</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="304266470">
+									<reference key="NSMenu" ref="110575045"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="755159360">
+									<reference key="NSMenu" ref="110575045"/>
+									<string key="NSTitle">Hide FreeRDP</string>
+									<string key="NSKeyEquiv">h</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="342932134">
+									<reference key="NSMenu" ref="110575045"/>
+									<string key="NSTitle">Hide Others</string>
+									<string key="NSKeyEquiv">h</string>
+									<int key="NSKeyEquivModMask">1572864</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="908899353">
+									<reference key="NSMenu" ref="110575045"/>
+									<string key="NSTitle">Show All</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="1056857174">
+									<reference key="NSMenu" ref="110575045"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="632727374">
+									<reference key="NSMenu" ref="110575045"/>
+									<string key="NSTitle">Quit FreeRDP</string>
+									<string key="NSKeyEquiv">q</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+							</array>
+							<string key="NSName">_NSAppleMenu</string>
+						</object>
+					</object>
+					<object class="NSMenuItem" id="379814623">
+						<reference key="NSMenu" ref="649796088"/>
+						<string key="NSTitle">File</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="35465992"/>
+						<reference key="NSMixedImage" ref="502551668"/>
+					</object>
+					<object class="NSMenuItem" id="952259628">
+						<reference key="NSMenu" ref="649796088"/>
+						<string key="NSTitle">Edit</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="35465992"/>
+						<reference key="NSMixedImage" ref="502551668"/>
+					</object>
+					<object class="NSMenuItem" id="302598603">
+						<reference key="NSMenu" ref="649796088"/>
+						<string key="NSTitle">Format</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="35465992"/>
+						<reference key="NSMixedImage" ref="502551668"/>
+					</object>
+					<object class="NSMenuItem" id="586577488">
+						<reference key="NSMenu" ref="649796088"/>
+						<string key="NSTitle">View</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="35465992"/>
+						<reference key="NSMixedImage" ref="502551668"/>
+					</object>
+					<object class="NSMenuItem" id="713487014">
+						<reference key="NSMenu" ref="649796088"/>
+						<string key="NSTitle">Window</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="35465992"/>
+						<reference key="NSMixedImage" ref="502551668"/>
+						<string key="NSAction">submenuAction:</string>
+						<object class="NSMenu" key="NSSubmenu" id="835318025">
+							<string key="NSTitle">Window</string>
+							<array class="NSMutableArray" key="NSMenuItems">
+								<object class="NSMenuItem" id="1011231497">
+									<reference key="NSMenu" ref="835318025"/>
+									<string key="NSTitle">Minimize</string>
+									<string key="NSKeyEquiv">m</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="575023229">
+									<reference key="NSMenu" ref="835318025"/>
+									<string key="NSTitle">Zoom</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="299356726">
+									<reference key="NSMenu" ref="835318025"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="625202149">
+									<reference key="NSMenu" ref="835318025"/>
+									<string key="NSTitle">Bring All to Front</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+							</array>
+							<string key="NSName">_NSWindowsMenu</string>
+						</object>
+					</object>
+					<object class="NSMenuItem" id="448692316">
+						<reference key="NSMenu" ref="649796088"/>
+						<string key="NSTitle">Help</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="35465992"/>
+						<reference key="NSMixedImage" ref="502551668"/>
+						<string key="NSAction">submenuAction:</string>
+						<object class="NSMenu" key="NSSubmenu" id="992780483">
+							<string key="NSTitle">Help</string>
+							<array class="NSMutableArray" key="NSMenuItems">
+								<object class="NSMenuItem" id="105068016">
+									<reference key="NSMenu" ref="992780483"/>
+									<string key="NSTitle">Mac Help</string>
+									<string key="NSKeyEquiv">?</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+							</array>
+							<string key="NSName">_NSHelpMenu</string>
+						</object>
+					</object>
+				</array>
+				<string key="NSName">_NSMainMenu</string>
+			</object>
+			<object class="NSWindowTemplate" id="972006081">
+				<int key="NSWindowStyleMask">15</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{163, 10}, {1024, 768}}</string>
+				<int key="NSWTFlags">1954021376</int>
+				<string key="NSWindowTitle">FreeRDP</string>
+				<string key="NSWindowClass">NSWindow</string>
+				<nil key="NSViewClass"/>
+				<nil key="NSUserInterfaceItemIdentifier"/>
+				<string key="NSWindowContentMaxSize">{1024, 768}</string>
+				<string key="NSWindowContentMinSize">{1024, 768}</string>
+				<object class="NSView" key="NSWindowView" id="439893737">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<array class="NSMutableArray" key="NSSubviews">
+						<object class="NSCustomView" id="467991374">
+							<reference key="NSNextResponder" ref="439893737"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrameSize">{1024, 768}</string>
+							<reference key="NSSuperview" ref="439893737"/>
+							<reference key="NSWindow"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<string key="NSClassName">MRDPView</string>
+						</object>
+					</array>
+					<string key="NSFrameSize">{1024, 768}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
+					<reference key="NSNextKeyView" ref="467991374"/>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1366, 746}}</string>
+				<string key="NSMinSize">{1024, 790}</string>
+				<string key="NSMaxSize">{1024, 790}</string>
+				<int key="NSWindowCollectionBehavior">128</int>
+				<bool key="NSWindowIsRestorable">YES</bool>
+			</object>
+			<object class="NSCustomObject" id="976324537">
+				<string key="NSClassName">AppDelegate</string>
+			</object>
+			<object class="NSCustomObject" id="755631768">
+				<string key="NSClassName">NSFontManager</string>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">terminate:</string>
+						<reference key="source" ref="1050"/>
+						<reference key="destination" ref="632727374"/>
+					</object>
+					<int key="connectionID">449</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">orderFrontStandardAboutPanel:</string>
+						<reference key="source" ref="1021"/>
+						<reference key="destination" ref="238522557"/>
+					</object>
+					<int key="connectionID">142</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="1021"/>
+						<reference key="destination" ref="976324537"/>
+					</object>
+					<int key="connectionID">568</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">performMiniaturize:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="1011231497"/>
+					</object>
+					<int key="connectionID">37</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">arrangeInFront:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="625202149"/>
+					</object>
+					<int key="connectionID">39</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">performZoom:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="575023229"/>
+					</object>
+					<int key="connectionID">240</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">hide:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="755159360"/>
+					</object>
+					<int key="connectionID">367</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">hideOtherApplications:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="342932134"/>
+					</object>
+					<int key="connectionID">368</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">unhideAllApplications:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="908899353"/>
+					</object>
+					<int key="connectionID">370</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">showHelp:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="105068016"/>
+					</object>
+					<int key="connectionID">493</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">mrdpView</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="467991374"/>
+					</object>
+					<int key="connectionID">565</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">window</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="972006081"/>
+					</object>
+					<int key="connectionID">567</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="1048"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="1021"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="1014"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="1050"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Application</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">29</int>
+						<reference key="object" ref="649796088"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="713487014"/>
+							<reference ref="694149608"/>
+							<reference ref="952259628"/>
+							<reference ref="379814623"/>
+							<reference ref="586577488"/>
+							<reference ref="302598603"/>
+							<reference ref="448692316"/>
+						</array>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">19</int>
+						<reference key="object" ref="713487014"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="835318025"/>
+						</array>
+						<reference key="parent" ref="649796088"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">56</int>
+						<reference key="object" ref="694149608"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="110575045"/>
+						</array>
+						<reference key="parent" ref="649796088"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">217</int>
+						<reference key="object" ref="952259628"/>
+						<array class="NSMutableArray" key="children"/>
+						<reference key="parent" ref="649796088"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">83</int>
+						<reference key="object" ref="379814623"/>
+						<array class="NSMutableArray" key="children"/>
+						<reference key="parent" ref="649796088"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">57</int>
+						<reference key="object" ref="110575045"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="238522557"/>
+							<reference ref="755159360"/>
+							<reference ref="908899353"/>
+							<reference ref="632727374"/>
+							<reference ref="304266470"/>
+							<reference ref="1056857174"/>
+							<reference ref="342932134"/>
+						</array>
+						<reference key="parent" ref="694149608"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">58</int>
+						<reference key="object" ref="238522557"/>
+						<reference key="parent" ref="110575045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">134</int>
+						<reference key="object" ref="755159360"/>
+						<reference key="parent" ref="110575045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">150</int>
+						<reference key="object" ref="908899353"/>
+						<reference key="parent" ref="110575045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">136</int>
+						<reference key="object" ref="632727374"/>
+						<reference key="parent" ref="110575045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">236</int>
+						<reference key="object" ref="304266470"/>
+						<reference key="parent" ref="110575045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">149</int>
+						<reference key="object" ref="1056857174"/>
+						<reference key="parent" ref="110575045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">145</int>
+						<reference key="object" ref="342932134"/>
+						<reference key="parent" ref="110575045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">24</int>
+						<reference key="object" ref="835318025"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="299356726"/>
+							<reference ref="625202149"/>
+							<reference ref="575023229"/>
+							<reference ref="1011231497"/>
+						</array>
+						<reference key="parent" ref="713487014"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">92</int>
+						<reference key="object" ref="299356726"/>
+						<reference key="parent" ref="835318025"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5</int>
+						<reference key="object" ref="625202149"/>
+						<reference key="parent" ref="835318025"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">239</int>
+						<reference key="object" ref="575023229"/>
+						<reference key="parent" ref="835318025"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">23</int>
+						<reference key="object" ref="1011231497"/>
+						<reference key="parent" ref="835318025"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">295</int>
+						<reference key="object" ref="586577488"/>
+						<array class="NSMutableArray" key="children"/>
+						<reference key="parent" ref="649796088"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">371</int>
+						<reference key="object" ref="972006081"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="439893737"/>
+						</array>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">372</int>
+						<reference key="object" ref="439893737"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="467991374"/>
+							<object class="IBNSLayoutConstraint" id="334327932">
+								<reference key="firstItem" ref="467991374"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="439893737"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+								<reference key="containingView" ref="439893737"/>
+							</object>
+							<object class="IBNSLayoutConstraint" id="890641817">
+								<reference key="firstItem" ref="467991374"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="439893737"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+								<reference key="containingView" ref="439893737"/>
+							</object>
+							<object class="IBNSLayoutConstraint" id="437142032">
+								<reference key="firstItem" ref="467991374"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="439893737"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+								<reference key="containingView" ref="439893737"/>
+							</object>
+							<object class="IBNSLayoutConstraint" id="934352021">
+								<reference key="firstItem" ref="467991374"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="439893737"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+								<reference key="containingView" ref="439893737"/>
+							</object>
+						</array>
+						<reference key="parent" ref="972006081"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">375</int>
+						<reference key="object" ref="302598603"/>
+						<array class="NSMutableArray" key="children"/>
+						<reference key="parent" ref="649796088"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">420</int>
+						<reference key="object" ref="755631768"/>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">490</int>
+						<reference key="object" ref="448692316"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="992780483"/>
+						</array>
+						<reference key="parent" ref="649796088"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">491</int>
+						<reference key="object" ref="992780483"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="105068016"/>
+						</array>
+						<reference key="parent" ref="448692316"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">492</int>
+						<reference key="object" ref="105068016"/>
+						<reference key="parent" ref="992780483"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">494</int>
+						<reference key="object" ref="976324537"/>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">551</int>
+						<reference key="object" ref="467991374"/>
+						<reference key="parent" ref="439893737"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">561</int>
+						<reference key="object" ref="334327932"/>
+						<reference key="parent" ref="439893737"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">562</int>
+						<reference key="object" ref="890641817"/>
+						<reference key="parent" ref="439893737"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">563</int>
+						<reference key="object" ref="437142032"/>
+						<reference key="parent" ref="439893737"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">564</int>
+						<reference key="object" ref="934352021"/>
+						<reference key="parent" ref="439893737"/>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="134.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="136.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="145.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="149.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="150.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="217.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="23.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="236.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="239.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="24.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="YES" key="371.IBNSWindowAutoPositionCentersHorizontal"/>
+				<boolean value="YES" key="371.IBNSWindowAutoPositionCentersVertical"/>
+				<string key="371.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="371.IBWindowTemplateEditedContentRect">{{380, 496}, {480, 360}}</string>
+				<integer value="1" key="371.NSWindowTemplate.visibleAtLaunch"/>
+				<array class="NSMutableArray" key="372.IBNSViewMetadataConstraints">
+					<reference ref="334327932"/>
+					<reference ref="890641817"/>
+					<reference ref="437142032"/>
+					<reference ref="934352021"/>
+				</array>
+				<string key="372.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="375.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="420.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="490.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="491.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="492.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="494.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="551.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="551.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="56.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="561.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="562.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="563.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="564.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="57.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="58.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="83.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="92.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">568</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">AppDelegate</string>
+					<string key="superclassName">NSObject</string>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="mrdpView">MRDPView</string>
+						<string key="window">NSWindow</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="mrdpView">
+							<string key="name">mrdpView</string>
+							<string key="candidateClassName">MRDPView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="window">
+							<string key="name">window</string>
+							<string key="candidateClassName">NSWindow</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/AppDelegate.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">MRDPView</string>
+					<string key="superclassName">NSView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/MRDPView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSLayoutConstraint</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/NSLayoutConstraint.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<integer value="1070" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="NSMenuCheckmark">{11, 11}</string>
+			<string key="NSMenuMixedState">{10, 3}</string>
+		</dictionary>
+		<bool key="IBDocument.UseAutolayout">YES</bool>
+	</data>
+</archive>
diff --git a/client/Mac/main.m b/client/Mac/main.m
new file mode 100644
index 000000000..a7ee86852
--- /dev/null
+++ b/client/Mac/main.m
@@ -0,0 +1,14 @@
+//
+//  main.m
+//  MacFreeRDP
+//
+//  Created by Thomas Goddard on 5/8/12.
+//  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+int main(int argc, char *argv[])
+{
+	return NSApplicationMain(argc, (const char **)argv);
+}