Add files using upload-large-folder tool

.gitattributes

@@ -104,3 +104,14 @@ local-test-sqlite3-delta-01/afc-sqlite3/test/fuzzdata5.db filter=lfs diff=lfs me
 local-test-sqlite3-delta-03/afc-sqlite3/contacts.lsm filter=lfs diff=lfs merge=lfs -text
 local-test-sqlite3-delta-03/fuzz-tooling/infra/cifuzz/test_data/timeout_fuzzer filter=lfs diff=lfs merge=lfs -text
 local-test-freerdp-full-01/afc-freerdp/client/Windows/resource/FreeRDP.ico filter=lfs diff=lfs merge=lfs -text
+local-test-sqlite3-delta-03/afc-sqlite3/test/fuzzdata4.db filter=lfs diff=lfs merge=lfs -text
+local-test-sqlite3-delta-03/afc-sqlite3/test/fuzzdata6.db filter=lfs diff=lfs merge=lfs -text
+local-test-sqlite3-delta-03/afc-sqlite3/test/fuzzdata1.db filter=lfs diff=lfs merge=lfs -text
+local-test-sqlite3-delta-03/afc-sqlite3/test/fuzzdata3.db filter=lfs diff=lfs merge=lfs -text
+local-test-sqlite3-delta-03/afc-sqlite3/test/fuzzdata2.db filter=lfs diff=lfs merge=lfs -text
+local-test-sqlite3-delta-03/afc-sqlite3/test/sessionfuzz-data1.db filter=lfs diff=lfs merge=lfs -text
+local-test-sqlite3-delta-03/afc-sqlite3/test/fuzzdata7.db filter=lfs diff=lfs merge=lfs -text
+local-test-sqlite3-delta-03/afc-sqlite3/test/fuzzdata8.db filter=lfs diff=lfs merge=lfs -text
+local-test-sqlite3-delta-03/afc-sqlite3/test/fuzzdata5.db filter=lfs diff=lfs merge=lfs -text
+local-test-libexif-delta-01-exif-003/fuzz-tooling/infra/cifuzz/test_data/timeout_fuzzer filter=lfs diff=lfs merge=lfs -text
+local-test-libpostal-full-01/afc-libpostal/src/transliteration_data.c filter=lfs diff=lfs merge=lfs -text

local-test-freerdp-full-01/afc-freerdp/channels/CMakeLists.txt

@@ -0,0 +1,285 @@
+# FreeRDP: A Remote Desktop Protocol Implementation
+# FreeRDP cmake build script
+#
+# Copyright 2012 Marc-Andre Moreau <[email protected]>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+include(CMakeParseArguments)
+include(CMakeDependentOption)
+
+macro(define_channel_options)
+  set(PREFIX "CHANNEL")
+
+  cmake_parse_arguments(
+    ${PREFIX} "" "NAME;TYPE;DESCRIPTION;SPECIFICATIONS;DEFAULT;CLIENT_DEFAULT;SERVER_DEFAULT" "" ${ARGN}
+  )
+
+  string(TOUPPER "CHANNEL_${CHANNEL_NAME}" CHANNEL_OPTION)
+  string(TOUPPER "CHANNEL_${CHANNEL_NAME}_CLIENT" CHANNEL_CLIENT_OPTION)
+  string(TOUPPER "CHANNEL_${CHANNEL_NAME}_SERVER" CHANNEL_SERVER_OPTION)
+  string(TOUPPER "${CHANNEL_TYPE}" CHANNEL_TYPE)
+
+  if(CHANNEL_DEFAULT)
+    set(OPTION_DEFAULT ${CHANNEL_DEFAULT})
+  elseif(CHANNEL_CLIENT_OPTION OR CHANNEL_SERVER_OPTION)
+    set(OPTION_DEFAULT "ON")
+  endif()
+
+  set(CHANNEL_OPTION_DOC "Build ${CHANNEL_NAME} ${CHANNEL_TYPE} channel")
+  set(CHANNEL_CLIENT_OPTION_DOC "Build ${CHANNEL_NAME} ${CHANNEL_TYPE} channel client")
+  set(CHANNEL_SERVER_OPTION_DOC "Build ${CHANNEL_NAME} ${CHANNEL_TYPE} channel server")
+
+  if("${CHANNEL_TYPE}" STREQUAL "DYNAMIC")
+    cmake_dependent_option(${CHANNEL_OPTION} "${CHANNEL_OPTION_DOC}" ${CHANNEL_DEFAULT} "CHANNEL_DRDYNVC" OFF)
+  else()
+    option(${CHANNEL_OPTION} "${CHANNEL_OPTION_DOC}" ${CHANNEL_DEFAULT})
+  endif()
+
+  cmake_dependent_option(
+    ${CHANNEL_CLIENT_OPTION} "${CHANNEL_CLIENT_OPTION_DOC}" ${CHANNEL_CLIENT_DEFAULT} "${CHANNEL_OPTION}" OFF
+  )
+
+  cmake_dependent_option(
+    ${CHANNEL_SERVER_OPTION} "${CHANNEL_SERVER_OPTION_DOC}" ${CHANNEL_SERVER_DEFAULT} "${CHANNEL_OPTION}" OFF
+  )
+endmacro(define_channel_options)
+
+macro(define_channel _channel_name)
+  set(CHANNEL_NAME ${_channel_name})
+  set(MODULE_NAME ${CHANNEL_NAME})
+  string(TOUPPER "CHANNEL_${CHANNEL_NAME}" MODULE_PREFIX)
+endmacro(define_channel)
+
+macro(define_channel_client _channel_name)
+  set(CHANNEL_NAME ${_channel_name})
+  set(MODULE_NAME "${CHANNEL_NAME}-client")
+  string(TOUPPER "CHANNEL_${CHANNEL_NAME}_CLIENT" MODULE_PREFIX)
+endmacro(define_channel_client)
+
+macro(define_channel_server _channel_name)
+  set(CHANNEL_NAME ${_channel_name})
+  set(MODULE_NAME "${CHANNEL_NAME}-server")
+  string(TOUPPER "CHANNEL_${CHANNEL_NAME}_SERVER" MODULE_PREFIX)
+endmacro(define_channel_server)
+
+macro(define_channel_client_subsystem _channel_name _subsystem _type)
+  set(CHANNEL_NAME ${_channel_name})
+  set(CHANNEL_SUBSYSTEM ${_subsystem})
+  string(LENGTH "${_type}" _type_length)
+  string(TOUPPER "CHANNEL_${CHANNEL_NAME}_CLIENT" CHANNEL_PREFIX)
+  if(_type_length GREATER 0)
+    set(SUBSYSTEM_TYPE ${_type})
+    set(MODULE_NAME "${CHANNEL_NAME}-client-${CHANNEL_SUBSYSTEM}-${SUBSYSTEM_TYPE}")
+    string(TOUPPER "CHANNEL_${CHANNEL_NAME}_CLIENT_${CHANNEL_SUBSYSTEM}_${SUBSYSTEM_TYPE}" MODULE_PREFIX)
+  else()
+    set(MODULE_NAME "${CHANNEL_NAME}-client-${CHANNEL_SUBSYSTEM}")
+    string(TOUPPER "CHANNEL_${CHANNEL_NAME}_CLIENT_${CHANNEL_SUBSYSTEM}" MODULE_PREFIX)
+  endif()
+endmacro(define_channel_client_subsystem)
+
+macro(define_channel_server_subsystem _channel_name _subsystem _type)
+  set(CHANNEL_NAME ${_channel_name})
+  set(CHANNEL_SUBSYSTEM ${_subsystem})
+  set(MODULE_NAME "${CHANNEL_NAME}-server-${CHANNEL_SUBSYSTEM}")
+  string(TOUPPER "CHANNEL_${CHANNEL_NAME}_server_${CHANNEL_SUBSYSTEM}" MODULE_PREFIX)
+endmacro(define_channel_server_subsystem)
+
+macro(add_channel_client _channel_prefix _channel_name)
+  if(${_channel_prefix}_CLIENT)
+    add_subdirectory(client)
+    if(${${_channel_prefix}_CLIENT_STATIC})
+      set(CHANNEL_STATIC_CLIENT_MODULES ${CHANNEL_STATIC_CLIENT_MODULES} ${_channel_prefix} PARENT_SCOPE)
+      set(${_channel_prefix}_CLIENT_NAME ${${_channel_prefix}_CLIENT_NAME} PARENT_SCOPE)
+      set(${_channel_prefix}_CLIENT_CHANNEL ${${_channel_prefix}_CLIENT_CHANNEL} PARENT_SCOPE)
+      set(${_channel_prefix}_CLIENT_ENTRY ${${_channel_prefix}_CLIENT_ENTRY} PARENT_SCOPE)
+      set(CHANNEL_STATIC_CLIENT_ENTRIES ${CHANNEL_STATIC_CLIENT_ENTRIES} ${${_channel_prefix}_CLIENT_ENTRY}
+          PARENT_SCOPE
+      )
+    endif()
+  endif()
+endmacro(add_channel_client)
+
+macro(add_channel_server _channel_prefix _channel_name)
+  if(${_channel_prefix}_SERVER)
+    add_subdirectory(server)
+    if(${${_channel_prefix}_SERVER_STATIC})
+      set(CHANNEL_STATIC_SERVER_MODULES ${CHANNEL_STATIC_SERVER_MODULES} ${_channel_prefix} PARENT_SCOPE)
+      set(${_channel_prefix}_SERVER_NAME ${${_channel_prefix}_SERVER_NAME} PARENT_SCOPE)
+      set(${_channel_prefix}_SERVER_CHANNEL ${${_channel_prefix}_SERVER_CHANNEL} PARENT_SCOPE)
+      set(${_channel_prefix}_SERVER_ENTRY ${${_channel_prefix}_SERVER_ENTRY} PARENT_SCOPE)
+      set(CHANNEL_STATIC_SERVER_ENTRIES ${CHANNEL_STATIC_SERVER_ENTRIES} ${${_channel_prefix}_SERVER_ENTRY}
+          PARENT_SCOPE
+      )
+    endif()
+  endif()
+endmacro(add_channel_server)
+
+macro(add_channel_client_subsystem _channel_prefix _channel_name _subsystem _type)
+  add_subdirectory(${_subsystem})
+  set(_channel_module_name "${_channel_name}-client")
+  string(LENGTH "${_type}" _type_length)
+  if(_type_length GREATER 0)
+    string(TOUPPER "CHANNEL_${_channel_name}_CLIENT_${_subsystem}_${_type}" _subsystem_prefix)
+  else()
+    string(TOUPPER "CHANNEL_${_channel_name}_CLIENT_${_subsystem}" _subsystem_prefix)
+  endif()
+  if(${${_subsystem_prefix}_STATIC})
+    get_target_property(CHANNEL_SUBSYSTEMS ${_channel_module_name} SUBSYSTEMS)
+    if(_type_length GREATER 0)
+      set(SUBSYSTEMS ${SUBSYSTEMS} "${_subsystem}-${_type}")
+    else()
+      set(SUBSYSTEMS ${SUBSYSTEMS} ${_subsystem})
+    endif()
+    set_target_properties(${_channel_module_name} PROPERTIES SUBSYSTEMS "${SUBSYSTEMS}")
+  endif()
+endmacro(add_channel_client_subsystem)
+
+macro(channel_install _targets _destination _export_target)
+  if(NOT BUILD_SHARED_LIBS)
+    foreach(_target_name IN ITEMS ${_targets})
+      target_include_directories(${_target_name} INTERFACE $<INSTALL_INTERFACE:include>)
+    endforeach()
+    install(TARGETS ${_targets} DESTINATION ${_destination} EXPORT ${_export_target})
+  endif()
+endmacro(channel_install)
+
+macro(server_channel_install _targets _destination)
+  channel_install(${_targets} ${_destination} "FreeRDP-ServerTargets")
+endmacro(server_channel_install)
+
+macro(client_channel_install _targets _destination)
+  channel_install(${_targets} ${_destination} "FreeRDP-ClientTargets")
+endmacro(client_channel_install)
+
+macro(add_channel_client_library _module_prefix _module_name _channel_name _dynamic _entry)
+  set(_lnk_dir ${${_module_prefix}_LINK_DIRS})
+  if(NOT "${_lnk_dir}" STREQUAL "")
+    link_directories(${_lnk_dir})
+  endif()
+
+  set(${_module_prefix}_STATIC ON PARENT_SCOPE)
+  set(${_module_prefix}_NAME ${_module_name} PARENT_SCOPE)
+  set(${_module_prefix}_CHANNEL ${_channel_name} PARENT_SCOPE)
+  set(${_module_prefix}_ENTRY ${_entry} PARENT_SCOPE)
+
+  add_library(${_module_name} OBJECT ${${_module_prefix}_SRCS})
+  set_property(TARGET ${_module_name} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")
+
+  if(${_module_prefix}_LIBS)
+    target_link_libraries(${_module_name} PUBLIC ${${_module_prefix}_LIBS})
+  endif()
+  client_channel_install(${_module_name} ${FREERDP_ADDIN_PATH})
+endmacro(add_channel_client_library)
+
+macro(
+  add_channel_client_subsystem_library
+  _module_prefix
+  _module_name
+  _channel_name
+  _type
+  _dynamic
+  _entry
+)
+  set(_lnk_dir ${${_module_prefix}_LINK_DIRS})
+  if(NOT "${_lnk_dir}" STREQUAL "")
+    link_directories(${_lnk_dir})
+  endif()
+
+  set(${_module_prefix}_STATIC ON PARENT_SCOPE)
+  set(${_module_prefix}_NAME ${_module_name} PARENT_SCOPE)
+  set(${_module_prefix}_TYPE ${_type} PARENT_SCOPE)
+
+  add_library(${_module_name} OBJECT ${${_module_prefix}_SRCS})
+  set_property(TARGET ${_module_name} PROPERTY FOLDER "Channels/${_channel_name}/Client/Subsystem/${CHANNEL_SUBSYSTEM}")
+
+  if(${_module_prefix}_LIBS)
+    target_link_libraries(${_module_name} PUBLIC ${${_module_prefix}_LIBS})
+  endif()
+  client_channel_install(${_module_name} ${FREERDP_ADDIN_PATH})
+endmacro(add_channel_client_subsystem_library)
+
+macro(add_channel_server_library _module_prefix _module_name _channel_name _dynamic _entry)
+  set(_lnk_dir ${${_module_prefix}_LINK_DIRS})
+  if(NOT "${_lnk_dir}" STREQUAL "")
+    link_directories(${_lnk_dir})
+  endif()
+
+  set(${_module_prefix}_STATIC ON PARENT_SCOPE)
+  set(${_module_prefix}_NAME ${_module_name} PARENT_SCOPE)
+  set(${_module_prefix}_CHANNEL ${_channel_name} PARENT_SCOPE)
+  set(${_module_prefix}_ENTRY ${_entry} PARENT_SCOPE)
+
+  add_library(${_module_name} OBJECT ${${_module_prefix}_SRCS})
+  set_property(TARGET ${_module_name} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Server")
+
+  if(${_module_prefix}_LIBS)
+    target_link_libraries(${_module_name} PUBLIC ${${_module_prefix}_LIBS})
+  endif()
+  server_channel_install(${_module_name} ${FREERDP_ADDIN_PATH})
+endmacro(add_channel_server_library)
+
+set(FILENAME "ChannelOptions.cmake")
+file(GLOB FILEPATHS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/${FILENAME}")
+
+# We need special treatment for drdynvc:
+# It needs to be the first entry so that every
+# dynamic channel has the dependent options available.
+set(DRDYNVC_MATCH "")
+
+foreach(FILEPATH ${FILEPATHS})
+  if(${FILEPATH} MATCHES "^([^/]*)drdynvc/+${FILENAME}")
+    set(DRDYNVC_MATCH ${FILEPATH})
+  endif()
+endforeach()
+
+if(NOT "${DRDYNVC_MATCH}" STREQUAL "")
+  list(REMOVE_ITEM FILEPATHS ${DRDYNVC_MATCH})
+  list(APPEND FILEPATHS ${DRDYNVC_MATCH})
+  list(REVERSE FILEPATHS) # list PREPEND is not available on old CMake3
+endif()
+
+foreach(FILEPATH ${FILEPATHS})
+  if(${FILEPATH} MATCHES "^([^/]*)/+${FILENAME}")
+    string(REGEX REPLACE "^([^/]*)/+${FILENAME}" "\\1" DIR ${FILEPATH})
+    set(CHANNEL_OPTION)
+    include(${FILEPATH})
+    if(${CHANNEL_OPTION})
+      set(CHANNEL_MESSAGE "Adding ${CHANNEL_TYPE} channel")
+      if(${CHANNEL_CLIENT_OPTION})
+        set(CHANNEL_MESSAGE "${CHANNEL_MESSAGE} client")
+      endif()
+      if(${CHANNEL_SERVER_OPTION})
+        set(CHANNEL_MESSAGE "${CHANNEL_MESSAGE} server")
+      endif()
+      set(CHANNEL_MESSAGE "${CHANNEL_MESSAGE} \"${CHANNEL_NAME}\"")
+      set(CHANNEL_MESSAGE "${CHANNEL_MESSAGE}: ${CHANNEL_DESCRIPTION}")
+      message(STATUS "${CHANNEL_MESSAGE}")
+      add_subdirectory(${DIR})
+    endif()
+  endif()
+endforeach(FILEPATH)
+
+if(WITH_CHANNELS)
+  if(WITH_CLIENT_CHANNELS)
+    add_subdirectory(client)
+    set(FREERDP_CHANNELS_CLIENT_SRCS ${FREERDP_CHANNELS_CLIENT_SRCS} PARENT_SCOPE)
+    set(FREERDP_CHANNELS_CLIENT_LIBS ${FREERDP_CHANNELS_CLIENT_LIBS} PARENT_SCOPE)
+  endif()
+
+  if(WITH_SERVER_CHANNELS)
+    add_subdirectory(server)
+    set(FREERDP_CHANNELS_SERVER_SRCS ${FREERDP_CHANNELS_SERVER_SRCS} PARENT_SCOPE)
+    set(FREERDP_CHANNELS_SERVER_LIBS ${FREERDP_CHANNELS_SERVER_LIBS} PARENT_SCOPE)
+  endif()
+endif()

local-test-freerdp-full-01/afc-freerdp/client/iOS/Additions/OrderedDictionary.m

@@ -0,0 +1,167 @@
+//
+//  OrderedDictionary.m
+//  OrderedDictionary
+//
+//  Modified version (Added indexForKey/Value functions)
+//
+//  Created by Matt Gallagher on 19/12/08.
+//  Copyright 2008 Matt Gallagher. All rights reserved.
+//
+//  This software is provided 'as-is', without any express or implied
+//  warranty. In no event will the authors be held liable for any damages
+//  arising from the use of this software. Permission is granted to anyone to
+//  use this software for any purpose, including commercial applications, and to
+//  alter it and redistribute it freely, subject to the following restrictions:
+//
+//  1. The origin of this software must not be misrepresented; you must not
+//     claim that you wrote the original software. If you use this software
+//     in a product, an acknowledgment in the product documentation would be
+//     appreciated but is not required.
+//  2. Altered source versions must be plainly marked as such, and must not be
+//     misrepresented as being the original software.
+//  3. This notice may not be removed or altered from any source
+//     distribution.
+//
+
+#import "OrderedDictionary.h"
+
+NSString *DescriptionForObject(NSObject *object, id locale, NSUInteger indent)
+{
+	NSString *objectString;
+	if ([object isKindOfClass:[NSString class]])
+	{
+		objectString = (NSString *)[[object retain] autorelease];
+	}
+	else if ([object respondsToSelector:@selector(descriptionWithLocale:indent:)])
+	{
+		objectString = [(NSDictionary *)object descriptionWithLocale:locale indent:indent];
+	}
+	else if ([object respondsToSelector:@selector(descriptionWithLocale:)])
+	{
+		objectString = [(NSSet *)object descriptionWithLocale:locale];
+	}
+	else
+	{
+		objectString = [object description];
+	}
+	return objectString;
+}
+
+@implementation OrderedDictionary
+
+- (id)init
+{
+	return [self initWithCapacity:0];
+}
+
+- (id)initWithCapacity:(NSUInteger)capacity
+{
+	self = [super init];
+	if (self != nil)
+	{
+		dictionary = [[NSMutableDictionary alloc] initWithCapacity:capacity];
+		array = [[NSMutableArray alloc] initWithCapacity:capacity];
+	}
+	return self;
+}
+
+- (void)dealloc
+{
+	[dictionary release];
+	[array release];
+	[super dealloc];
+}
+
+- (id)copy
+{
+	return [self mutableCopy];
+}
+
+- (void)setObject:(id)anObject forKey:(id)aKey
+{
+	if (![dictionary objectForKey:aKey])
+	{
+		[array addObject:aKey];
+	}
+	[dictionary setObject:anObject forKey:aKey];
+}
+
+- (void)removeObjectForKey:(id)aKey
+{
+	[dictionary removeObjectForKey:aKey];
+	[array removeObject:aKey];
+}
+
+- (NSUInteger)count
+{
+	return [dictionary count];
+}
+
+- (id)objectForKey:(id)aKey
+{
+	return [dictionary objectForKey:aKey];
+}
+
+- (NSEnumerator *)keyEnumerator
+{
+	return [array objectEnumerator];
+}
+
+- (NSEnumerator *)reverseKeyEnumerator
+{
+	return [array reverseObjectEnumerator];
+}
+
+- (void)insertObject:(id)anObject forKey:(id)aKey atIndex:(NSUInteger)anIndex
+{
+	if ([dictionary objectForKey:aKey])
+	{
+		[self removeObjectForKey:aKey];
+	}
+	[array insertObject:aKey atIndex:anIndex];
+	[dictionary setObject:anObject forKey:aKey];
+}
+
+- (id)keyAtIndex:(NSUInteger)anIndex
+{
+	return [array objectAtIndex:anIndex];
+}
+
+- (NSUInteger)indexForKey:(id)key
+{
+	return [array indexOfObject:key];
+}
+
+- (NSUInteger)indexForValue:(id)value
+{
+	NSArray *keys = [self allKeysForObject:value];
+	if ([keys count] > 0)
+	{
+		return [self indexForKey:[keys objectAtIndex:0]];
+	}
+
+	return NSNotFound;
+}
+
+- (NSString *)descriptionWithLocale:(id)locale indent:(NSUInteger)level
+{
+	NSMutableString *indentString = [NSMutableString string];
+	NSUInteger count = level;
+	for (NSUInteger i = 0; i < count; i++)
+	{
+		[indentString appendFormat:@"    "];
+	}
+
+	NSMutableString *description = [NSMutableString string];
+	[description appendFormat:@"%@{\n", indentString];
+	for (NSObject *key in self)
+	{
+		[description appendFormat:@"%@    %@ = %@;\n", indentString,
+		                          DescriptionForObject(key, locale, level),
+		                          DescriptionForObject([self objectForKey:key], locale, level)];
+	}
+	[description appendFormat:@"%@}\n", indentString];
+	return description;
+}
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Additions/TSXAdditions.m

@@ -0,0 +1,239 @@
+/*
+ Additions to Cocoa touch classes
+
+ Copyright 2013 Thincast Technologies GmbH, Authors: Dorian Johnson, Martin Fleisz
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import "TSXAdditions.h"
+#include <openssl/bio.h>
+#include <openssl/evp.h>
+#include <openssl/err.h>
+
+@implementation NSObject (TSXAdditions)
+
+- (void)setValuesForKeyPathsWithDictionary:(NSDictionary *)keyedValues
+{
+	for (id keyPath in keyedValues)
+		[self setValue:[keyedValues objectForKey:keyPath] forKeyPath:keyPath];
+}
+
+- mutableDeepCopy
+{
+	if ([self respondsToSelector:@selector(mutableCopyWithZone:)])
+		return [self mutableCopy];
+	else if ([self respondsToSelector:@selector(copyWithZone:)])
+		return [self copy];
+	else
+		return [self retain];
+}
+
+@end
+
+#pragma mark -
+
+@implementation NSString (TSXAdditions)
+
+#pragma mark Creation routines
++ (NSString *)stringWithUUID
+{
+	CFUUIDRef uuidObj = CFUUIDCreate(nil);
+	NSString *uuidString = (NSString *)CFUUIDCreateString(nil, uuidObj);
+	CFRelease(uuidObj);
+	return [uuidString autorelease];
+}
+
+/* Code from
+ * http://code.google.com/p/google-toolbox-for-mac/source/browse/trunk/Foundation/GTMNSData%2BHex.m?r=344
+ */
+- (NSData *)dataFromHexString
+{
+	NSData *hexData = [self dataUsingEncoding:NSASCIIStringEncoding];
+	const char *hexBuf = [hexData bytes];
+	NSUInteger hexLen = [hexData length];
+
+	// This indicates an error converting to ASCII.
+	if (!hexData)
+		return nil;
+
+	if ((hexLen % 2) != 0)
+	{
+		return nil;
+	}
+
+	NSMutableData *binaryData = [NSMutableData dataWithLength:(hexLen / 2)];
+	unsigned char *binaryPtr = [binaryData mutableBytes];
+	unsigned char value = 0;
+	for (NSUInteger i = 0; i < hexLen; i++)
+	{
+		char c = hexBuf[i];
+
+		if (!isxdigit(c))
+		{
+			return nil;
+		}
+
+		if (isdigit(c))
+		{
+			value += c - '0';
+		}
+		else if (islower(c))
+		{
+			value += 10 + c - 'a';
+		}
+		else
+		{
+			value += 10 + c - 'A';
+		}
+
+		if (i & 1)
+		{
+			*binaryPtr++ = value;
+			value = 0;
+		}
+		else
+		{
+			value <<= 4;
+		}
+	}
+
+	return [NSData dataWithData:binaryData];
+}
+
++ (NSString *)hexStringFromData:(const unsigned char *)data
+                         ofSize:(unsigned int)size
+                  withSeparator:(NSString *)sep
+                   afterNthChar:(int)sepnth
+{
+	NSMutableString *result;
+	NSString *immutableResult;
+
+	result = [[NSMutableString alloc] init];
+	for (int i = 0; i < size; i++)
+	{
+		if (i && sep && sepnth && i % sepnth == 0)
+			[result appendString:sep];
+		[result appendFormat:@"%02X", data[i]];
+	}
+
+	immutableResult = [NSString stringWithString:result];
+	[result release];
+	return immutableResult;
+}
+
+@end
+
+#pragma mark Mutable deep copy for dictionary, array and set
+
+@implementation NSDictionary (TSXAdditions)
+
+- mutableDeepCopy
+{
+	NSMutableDictionary *newDictionary = [[NSMutableDictionary alloc] init];
+	NSEnumerator *enumerator = [self keyEnumerator];
+	id key;
+	while ((key = [enumerator nextObject]))
+	{
+		id obj = [[self objectForKey:key] mutableDeepCopy];
+		[newDictionary setObject:obj forKey:key];
+		[obj release];
+	}
+	return newDictionary;
+}
+
+@end
+
+@implementation NSArray (TSXAdditions)
+
+- mutableDeepCopy
+{
+	NSMutableArray *newArray = [[NSMutableArray alloc] init];
+	NSEnumerator *enumerator = [self objectEnumerator];
+	id obj;
+	while ((obj = [enumerator nextObject]))
+	{
+		obj = [obj mutableDeepCopy];
+		[newArray addObject:obj];
+		[obj release];
+	}
+	return newArray;
+}
+
+@end
+
+@implementation NSSet (TSXAdditions)
+
+- mutableDeepCopy
+{
+	NSMutableSet *newSet = [[NSMutableSet alloc] init];
+	NSEnumerator *enumerator = [self objectEnumerator];
+	id obj;
+	while ((obj = [enumerator nextObject]))
+	{
+		obj = [obj mutableDeepCopy];
+		[newSet addObject:obj];
+		[obj release];
+	}
+	return newSet;
+}
+
+@end
+
+#pragma mark -
+
+/* Code from
+ * http://stackoverflow.com/questions/1305225/best-way-to-serialize-a-nsdata-into-an-hexadeximal-string
+ */
+@implementation NSData (TSXAdditions)
+
+#pragma mark - String Conversion
+- (NSString *)hexadecimalString
+{
+	/* Returns hexadecimal string of NSData. Empty string if data is empty.   */
+
+	const unsigned char *dataBuffer = (const unsigned char *)[self bytes];
+
+	if (!dataBuffer)
+		return [NSString string];
+
+	NSUInteger dataLength = [self length];
+	NSMutableString *hexString = [NSMutableString stringWithCapacity:(dataLength * 2)];
+
+	for (int i = 0; i < dataLength; ++i)
+		[hexString appendString:[NSString stringWithFormat:@"%02lx", (unsigned long)dataBuffer[i]]];
+
+	return [NSString stringWithString:hexString];
+}
+
+/* Code from http://cocoawithlove.com/2009/06/base64-encoding-options-on-mac-and.html */
+- (NSString *)base64EncodedString
+{
+	// Construct an OpenSSL context
+	BIO *context = BIO_new(BIO_s_mem());
+
+	// Tell the context to encode base64
+	BIO *command = BIO_new(BIO_f_base64());
+	context = BIO_push(command, context);
+	BIO_set_flags(context, BIO_FLAGS_BASE64_NO_NL);
+
+	// Encode all the data
+	ERR_clear_error();
+	BIO_write(context, [self bytes], [self length]);
+	(void)BIO_flush(context);
+
+	// Get the data out of the context
+	char *outputBuffer;
+	long outputLength = BIO_get_mem_data(context, &outputBuffer);
+	NSString *encodedString = [[NSString alloc] initWithBytes:outputBuffer
+	                                                   length:outputLength
+	                                                 encoding:NSASCIIStringEncoding];
+
+	BIO_free_all(context);
+
+	return encodedString;
+}
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Additions/Toast+UIView.m

@@ -0,0 +1,367 @@
+/***************************************************************************
+
+ Toast+UIView.h
+ Toast
+ Version 0.1
+
+ Copyright (c) 2011 Charles Scalesse.
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+ ***************************************************************************/
+
+#import "Toast+UIView.h"
+#import <QuartzCore/QuartzCore.h>
+#import <objc/runtime.h>
+
+#define kMaxWidth 0.8
+#define kMaxHeight 0.8
+
+#define kHorizontalPadding 10.0
+#define kVerticalPadding 10.0
+#define kCornerRadius 10.0
+#define kOpacity 0.8
+#define kFontSize 16.0
+#define kMaxTitleLines 999
+#define kMaxMessageLines 999
+
+#define kFadeDuration 0.2
+
+#define kDefaultLength 3
+#define kDefaultPosition @"bottom"
+
+#define kImageWidth 80.0
+#define kImageHeight 80.0
+
+static NSString *kDurationKey = @"duration";
+
+@interface UIView (ToastPrivate)
+
+- (CGPoint)getPositionFor:(id)position toast:(UIView *)toast;
+- (UIView *)makeViewForMessage:(NSString *)message title:(NSString *)title image:(UIImage *)image;
+
+@end
+
+@implementation UIView (Toast)
+
+#pragma mark -
+#pragma mark Toast Methods
+
+- (void)makeToast:(NSString *)message
+{
+	[self makeToast:message duration:kDefaultLength position:kDefaultPosition];
+}
+
+- (void)makeToast:(NSString *)message duration:(float)interval position:(id)point
+{
+	UIView *toast = [self makeViewForMessage:message title:nil image:nil];
+	[self showToast:toast duration:interval position:point];
+}
+
+- (void)makeToast:(NSString *)message
+         duration:(float)interval
+         position:(id)point
+            title:(NSString *)title
+{
+	UIView *toast = [self makeViewForMessage:message title:title image:nil];
+	[self showToast:toast duration:interval position:point];
+}
+
+- (void)makeToast:(NSString *)message
+         duration:(float)interval
+         position:(id)point
+            image:(UIImage *)image
+{
+	UIView *toast = [self makeViewForMessage:message title:nil image:image];
+	[self showToast:toast duration:interval position:point];
+}
+
+- (void)makeToast:(NSString *)message
+         duration:(float)interval
+         position:(id)point
+            title:(NSString *)title
+            image:(UIImage *)image
+{
+	UIView *toast = [self makeViewForMessage:message title:title image:image];
+	[self showToast:toast duration:interval position:point];
+}
+
+- (void)showToast:(UIView *)toast
+{
+	[self showToast:toast duration:kDefaultLength position:kDefaultPosition];
+}
+
+- (void)showToast:(UIView *)toast duration:(float)interval position:(id)point
+{
+
+	/****************************************************
+	 *                                                  *
+	 * Displays a view for a given duration & position. *
+	 *                                                  *
+	 ****************************************************/
+
+	CGPoint toastPoint = [self getPositionFor:point toast:toast];
+
+	// use an associative reference to associate the toast view with the display interval
+	objc_setAssociatedObject(toast, &kDurationKey, [NSNumber numberWithFloat:interval],
+	                         OBJC_ASSOCIATION_RETAIN);
+
+	[toast setCenter:toastPoint];
+	[toast setAlpha:0.0];
+	[self addSubview:toast];
+
+	[UIView beginAnimations:@"fade_in" context:toast];
+	[UIView setAnimationDuration:kFadeDuration];
+	[UIView setAnimationDelegate:self];
+	[UIView setAnimationDidStopSelector:@selector(animationDidStop:finished:context:)];
+	[UIView setAnimationCurve:UIViewAnimationCurveEaseOut];
+	[toast setAlpha:1.0];
+	[UIView commitAnimations];
+}
+
+#pragma mark -
+#pragma mark Animation Delegate Method
+
+- (void)animationDidStop:(NSString *)animationID finished:(BOOL)finished context:(void *)context
+{
+
+	UIView *toast = (UIView *)context;
+
+	// retrieve the display interval associated with the view
+	float interval = [(NSNumber *)objc_getAssociatedObject(toast, &kDurationKey) floatValue];
+
+	if ([animationID isEqualToString:@"fade_in"])
+	{
+
+		[UIView beginAnimations:@"fade_out" context:toast];
+		[UIView setAnimationDelay:interval];
+		[UIView setAnimationDuration:kFadeDuration];
+		[UIView setAnimationDelegate:self];
+		[UIView setAnimationDidStopSelector:@selector(animationDidStop:finished:context:)];
+		[UIView setAnimationCurve:UIViewAnimationCurveEaseIn];
+		[toast setAlpha:0.0];
+		[UIView commitAnimations];
+	}
+	else if ([animationID isEqualToString:@"fade_out"])
+	{
+
+		[toast removeFromSuperview];
+	}
+}
+
+#pragma mark -
+#pragma mark Private Methods
+
+- (CGPoint)getPositionFor:(id)point toast:(UIView *)toast
+{
+
+	/*************************************************************************************
+	 *                                                                                   *
+	 * Converts string literals @"top", @"bottom", @"center", or any point wrapped in an *
+	 * NSValue object into a CGPoint                                                     *
+	 *                                                                                   *
+	 *************************************************************************************/
+
+	if ([point isKindOfClass:[NSString class]])
+	{
+
+		if ([point caseInsensitiveCompare:@"top"] == NSOrderedSame)
+		{
+			return CGPointMake(self.bounds.size.width / 2,
+			                   (toast.frame.size.height / 2) + kVerticalPadding);
+		}
+		else if ([point caseInsensitiveCompare:@"bottom"] == NSOrderedSame)
+		{
+			return CGPointMake(self.bounds.size.width / 2,
+			                   (self.bounds.size.height - (toast.frame.size.height / 2)) -
+			                       kVerticalPadding);
+		}
+		else if ([point caseInsensitiveCompare:@"center"] == NSOrderedSame)
+		{
+			return CGPointMake(self.bounds.size.width / 2, self.bounds.size.height / 2);
+		}
+	}
+	else if ([point isKindOfClass:[NSValue class]])
+	{
+		return [point CGPointValue];
+	}
+
+	NSLog(@"Error: Invalid position for toast.");
+	return [self getPositionFor:kDefaultPosition toast:toast];
+}
+
+- (UIView *)makeViewForMessage:(NSString *)message title:(NSString *)title image:(UIImage *)image
+{
+
+	/***********************************************************************************
+	 *                                                                                 *
+	 * Dynamically build a toast view with any combination of message, title, & image. *
+	 *                                                                                 *
+	 ***********************************************************************************/
+
+	if ((message == nil) && (title == nil) && (image == nil))
+		return nil;
+
+	UILabel *messageLabel = nil;
+	UILabel *titleLabel = nil;
+	UIImageView *imageView = nil;
+
+	// create the parent view
+	UIView *wrapperView = [[[UIView alloc] init] autorelease];
+	[wrapperView.layer setCornerRadius:kCornerRadius];
+	[wrapperView setBackgroundColor:[[UIColor blackColor] colorWithAlphaComponent:kOpacity]];
+	wrapperView.autoresizingMask =
+	    UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleLeftMargin |
+	    UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleBottomMargin;
+
+	if (image != nil)
+	{
+		imageView = [[[UIImageView alloc] initWithImage:image] autorelease];
+		[imageView setContentMode:UIViewContentModeScaleAspectFit];
+		[imageView
+		    setFrame:CGRectMake(kHorizontalPadding, kVerticalPadding, kImageWidth, kImageHeight)];
+	}
+
+	float imageWidth, imageHeight, imageLeft;
+
+	// the imageView frame values will be used to size & position the other views
+	if (imageView != nil)
+	{
+		imageWidth = imageView.bounds.size.width;
+		imageHeight = imageView.bounds.size.height;
+		imageLeft = kHorizontalPadding;
+	}
+	else
+	{
+		imageWidth = imageHeight = imageLeft = 0;
+	}
+
+	if (title != nil)
+	{
+		titleLabel = [[[UILabel alloc] init] autorelease];
+		[titleLabel setNumberOfLines:kMaxTitleLines];
+		[titleLabel setFont:[UIFont boldSystemFontOfSize:kFontSize]];
+		[titleLabel setTextAlignment:UITextAlignmentLeft];
+		[titleLabel setLineBreakMode:UILineBreakModeWordWrap];
+		[titleLabel setTextColor:[UIColor whiteColor]];
+		[titleLabel setBackgroundColor:[UIColor clearColor]];
+		[titleLabel setAlpha:1.0];
+		[titleLabel setText:title];
+
+		// size the title label according to the length of the text
+		CGSize maxSizeTitle = CGSizeMake((self.bounds.size.width * kMaxWidth) - imageWidth,
+		                                 self.bounds.size.height * kMaxHeight);
+		CGSize expectedSizeTitle = [title sizeWithFont:titleLabel.font
+		                             constrainedToSize:maxSizeTitle
+		                                 lineBreakMode:titleLabel.lineBreakMode];
+		[titleLabel setFrame:CGRectMake(0, 0, expectedSizeTitle.width, expectedSizeTitle.height)];
+	}
+
+	if (message != nil)
+	{
+		messageLabel = [[[UILabel alloc] init] autorelease];
+		[messageLabel setNumberOfLines:kMaxMessageLines];
+		[messageLabel setFont:[UIFont systemFontOfSize:kFontSize]];
+		[messageLabel setLineBreakMode:UILineBreakModeWordWrap];
+		[messageLabel setTextColor:[UIColor whiteColor]];
+		[messageLabel setTextAlignment:UITextAlignmentCenter];
+		[messageLabel setBackgroundColor:[UIColor clearColor]];
+		[messageLabel setAlpha:1.0];
+		[messageLabel setText:message];
+
+		// size the message label according to the length of the text
+		CGSize maxSizeMessage = CGSizeMake((self.bounds.size.width * kMaxWidth) - imageWidth,
+		                                   self.bounds.size.height * kMaxHeight);
+		CGSize expectedSizeMessage = [message sizeWithFont:messageLabel.font
+		                                 constrainedToSize:maxSizeMessage
+		                                     lineBreakMode:messageLabel.lineBreakMode];
+		[messageLabel
+		    setFrame:CGRectMake(0, 0, expectedSizeMessage.width, expectedSizeMessage.height)];
+	}
+
+	// titleLabel frame values
+	float titleWidth, titleHeight, titleTop, titleLeft;
+
+	if (titleLabel != nil)
+	{
+		titleWidth = titleLabel.bounds.size.width;
+		titleHeight = titleLabel.bounds.size.height;
+		titleTop = kVerticalPadding;
+		titleLeft = imageLeft + imageWidth + kHorizontalPadding;
+	}
+	else
+	{
+		titleWidth = titleHeight = titleTop = titleLeft = 0;
+	}
+
+	// messageLabel frame values
+	float messageWidth, messageHeight, messageLeft, messageTop;
+
+	if (messageLabel != nil)
+	{
+		messageWidth = messageLabel.bounds.size.width;
+		messageHeight = messageLabel.bounds.size.height;
+		messageLeft = imageLeft + imageWidth + kHorizontalPadding;
+		messageTop = titleTop + titleHeight + kVerticalPadding;
+	}
+	else
+	{
+		messageWidth = messageHeight = messageLeft = messageTop = 0;
+	}
+
+	// compare the title & message widths and use the longer value to calculate the size of the
+	// wrapper width the same logic applies to the x value (left)
+	float longerWidth = (messageWidth < titleWidth) ? titleWidth : messageWidth;
+	float longerLeft = (messageLeft < titleLeft) ? titleLeft : messageLeft;
+
+	// if the image width is larger than longerWidth, use the image width to calculate the wrapper
+	// width. the same logic applies to the wrapper height
+	float wrapperWidth =
+	    ((longerLeft + longerWidth + kHorizontalPadding) < imageWidth + (kHorizontalPadding * 2))
+	        ? imageWidth + (kHorizontalPadding * 2)
+	        : (longerLeft + longerWidth + kHorizontalPadding);
+	float wrapperHeight =
+	    ((messageTop + messageHeight + kVerticalPadding) < imageHeight + (kVerticalPadding * 2))
+	        ? imageHeight + (kVerticalPadding * 2)
+	        : (messageTop + messageHeight + kVerticalPadding);
+
+	[wrapperView setFrame:CGRectMake(0, 0, wrapperWidth, wrapperHeight)];
+
+	if (titleLabel != nil)
+	{
+		[titleLabel setFrame:CGRectMake(titleLeft, titleTop, titleWidth, titleHeight)];
+		[wrapperView addSubview:titleLabel];
+	}
+
+	if (messageLabel != nil)
+	{
+		[messageLabel setFrame:CGRectMake(messageLeft, messageTop, messageWidth, messageHeight)];
+		[wrapperView addSubview:messageLabel];
+	}
+
+	if (imageView != nil)
+	{
+		[wrapperView addSubview:imageView];
+	}
+
+	return wrapperView;
+}
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/AppDelegate.m

@@ -0,0 +1,127 @@
+/*
+ App delegate
+
+ Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import "AppDelegate.h"
+
+#import "AboutController.h"
+#import "HelpController.h"
+#import "BookmarkListController.h"
+#import "AppSettingsController.h"
+#import "MainTabBarController.h"
+#import "Utils.h"
+
+@implementation AppDelegate
+
+@synthesize window = _window, tabBarController = _tabBarController;
+
+- (BOOL)application:(UIApplication *)application
+    didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
+	// Set default values for most NSUserDefaults
+	[[NSUserDefaults standardUserDefaults]
+	    registerDefaults:[NSDictionary dictionaryWithContentsOfFile:[[NSBundle mainBundle]
+	                                                                    pathForResource:@"Defaults"
+	                                                                             ofType:@"plist"]]];
+
+	// init global settings
+	SetSwapMouseButtonsFlag(
+	    [[NSUserDefaults standardUserDefaults] boolForKey:@"ui.swap_mouse_buttons"]);
+	SetInvertScrollingFlag(
+	    [[NSUserDefaults standardUserDefaults] boolForKey:@"ui.invert_scrolling"]);
+
+	// create bookmark view and navigation controller
+	BookmarkListController *bookmarkListController =
+	    [[[BookmarkListController alloc] initWithNibName:@"BookmarkListView"
+	                                              bundle:nil] autorelease];
+	UINavigationController *bookmarkNavigationController = [[[UINavigationController alloc]
+	    initWithRootViewController:bookmarkListController] autorelease];
+
+	// create app settings view and navigation controller
+	AppSettingsController *appSettingsController =
+	    [[[AppSettingsController alloc] initWithStyle:UITableViewStyleGrouped] autorelease];
+	UINavigationController *appSettingsNavigationController = [[[UINavigationController alloc]
+	    initWithRootViewController:appSettingsController] autorelease];
+
+	// create help view controller
+	HelpController *helpViewController = [[[HelpController alloc] initWithNibName:nil
+	                                                                       bundle:nil] autorelease];
+
+	// create about view controller
+	AboutController *aboutViewController =
+	    [[[AboutController alloc] initWithNibName:nil bundle:nil] autorelease];
+
+	// add tab-bar controller to the main window and display everything
+	NSArray *tabItems =
+	    [NSArray arrayWithObjects:bookmarkNavigationController, appSettingsNavigationController,
+	                              helpViewController, aboutViewController, nil];
+	[_tabBarController setViewControllers:tabItems];
+	if ([_window respondsToSelector:@selector(setRootViewController:)])
+		[_window setRootViewController:_tabBarController];
+	else
+		[_window addSubview:[_tabBarController view]];
+	[_window makeKeyAndVisible];
+
+	return YES;
+}
+
+- (void)applicationWillResignActive:(UIApplication *)application
+{
+	/*
+	 Sent when the application is about to move from active to inactive state. This can occur for
+	 certain types of temporary interruptions (such as an incoming phone call or SMS message) or
+	 when the user quits the application and it begins the transition to the background state. Use
+	 this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates.
+	 Games should use this method to pause the game.
+	 */
+}
+
+- (void)applicationDidEnterBackground:(UIApplication *)application
+{
+	/*
+	 Use this method to release shared resources, save user data, invalidate timers, and store
+	 enough application state information to restore your application to its current state in case
+	 it is terminated later. If your application supports background execution, this method is
+	 called instead of applicationWillTerminate: when the user quits.
+	 */
+}
+
+- (void)applicationWillEnterForeground:(UIApplication *)application
+{
+	/*
+	 Called as part of the transition from the background to the inactive state; here you can undo
+	 many of the changes made on entering the background.
+	 */
+	// cancel disconnect timer
+}
+
+- (void)applicationDidBecomeActive:(UIApplication *)application
+{
+	/*
+	 Restart any tasks that were paused (or not yet started) while the application was inactive. If
+	 the application was previously in the background, optionally refresh the user interface.
+	 */
+}
+
+- (void)applicationWillTerminate:(UIApplication *)application
+{
+	/*
+	 Called when the application is about to terminate.
+	 Save data if appropriate.
+	 See also applicationDidEnterBackground:.
+	 */
+}
+
+- (void)dealloc
+{
+	[_window release];
+	[super dealloc];
+}
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Controllers/AboutController.h

@@ -0,0 +1,19 @@
+/*
+ Application info controller
+
+ Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import <UIKit/UIKit.h>
+
+@interface AboutController : UIViewController <UIWebViewDelegate>
+{
+	NSString *last_link_clicked;
+	UIWebView *webView;
+}
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Controllers/AboutController.m

@@ -0,0 +1,120 @@
+/*
+ Application info controller
+
+ Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import "AboutController.h"
+#import "Utils.h"
+#import "BlockAlertView.h"
+
+@implementation AboutController
+
+// The designated initializer.  Override if you create the controller programmatically and want to
+// perform customization that is not appropriate for viewDidLoad.
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+{
+	if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]))
+	{
+
+		// set title and tab-bar image
+		[self setTitle:NSLocalizedString(@"About", @"About Controller title")];
+		UIImage *tabBarIcon = [UIImage
+		    imageWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"tabbar_icon_about"
+		                                                            ofType:@"png"]];
+		[self setTabBarItem:[[[UITabBarItem alloc]
+		                        initWithTitle:NSLocalizedString(@"About", @"Tabbar item about")
+		                                image:tabBarIcon
+		                                  tag:0] autorelease]];
+
+		last_link_clicked = nil;
+	}
+	return self;
+}
+
+- (void)dealloc
+{
+	[super dealloc];
+	[last_link_clicked release];
+}
+
+// Implement loadView to create a view hierarchy programmatically, without using a nib.
+- (void)loadView
+{
+	webView = [[[UIWebView alloc] initWithFrame:CGRectZero] autorelease];
+	[webView
+	    setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)];
+	[webView setAutoresizesSubviews:YES];
+	[webView setDelegate:self];
+	[webView setDataDetectorTypes:UIDataDetectorTypeNone];
+	[self setView:webView];
+}
+
+// Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
+- (void)viewDidLoad
+{
+	[super viewDidLoad];
+
+	NSString *filename = (IsPhone() ? @"about_phone" : @"about");
+	NSString *htmlString = [[[NSString alloc]
+	    initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:filename
+	                                                           ofType:@"html"
+	                                                      inDirectory:@"about_page"]
+	                  encoding:NSUTF8StringEncoding
+	                     error:nil] autorelease];
+
+	[webView
+	    loadHTMLString:[NSString stringWithFormat:htmlString, TSXAppFullVersion(),
+	                                              [[UIDevice currentDevice] systemName],
+	                                              [[UIDevice currentDevice] systemVersion],
+	                                              [[UIDevice currentDevice] model]]
+	           baseURL:[NSURL fileURLWithPath:[[[NSBundle mainBundle] bundlePath]
+	                                              stringByAppendingPathComponent:@"about_page"]]];
+}
+
+// Override to allow orientations other than the default portrait orientation.
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+	return YES;
+}
+
+#pragma mark -
+#pragma mark UIWebView callbacks
+- (BOOL)webView:(UIWebView *)webView
+    shouldStartLoadWithRequest:(NSURLRequest *)request
+                navigationType:(UIWebViewNavigationType)navigationType
+{
+	if ([[request URL] isFileURL])
+		return YES;
+
+	if (navigationType == UIWebViewNavigationTypeLinkClicked)
+	{
+		[last_link_clicked release];
+		last_link_clicked = [[[request URL] absoluteString] retain];
+		BlockAlertView *alert = [BlockAlertView
+		    alertWithTitle:NSLocalizedString(@"External Link", @"External Link Alert Title")
+		           message:[NSString stringWithFormat:
+		                                 NSLocalizedString(
+		                                     @"Open [%@] in Browser?",
+		                                     @"Open link in browser (with link as parameter)"),
+		                                 last_link_clicked]];
+
+		[alert setCancelButtonWithTitle:NSLocalizedString(@"No", @"No Button") block:nil];
+		[alert addButtonWithTitle:NSLocalizedString(@"OK", @"OK Button")
+		                    block:^{
+			                    [[UIApplication sharedApplication]
+			                        openURL:[NSURL URLWithString:last_link_clicked]];
+		                    }];
+
+		[alert show];
+
+		return NO;
+	}
+	return YES;
+}
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Controllers/AdvancedBookmarkEditorController.h

@@ -0,0 +1,26 @@
+/*
+ Controller to edit advanced bookmark settings
+
+ Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import "EditorBaseController.h"
+
+@class ComputerBookmark;
+@class ConnectionParams;
+
+@interface AdvancedBookmarkEditorController : EditorBaseController
+{
+  @private
+	ComputerBookmark *_bookmark;
+	ConnectionParams *_params;
+}
+
+// init for the given bookmark
+- (id)initWithBookmark:(ComputerBookmark *)bookmark;
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Controllers/AdvancedBookmarkEditorController.m

@@ -0,0 +1,407 @@
+/*
+ Controller to edit advanced bookmark settings
+
+ Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import "AdvancedBookmarkEditorController.h"
+#import "Bookmark.h"
+#import "Utils.h"
+#import "EditorSelectionController.h"
+#import "ScreenSelectionController.h"
+#import "PerformanceEditorController.h"
+#import "BookmarkGatewaySettingsController.h"
+
+@interface AdvancedBookmarkEditorController ()
+
+@end
+
+#define SECTION_ADVANCED_SETTINGS 0
+#define SECTION_COUNT 1
+
+@implementation AdvancedBookmarkEditorController
+
+- (id)initWithBookmark:(ComputerBookmark *)bookmark
+{
+	if ((self = [super initWithStyle:UITableViewStyleGrouped]))
+	{
+		// set additional settings state according to bookmark data
+		_bookmark = [bookmark retain];
+		_params = [bookmark params];
+	}
+	return self;
+}
+
+- (void)viewDidLoad
+{
+	[super viewDidLoad];
+	[self setTitle:NSLocalizedString(@"Advanced Settings", @"Advanced Settings title")];
+}
+
+- (void)viewWillAppear:(BOOL)animated
+{
+	[super viewWillAppear:animated];
+
+	// we need to reload the table view data here to have up-to-date data for the
+	// advanced settings accessory items (like for resolution/color mode settings)
+	[[self tableView] reloadData];
+}
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+	return YES;
+}
+
+#pragma mark -
+#pragma mark Table view data source
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
+{
+	// Return the number of sections.
+	return SECTION_COUNT;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+	// Return the number of rows in the section.
+	switch (section)
+	{
+		case SECTION_ADVANCED_SETTINGS: // advanced settings
+			return 9;
+		default:
+			break;
+	}
+
+	return 0;
+}
+
+// set section headers
+- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section
+{
+	switch (section)
+	{
+		case SECTION_ADVANCED_SETTINGS:
+			return NSLocalizedString(@"Advanced", @"'Advanced': advanced settings header");
+	}
+	return @"unknown";
+}
+
+// Customize the appearance of table view cells.
+- (UITableViewCell *)tableView:(UITableView *)tableView
+         cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+
+	// determine the required cell type
+	NSString *cellType = nil;
+	switch ([indexPath section])
+	{
+		case SECTION_ADVANCED_SETTINGS: // advanced settings
+		{
+			switch ([indexPath row])
+			{
+				case 0: // Enable/Disable TSG Settings
+					cellType = TableCellIdentifierYesNo;
+					break;
+				case 1: // TS Gateway Settings
+					cellType = TableCellIdentifierSubEditor;
+					break;
+				case 2: // 3G Settings
+					cellType = TableCellIdentifierYesNo;
+					break;
+				case 3: // 3G screen/color depth
+					cellType = TableCellIdentifierSelection;
+					break;
+				case 4: // 3G performance settings
+					cellType = TableCellIdentifierSubEditor;
+					break;
+				case 5: // security mode
+					cellType = TableCellIdentifierSelection;
+					break;
+				case 6: // remote program
+				case 7: // work dir
+					cellType = TableCellIdentifierText;
+					break;
+				case 8: // console mode
+					cellType = TableCellIdentifierYesNo;
+					break;
+				default:
+					break;
+			}
+			break;
+		}
+	}
+	NSAssert(cellType != nil, @"Couldn't determine cell type");
+
+	// get the table view cell
+	UITableViewCell *cell = [self tableViewCellFromIdentifier:cellType];
+	NSAssert(cell, @"Invalid cell");
+
+	// set cell values
+	switch ([indexPath section])
+	{
+			// advanced settings
+		case SECTION_ADVANCED_SETTINGS:
+			[self initAdvancedSettings:indexPath cell:cell];
+			break;
+
+		default:
+			break;
+	}
+
+	return cell;
+}
+
+// updates advanced settings in the UI
+- (void)initAdvancedSettings:(NSIndexPath *)indexPath cell:(UITableViewCell *)cell
+{
+	BOOL enable_3G_settings = [_params boolForKey:@"enable_3g_settings"];
+	switch (indexPath.row)
+	{
+		case 0:
+		{
+			EditFlagTableViewCell *flagCell = (EditFlagTableViewCell *)cell;
+			[[flagCell label]
+			    setText:NSLocalizedString(@"Enable TS Gateway",
+			                              @"'Enable TS Gateway': Bookmark enable TSG settings")];
+			[[flagCell toggle] setTag:GET_TAG_FROM_PATH(indexPath)];
+			[[flagCell toggle] setOn:[_params boolForKey:@"enable_tsg_settings"]];
+			[[flagCell toggle] addTarget:self
+			                      action:@selector(toggleSettingValue:)
+			            forControlEvents:UIControlEventValueChanged];
+			break;
+		}
+		case 1:
+		{
+			BOOL enable_tsg_settings = [_params boolForKey:@"enable_tsg_settings"];
+			EditSubEditTableViewCell *editCell = (EditSubEditTableViewCell *)cell;
+			[[editCell label]
+			    setText:NSLocalizedString(@"TS Gateway Settings",
+			                              @"'TS Gateway Settings': Bookmark TS Gateway Settings")];
+			[[editCell label] setEnabled:enable_tsg_settings];
+			[editCell setSelectionStyle:enable_tsg_settings ? UITableViewCellSelectionStyleBlue
+			                                                : UITableViewCellSelectionStyleNone];
+			break;
+		}
+		case 2:
+		{
+			EditFlagTableViewCell *flagCell = (EditFlagTableViewCell *)cell;
+			[[flagCell label]
+			    setText:NSLocalizedString(@"3G Settings",
+			                              @"'3G Settings': Bookmark enable 3G settings")];
+			[[flagCell toggle] setTag:GET_TAG_FROM_PATH(indexPath)];
+			[[flagCell toggle] setOn:[_params boolForKey:@"enable_3g_settings"]];
+			[[flagCell toggle] addTarget:self
+			                      action:@selector(toggleSettingValue:)
+			            forControlEvents:UIControlEventValueChanged];
+			break;
+		}
+		case 3:
+		{
+			EditSelectionTableViewCell *selCell = (EditSelectionTableViewCell *)cell;
+			[[selCell label]
+			    setText:NSLocalizedString(@"3G Screen",
+			                              @"'3G Screen': Bookmark 3G Screen settings")];
+			NSString *resolution = ScreenResolutionDescription(
+			    [_params intForKeyPath:@"settings_3g.screen_resolution_type"],
+			    [_params intForKeyPath:@"settings_3g.width"],
+			    [_params intForKeyPath:@"settings_3g.height"]);
+			int colorBits = [_params intForKeyPath:@"settings_3g.colors"];
+			[[selCell selection]
+			    setText:[NSString stringWithFormat:@"%@@%d", resolution, colorBits]];
+			[[selCell label] setEnabled:enable_3G_settings];
+			[[selCell selection] setEnabled:enable_3G_settings];
+			[selCell setSelectionStyle:enable_3G_settings ? UITableViewCellSelectionStyleBlue
+			                                              : UITableViewCellSelectionStyleNone];
+			break;
+		}
+		case 4:
+		{
+			EditSubEditTableViewCell *editCell = (EditSubEditTableViewCell *)cell;
+			[[editCell label]
+			    setText:NSLocalizedString(@"3G Performance",
+			                              @"'3G Performance': Bookmark 3G Performance Settings")];
+			[[editCell label] setEnabled:enable_3G_settings];
+			[editCell setSelectionStyle:enable_3G_settings ? UITableViewCellSelectionStyleBlue
+			                                               : UITableViewCellSelectionStyleNone];
+			break;
+		}
+		case 5:
+		{
+			EditSelectionTableViewCell *selCell = (EditSelectionTableViewCell *)cell;
+			[[selCell label]
+			    setText:NSLocalizedString(@"Security",
+			                              @"'Security': Bookmark protocol security settings")];
+			[[selCell selection]
+			    setText:ProtocolSecurityDescription([_params intForKey:@"security"])];
+			break;
+		}
+		case 6:
+		{
+			EditTextTableViewCell *textCell = (EditTextTableViewCell *)cell;
+			[[textCell label]
+			    setText:NSLocalizedString(@"Remote Program",
+			                              @"'Remote Program': Bookmark remote program settings")];
+			[[textCell textfield] setText:[_params StringForKey:@"remote_program"]];
+			[[textCell textfield] setTag:GET_TAG_FROM_PATH(indexPath)];
+			[[textCell textfield]
+			    setPlaceholder:NSLocalizedString(@"not set", @"not set placeholder")];
+			[self adjustEditTextTableViewCell:textCell];
+			break;
+		}
+		case 7:
+		{
+			EditTextTableViewCell *textCell = (EditTextTableViewCell *)cell;
+			[[textCell label]
+			    setText:NSLocalizedString(
+			                @"Working Directory",
+			                @"'Working Directory': Bookmark working directory settings")];
+			[[textCell textfield] setText:[_params StringForKey:@"working_dir"]];
+			[[textCell textfield] setTag:GET_TAG_FROM_PATH(indexPath)];
+			[[textCell textfield]
+			    setPlaceholder:NSLocalizedString(@"not set", @"not set placeholder")];
+			[self adjustEditTextTableViewCell:textCell];
+			break;
+		}
+		case 8:
+		{
+			EditFlagTableViewCell *flagCell = (EditFlagTableViewCell *)cell;
+			[[flagCell label]
+			    setText:NSLocalizedString(@"Console Mode",
+			                              @"'Console Mode': Bookmark console mode settings")];
+			[[flagCell toggle] setTag:GET_TAG_FROM_PATH(indexPath)];
+			[[flagCell toggle] setOn:[_params boolForKey:@"console"]];
+			[[flagCell toggle] addTarget:self
+			                      action:@selector(toggleSettingValue:)
+			            forControlEvents:UIControlEventValueChanged];
+			break;
+		}
+		default:
+			NSLog(@"Invalid row index in settings table!");
+			break;
+	}
+}
+
+#pragma mark -
+#pragma mark Table view delegate
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+	UIViewController *viewCtrl = nil;
+
+	// determine view
+	switch ([indexPath row])
+	{
+		case 1:
+			if ([_params boolForKey:@"enable_tsg_settings"])
+				viewCtrl = [[[BookmarkGatewaySettingsController alloc] initWithBookmark:_bookmark]
+				    autorelease];
+			break;
+		case 3:
+			if ([_params boolForKey:@"enable_3g_settings"])
+				viewCtrl = [[[ScreenSelectionController alloc]
+				    initWithConnectionParams:_params
+				                     keyPath:@"settings_3g"] autorelease];
+			break;
+		case 4:
+			if ([_params boolForKey:@"enable_3g_settings"])
+				viewCtrl = [[[PerformanceEditorController alloc]
+				    initWithConnectionParams:_params
+				                     keyPath:@"settings_3g"] autorelease];
+			break;
+		case 5:
+			viewCtrl = [[[EditorSelectionController alloc]
+			    initWithConnectionParams:_params
+			                     entries:[NSArray arrayWithObject:@"security"]
+			                  selections:[NSArray arrayWithObject:SelectionForSecuritySetting()]]
+			    autorelease];
+			break;
+		default:
+			break;
+	}
+
+	// display view
+	if (viewCtrl)
+		[[self navigationController] pushViewController:viewCtrl animated:YES];
+}
+
+#pragma mark -
+#pragma mark Text Field delegate
+
+- (BOOL)textFieldShouldReturn:(UITextField *)textField
+{
+	[textField resignFirstResponder];
+	return NO;
+}
+
+- (BOOL)textFieldShouldEndEditing:(UITextField *)textField
+{
+	switch (textField.tag)
+	{
+		// update remote program/work dir settings
+		case GET_TAG(SECTION_ADVANCED_SETTINGS, 6):
+		{
+			[_params setValue:[textField text] forKey:@"remote_program"];
+			break;
+		}
+
+		case GET_TAG(SECTION_ADVANCED_SETTINGS, 7):
+		{
+			[_params setValue:[textField text] forKey:@"working_dir"];
+			break;
+		}
+
+		default:
+			break;
+	}
+	return YES;
+}
+
+#pragma mark - Action handlers
+
+- (void)toggleSettingValue:(id)sender
+{
+	UISwitch *valueSwitch = (UISwitch *)sender;
+	switch (valueSwitch.tag)
+	{
+		case GET_TAG(SECTION_ADVANCED_SETTINGS, 0):
+		{
+			[_params setBool:[valueSwitch isOn] forKey:@"enable_tsg_settings"];
+			NSArray *indexPaths =
+			    [NSArray arrayWithObjects:[NSIndexPath indexPathForRow:1
+			                                                 inSection:SECTION_ADVANCED_SETTINGS],
+			                              [NSIndexPath indexPathForRow:2
+			                                                 inSection:SECTION_ADVANCED_SETTINGS],
+			                              nil];
+			[[self tableView] reloadRowsAtIndexPaths:indexPaths
+			                        withRowAnimation:UITableViewRowAnimationNone];
+			break;
+		}
+
+		case GET_TAG(SECTION_ADVANCED_SETTINGS, 2):
+		{
+			[_params setBool:[valueSwitch isOn] forKey:@"enable_3g_settings"];
+			NSArray *indexPaths =
+			    [NSArray arrayWithObjects:[NSIndexPath indexPathForRow:3
+			                                                 inSection:SECTION_ADVANCED_SETTINGS],
+			                              [NSIndexPath indexPathForRow:2
+			                                                 inSection:SECTION_ADVANCED_SETTINGS],
+			                              nil];
+			[[self tableView] reloadRowsAtIndexPaths:indexPaths
+			                        withRowAnimation:UITableViewRowAnimationNone];
+			break;
+		}
+
+		case GET_TAG(SECTION_ADVANCED_SETTINGS, 8):
+			[_params setBool:[valueSwitch isOn] forKey:@"console"];
+			break;
+
+		default:
+			break;
+	}
+}
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Controllers/AppSettingsController.h

@@ -0,0 +1,15 @@
+/*
+ Controller to specify application wide settings
+
+ Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import "EditorBaseController.h"
+
+@interface AppSettingsController : EditorBaseController
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Controllers/AppSettingsController.m

@@ -0,0 +1,360 @@
+/*
+ Controller to specify application wide settings
+
+ Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import "AppSettingsController.h"
+#import "Utils.h"
+#import "Toast+UIView.h"
+
+@implementation AppSettingsController
+
+// keep this up-to-date for correct section display/hiding
+#define SECTION_UI_SETTINGS 0
+#define SECTION_CERTIFICATE_HANDLING_SETTINGS 1
+#define SECTION_NUM_SECTIONS 2
+
+#pragma mark -
+#pragma mark Initialization
+
+- (id)initWithStyle:(UITableViewStyle)style
+{
+	if ((self = [super initWithStyle:style]))
+	{
+		UIImage *tabBarIcon = [UIImage
+		    imageWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"tabbar_icon_settings"
+		                                                            ofType:@"png"]];
+		[self
+		    setTabBarItem:[[[UITabBarItem alloc]
+		                      initWithTitle:NSLocalizedString(@"Settings", @"Tabbar item settings")
+		                              image:tabBarIcon
+		                                tag:0] autorelease]];
+	}
+	return self;
+}
+
+#pragma mark -
+#pragma mark View lifecycle
+
+- (void)viewDidLoad
+{
+	[super viewDidLoad];
+
+	// set title
+	[self setTitle:NSLocalizedString(@"Settings", @"App Settings title")];
+}
+
+- (void)viewWillDisappear:(BOOL)animated
+{
+	[super viewWillDisappear:animated];
+}
+
+// Override to allow orientations other than the default portrait orientation.
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+	return YES;
+}
+
+- (void)dealloc
+{
+	[[NSNotificationCenter defaultCenter] removeObserver:self];
+	[super dealloc];
+}
+
+#pragma mark -
+#pragma mark Table view data source
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
+{
+	// Return the number of sections.
+	return SECTION_NUM_SECTIONS;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+	// Return the number of rows in the section.
+	switch (section)
+	{
+		case SECTION_UI_SETTINGS: // UI settings
+			return 5;
+		case SECTION_CERTIFICATE_HANDLING_SETTINGS: // certificate handling settings
+			return 2;
+		default:
+			break;
+	}
+
+	return 0;
+}
+
+// set section headers
+- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section
+{
+	switch (section)
+	{
+		case SECTION_UI_SETTINGS:
+			return NSLocalizedString(@"User Interface", @"UI settings section title");
+		case SECTION_CERTIFICATE_HANDLING_SETTINGS:
+			return NSLocalizedString(@"Server Certificate Handling",
+			                         @"Server Certificate Handling section title");
+		default:
+			return nil;
+	}
+	return @"unknown";
+}
+
+// Customize the appearance of table view cells.
+- (UITableViewCell *)tableView:(UITableView *)tableView
+         cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+
+	// determine the required cell type
+	NSString *cellIdentifier = nil;
+	switch ([indexPath section])
+	{
+		case SECTION_UI_SETTINGS:
+		{
+			switch ([indexPath row])
+			{
+				case 0:
+				case 1:
+				case 2:
+				case 3:
+				case 4:
+					cellIdentifier = TableCellIdentifierYesNo;
+					break;
+			}
+			break;
+		}
+		case SECTION_CERTIFICATE_HANDLING_SETTINGS:
+		{
+			switch ([indexPath row])
+			{
+				case 0:
+					cellIdentifier = TableCellIdentifierYesNo;
+					break;
+				case 1:
+					cellIdentifier = TableCellIdentifierSubEditor;
+					break;
+			}
+			break;
+		}
+	}
+	NSAssert(cellIdentifier != nil, @"Couldn't determine cell type");
+
+	// get the table view cell
+	UITableViewCell *cell = [self tableViewCellFromIdentifier:cellIdentifier];
+	NSAssert(cell, @"Invalid cell");
+
+	// set cell values
+	switch ([indexPath section])
+	{
+		case SECTION_UI_SETTINGS:
+			[self initUISettings:indexPath cell:cell];
+			break;
+
+		case SECTION_CERTIFICATE_HANDLING_SETTINGS:
+			[self initCertificateHandlingSettings:indexPath cell:cell];
+			break;
+
+		default:
+			break;
+	}
+
+	return cell;
+}
+
+#pragma mark - Initialization helpers
+
+// updates UI settings in the UI
+- (void)initUISettings:(NSIndexPath *)indexPath cell:(UITableViewCell *)cell
+{
+	switch ([indexPath row])
+	{
+		case 0:
+		{
+			EditFlagTableViewCell *flagCell = (EditFlagTableViewCell *)cell;
+			[[flagCell label] setText:NSLocalizedString(@"Hide Status Bar",
+			                                            "Show/Hide Phone Status Bar setting")];
+			[[flagCell toggle] setTag:GET_TAG_FROM_PATH(indexPath)];
+			[[flagCell toggle]
+			    setOn:[[NSUserDefaults standardUserDefaults] boolForKey:@"ui.hide_status_bar"]];
+			[[flagCell toggle] addTarget:self
+			                      action:@selector(toggleSettingValue:)
+			            forControlEvents:UIControlEventValueChanged];
+			break;
+		}
+		case 1:
+		{
+			EditFlagTableViewCell *flagCell = (EditFlagTableViewCell *)cell;
+			[[flagCell label]
+			    setText:NSLocalizedString(@"Hide Tool Bar", "Show/Hide Tool Bar setting")];
+			[[flagCell toggle] setTag:GET_TAG_FROM_PATH(indexPath)];
+			[[flagCell toggle]
+			    setOn:[[NSUserDefaults standardUserDefaults] boolForKey:@"ui.hide_tool_bar"]];
+			[[flagCell toggle] addTarget:self
+			                      action:@selector(toggleSettingValue:)
+			            forControlEvents:UIControlEventValueChanged];
+			break;
+		}
+		case 2:
+		{
+			EditFlagTableViewCell *flagCell = (EditFlagTableViewCell *)cell;
+			[[flagCell label]
+			    setText:NSLocalizedString(@"Swap Mouse Buttons", "Swap Mouse Button UI setting")];
+			[[flagCell toggle] setTag:GET_TAG_FROM_PATH(indexPath)];
+			[[flagCell toggle]
+			    setOn:[[NSUserDefaults standardUserDefaults] boolForKey:@"ui.swap_mouse_buttons"]];
+			[[flagCell toggle] addTarget:self
+			                      action:@selector(toggleSettingValue:)
+			            forControlEvents:UIControlEventValueChanged];
+			break;
+		}
+		case 3:
+		{
+			EditFlagTableViewCell *flagCell = (EditFlagTableViewCell *)cell;
+			[[flagCell label]
+			    setText:NSLocalizedString(@"Invert Scrolling", "Invert Scrolling UI setting")];
+			[[flagCell toggle] setTag:GET_TAG_FROM_PATH(indexPath)];
+			[[flagCell toggle]
+			    setOn:[[NSUserDefaults standardUserDefaults] boolForKey:@"ui.invert_scrolling"]];
+			[[flagCell toggle] addTarget:self
+			                      action:@selector(toggleSettingValue:)
+			            forControlEvents:UIControlEventValueChanged];
+			break;
+		}
+		case 4:
+		{
+			EditFlagTableViewCell *flagCell = (EditFlagTableViewCell *)cell;
+			[[flagCell label] setText:NSLocalizedString(@"Touch Pointer Auto Scroll",
+			                                            "Touch Pointer Auto Scroll UI setting")];
+			[[flagCell toggle] setTag:GET_TAG_FROM_PATH(indexPath)];
+			[[flagCell toggle] setOn:[[NSUserDefaults standardUserDefaults]
+			                             boolForKey:@"ui.auto_scroll_touchpointer"]];
+			[[flagCell toggle] addTarget:self
+			                      action:@selector(toggleSettingValue:)
+			            forControlEvents:UIControlEventValueChanged];
+			break;
+		}
+		default:
+			NSLog(@"Invalid row index in settings table!");
+			break;
+	}
+}
+
+// updates certificate handling settings in the UI
+- (void)initCertificateHandlingSettings:(NSIndexPath *)indexPath cell:(UITableViewCell *)cell
+{
+	switch ([indexPath row])
+	{
+		case 0:
+		{
+			EditFlagTableViewCell *flagCell = (EditFlagTableViewCell *)cell;
+			[[flagCell label] setText:NSLocalizedString(@"Accept all Certificates",
+			                                            "Accept All Certificates setting")];
+			[[flagCell toggle] setTag:GET_TAG_FROM_PATH(indexPath)];
+			[[flagCell toggle] setOn:[[NSUserDefaults standardUserDefaults]
+			                             boolForKey:@"security.accept_certificates"]];
+			[[flagCell toggle] addTarget:self
+			                      action:@selector(toggleSettingValue:)
+			            forControlEvents:UIControlEventValueChanged];
+			break;
+		}
+		case 1:
+		{
+			EditSubEditTableViewCell *subCell = (EditSubEditTableViewCell *)cell;
+			[[subCell label] setText:NSLocalizedString(@"Erase Certificate Cache",
+			                                           @"Erase certificate cache button")];
+			break;
+		}
+		default:
+			NSLog(@"Invalid row index in settings table!");
+			break;
+	}
+}
+
+#pragma mark -
+#pragma mark Table view delegate
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+
+	// deselect any row to fake a button-pressed like effect
+	[tableView deselectRowAtIndexPath:indexPath animated:YES];
+
+	// ensure everything is stored in our settings before we proceed
+	[[self view] endEditing:NO];
+
+	// clear certificate cache
+	if ([indexPath section] == SECTION_CERTIFICATE_HANDLING_SETTINGS && [indexPath row] == 1)
+	{
+		// delete certificates cache
+		NSError *err;
+		if ([[NSFileManager defaultManager]
+		        removeItemAtPath:[[NSSearchPathForDirectoriesInDomains(
+		                             NSDocumentDirectory, NSUserDomainMask, YES) lastObject]
+		                             stringByAppendingPathComponent:@"/.freerdp"]
+		                   error:&err])
+			[[self view] makeToast:NSLocalizedString(@"Certificate Cache cleared!",
+			                                         @"Clear Certificate cache success message")
+			              duration:ToastDurationNormal
+			              position:@"center"];
+		else
+			[[self view] makeToast:NSLocalizedString(@"Error clearing the Certificate Cache!",
+			                                         @"Clear Certificate cache failed message")
+			              duration:ToastDurationNormal
+			              position:@"center"];
+	}
+}
+
+#pragma mark -
+#pragma mark Action Handlers
+
+- (void)toggleSettingValue:(id)sender
+{
+	UISwitch *valueSwitch = (UISwitch *)sender;
+	switch ([valueSwitch tag])
+	{
+		case GET_TAG(SECTION_UI_SETTINGS, 0):
+			[[NSUserDefaults standardUserDefaults] setBool:[valueSwitch isOn]
+			                                        forKey:@"ui.hide_status_bar"];
+			break;
+
+		case GET_TAG(SECTION_UI_SETTINGS, 1):
+			[[NSUserDefaults standardUserDefaults] setBool:[valueSwitch isOn]
+			                                        forKey:@"ui.hide_tool_bar"];
+			break;
+
+		case GET_TAG(SECTION_UI_SETTINGS, 2):
+			[[NSUserDefaults standardUserDefaults] setBool:[valueSwitch isOn]
+			                                        forKey:@"ui.swap_mouse_buttons"];
+			SetSwapMouseButtonsFlag([valueSwitch isOn]);
+			break;
+
+		case GET_TAG(SECTION_UI_SETTINGS, 3):
+			[[NSUserDefaults standardUserDefaults] setBool:[valueSwitch isOn]
+			                                        forKey:@"ui.invert_scrolling"];
+			SetInvertScrollingFlag([valueSwitch isOn]);
+			break;
+
+		case GET_TAG(SECTION_UI_SETTINGS, 4):
+			[[NSUserDefaults standardUserDefaults] setBool:[valueSwitch isOn]
+			                                        forKey:@"ui.auto_scroll_touchpointer"];
+			SetInvertScrollingFlag([valueSwitch isOn]);
+			break;
+
+		case GET_TAG(SECTION_CERTIFICATE_HANDLING_SETTINGS, 0):
+			[[NSUserDefaults standardUserDefaults] setBool:[valueSwitch isOn]
+			                                        forKey:@"security.accept_certificates"];
+			break;
+
+		default:
+			break;
+	}
+}
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Controllers/BookmarkEditorController.h

@@ -0,0 +1,38 @@
+/*
+ Bookmark editor controller
+
+ Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import <UIKit/UIKit.h>
+#import "EditorBaseController.h"
+
+@class ComputerBookmark;
+@class ConnectionParams;
+
+@protocol BookmarkEditorDelegate <NSObject>
+// bookmark editing finished
+- (void)commitBookmark:(ComputerBookmark *)bookmark;
+@end
+
+@interface BookmarkEditorController : EditorBaseController
+{
+  @private
+	ComputerBookmark *_bookmark;
+	ConnectionParams *_params;
+
+	BOOL _display_server_settings;
+
+	id<BookmarkEditorDelegate> delegate;
+}
+
+@property(nonatomic, assign) id<BookmarkEditorDelegate> delegate;
+
+// init for the given bookmark
+- (id)initWithBookmark:(ComputerBookmark *)bookmark;
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Controllers/BookmarkEditorController.m

@@ -0,0 +1,427 @@
+/*
+ Bookmark editor controller
+
+ Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import "BookmarkEditorController.h"
+#import "Bookmark.h"
+#import "Utils.h"
+#import "ScreenSelectionController.h"
+#import "PerformanceEditorController.h"
+#import "CredentialsEditorController.h"
+#import "AdvancedBookmarkEditorController.h"
+#import "BlockAlertView.h"
+
+@implementation BookmarkEditorController
+
+@synthesize delegate;
+
+#define SECTION_SERVER 0
+#define SECTION_CREDENTIALS 1
+#define SECTION_SETTINGS 2
+#define SECTION_COUNT 3
+
+#pragma mark -
+#pragma mark Initialization
+
+- (id)initWithBookmark:(ComputerBookmark *)bookmark
+{
+	if ((self = [super initWithStyle:UITableViewStyleGrouped]))
+	{
+		// set additional settings state according to bookmark data
+		if ([[bookmark uuid] length] == 0)
+			_bookmark = [bookmark copy];
+		else
+			_bookmark = [bookmark copyWithUUID];
+		_params = [_bookmark params];
+
+		_display_server_settings = YES;
+	}
+	return self;
+}
+
+#pragma mark -
+#pragma mark View lifecycle
+
+- (void)viewDidLoad
+{
+	[super viewDidLoad];
+
+	// replace back button with a custom handler that checks if the required bookmark settings were
+	// specified
+	UIBarButtonItem *saveButton =
+	    [[[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Save", @"Save Button title")
+	                                      style:UIBarButtonItemStyleDone
+	                                     target:self
+	                                     action:@selector(handleSave:)] autorelease];
+	UIBarButtonItem *cancelButton =
+	    [[[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Cancel", @"Cancel Button title")
+	                                      style:UIBarButtonItemStyleBordered
+	                                     target:self
+	                                     action:@selector(handleCancel:)] autorelease];
+	[[self navigationItem] setLeftBarButtonItem:cancelButton];
+	[[self navigationItem] setRightBarButtonItem:saveButton];
+}
+
+- (void)viewWillAppear:(BOOL)animated
+{
+	[super viewWillAppear:animated];
+
+	// we need to reload the table view data here to have up-to-date data for the
+	// advanced settings accessory items (like for resolution/color mode settings)
+	[[self tableView] reloadData];
+}
+
+// Override to allow orientations other than the default portrait orientation.
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+	return YES;
+}
+
+#pragma mark -
+#pragma mark Table view data source
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
+{
+	// Return the number of sections.
+	return SECTION_COUNT;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+	// Return the number of rows in the section.
+	switch (section)
+	{
+		case SECTION_SERVER: // server settings
+			return (_display_server_settings ? 3 : 0);
+		case SECTION_CREDENTIALS: // credentials
+			return 1;
+		case SECTION_SETTINGS: // session settings
+			return 3;
+		default:
+			break;
+	}
+
+	return 0;
+}
+
+// set section headers
+- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section
+{
+	switch (section)
+	{
+		case SECTION_SERVER:
+			return (_display_server_settings
+			            ? NSLocalizedString(@"Host", @"'Host': host settings header")
+			            : nil);
+		case SECTION_CREDENTIALS:
+			return NSLocalizedString(@"Credentials", @"'Credentials': credentials settings header");
+		case SECTION_SETTINGS:
+			return NSLocalizedString(@"Settings", @"'Session Settings': session settings header");
+	}
+	return @"unknown";
+}
+
+// Customize the appearance of table view cells.
+- (UITableViewCell *)tableView:(UITableView *)tableView
+         cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+
+	// determine the required cell type
+	NSString *cellType = nil;
+	switch ([indexPath section])
+	{
+		case SECTION_SERVER:
+			cellType = TableCellIdentifierText;
+			break;
+
+		case SECTION_CREDENTIALS:
+			cellType = TableCellIdentifierSelection;
+			break;
+
+		case SECTION_SETTINGS: // settings
+		{
+			switch ([indexPath row])
+			{
+				case 0: // screen/color depth
+					cellType = TableCellIdentifierSelection;
+					break;
+				case 1: // performance settings
+				case 2: // advanced settings
+					cellType = TableCellIdentifierSubEditor;
+					break;
+				default:
+					break;
+			}
+		}
+		break;
+
+		default:
+			break;
+	}
+	NSAssert(cellType != nil, @"Couldn't determine cell type");
+
+	// get the table view cell
+	UITableViewCell *cell = [self tableViewCellFromIdentifier:cellType];
+	NSAssert(cell, @"Invalid cell");
+
+	// set cell values
+	switch ([indexPath section])
+	{
+		// server settings
+		case SECTION_SERVER:
+			[self initServerSettings:indexPath cell:cell];
+			break;
+
+		// credentials
+		case SECTION_CREDENTIALS:
+			[self initCredentialSettings:indexPath cell:cell];
+			break;
+
+		// session settings
+		case SECTION_SETTINGS:
+			[self initSettings:indexPath cell:cell];
+			break;
+
+		default:
+			break;
+	}
+
+	return cell;
+}
+
+// updates server settings in the UI
+- (void)initServerSettings:(NSIndexPath *)indexPath cell:(UITableViewCell *)cell
+{
+	EditTextTableViewCell *textCell = (EditTextTableViewCell *)cell;
+	[[textCell textfield] setTag:GET_TAG_FROM_PATH(indexPath)];
+	switch ([indexPath row])
+	{
+		case 0:
+			[[textCell label] setText:NSLocalizedString(@"Label", @"'Label': Bookmark label")];
+			[[textCell textfield] setText:[_bookmark label]];
+			[[textCell textfield]
+			    setPlaceholder:NSLocalizedString(@"not set", @"not set placeholder")];
+			break;
+		case 1:
+			[[textCell label] setText:NSLocalizedString(@"Host", @"'Host': Bookmark hostname")];
+			[[textCell textfield] setText:[_params StringForKey:@"hostname"]];
+			[[textCell textfield]
+			    setPlaceholder:NSLocalizedString(@"not set", @"not set placeholder")];
+			break;
+		case 2:
+			[[textCell label] setText:NSLocalizedString(@"Port", @"'Port': Bookmark port")];
+			[[textCell textfield]
+			    setText:[NSString stringWithFormat:@"%d", [_params intForKey:@"port"]]];
+			[[textCell textfield] setKeyboardType:UIKeyboardTypeNumberPad];
+			break;
+		default:
+			NSLog(@"Invalid row index in settings table!");
+			break;
+	}
+
+	[self adjustEditTextTableViewCell:textCell];
+}
+
+// updates credentials in the UI
+- (void)initCredentialSettings:(NSIndexPath *)indexPath cell:(UITableViewCell *)cell
+{
+	EditSelectionTableViewCell *selCell = (EditSelectionTableViewCell *)cell;
+	switch (indexPath.row)
+	{
+		case 0:
+			[[selCell label]
+			    setText:NSLocalizedString(@"Credentials", @"'Credentials': Bookmark credentials")];
+			[[selCell selection] setText:[_params StringForKey:@"username"]];
+			break;
+		default:
+			NSLog(@"Invalid row index in settings table!");
+			break;
+	}
+}
+
+// updates session settings in the UI
+- (void)initSettings:(NSIndexPath *)indexPath cell:(UITableViewCell *)cell
+{
+	switch (indexPath.row)
+	{
+		case 0:
+		{
+			EditSelectionTableViewCell *selCell = (EditSelectionTableViewCell *)cell;
+			[[selCell label]
+			    setText:NSLocalizedString(@"Screen", @"'Screen': Bookmark Screen settings")];
+			NSString *resolution = ScreenResolutionDescription(
+			    [_params intForKey:@"screen_resolution_type"], [_params intForKey:@"width"],
+			    [_params intForKey:@"height"]);
+			int colorBits = [_params intForKey:@"colors"];
+			[[selCell selection]
+			    setText:[NSString stringWithFormat:@"%@@%d", resolution, colorBits]];
+			break;
+		}
+		case 1:
+		{
+			EditSubEditTableViewCell *editCell = (EditSubEditTableViewCell *)cell;
+			[[editCell label]
+			    setText:NSLocalizedString(@"Performance",
+			                              @"'Performance': Bookmark Performance Settings")];
+			break;
+		}
+		case 2:
+		{
+			EditSubEditTableViewCell *editCell = (EditSubEditTableViewCell *)cell;
+			[[editCell label]
+			    setText:NSLocalizedString(@"Advanced", @"'Advanced': Bookmark Advanced Settings")];
+			break;
+		}
+		default:
+			NSLog(@"Invalid row index in settings table!");
+			break;
+	}
+}
+
+#pragma mark -
+#pragma mark Table view delegate
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+	UIViewController *viewCtrl = nil;
+
+	// determine view
+	switch ([indexPath section])
+	{
+		case SECTION_CREDENTIALS:
+		{
+			if ([indexPath row] == 0)
+				viewCtrl =
+				    [[[CredentialsEditorController alloc] initWithBookmark:_bookmark] autorelease];
+			break;
+		}
+
+		case SECTION_SETTINGS:
+		{
+			switch ([indexPath row])
+			{
+				case 0:
+					viewCtrl = [[[ScreenSelectionController alloc] initWithConnectionParams:_params]
+					    autorelease];
+					break;
+				case 1:
+					viewCtrl = [[[PerformanceEditorController alloc]
+					    initWithConnectionParams:_params] autorelease];
+					break;
+				case 2:
+					viewCtrl = [[[AdvancedBookmarkEditorController alloc]
+					    initWithBookmark:_bookmark] autorelease];
+					break;
+				default:
+					break;
+			}
+
+			break;
+		}
+	}
+
+	// display view
+	if (viewCtrl)
+		[[self navigationController] pushViewController:viewCtrl animated:YES];
+}
+
+#pragma mark -
+#pragma mark Text Field delegate
+
+- (BOOL)textFieldShouldReturn:(UITextField *)textField
+{
+	[textField resignFirstResponder];
+	return NO;
+}
+
+- (BOOL)textFieldShouldEndEditing:(UITextField *)textField
+{
+	switch (textField.tag)
+	{
+		// update server settings
+		case GET_TAG(SECTION_SERVER, 0):
+			[_bookmark setLabel:[textField text]];
+			break;
+
+		case GET_TAG(SECTION_SERVER, 1):
+			[_params setValue:[textField text] forKey:@"hostname"];
+			break;
+
+		case GET_TAG(SECTION_SERVER, 2):
+			[_params setInt:[[textField text] intValue] forKey:@"port"];
+			break;
+
+		default:
+			break;
+	}
+	return YES;
+}
+
+#pragma mark -
+#pragma mark Action Handlers
+
+- (void)handleSave:(id)sender
+{
+	// resign any first responder (so that we finish editing any bookmark parameter that might be
+	// currently edited)
+	[[self view] endEditing:NO];
+
+	// verify that bookmark is complete (only for manual bookmarks)
+	if ([[_bookmark label] length] == 0 || [[_params StringForKey:@"hostname"] length] == 0 ||
+	    [_params intForKey:@"port"] == 0)
+	{
+		BlockAlertView *alertView = [BlockAlertView
+		    alertWithTitle:NSLocalizedString(@"Cancel without saving?",
+		                                     @"Incomplete bookmark error title")
+		           message:NSLocalizedString(@"Press 'Cancel' to abort!\nPress 'Continue' to "
+		                                     @"specify the required fields!",
+		                                     @"Incomplete bookmark error message")];
+		[alertView
+		    setCancelButtonWithTitle:NSLocalizedString(@"Cancel", @"Cancel Button")
+		                       block:^{
+			                       // cancel bookmark editing and return to previous view controller
+			                       [[self navigationController] popViewControllerAnimated:YES];
+		                       }];
+		[alertView addButtonWithTitle:NSLocalizedString(@"Continue", @"Continue Button") block:nil];
+		[alertView show];
+		return;
+	}
+
+	// commit bookmark
+	if ([[self delegate] respondsToSelector:@selector(commitBookmark:)])
+		[[self delegate] commitBookmark:_bookmark];
+
+	// return to previous view controller
+	[[self navigationController] popViewControllerAnimated:YES];
+}
+
+- (void)handleCancel:(id)sender
+{
+	// return to previous view controller
+	[[self navigationController] popViewControllerAnimated:YES];
+}
+
+#pragma mark -
+#pragma mark Memory management
+
+- (void)didReceiveMemoryWarning
+{
+	// Releases the view if it doesn't have a superview.
+	[super didReceiveMemoryWarning];
+
+	// Relinquish ownership any cached data, images, etc that aren't in use.
+}
+
+- (void)dealloc
+{
+	[super dealloc];
+	[_bookmark autorelease];
+}
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Controllers/BookmarkGatewaySettingsController.h

@@ -0,0 +1,26 @@
+/*
+ Controller to edit ts gateway bookmark settings
+
+ Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import "EditorBaseController.h"
+
+@class ComputerBookmark;
+@class ConnectionParams;
+
+@interface BookmarkGatewaySettingsController : EditorBaseController
+{
+  @private
+	ComputerBookmark *_bookmark;
+	ConnectionParams *_params;
+}
+
+// init for the given bookmark
+- (id)initWithBookmark:(ComputerBookmark *)bookmark;
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Controllers/BookmarkGatewaySettingsController.m

@@ -0,0 +1,242 @@
+//
+//  BookmarkGatewaySettingsController.m
+//  FreeRDP
+//
+//  Created by a Thincast Developer on 4/30/13.
+//
+//
+
+#import "BookmarkGatewaySettingsController.h"
+#import "Bookmark.h"
+#import "Utils.h"
+#import "EditorSelectionController.h"
+
+#define SECTION_TSGATEWAY_SETTINGS 0
+#define SECTION_COUNT 1
+
+@interface BookmarkGatewaySettingsController ()
+
+@end
+
+@implementation BookmarkGatewaySettingsController
+
+- (id)initWithBookmark:(ComputerBookmark *)bookmark
+{
+	if ((self = [super initWithStyle:UITableViewStyleGrouped]))
+	{
+		// set additional settings state according to bookmark data
+		_bookmark = [bookmark retain];
+		_params = [bookmark params];
+	}
+	return self;
+}
+
+- (void)viewDidLoad
+{
+	[super viewDidLoad];
+	[self setTitle:NSLocalizedString(@"TS Gateway Settings", @"TS Gateway Settings title")];
+}
+
+- (void)viewWillAppear:(BOOL)animated
+{
+	[super viewWillAppear:animated];
+
+	// we need to reload the table view data here to have up-to-date data for the
+	// advanced settings accessory items (like for resolution/color mode settings)
+	[[self tableView] reloadData];
+}
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+	return YES;
+}
+
+- (void)dealloc
+{
+	[super dealloc];
+	[_bookmark release];
+}
+
+#pragma mark - Table view data source
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
+{
+	// Return the number of sections.
+	return SECTION_COUNT;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+	// Return the number of rows in the section.
+	switch (section)
+	{
+		case SECTION_TSGATEWAY_SETTINGS: // ts gateway settings
+			return 5;
+		default:
+			break;
+	}
+
+	return 0;
+}
+
+// set section headers
+- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section
+{
+	switch (section)
+	{
+		case SECTION_TSGATEWAY_SETTINGS:
+			return NSLocalizedString(@"TS Gateway", @"'TS Gateway': ts gateway settings header");
+	}
+	return @"unknown";
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView
+         cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+	// determine the required cell type
+	NSString *cellType = nil;
+	switch ([indexPath section])
+	{
+		case SECTION_TSGATEWAY_SETTINGS: // advanced settings
+		{
+			switch ([indexPath row])
+			{
+				case 0: // hostname
+				case 1: // port
+				case 2: // username
+				case 4: // domain
+					cellType = TableCellIdentifierText;
+					break;
+				case 3: // password
+					cellType = TableCellIdentifierSecretText;
+					break;
+				default:
+					break;
+			}
+			break;
+		}
+	}
+	NSAssert(cellType != nil, @"Couldn't determine cell type");
+
+	// get the table view cell
+	UITableViewCell *cell = [self tableViewCellFromIdentifier:cellType];
+	NSAssert(cell, @"Invalid cell");
+
+	// set cell values
+	switch ([indexPath section])
+	{
+			// advanced settings
+		case SECTION_TSGATEWAY_SETTINGS:
+			[self initGatewaySettings:indexPath cell:cell];
+			break;
+
+		default:
+			break;
+	}
+
+	return cell;
+}
+
+// updates server settings in the UI
+- (void)initGatewaySettings:(NSIndexPath *)indexPath cell:(UITableViewCell *)cell
+{
+	EditTextTableViewCell *textCell = (EditTextTableViewCell *)cell;
+	[[textCell textfield] setTag:GET_TAG_FROM_PATH(indexPath)];
+	switch ([indexPath row])
+	{
+		case 0:
+		{
+			[[textCell label] setText:NSLocalizedString(@"Host", @"'Host': Bookmark hostname")];
+			[[textCell textfield] setText:[_params StringForKey:@"tsg_hostname"]];
+			[[textCell textfield]
+			    setPlaceholder:NSLocalizedString(@"not set", @"not set placeholder")];
+			break;
+		}
+		case 1:
+		{
+			int port = [_params intForKey:@"tsg_port"];
+			if (port == 0)
+				port = 443;
+			[[textCell label] setText:NSLocalizedString(@"Port", @"'Port': Bookmark port")];
+			[[textCell textfield] setText:[NSString stringWithFormat:@"%d", port]];
+			[[textCell textfield] setKeyboardType:UIKeyboardTypeNumberPad];
+			break;
+		}
+		case 2:
+		{
+			[[textCell textfield] setTag:GET_TAG_FROM_PATH(indexPath)];
+			[[textCell label]
+			    setText:NSLocalizedString(@"Username", @"'Username': Bookmark username")];
+			[[textCell textfield] setText:[_params StringForKey:@"tsg_username"]];
+			[[textCell textfield]
+			    setPlaceholder:NSLocalizedString(@"not set", @"not set placeholder")];
+			break;
+		}
+		case 3:
+		{
+			[[textCell textfield] setTag:GET_TAG_FROM_PATH(indexPath)];
+			[[textCell label]
+			    setText:NSLocalizedString(@"Password", @"'Password': Bookmark password")];
+			[[textCell textfield] setText:[_params StringForKey:@"tsg_password"]];
+			[[textCell textfield]
+			    setPlaceholder:NSLocalizedString(@"not set", @"not set placeholder")];
+			break;
+		}
+		case 4:
+		{
+			[[textCell textfield] setTag:GET_TAG_FROM_PATH(indexPath)];
+			[[textCell label] setText:NSLocalizedString(@"Domain", @"'Domain': Bookmark domain")];
+			[[textCell textfield] setText:[_params StringForKey:@"tsg_domain"]];
+			[[textCell textfield]
+			    setPlaceholder:NSLocalizedString(@"not set", @"not set placeholder")];
+			break;
+		}
+		default:
+			NSLog(@"Invalid row index in settings table!");
+			break;
+	}
+
+	[self adjustEditTextTableViewCell:textCell];
+}
+
+#pragma mark -
+#pragma mark Text Field delegate
+
+- (BOOL)textFieldShouldReturn:(UITextField *)textField
+{
+	[textField resignFirstResponder];
+	return NO;
+}
+
+- (BOOL)textFieldShouldEndEditing:(UITextField *)textField
+{
+	switch (textField.tag)
+	{
+			// update server settings
+		case GET_TAG(SECTION_TSGATEWAY_SETTINGS, 0):
+			[_params setValue:[textField text] forKey:@"tsg_hostname"];
+			break;
+
+		case GET_TAG(SECTION_TSGATEWAY_SETTINGS, 1):
+			[_params setInt:[[textField text] intValue] forKey:@"tsg_port"];
+			break;
+
+		case GET_TAG(SECTION_TSGATEWAY_SETTINGS, 2):
+			[_params setValue:[textField text] forKey:@"tsg_username"];
+			break;
+
+		case GET_TAG(SECTION_TSGATEWAY_SETTINGS, 3):
+			[_params setValue:[textField text] forKey:@"tsg_password"];
+			break;
+
+		case GET_TAG(SECTION_TSGATEWAY_SETTINGS, 4):
+			[_params setValue:[textField text] forKey:@"tsg_domain"];
+			break;
+
+		default:
+			break;
+	}
+	return YES;
+}
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Controllers/BookmarkListController.h

@@ -0,0 +1,56 @@
+/*
+ bookmarks and active session view controller
+
+ Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import <UIKit/UIKit.h>
+#import "Bookmark.h"
+#import "BookmarkTableCell.h"
+#import "SessionTableCell.h"
+#import "BookmarkEditorController.h"
+#import "Reachability.h"
+
+@interface BookmarkListController : UIViewController <UISearchBarDelegate, UITableViewDelegate,
+                                                      UITableViewDataSource, BookmarkEditorDelegate>
+{
+	// custom bookmark and session table cells
+	BookmarkTableCell *_bmTableCell;
+	SessionTableCell *_sessTableCell;
+
+	// child views
+	UISearchBar *_searchBar;
+	UITableView *_tableView;
+
+	// array with search results (or nil if no search active)
+	NSMutableArray *_manual_search_result;
+	NSMutableArray *_history_search_result;
+
+	// bookmark arrays
+	NSMutableArray *_manual_bookmarks;
+
+	// bookmark star images
+	UIImage *_star_on_img;
+	UIImage *_star_off_img;
+
+	// array with active sessions
+	NSMutableArray *_active_sessions;
+
+	// array with connection history entries
+	NSMutableArray *_connection_history;
+
+	// temporary bookmark when asking if the user wants to store a bookmark for a session initiated
+	// by a quick connect
+	ComputerBookmark *_temporary_bookmark;
+}
+
+@property(nonatomic, retain) IBOutlet UISearchBar *searchBar;
+@property(nonatomic, retain) IBOutlet UITableView *tableView;
+@property(nonatomic, retain) IBOutlet BookmarkTableCell *bmTableCell;
+@property(nonatomic, retain) IBOutlet SessionTableCell *sessTableCell;
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Controllers/BookmarkListController.m

@@ -0,0 +1,957 @@
+/*
+ bookmarks and active session view controller
+
+ Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import "BookmarkListController.h"
+#import "Utils.h"
+#import "BookmarkEditorController.h"
+#import "RDPSessionViewController.h"
+#import "Toast+UIView.h"
+#import "Reachability.h"
+#import "GlobalDefaults.h"
+#import "BlockAlertView.h"
+
+#define SECTION_SESSIONS 0
+#define SECTION_BOOKMARKS 1
+#define NUM_SECTIONS 2
+
+@interface BookmarkListController (Private)
+#pragma mark misc functions
+- (UIButton *)disclosureButtonWithImage:(UIImage *)image;
+- (void)performSearch:(NSString *)searchText;
+#pragma mark Persisting bookmarks
+- (void)scheduleWriteBookmarksToDataStore;
+- (void)writeBookmarksToDataStore;
+- (void)scheduleWriteManualBookmarksToDataStore;
+- (void)writeManualBookmarksToDataStore;
+- (void)readManualBookmarksFromDataStore;
+- (void)writeArray:(NSArray *)bookmarks toDataStoreURL:(NSURL *)url;
+- (NSMutableArray *)arrayFromDataStoreURL:(NSURL *)url;
+- (NSURL *)manualBookmarksDataStoreURL;
+- (NSURL *)connectionHistoryDataStoreURL;
+@end
+
+@implementation BookmarkListController
+
+@synthesize searchBar = _searchBar, tableView = _tableView, bmTableCell = _bmTableCell,
+            sessTableCell = _sessTableCell;
+
+// The designated initializer.  Override if you create the controller programmatically and want to
+// perform customization that is not appropriate for viewDidLoad.
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+{
+	if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]))
+	{
+		// load bookmarks
+		[self readManualBookmarksFromDataStore];
+
+		// load connection history
+		[self readConnectionHistoryFromDataStore];
+
+		// init search result array
+		_manual_search_result = nil;
+
+		// register for session notifications
+		[[NSNotificationCenter defaultCenter] addObserver:self
+		                                         selector:@selector(sessionDisconnected:)
+		                                             name:TSXSessionDidDisconnectNotification
+		                                           object:nil];
+		[[NSNotificationCenter defaultCenter] addObserver:self
+		                                         selector:@selector(sessionFailedToConnect:)
+		                                             name:TSXSessionDidFailToConnectNotification
+		                                           object:nil];
+
+		// set title and tabbar controller image
+		[self setTitle:NSLocalizedString(@"Connections",
+		                                 @"'Connections': bookmark controller title")];
+		[self setTabBarItem:[[[UITabBarItem alloc]
+		                        initWithTabBarSystemItem:UITabBarSystemItemBookmarks
+		                                             tag:0] autorelease]];
+
+		// load images
+		_star_on_img = [[UIImage
+		    imageWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"icon_accessory_star_on"
+		                                                            ofType:@"png"]] retain];
+		_star_off_img =
+		    [[UIImage imageWithContentsOfFile:[[NSBundle mainBundle]
+		                                          pathForResource:@"icon_accessory_star_off"
+		                                                   ofType:@"png"]] retain];
+
+		// init reachability detection
+		[[NSNotificationCenter defaultCenter] addObserver:self
+		                                         selector:@selector(reachabilityChanged:)
+		                                             name:kReachabilityChangedNotification
+		                                           object:nil];
+
+		// init other properties
+		_active_sessions = [[NSMutableArray alloc] init];
+		_temporary_bookmark = nil;
+	}
+	return self;
+}
+
+- (void)loadView
+{
+	[super loadView];
+}
+
+// Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
+- (void)viewDidLoad
+{
+	[super viewDidLoad];
+
+	// set edit button to allow bookmark list editing
+	[[self navigationItem] setRightBarButtonItem:[self editButtonItem]];
+}
+
+- (void)viewWillAppear:(BOOL)animated
+{
+	[super viewWillAppear:animated];
+
+	// in case we had a search - search again cause the bookmark searchable items could have changed
+	if ([[_searchBar text] length] > 0)
+		[self performSearch:[_searchBar text]];
+
+	// to reflect any bookmark changes - reload table
+	[_tableView reloadData];
+}
+
+- (void)viewWillDisappear:(BOOL)animated
+{
+	[super viewWillDisappear:animated];
+
+	// clear any search
+	[_searchBar setText:@""];
+	[_searchBar resignFirstResponder];
+	[self performSearch:@""];
+}
+
+// Override to allow orientations other than the default portrait orientation.
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+	// Return YES for supported orientations
+	return YES;
+}
+
+- (void)didReceiveMemoryWarning
+{
+	// Releases the view if it doesn't have a superview.
+	[super didReceiveMemoryWarning];
+
+	// Release any cached data, images, etc that aren't in use.
+}
+
+- (void)viewDidUnload
+{
+	[super viewDidUnload];
+	// Release any retained subviews of the main view.
+	// e.g. self.myOutlet = nil;
+}
+
+- (void)dealloc
+{
+	[[NSNotificationCenter defaultCenter] removeObserver:self];
+
+	[_temporary_bookmark release];
+	[_connection_history release];
+	[_active_sessions release];
+	[_manual_search_result release];
+	[_manual_bookmarks release];
+
+	[_star_on_img release];
+	[_star_off_img release];
+
+	[super dealloc];
+}
+
+#pragma mark -
+#pragma mark Table view data source
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
+{
+	// Return the number of sections.
+	return NUM_SECTIONS;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+
+	switch (section)
+	{
+		case SECTION_SESSIONS:
+			return 0;
+			break;
+
+		case SECTION_BOOKMARKS:
+		{
+			// (+1 for Add Bookmark entry)
+			if (_manual_search_result != nil)
+				return ([_manual_search_result count] + [_history_search_result count] + 1);
+			return ([_manual_bookmarks count] + 1);
+		}
+		break;
+
+		default:
+			break;
+	}
+	return 0;
+}
+
+- (UITableViewCell *)cellForGenericListEntry
+{
+	static NSString *CellIdentifier = @"BookmarkListCell";
+	UITableViewCell *cell = [[self tableView] dequeueReusableCellWithIdentifier:CellIdentifier];
+	if (cell == nil)
+	{
+		cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault
+		                              reuseIdentifier:CellIdentifier];
+		[cell setSelectionStyle:UITableViewCellSelectionStyleNone];
+		[cell setAccessoryView:[self disclosureButtonWithImage:_star_off_img]];
+	}
+
+	return cell;
+}
+
+- (BookmarkTableCell *)cellForBookmark
+{
+	static NSString *BookmarkCellIdentifier = @"BookmarkCell";
+	BookmarkTableCell *cell = (BookmarkTableCell *)[[self tableView]
+	    dequeueReusableCellWithIdentifier:BookmarkCellIdentifier];
+	if (cell == nil)
+	{
+		[[NSBundle mainBundle] loadNibNamed:@"BookmarkTableViewCell" owner:self options:nil];
+		[_bmTableCell setAccessoryView:[self disclosureButtonWithImage:_star_on_img]];
+		cell = _bmTableCell;
+		_bmTableCell = nil;
+	}
+
+	return cell;
+}
+
+// Customize the appearance of table view cells.
+- (UITableViewCell *)tableView:(UITableView *)tableView
+         cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+
+	switch ([indexPath section])
+	{
+		case SECTION_SESSIONS:
+		{
+			// get custom session cell
+			static NSString *SessionCellIdentifier = @"SessionCell";
+			SessionTableCell *cell = (SessionTableCell *)[tableView
+			    dequeueReusableCellWithIdentifier:SessionCellIdentifier];
+			if (cell == nil)
+			{
+				[[NSBundle mainBundle] loadNibNamed:@"SessionTableViewCell" owner:self options:nil];
+				cell = _sessTableCell;
+				_sessTableCell = nil;
+			}
+
+			// set cell data
+			RDPSession *session = [_active_sessions objectAtIndex:[indexPath row]];
+			[[cell title] setText:[session sessionName]];
+			[[cell server] setText:[[session params] StringForKey:@"hostname"]];
+			[[cell username] setText:[[session params] StringForKey:@"username"]];
+			[[cell screenshot]
+			    setImage:[session getScreenshotWithSize:[[cell screenshot] bounds].size]];
+			[[cell disconnectButton] setTag:[indexPath row]];
+			return cell;
+		}
+
+		case SECTION_BOOKMARKS:
+		{
+			// special handling for first cell - quick connect/quick create Bookmark cell
+			if ([indexPath row] == 0)
+			{
+				// if a search text is entered the cell becomes a quick connect/quick create
+				// bookmark cell - otherwise it's just an add bookmark cell
+				UITableViewCell *cell = [self cellForGenericListEntry];
+				if ([[_searchBar text] length] == 0)
+				{
+					[[cell textLabel]
+					    setText:[@"  " stringByAppendingString:
+					                       NSLocalizedString(@"Add Connection",
+					                                         @"'Add Connection': button label")]];
+					[((UIButton *)[cell accessoryView]) setHidden:YES];
+				}
+				else
+				{
+					[[cell textLabel] setText:[@"  " stringByAppendingString:[_searchBar text]]];
+					[((UIButton *)[cell accessoryView]) setHidden:NO];
+				}
+
+				return cell;
+			}
+			else
+			{
+				// do we have a history cell or bookmark cell?
+				if ([self isIndexPathToHistoryItem:indexPath])
+				{
+					UITableViewCell *cell = [self cellForGenericListEntry];
+					[[cell textLabel]
+					    setText:[@"  " stringByAppendingString:
+					                       [_history_search_result
+					                           objectAtIndex:
+					                               [self historyIndexFromIndexPath:indexPath]]]];
+					[((UIButton *)[cell accessoryView]) setHidden:NO];
+					return cell;
+				}
+				else
+				{
+					// set cell properties
+					ComputerBookmark *entry;
+					BookmarkTableCell *cell = [self cellForBookmark];
+					if (_manual_search_result == nil)
+						entry = [_manual_bookmarks
+						    objectAtIndex:[self bookmarkIndexFromIndexPath:indexPath]];
+					else
+						entry = [[_manual_search_result
+						    objectAtIndex:[self bookmarkIndexFromIndexPath:indexPath]]
+						    valueForKey:@"bookmark"];
+
+					[[cell title] setText:[entry label]];
+					[[cell subTitle] setText:[[entry params] StringForKey:@"hostname"]];
+					return cell;
+				}
+			}
+		}
+
+		default:
+			break;
+	}
+
+	NSAssert(0, @"Failed to create cell");
+	return nil;
+}
+
+// Override to support conditional editing of the table view.
+- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath
+{
+	// dont allow to edit Add Bookmark item
+	if ([indexPath section] == SECTION_SESSIONS)
+		return NO;
+	if ([indexPath section] == SECTION_BOOKMARKS && [indexPath row] == 0)
+		return NO;
+	return YES;
+}
+
+// Override to support editing the table view.
+- (void)tableView:(UITableView *)tableView
+    commitEditingStyle:(UITableViewCellEditingStyle)editingStyle
+     forRowAtIndexPath:(NSIndexPath *)indexPath
+{
+	if (editingStyle == UITableViewCellEditingStyleDelete)
+	{
+		// Delete the row from the data source
+		switch ([indexPath section])
+		{
+			case SECTION_BOOKMARKS:
+			{
+				if (_manual_search_result == nil)
+					[_manual_bookmarks
+					    removeObjectAtIndex:[self bookmarkIndexFromIndexPath:indexPath]];
+				else
+				{
+					// history item or bookmark?
+					if ([self isIndexPathToHistoryItem:indexPath])
+					{
+						[_connection_history
+						    removeObject:
+						        [_history_search_result
+						            objectAtIndex:[self historyIndexFromIndexPath:indexPath]]];
+						[_history_search_result
+						    removeObjectAtIndex:[self historyIndexFromIndexPath:indexPath]];
+					}
+					else
+					{
+						[_manual_bookmarks
+						    removeObject:
+						        [[_manual_search_result
+						            objectAtIndex:[self bookmarkIndexFromIndexPath:indexPath]]
+						            valueForKey:@"bookmark"]];
+						[_manual_search_result
+						    removeObjectAtIndex:[self bookmarkIndexFromIndexPath:indexPath]];
+					}
+				}
+				[self scheduleWriteManualBookmarksToDataStore];
+				break;
+			}
+		}
+
+		[tableView reloadSections:[NSIndexSet indexSetWithIndex:[indexPath section]]
+		         withRowAnimation:UITableViewRowAnimationNone];
+	}
+}
+
+// Override to support rearranging the table view.
+- (void)tableView:(UITableView *)tableView
+    moveRowAtIndexPath:(NSIndexPath *)fromIndexPath
+           toIndexPath:(NSIndexPath *)toIndexPath
+{
+	if ([fromIndexPath compare:toIndexPath] != NSOrderedSame)
+	{
+		switch ([fromIndexPath section])
+		{
+			case SECTION_BOOKMARKS:
+			{
+				int fromIdx = [self bookmarkIndexFromIndexPath:fromIndexPath];
+				int toIdx = [self bookmarkIndexFromIndexPath:toIndexPath];
+				ComputerBookmark *temp_bookmark =
+				    [[_manual_bookmarks objectAtIndex:fromIdx] retain];
+				[_manual_bookmarks removeObjectAtIndex:fromIdx];
+				if (toIdx >= [_manual_bookmarks count])
+					[_manual_bookmarks addObject:temp_bookmark];
+				else
+					[_manual_bookmarks insertObject:temp_bookmark atIndex:toIdx];
+				[temp_bookmark release];
+
+				[self scheduleWriteManualBookmarksToDataStore];
+				break;
+			}
+		}
+	}
+}
+
+// prevent that an item is moved before the Add Bookmark item
+- (NSIndexPath *)tableView:(UITableView *)tableView
+    targetIndexPathForMoveFromRowAtIndexPath:(NSIndexPath *)sourceIndexPath
+                         toProposedIndexPath:(NSIndexPath *)proposedDestinationIndexPath
+{
+	// don't allow to move:
+	//  - items between sections
+	//  - the quick connect/quick create bookmark cell
+	//  - any item while a search is applied
+	if ([proposedDestinationIndexPath row] == 0 ||
+	    ([sourceIndexPath section] != [proposedDestinationIndexPath section]) ||
+	    _manual_search_result != nil)
+	{
+		return sourceIndexPath;
+	}
+	else
+	{
+		return proposedDestinationIndexPath;
+	}
+}
+
+// Override to support conditional rearranging of the table view.
+- (BOOL)tableView:(UITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath
+{
+	// dont allow to reorder Add Bookmark item
+	if ([indexPath section] == SECTION_BOOKMARKS && [indexPath row] == 0)
+		return NO;
+	return YES;
+}
+
+- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section
+{
+	if (section == SECTION_SESSIONS && [_active_sessions count] > 0)
+		return NSLocalizedString(@"My Sessions", @"'My Session': section sessions header");
+	if (section == SECTION_BOOKMARKS)
+		return NSLocalizedString(@"Manual Connections",
+		                         @"'Manual Connections': section manual bookmarks header");
+	return nil;
+}
+
+- (NSString *)tableView:(UITableView *)tableView titleForFooterInSection:(NSInteger)section
+{
+	return nil;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+	if ([indexPath section] == SECTION_SESSIONS)
+		return 72;
+	return [tableView rowHeight];
+}
+
+#pragma mark -
+#pragma mark Table view delegate
+
+- (void)setEditing:(BOOL)editing animated:(BOOL)animated
+{
+	[super setEditing:editing animated:animated];
+	[[self tableView] setEditing:editing animated:animated];
+}
+
+- (void)accessoryButtonTapped:(UIControl *)button withEvent:(UIEvent *)event
+{
+	// forward a tap on our custom accessory button to the real accessory button handler
+	NSIndexPath *indexPath =
+	    [[self tableView] indexPathForRowAtPoint:[[[event touchesForView:button] anyObject]
+	                                                 locationInView:[self tableView]]];
+	if (indexPath == nil)
+		return;
+
+	[[[self tableView] delegate] tableView:[self tableView]
+	    accessoryButtonTappedForRowWithIndexPath:indexPath];
+}
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+	if ([indexPath section] == SECTION_SESSIONS)
+	{
+		// resume session
+		RDPSession *session = [_active_sessions objectAtIndex:[indexPath row]];
+		UIViewController *ctrl =
+		    [[[RDPSessionViewController alloc] initWithNibName:@"RDPSessionView"
+		                                                bundle:nil
+		                                               session:session] autorelease];
+		[ctrl setHidesBottomBarWhenPushed:YES];
+		[[self navigationController] pushViewController:ctrl animated:YES];
+	}
+	else
+	{
+		ComputerBookmark *bookmark = nil;
+		if ([indexPath section] == SECTION_BOOKMARKS)
+		{
+			// first row has either quick connect or add bookmark item
+			if ([indexPath row] == 0)
+			{
+				if ([[_searchBar text] length] == 0)
+				{
+					// show add bookmark controller
+					ComputerBookmark *bookmark =
+					    [[[ComputerBookmark alloc] initWithBaseDefaultParameters] autorelease];
+					BookmarkEditorController *bookmarkEditorController =
+					    [[[BookmarkEditorController alloc] initWithBookmark:bookmark] autorelease];
+					[bookmarkEditorController
+					    setTitle:NSLocalizedString(@"Add Connection", @"Add Connection title")];
+					[bookmarkEditorController setDelegate:self];
+					[bookmarkEditorController setHidesBottomBarWhenPushed:YES];
+					[[self navigationController] pushViewController:bookmarkEditorController
+					                                       animated:YES];
+				}
+				else
+				{
+					// create a quick connect bookmark and add an entry to the quick connect history
+					// (if not already in the history)
+					bookmark = [self bookmarkForQuickConnectTo:[_searchBar text]];
+					if (![_connection_history containsObject:[_searchBar text]])
+					{
+						[_connection_history addObject:[_searchBar text]];
+						[self scheduleWriteConnectionHistoryToDataStore];
+					}
+				}
+			}
+			else
+			{
+				if (_manual_search_result != nil)
+				{
+					if ([self isIndexPathToHistoryItem:indexPath])
+					{
+						// create a quick connect bookmark for a history item
+						NSString *item = [_history_search_result
+						    objectAtIndex:[self historyIndexFromIndexPath:indexPath]];
+						bookmark = [self bookmarkForQuickConnectTo:item];
+					}
+					else
+						bookmark = [[_manual_search_result
+						    objectAtIndex:[self bookmarkIndexFromIndexPath:indexPath]]
+						    valueForKey:@"bookmark"];
+				}
+				else
+					bookmark = [_manual_bookmarks
+					    objectAtIndex:[self bookmarkIndexFromIndexPath:
+					                            indexPath]]; // -1 because of ADD BOOKMARK entry
+			}
+
+			// set reachability status
+			WakeUpWWAN();
+			[bookmark
+			    setConntectedViaWLAN:[[Reachability
+			                             reachabilityWithHostName:[[bookmark params]
+			                                                          StringForKey:@"hostname"]]
+			                             currentReachabilityStatus] == ReachableViaWiFi];
+		}
+
+		if (bookmark != nil)
+		{
+			// create rdp session
+			RDPSession *session = [[[RDPSession alloc] initWithBookmark:bookmark] autorelease];
+			UIViewController *ctrl =
+			    [[[RDPSessionViewController alloc] initWithNibName:@"RDPSessionView"
+			                                                bundle:nil
+			                                               session:session] autorelease];
+			[ctrl setHidesBottomBarWhenPushed:YES];
+			[[self navigationController] pushViewController:ctrl animated:YES];
+			[_active_sessions addObject:session];
+		}
+	}
+}
+
+- (void)tableView:(UITableView *)tableView
+    accessoryButtonTappedForRowWithIndexPath:(NSIndexPath *)indexPath
+{
+	// get the bookmark
+	NSString *bookmark_editor_title =
+	    NSLocalizedString(@"Edit Connection", @"Edit Connection title");
+	ComputerBookmark *bookmark = nil;
+	if ([indexPath section] == SECTION_BOOKMARKS)
+	{
+		if ([indexPath row] == 0)
+		{
+			// create a new bookmark and init hostname and label
+			bookmark = [self bookmarkForQuickConnectTo:[_searchBar text]];
+			bookmark_editor_title = NSLocalizedString(@"Add Connection", @"Add Connection title");
+		}
+		else
+		{
+			if (_manual_search_result != nil)
+			{
+				if ([self isIndexPathToHistoryItem:indexPath])
+				{
+					// create a new bookmark and init hostname and label
+					NSString *item = [_history_search_result
+					    objectAtIndex:[self historyIndexFromIndexPath:indexPath]];
+					bookmark = [self bookmarkForQuickConnectTo:item];
+					bookmark_editor_title =
+					    NSLocalizedString(@"Add Connection", @"Add Connection title");
+				}
+				else
+					bookmark = [[_manual_search_result
+					    objectAtIndex:[self bookmarkIndexFromIndexPath:indexPath]]
+					    valueForKey:@"bookmark"];
+			}
+			else
+				bookmark = [_manual_bookmarks
+				    objectAtIndex:[self bookmarkIndexFromIndexPath:indexPath]]; // -1 because of ADD
+				                                                                // BOOKMARK entry
+		}
+	}
+
+	// bookmark found? - start the editor
+	if (bookmark != nil)
+	{
+		BookmarkEditorController *editBookmarkController =
+		    [[[BookmarkEditorController alloc] initWithBookmark:bookmark] autorelease];
+		[editBookmarkController setHidesBottomBarWhenPushed:YES];
+		[editBookmarkController setTitle:bookmark_editor_title];
+		[editBookmarkController setDelegate:self];
+		[[self navigationController] pushViewController:editBookmarkController animated:YES];
+	}
+}
+
+#pragma mark -
+#pragma mark Search Bar Delegates
+
+- (BOOL)searchBarShouldBeginEditing:(UISearchBar *)searchBar
+{
+	// show cancel button
+	[searchBar setShowsCancelButton:YES animated:YES];
+	return YES;
+}
+
+- (void)searchBarCancelButtonClicked:(UISearchBar *)searchBar
+{
+	// clear search result
+	[_manual_search_result release];
+	_manual_search_result = nil;
+
+	// clear text and remove cancel button
+	[searchBar setText:@""];
+	[searchBar resignFirstResponder];
+}
+
+- (BOOL)searchBarShouldEndEditing:(UISearchBar *)searchBar
+{
+	[searchBar setShowsCancelButton:NO animated:YES];
+
+	// re-enable table selection
+	[_tableView setAllowsSelection:YES];
+
+	return YES;
+}
+
+- (void)searchBarSearchButtonClicked:(UISearchBar *)searchBar
+{
+	[_searchBar resignFirstResponder];
+}
+
+- (void)searchBar:(UISearchBar *)searchBar textDidChange:(NSString *)searchText
+{
+	[self performSearch:searchText];
+	[_tableView reloadData];
+}
+
+#pragma mark - Session handling
+
+// session was added
+- (void)sessionDisconnected:(NSNotification *)notification
+{
+	// remove session from active sessions
+	RDPSession *session = (RDPSession *)[notification object];
+	[_active_sessions removeObject:session];
+
+	// if this view is currently active refresh entries
+	if ([[self navigationController] visibleViewController] == self)
+		[_tableView reloadSections:[NSIndexSet indexSetWithIndex:SECTION_SESSIONS]
+		          withRowAnimation:UITableViewRowAnimationNone];
+
+	// if session's bookmark is not in the bookmark list ask the user if he wants to add it
+	// (this happens if the session is created using the quick connect feature)
+	if (![_manual_bookmarks containsObject:[session bookmark]])
+	{
+		// retain the bookmark in case we want to save it later
+		_temporary_bookmark = [[session bookmark] retain];
+
+		// ask the user if he wants to save the bookmark
+		NSString *title =
+		    NSLocalizedString(@"Save Connection Settings?", @"Save connection settings title");
+		NSString *message = NSLocalizedString(
+		    @"Your Connection Settings have not been saved. Do you want to save them?",
+		    @"Save connection settings message");
+		BlockAlertView *alert = [BlockAlertView alertWithTitle:title message:message];
+		[alert setCancelButtonWithTitle:NSLocalizedString(@"No", @"No Button") block:nil];
+		[alert addButtonWithTitle:NSLocalizedString(@"Yes", @"Yes Button")
+		                    block:^{
+			                    if (_temporary_bookmark)
+			                    {
+				                    [_manual_bookmarks addObject:_temporary_bookmark];
+				                    [_tableView
+				                          reloadSections:[NSIndexSet
+				                                             indexSetWithIndex:SECTION_BOOKMARKS]
+				                        withRowAnimation:UITableViewRowAnimationNone];
+				                    [_temporary_bookmark autorelease];
+				                    _temporary_bookmark = nil;
+			                    }
+		                    }];
+		[alert show];
+	}
+}
+
+- (void)sessionFailedToConnect:(NSNotification *)notification
+{
+	// remove session from active sessions
+	RDPSession *session = (RDPSession *)[notification object];
+	[_active_sessions removeObject:session];
+
+	// display error toast
+	[[self view] makeToast:NSLocalizedString(@"Failed to connect to session!",
+	                                         @"Failed to connect error message")
+	              duration:ToastDurationNormal
+	              position:@"center"];
+}
+
+#pragma mark - Reachability notification
+- (void)reachabilityChanged:(NSNotification *)notification
+{
+	// no matter how the network changed - we will disconnect
+	// disconnect session (if there is any)
+	if ([_active_sessions count] > 0)
+	{
+		RDPSession *session = [_active_sessions objectAtIndex:0];
+		[session disconnect];
+	}
+}
+
+#pragma mark - BookmarkEditorController delegate
+
+- (void)commitBookmark:(ComputerBookmark *)bookmark
+{
+	// if we got a manual bookmark that is not in the list yet - add it otherwise replace it
+	BOOL found = NO;
+	for (int idx = 0; idx < [_manual_bookmarks count]; ++idx)
+	{
+		if ([[bookmark uuid] isEqualToString:[[_manual_bookmarks objectAtIndex:idx] uuid]])
+		{
+			[_manual_bookmarks replaceObjectAtIndex:idx withObject:bookmark];
+			found = YES;
+			break;
+		}
+	}
+	if (!found)
+		[_manual_bookmarks addObject:bookmark];
+
+	// remove any quick connect history entry with the same hostname
+	NSString *hostname = [[bookmark params] StringForKey:@"hostname"];
+	if ([_connection_history containsObject:hostname])
+	{
+		[_connection_history removeObject:hostname];
+		[self scheduleWriteConnectionHistoryToDataStore];
+	}
+
+	[self scheduleWriteManualBookmarksToDataStore];
+}
+
+- (IBAction)disconnectButtonPressed:(id)sender
+{
+	// disconnect session and refresh table view
+	RDPSession *session = [_active_sessions objectAtIndex:[sender tag]];
+	[session disconnect];
+}
+
+#pragma mark - Misc functions
+
+- (BOOL)hasNoBookmarks
+{
+	return ([_manual_bookmarks count] == 0);
+}
+
+- (UIButton *)disclosureButtonWithImage:(UIImage *)image
+{
+	// we make the button a little bit bigger (image width * 2, height + 10) so that the user
+	// doesn't accidentally connect to the bookmark ...
+	UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom];
+	[button setFrame:CGRectMake(0, 0, [image size].width * 2, [image size].height + 10)];
+	[button setImage:image forState:UIControlStateNormal];
+	[button addTarget:self
+	              action:@selector(accessoryButtonTapped:withEvent:)
+	    forControlEvents:UIControlEventTouchUpInside];
+	[button setUserInteractionEnabled:YES];
+	return button;
+}
+
+- (void)performSearch:(NSString *)searchText
+{
+	[_manual_search_result autorelease];
+
+	if ([searchText length] > 0)
+	{
+		_manual_search_result = [FilterBookmarks(
+		    _manual_bookmarks,
+		    [searchText componentsSeparatedByCharactersInSet:[NSCharacterSet
+		                                                         whitespaceAndNewlineCharacterSet]])
+		    retain];
+		_history_search_result = [FilterHistory(_connection_history, searchText) retain];
+	}
+	else
+	{
+		_history_search_result = nil;
+		_manual_search_result = nil;
+	}
+}
+
+- (int)bookmarkIndexFromIndexPath:(NSIndexPath *)indexPath
+{
+	return [indexPath row] -
+	       ((_history_search_result != nil) ? [_history_search_result count] : 0) - 1;
+}
+
+- (int)historyIndexFromIndexPath:(NSIndexPath *)indexPath
+{
+	return [indexPath row] - 1;
+}
+
+- (BOOL)isIndexPathToHistoryItem:(NSIndexPath *)indexPath
+{
+	return (([indexPath row] - 1) < [_history_search_result count]);
+}
+
+- (ComputerBookmark *)bookmarkForQuickConnectTo:(NSString *)host
+{
+	ComputerBookmark *bookmark =
+	    [[[ComputerBookmark alloc] initWithBaseDefaultParameters] autorelease];
+	[bookmark setLabel:host];
+	[[bookmark params] setValue:host forKey:@"hostname"];
+	return bookmark;
+}
+
+#pragma mark - Persisting bookmarks
+
+- (void)scheduleWriteBookmarksToDataStore
+{
+	[[NSOperationQueue mainQueue] addOperationWithBlock:^{
+		[self writeBookmarksToDataStore];
+	}];
+}
+
+- (void)writeBookmarksToDataStore
+{
+	[self writeManualBookmarksToDataStore];
+}
+
+- (void)scheduleWriteManualBookmarksToDataStore
+{
+	[[NSOperationQueue mainQueue]
+	    addOperation:[[[NSInvocationOperation alloc]
+	                     initWithTarget:self
+	                           selector:@selector(writeManualBookmarksToDataStore)
+	                             object:nil] autorelease]];
+}
+
+- (void)writeManualBookmarksToDataStore
+{
+	[self writeArray:_manual_bookmarks toDataStoreURL:[self manualBookmarksDataStoreURL]];
+}
+
+- (void)scheduleWriteConnectionHistoryToDataStore
+{
+	[[NSOperationQueue mainQueue]
+	    addOperation:[[[NSInvocationOperation alloc]
+	                     initWithTarget:self
+	                           selector:@selector(writeConnectionHistoryToDataStore)
+	                             object:nil] autorelease]];
+}
+
+- (void)writeConnectionHistoryToDataStore
+{
+	[self writeArray:_connection_history toDataStoreURL:[self connectionHistoryDataStoreURL]];
+}
+
+- (void)writeArray:(NSArray *)bookmarks toDataStoreURL:(NSURL *)url
+{
+	NSData *archived_data = [NSKeyedArchiver archivedDataWithRootObject:bookmarks];
+	[archived_data writeToURL:url atomically:YES];
+}
+
+- (void)readManualBookmarksFromDataStore
+{
+	[_manual_bookmarks autorelease];
+	_manual_bookmarks = [self arrayFromDataStoreURL:[self manualBookmarksDataStoreURL]];
+
+	if (_manual_bookmarks == nil)
+	{
+		_manual_bookmarks = [[NSMutableArray alloc] init];
+		[_manual_bookmarks
+		    addObject:[[[GlobalDefaults sharedGlobalDefaults] newTestServerBookmark] autorelease]];
+	}
+}
+
+- (void)readConnectionHistoryFromDataStore
+{
+	[_connection_history autorelease];
+	_connection_history = [self arrayFromDataStoreURL:[self connectionHistoryDataStoreURL]];
+
+	if (_connection_history == nil)
+		_connection_history = [[NSMutableArray alloc] init];
+}
+
+- (NSMutableArray *)arrayFromDataStoreURL:(NSURL *)url
+{
+	NSData *archived_data = [NSData dataWithContentsOfURL:url];
+
+	if (!archived_data)
+		return nil;
+
+	return [[NSKeyedUnarchiver unarchiveObjectWithData:archived_data] retain];
+}
+
+- (NSURL *)manualBookmarksDataStoreURL
+{
+	return [NSURL
+	    fileURLWithPath:[NSString stringWithFormat:@"%@/%@",
+	                                               [NSSearchPathForDirectoriesInDomains(
+	                                                   NSDocumentDirectory, NSUserDomainMask, YES)
+	                                                   lastObject],
+	                                               @"com.freerdp.ifreerdp.bookmarks.plist"]];
+}
+
+- (NSURL *)connectionHistoryDataStoreURL
+{
+	return [NSURL
+	    fileURLWithPath:[NSString
+	                        stringWithFormat:@"%@/%@",
+	                                         [NSSearchPathForDirectoriesInDomains(
+	                                             NSDocumentDirectory, NSUserDomainMask, YES)
+	                                             lastObject],
+	                                         @"com.freerdp.ifreerdp.connection_history.plist"]];
+}
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Controllers/CredentialsEditorController.h

@@ -0,0 +1,26 @@
+/*
+ Controller to edit bookmark credentials
+
+ Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import "EditorBaseController.h"
+
+@class ComputerBookmark;
+@class ConnectionParams;
+
+@interface CredentialsEditorController : EditorBaseController
+{
+  @private
+	ComputerBookmark *_bookmark;
+	ConnectionParams *_params;
+}
+
+// init for the given bookmark
+- (id)initWithBookmark:(ComputerBookmark *)bookmark;
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Controllers/CredentialsEditorController.m

@@ -0,0 +1,215 @@
+/*
+ Controller to edit bookmark credentials
+
+ Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import "CredentialsEditorController.h"
+#import "Bookmark.h"
+#import "Utils.h"
+
+@interface CredentialsEditorController ()
+
+@end
+
+#define SECTION_CREDENTIALS 0
+#define SECTION_COUNT 1
+
+@implementation CredentialsEditorController
+
+- (id)initWithBookmark:(ComputerBookmark *)bookmark
+{
+	if ((self = [super initWithStyle:UITableViewStyleGrouped]))
+	{
+		// set additional settings state according to bookmark data
+		_bookmark = [bookmark retain];
+		_params = [bookmark params];
+	}
+	return self;
+}
+
+- (void)viewDidLoad
+{
+	[super viewDidLoad];
+	[self setTitle:NSLocalizedString(@"Credentials", @"Credentials title")];
+}
+
+- (void)viewDidUnload
+{
+	[super viewDidUnload];
+	// Release any retained subviews of the main view.
+}
+
+- (void)viewWillDisappear:(BOOL)animated
+{
+	[super viewWillDisappear:animated];
+
+	// foce any active editing to stop
+	[[self view] endEditing:NO];
+}
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+	return YES;
+}
+
+- (void)dealloc
+{
+	[super dealloc];
+	[_bookmark release];
+}
+
+#pragma mark -
+#pragma mark Table view data source
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
+{
+	// Return the number of sections.
+	return SECTION_COUNT;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+	// Return the number of rows in the section.
+	switch (section)
+	{
+		case SECTION_CREDENTIALS: // credentials
+			return 3;
+		default:
+			break;
+	}
+
+	return 0;
+}
+
+// set section headers
+- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section
+{
+	switch (section)
+	{
+		case SECTION_CREDENTIALS:
+			return NSLocalizedString(@"Credentials", @"'Credentials': credentials settings header");
+	}
+	return @"unknown";
+}
+
+// Customize the appearance of table view cells.
+- (UITableViewCell *)tableView:(UITableView *)tableView
+         cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+
+	// determine the required cell type
+	NSString *cellType = nil;
+	switch ([indexPath section])
+	{
+		case SECTION_CREDENTIALS: // credentials
+			if ([indexPath row] == 1)
+				cellType = TableCellIdentifierSecretText; // password field
+			else
+				cellType = TableCellIdentifierText;
+			break;
+
+		default:
+			break;
+	}
+	NSAssert(cellType != nil, @"Couldn't determine cell type");
+
+	// get the table view cell
+	UITableViewCell *cell = [self tableViewCellFromIdentifier:cellType];
+	NSAssert(cell, @"Invalid cell");
+
+	// set cell values
+	switch ([indexPath section])
+	{
+			// credentials
+		case SECTION_CREDENTIALS:
+			[self initCredentialSettings:indexPath cell:cell];
+			break;
+
+		default:
+			break;
+	}
+
+	return cell;
+}
+
+// updates credentials in the UI
+- (void)initCredentialSettings:(NSIndexPath *)indexPath cell:(UITableViewCell *)cell
+{
+	switch (indexPath.row)
+	{
+		case 0:
+		{
+			EditTextTableViewCell *textCell = (EditTextTableViewCell *)cell;
+			[[textCell textfield] setTag:GET_TAG_FROM_PATH(indexPath)];
+			[[textCell label]
+			    setText:NSLocalizedString(@"Username", @"'Username': Bookmark username")];
+			[[textCell textfield] setText:[_params StringForKey:@"username"]];
+			[[textCell textfield]
+			    setPlaceholder:NSLocalizedString(@"not set", @"not set placeholder")];
+			break;
+		}
+		case 1:
+		{
+			EditSecretTextTableViewCell *textCell = (EditSecretTextTableViewCell *)cell;
+			[[textCell textfield] setTag:GET_TAG_FROM_PATH(indexPath)];
+			[[textCell label]
+			    setText:NSLocalizedString(@"Password", @"'Password': Bookmark password")];
+			[[textCell textfield] setText:[_params StringForKey:@"password"]];
+			[[textCell textfield]
+			    setPlaceholder:NSLocalizedString(@"not set", @"not set placeholder")];
+			break;
+		}
+		case 2:
+		{
+			EditTextTableViewCell *textCell = (EditTextTableViewCell *)cell;
+			[[textCell textfield] setTag:GET_TAG_FROM_PATH(indexPath)];
+			[[textCell label] setText:NSLocalizedString(@"Domain", @"'Domain': Bookmark domain")];
+			[[textCell textfield] setText:[_params StringForKey:@"domain"]];
+			[[textCell textfield]
+			    setPlaceholder:NSLocalizedString(@"not set", @"not set placeholder")];
+			break;
+		}
+		default:
+			NSLog(@"Invalid row index in settings table!");
+			break;
+	}
+}
+
+#pragma mark -
+#pragma mark Text Field delegate
+
+- (BOOL)textFieldShouldReturn:(UITextField *)textField
+{
+	[textField resignFirstResponder];
+	return NO;
+}
+
+- (BOOL)textFieldShouldEndEditing:(UITextField *)textField
+{
+	switch (textField.tag)
+	{
+			// update credentials settings
+		case GET_TAG(SECTION_CREDENTIALS, 0):
+			[_params setValue:[textField text] forKey:@"username"];
+			break;
+
+		case GET_TAG(SECTION_CREDENTIALS, 1):
+			[_params setValue:[textField text] forKey:@"password"];
+			break;
+
+		case GET_TAG(SECTION_CREDENTIALS, 2):
+			[_params setValue:[textField text] forKey:@"domain"];
+			break;
+
+		default:
+			break;
+	}
+	return YES;
+}
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Controllers/CredentialsInputController.h

@@ -0,0 +1,35 @@
+/*
+ Credentials input controller
+
+ Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import <UIKit/UIKit.h>
+
+@class RDPSession;
+
+@interface CredentialsInputController : UIViewController
+{
+  @private
+	IBOutlet UITextField *_textfield_username;
+	IBOutlet UITextField *_textfield_password;
+	IBOutlet UITextField *_textfield_domain;
+	IBOutlet UIButton *_btn_login;
+	IBOutlet UIButton *_btn_cancel;
+	IBOutlet UIScrollView *_scroll_view;
+	IBOutlet UILabel *_lbl_message;
+
+	RDPSession *_session;
+	NSMutableDictionary *_params;
+}
+
+- (id)initWithNibName:(NSString *)nibNameOrNil
+               bundle:(NSBundle *)nibBundleOrNil
+              session:(RDPSession *)session
+               params:(NSMutableDictionary *)params;
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Controllers/CredentialsInputController.m

@@ -0,0 +1,160 @@
+/*
+ Credentials input controller
+
+ Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import "CredentialsInputController.h"
+#import "RDPSession.h"
+#import "Utils.h"
+
+@implementation CredentialsInputController
+
+- (id)initWithNibName:(NSString *)nibNameOrNil
+               bundle:(NSBundle *)nibBundleOrNil
+              session:(RDPSession *)session
+               params:(NSMutableDictionary *)params
+{
+	self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+	if (self)
+	{
+		_session = session;
+		_params = params;
+		[self setModalPresentationStyle:UIModalPresentationFormSheet];
+
+		// on iphone we have the problem that the buttons are hidden by the keyboard
+		// we solve this issue by registering keyboard notification handlers and adjusting the
+		// scrollview accordingly
+		if (IsPhone())
+		{
+			[[NSNotificationCenter defaultCenter] addObserver:self
+			                                         selector:@selector(keyboardWillShow:)
+			                                             name:UIKeyboardWillShowNotification
+			                                           object:nil];
+			[[NSNotificationCenter defaultCenter] addObserver:self
+			                                         selector:@selector(keyboardWillHide:)
+			                                             name:UIKeyboardWillHideNotification
+			                                           object:nil];
+		}
+	}
+	return self;
+}
+
+- (void)viewDidLoad
+{
+	[super viewDidLoad];
+
+	// set localized strings
+	[_lbl_message
+	    setText:NSLocalizedString(
+	                @"Please provide the missing user information in order to proceed and login.",
+	                @"Credentials input view message")];
+	[_textfield_username
+	    setPlaceholder:NSLocalizedString(@"Username", @"Credentials Input Username hint")];
+	[_textfield_password
+	    setPlaceholder:NSLocalizedString(@"Password", @"Credentials Input Password hint")];
+	[_textfield_domain
+	    setPlaceholder:NSLocalizedString(@"Domain", @"Credentials Input Domain hint")];
+	[_btn_login setTitle:NSLocalizedString(@"Login", @"Login Button")
+	            forState:UIControlStateNormal];
+	[_btn_cancel setTitle:NSLocalizedString(@"Cancel", @"Cancel Button")
+	             forState:UIControlStateNormal];
+
+	// init scrollview content size
+	[_scroll_view setContentSize:[_scroll_view frame].size];
+
+	// set params in the view
+	[_textfield_username setText:[_params valueForKey:@"username"]];
+	[_textfield_password setText:[_params valueForKey:@"password"]];
+	[_textfield_domain setText:[_params valueForKey:@"domain"]];
+}
+
+- (void)viewDidUnload
+{
+	[super viewDidUnload];
+}
+
+- (void)viewDidDisappear:(BOOL)animated
+{
+	[super viewDidDisappear:animated];
+	// set signal
+	[[_session uiRequestCompleted] signal];
+}
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+	return YES;
+}
+
+- (void)dealloc
+{
+	[super dealloc];
+	[[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
+#pragma mark -
+#pragma mark iOS Keyboard Notification Handlers
+
+- (void)keyboardWillShow:(NSNotification *)notification
+{
+	CGRect keyboardEndFrame =
+	    [[[notification userInfo] objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue];
+	CGRect keyboardFrame = [[self view] convertRect:keyboardEndFrame toView:nil];
+
+	[UIView beginAnimations:nil context:NULL];
+	[UIView setAnimationCurve:[[[notification userInfo]
+	                              objectForKey:UIKeyboardAnimationCurveUserInfoKey] intValue]];
+	[UIView
+	    setAnimationDuration:[[[notification userInfo]
+	                             objectForKey:UIKeyboardAnimationDurationUserInfoKey] doubleValue]];
+	CGRect frame = [_scroll_view frame];
+	frame.size.height -= keyboardFrame.size.height;
+	[_scroll_view setFrame:frame];
+	[UIView commitAnimations];
+}
+
+- (void)keyboardWillHide:(NSNotification *)notification
+{
+	CGRect keyboardEndFrame =
+	    [[[notification userInfo] objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue];
+	CGRect keyboardFrame = [[self view] convertRect:keyboardEndFrame toView:nil];
+
+	[UIView beginAnimations:nil context:NULL];
+	[UIView setAnimationCurve:[[[notification userInfo]
+	                              objectForKey:UIKeyboardAnimationCurveUserInfoKey] intValue]];
+	[UIView
+	    setAnimationDuration:[[[notification userInfo]
+	                             objectForKey:UIKeyboardAnimationDurationUserInfoKey] doubleValue]];
+	CGRect frame = [_scroll_view frame];
+	frame.size.height += keyboardFrame.size.height;
+	[_scroll_view setFrame:frame];
+	[UIView commitAnimations];
+}
+
+#pragma mark - Action handlers
+
+- (IBAction)loginPressed:(id)sender
+{
+	// read input back in
+	[_params setValue:[_textfield_username text] forKey:@"username"];
+	[_params setValue:[_textfield_password text] forKey:@"password"];
+	[_params setValue:[_textfield_domain text] forKey:@"domain"];
+	[_params setValue:[NSNumber numberWithBool:YES] forKey:@"result"];
+
+	// dismiss controller
+	[self dismissModalViewControllerAnimated:YES];
+}
+
+- (IBAction)cancelPressed:(id)sender
+{
+	[_params setValue:[NSNumber numberWithBool:NO] forKey:@"result"];
+
+	// dismiss controller
+	[self dismissModalViewControllerAnimated:YES];
+}
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Controllers/EditorBaseController.h

@@ -0,0 +1,44 @@
+/*
+ Basic interface for settings editors
+
+ Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import <UIKit/UIKit.h>
+#import "EditTextTableViewCell.h"
+#import "EditFlagTableViewCell.h"
+#import "EditSelectionTableViewCell.h"
+#import "EditSubEditTableViewCell.h"
+#import "EditSecretTextTableViewCell.h"
+#import "EditButtonTableViewCell.h"
+
+extern NSString *TableCellIdentifierText;
+extern NSString *TableCellIdentifierSecretText;
+extern NSString *TableCellIdentifierYesNo;
+extern NSString *TableCellIdentifierSelection;
+extern NSString *TableCellIdentifierSubEditor;
+extern NSString *TableCellIdentifierMultiChoice;
+extern NSString *TableCellIdentifierButton;
+
+@interface EditorBaseController : UITableViewController <UITextFieldDelegate>
+{
+  @private
+	IBOutlet EditTextTableViewCell *_textTableViewCell;
+	IBOutlet EditSecretTextTableViewCell *_secretTextTableViewCell;
+	IBOutlet EditFlagTableViewCell *_flagTableViewCell;
+	IBOutlet EditSelectionTableViewCell *_selectionTableViewCell;
+	IBOutlet EditSubEditTableViewCell *_subEditTableViewCell;
+	IBOutlet EditButtonTableViewCell *_buttonTableViewCell;
+}
+
+// returns one of the requested table view cells
+- (UITableViewCell *)tableViewCellFromIdentifier:(NSString *)identifier;
+
+// Adjust text input cells label/textfield width according to the label's text size
+- (void)adjustEditTextTableViewCell:(EditTextTableViewCell *)cell;
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Controllers/EditorBaseController.m

@@ -0,0 +1,110 @@
+/*
+ Basic interface for settings editors
+
+ Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import "EditorBaseController.h"
+
+@interface EditorBaseController ()
+
+@end
+
+NSString *TableCellIdentifierText = @"cellIdText";
+NSString *TableCellIdentifierSecretText = @"cellIdSecretText";
+NSString *TableCellIdentifierYesNo = @"cellIdYesNo";
+NSString *TableCellIdentifierSelection = @"cellIdSelection";
+NSString *TableCellIdentifierSubEditor = @"cellIdSubEditor";
+NSString *TableCellIdentifierMultiChoice = @"cellIdMultiChoice";
+NSString *TableCellIdentifierButton = @"cellIdButton";
+
+@implementation EditorBaseController
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+	return YES;
+}
+
+#pragma mark - Create table view cells
+- (UITableViewCell *)tableViewCellFromIdentifier:(NSString *)identifier
+{
+	// try to reuse a cell
+	UITableViewCell *cell = [[self tableView] dequeueReusableCellWithIdentifier:identifier];
+	if (cell != nil)
+		return cell;
+
+	// we have to create a new cell
+	if ([identifier isEqualToString:TableCellIdentifierText])
+	{
+		[[NSBundle mainBundle] loadNibNamed:@"EditTextTableViewCell" owner:self options:nil];
+		cell = _textTableViewCell;
+		_textTableViewCell = nil;
+	}
+	else if ([identifier isEqualToString:TableCellIdentifierSecretText])
+	{
+		[[NSBundle mainBundle] loadNibNamed:@"EditSecretTextTableViewCell" owner:self options:nil];
+		cell = _secretTextTableViewCell;
+		_secretTextTableViewCell = nil;
+	}
+	else if ([identifier isEqualToString:TableCellIdentifierYesNo])
+	{
+		[[NSBundle mainBundle] loadNibNamed:@"EditFlagTableViewCell" owner:self options:nil];
+		cell = _flagTableViewCell;
+		_flagTableViewCell = nil;
+	}
+	else if ([identifier isEqualToString:TableCellIdentifierSelection])
+	{
+		[[NSBundle mainBundle] loadNibNamed:@"EditSelectionTableViewCell" owner:self options:nil];
+		cell = _selectionTableViewCell;
+		_selectionTableViewCell = nil;
+	}
+	else if ([identifier isEqualToString:TableCellIdentifierSubEditor])
+	{
+		[[NSBundle mainBundle] loadNibNamed:@"EditSubEditTableViewCell" owner:self options:nil];
+		cell = _subEditTableViewCell;
+		_subEditTableViewCell = nil;
+	}
+	else if ([identifier isEqualToString:TableCellIdentifierButton])
+	{
+		[[NSBundle mainBundle] loadNibNamed:@"EditButtonTableViewCell" owner:self options:nil];
+		cell = _buttonTableViewCell;
+		_buttonTableViewCell = nil;
+	}
+	else if ([identifier isEqualToString:TableCellIdentifierMultiChoice])
+	{
+		cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleValue1
+		                               reuseIdentifier:identifier] autorelease];
+	}
+	else
+	{
+		NSAssert(false, @"Unknown table cell identifier");
+	}
+
+	return cell;
+}
+
+#pragma mark - Utility functions
+- (void)adjustEditTextTableViewCell:(EditTextTableViewCell *)cell
+{
+	UILabel *label = [cell label];
+	UITextField *textField = [cell textfield];
+
+	// adjust label
+	CGFloat width = [[label text] sizeWithFont:[label font]].width;
+	CGRect frame = [label frame];
+	CGFloat delta = width - frame.size.width;
+	frame.size.width = width;
+	[label setFrame:frame];
+
+	// adjust text field
+	frame = [textField frame];
+	frame.origin.x += delta;
+	frame.size.width -= delta;
+	[textField setFrame:frame];
+}
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Controllers/EditorSelectionController.m

@@ -0,0 +1,143 @@
+/*
+ Generic controller to select a single item from a list of options
+
+ Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import "EditorSelectionController.h"
+#import "ConnectionParams.h"
+#import "OrderedDictionary.h"
+
+@interface EditorSelectionController (Private)
+- (OrderedDictionary *)selectionForIndex:(int)index;
+@end
+
+@implementation EditorSelectionController
+
+- (id)initWithConnectionParams:(ConnectionParams *)params
+                       entries:(NSArray *)entries
+                    selections:(NSArray *)selections
+{
+	self = [super initWithStyle:UITableViewStyleGrouped];
+	if (self)
+	{
+		_params = [params retain];
+		_entries = [entries retain];
+		_selections = [selections retain];
+
+		// allocate and init current selections array
+		_cur_selections = [[NSMutableArray alloc] initWithCapacity:[_entries count]];
+		for (int i = 0; i < [entries count]; ++i)
+		{
+			NSString *entry = [entries objectAtIndex:i];
+			if ([_params hasValueForKeyPath:entry])
+			{
+				NSUInteger idx = [(OrderedDictionary *)[selections objectAtIndex:i]
+				    indexForValue:[NSNumber numberWithInt:[_params intForKeyPath:entry]]];
+				[_cur_selections addObject:[NSNumber numberWithInt:(idx != NSNotFound ? idx : 0)]];
+			}
+			else
+				[_cur_selections addObject:[NSNumber numberWithInt:0]];
+		}
+	}
+	return self;
+}
+
+- (void)didReceiveMemoryWarning
+{
+	// Releases the view if it doesn't have a superview.
+	[super didReceiveMemoryWarning];
+
+	// Release any cached data, images, etc that aren't in use.
+	[_params autorelease];
+	[_entries autorelease];
+	[_selections autorelease];
+	[_cur_selections autorelease];
+}
+
+#pragma mark - View lifecycle
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+	// Return YES for supported orientations
+	return YES;
+}
+
+#pragma mark - Table view data source
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
+{
+	// Return the number of sections.
+	return [_entries count];
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+	// Return the number of rows in the section.
+	return [[self selectionForIndex:section] count];
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView
+         cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+	UITableViewCell *cell = [self tableViewCellFromIdentifier:TableCellIdentifierMultiChoice];
+
+	// get selection
+	OrderedDictionary *selection = [self selectionForIndex:[indexPath section]];
+
+	// set cell properties
+	[[cell textLabel] setText:[selection keyAtIndex:[indexPath row]]];
+
+	// set default checkmark
+	if ([indexPath row] == [[_cur_selections objectAtIndex:[indexPath section]] intValue])
+		[cell setAccessoryType:UITableViewCellAccessoryCheckmark];
+	else
+		[cell setAccessoryType:UITableViewCellAccessoryNone];
+
+	return cell;
+}
+
+#pragma mark - Table view delegate
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+	// has selection change?
+	int cur_selection = [[_cur_selections objectAtIndex:[indexPath section]] intValue];
+	if ([indexPath row] != cur_selection)
+	{
+		[tableView deselectRowAtIndexPath:indexPath animated:NO];
+
+		NSIndexPath *oldIndexPath = [NSIndexPath indexPathForRow:cur_selection
+		                                               inSection:[indexPath section]];
+
+		// clear old checkmark
+		UITableViewCell *old_sel_cell = [tableView cellForRowAtIndexPath:oldIndexPath];
+		old_sel_cell.accessoryType = UITableViewCellAccessoryNone;
+
+		// set new checkmark
+		UITableViewCell *new_sel_cell = [tableView cellForRowAtIndexPath:indexPath];
+		new_sel_cell.accessoryType = UITableViewCellAccessoryCheckmark;
+
+		// get value from selection dictionary
+		OrderedDictionary *dict = [self selectionForIndex:[indexPath section]];
+		int sel_value = [[dict valueForKey:[dict keyAtIndex:[indexPath row]]] intValue];
+
+		// update selection index and params value
+		[_cur_selections replaceObjectAtIndex:[indexPath section]
+		                           withObject:[NSNumber numberWithInt:[indexPath row]]];
+		[_params setInt:sel_value forKeyPath:[_entries objectAtIndex:[indexPath section]]];
+	}
+}
+
+#pragma mark - Convenience functions
+
+- (OrderedDictionary *)selectionForIndex:(int)index
+{
+	return (OrderedDictionary *)[_selections objectAtIndex:index];
+}
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Controllers/EncryptionController.h

@@ -0,0 +1,25 @@
+/*
+ Password Encryption Controller
+
+ Copyright 2013 Thincast Technologies GmbH, Author: Dorian Johnson
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import <Foundation/Foundation.h>
+#import "Encryptor.h"
+
+@interface EncryptionController : NSObject
+{
+	Encryptor *_shared_encryptor;
+}
+
++ (EncryptionController *)sharedEncryptionController;
+
+// Return a Encryptor suitable for encrypting or decrypting with the master password
+- (Encryptor *)decryptor;
+- (Encryptor *)encryptor;
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Controllers/EncryptionController.m

@@ -0,0 +1,155 @@
+/*
+ Password Encryption Controller
+
+ Copyright 2013 Thincast Technologies GmbH, Author: Dorian Johnson
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import "EncryptionController.h"
+#import "SFHFKeychainUtils.h"
+#import "TSXAdditions.h"
+
+@interface EncryptionController (Private)
+
+- (BOOL)verifyPassword:(Encryptor *)decryptor;
+- (NSData *)encryptedVerificationData;
+- (void)setEncryptedVerificationData:(Encryptor *)encryptor;
+
+- (NSString *)keychainServerName;
+- (NSString *)keychainUsername;
+- (void)setKeychainPassword:(NSString *)password;
+- (NSString *)keychainPassword;
+- (NSString *)keychainDefaultPassword;
+
+@end
+
+static EncryptionController *_shared_encryption_controller = nil;
+
+#pragma mark -
+
+@implementation EncryptionController
+
++ (EncryptionController *)sharedEncryptionController
+{
+	@synchronized(self)
+	{
+		if (_shared_encryption_controller == nil)
+			_shared_encryption_controller = [[EncryptionController alloc] init];
+	}
+
+	return _shared_encryption_controller;
+}
+
+#pragma mark Getting an encryptor or decryptor
+
+- (Encryptor *)encryptor
+{
+	if (_shared_encryptor)
+		return _shared_encryptor;
+
+	NSString *saved_password = [self keychainPassword];
+	if (saved_password == nil)
+	{
+		saved_password = [self keychainDefaultPassword];
+		Encryptor *encryptor = [[[Encryptor alloc] initWithPassword:saved_password] autorelease];
+		[self setEncryptedVerificationData:encryptor];
+		_shared_encryptor = [encryptor retain];
+	}
+	else
+	{
+		Encryptor *encryptor = [[[Encryptor alloc] initWithPassword:saved_password] autorelease];
+		if ([self verifyPassword:encryptor])
+			_shared_encryptor = [encryptor retain];
+	}
+
+	return _shared_encryptor;
+}
+
+// For the current implementation, decryptors and encryptors are equivalent.
+- (Encryptor *)decryptor
+{
+	return [self encryptor];
+}
+
+@end
+
+#pragma mark -
+
+@implementation EncryptionController (Private)
+
+#pragma mark -
+#pragma mark Keychain password storage
+
+- (NSString *)keychainServerName
+{
+	return [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleName"];
+}
+
+- (NSString *)keychainUsername
+{
+	return @"master.password";
+}
+
+- (void)setKeychainPassword:(NSString *)password
+{
+	NSError *error;
+	if (password == nil)
+	{
+		[SFHFKeychainUtils deleteItemForUsername:[self keychainUsername]
+		                           andServerName:[self keychainServerName]
+		                                   error:&error];
+		return;
+	}
+
+	[SFHFKeychainUtils storeUsername:[self keychainUsername]
+	                     andPassword:password
+	                   forServerName:[self keychainServerName]
+	                  updateExisting:YES
+	                           error:&error];
+}
+
+- (NSString *)keychainPassword
+{
+	NSError *error;
+	return [SFHFKeychainUtils getPasswordForUsername:[self keychainUsername]
+	                                   andServerName:[self keychainServerName]
+	                                           error:&error];
+}
+
+- (NSString *)keychainDefaultPassword
+{
+	NSString *password = [[NSUserDefaults standardUserDefaults] stringForKey:@"UUID"];
+	if ([password length] == 0)
+	{
+		password = [NSString stringWithUUID];
+		[[NSUserDefaults standardUserDefaults] setObject:password forKey:@"UUID"];
+		[[NSUserDefaults standardUserDefaults] removeObjectForKey:@"TSXMasterPasswordVerification"];
+	}
+	return password;
+}
+
+#pragma mark -
+#pragma mark Verification of encryption key against verification data
+
+- (BOOL)verifyPassword:(Encryptor *)decryptor
+{
+	return [[decryptor plaintextPassword]
+	    isEqualToString:[decryptor decryptString:[self encryptedVerificationData]]];
+}
+
+- (NSData *)encryptedVerificationData
+{
+	return [[NSUserDefaults standardUserDefaults] dataForKey:@"TSXMasterPasswordVerification"];
+}
+
+- (void)setEncryptedVerificationData:(Encryptor *)encryptor
+{
+	[[NSUserDefaults standardUserDefaults]
+	    setObject:[encryptor encryptString:[encryptor plaintextPassword]]
+	       forKey:@"TSXMasterPasswordVerification"];
+}
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Controllers/HelpController.h

@@ -0,0 +1,17 @@
+/*
+ Application help controller
+
+ Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import <UIKit/UIKit.h>
+
+@interface HelpController : UIViewController <UIWebViewDelegate>
+{
+	UIWebView *webView;
+}
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Controllers/HelpController.m

@@ -0,0 +1,76 @@
+/*
+ Application help controller
+
+ Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import "HelpController.h"
+#import "Utils.h"
+
+@implementation HelpController
+
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+{
+	self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+	if (self)
+	{
+		// set title and tab-bar image
+		[self setTitle:NSLocalizedString(@"Help", @"Help Controller title")];
+		UIImage *tabBarIcon = [UIImage
+		    imageWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"tabbar_icon_help"
+		                                                            ofType:@"png"]];
+		[self setTabBarItem:[[[UITabBarItem alloc]
+		                        initWithTitle:NSLocalizedString(@"Help", @"Tabbar item help")
+		                                image:tabBarIcon
+		                                  tag:0] autorelease]];
+	}
+	return self;
+}
+
+// Implement loadView to create a view hierarchy programmatically, without using a nib.
+- (void)loadView
+{
+	webView = [[[UIWebView alloc] initWithFrame:CGRectZero] autorelease];
+	[webView
+	    setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)];
+	[webView setAutoresizesSubviews:YES];
+	[webView setDelegate:self];
+	[webView setDataDetectorTypes:UIDataDetectorTypeNone];
+	[self setView:webView];
+}
+
+- (void)dealloc
+{
+	[super dealloc];
+}
+
+// Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
+- (void)viewDidLoad
+{
+	[super viewDidLoad];
+
+	NSString *filename = (IsPhone() ? @"gestures_phone" : @"gestures");
+	NSString *htmlString = [[[NSString alloc]
+	    initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:filename
+	                                                           ofType:@"html"
+	                                                      inDirectory:@"help_page"]
+	                  encoding:NSUTF8StringEncoding
+	                     error:nil] autorelease];
+
+	[webView
+	    loadHTMLString:htmlString
+	           baseURL:[NSURL fileURLWithPath:[[[NSBundle mainBundle] bundlePath]
+	                                              stringByAppendingPathComponent:@"help_page"]]];
+}
+
+// Override to allow orientations other than the default portrait orientation.
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+	return YES;
+}
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Controllers/MainTabBarController.h

@@ -0,0 +1,18 @@
+/*
+ main tabbar controller
+
+ Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+@interface MainTabBarController : UITabBarController
+{
+}
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Controllers/MainTabBarController.m

@@ -0,0 +1,20 @@
+/*
+ main tabbar controller
+
+ Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import "MainTabBarController.h"
+
+@implementation MainTabBarController
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation
+{
+	return YES;
+}
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Controllers/PerformanceEditorController.h

@@ -0,0 +1,25 @@
+/*
+ controller for performance settings selection
+
+ Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import "EditorBaseController.h"
+
+@class ConnectionParams;
+
+@interface PerformanceEditorController : EditorBaseController
+{
+  @private
+	ConnectionParams *_params;
+	NSString *_keyPath;
+}
+
+- (id)initWithConnectionParams:(ConnectionParams *)params;
+- (id)initWithConnectionParams:(ConnectionParams *)params keyPath:(NSString *)keyPath;
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Controllers/PerformanceEditorController.m

@@ -0,0 +1,244 @@
+/*
+ controller for performance settings selection
+
+ Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import "PerformanceEditorController.h"
+#import "ConnectionParams.h"
+#import "Utils.h"
+
+@interface PerformanceEditorController (Private)
+- (NSString *)keyPathForKey:(NSString *)key;
+@end
+
+@implementation PerformanceEditorController
+
+- (id)initWithConnectionParams:(ConnectionParams *)params
+{
+	return [self initWithConnectionParams:params keyPath:nil];
+}
+
+- (id)initWithConnectionParams:(ConnectionParams *)params keyPath:(NSString *)keyPath;
+{
+	self = [super initWithStyle:UITableViewStyleGrouped];
+
+	if (self)
+	{
+		_params = [params retain];
+		_keyPath = (keyPath != nil ? [keyPath retain] : nil);
+	}
+
+	return self;
+}
+
+- (void)viewDidLoad
+{
+	[super viewDidLoad];
+	// Do any additional setup after loading the view.
+}
+
+- (void)viewDidUnload
+{
+	[super viewDidUnload];
+	// Release any retained subviews of the main view.
+}
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+	return YES;
+}
+
+- (NSString *)keyPathForKey:(NSString *)key
+{
+	if (_keyPath)
+		return [_keyPath stringByAppendingFormat:@".%@", key];
+
+	return key;
+}
+
+- (void)dealloc
+{
+	[super dealloc];
+	[_params release];
+}
+
+#pragma mark -
+#pragma mark Table view data source
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
+{
+	// Return the number of sections.
+	return 1;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+	return 7;
+}
+
+// set section headers
+- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section
+{
+	return NSLocalizedString(@"Performance Settings",
+	                         @"'Performance Settings': performance settings header");
+}
+
+// Customize the appearance of table view cells.
+- (UITableViewCell *)tableView:(UITableView *)tableView
+         cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+	// get the table view cell
+	EditFlagTableViewCell *cell =
+	    (EditFlagTableViewCell *)[self tableViewCellFromIdentifier:TableCellIdentifierYesNo];
+	NSAssert(cell, @"Invalid cell");
+
+	switch ([indexPath row])
+	{
+		case 0:
+		{
+			[[cell label] setText:NSLocalizedString(@"RemoteFX", @"RemoteFX performance setting")];
+			[[cell toggle] setOn:[_params boolForKeyPath:[self keyPathForKey:@"perf_remotefx"]]];
+			break;
+		}
+
+		case 1:
+		{
+			[[cell label] setText:NSLocalizedString(@"GFX", @"GFX performance setting")];
+			[[cell toggle] setOn:[_params boolForKeyPath:[self keyPathForKey:@"perf_gfx"]]];
+			break;
+		}
+
+		case 2:
+		{
+			[[cell label] setText:NSLocalizedString(@"H264", @"H264 performance setting")];
+			[[cell toggle] setOn:[_params boolForKeyPath:[self keyPathForKey:@"perf_h264"]]];
+			break;
+		}
+
+		case 3:
+		{
+			[[cell label] setText:NSLocalizedString(@"Desktop Background",
+			                                        @"Desktop background performance setting")];
+			[[cell toggle]
+			    setOn:[_params boolForKeyPath:[self keyPathForKey:@"perf_show_desktop"]]];
+			break;
+		}
+
+		case 4:
+		{
+			[[cell label] setText:NSLocalizedString(@"Font Smoothing",
+			                                        @"Font smoothing performance setting")];
+			[[cell toggle]
+			    setOn:[_params boolForKeyPath:[self keyPathForKey:@"perf_font_smoothing"]]];
+			break;
+		}
+
+		case 5:
+		{
+			[[cell label] setText:NSLocalizedString(@"Desktop Composition",
+			                                        @"Desktop composition performance setting")];
+			[[cell toggle]
+			    setOn:[_params boolForKeyPath:[self keyPathForKey:@"perf_desktop_composition"]]];
+			break;
+		}
+
+		case 6:
+		{
+			[[cell label] setText:NSLocalizedString(@"Window contents while dragging",
+			                                        @"Window Dragging performance setting")];
+			[[cell toggle]
+			    setOn:[_params boolForKeyPath:[self keyPathForKey:@"perf_window_dragging"]]];
+			break;
+		}
+
+		case 7:
+		{
+			[[cell label] setText:NSLocalizedString(@"Menu Animation",
+			                                        @"Menu Animations performance setting")];
+			[[cell toggle]
+			    setOn:[_params boolForKeyPath:[self keyPathForKey:@"perf_menu_animation"]]];
+			break;
+		}
+
+		case 8:
+		{
+			[[cell label]
+			    setText:NSLocalizedString(@"Visual Styles", @"Use Themes performance setting")];
+			[[cell toggle]
+			    setOn:[_params boolForKeyPath:[self keyPathForKey:@"perf_windows_themes"]]];
+			break;
+		}
+
+		default:
+			break;
+	}
+
+	[[cell toggle] setTag:GET_TAG_FROM_PATH(indexPath)];
+	[[cell toggle] addTarget:self
+	                  action:@selector(togglePerformanceSetting:)
+	        forControlEvents:UIControlEventValueChanged];
+	return cell;
+}
+
+#pragma mark -
+#pragma mark Action Handlers
+
+- (void)togglePerformanceSetting:(id)sender
+{
+	UISwitch *valueSwitch = (UISwitch *)sender;
+
+	switch (valueSwitch.tag)
+	{
+		case GET_TAG(0, 0):
+			[_params setBool:[valueSwitch isOn] forKeyPath:[self keyPathForKey:@"perf_remotefx"]];
+			break;
+
+		case GET_TAG(0, 1):
+			[_params setBool:[valueSwitch isOn] forKeyPath:[self keyPathForKey:@"perf_gfx"]];
+			break;
+
+		case GET_TAG(0, 2):
+			[_params setBool:[valueSwitch isOn] forKeyPath:[self keyPathForKey:@"perf_h264"]];
+			break;
+
+		case GET_TAG(0, 3):
+			[_params setBool:[valueSwitch isOn]
+			      forKeyPath:[self keyPathForKey:@"perf_show_desktop"]];
+			break;
+
+		case GET_TAG(0, 4):
+			[_params setBool:[valueSwitch isOn]
+			      forKeyPath:[self keyPathForKey:@"perf_font_smoothing"]];
+			break;
+
+		case GET_TAG(0, 5):
+			[_params setBool:[valueSwitch isOn]
+			      forKeyPath:[self keyPathForKey:@"perf_desktop_composition"]];
+			break;
+
+		case GET_TAG(0, 6):
+			[_params setBool:[valueSwitch isOn]
+			      forKeyPath:[self keyPathForKey:@"perf_window_dragging"]];
+			break;
+
+		case GET_TAG(0, 7):
+			[_params setBool:[valueSwitch isOn]
+			      forKeyPath:[self keyPathForKey:@"perf_menu_animation"]];
+			break;
+
+		case GET_TAG(0, 8):
+			[_params setBool:[valueSwitch isOn]
+			      forKeyPath:[self keyPathForKey:@"perf_windows_themes"]];
+			break;
+
+		default:
+			break;
+	}
+}
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Controllers/RDPSessionViewController.h

@@ -0,0 +1,75 @@
+/*
+ RDP Session View Controller
+
+ Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import <UIKit/UIKit.h>
+#import "RDPSession.h"
+#import "RDPKeyboard.h"
+#import "RDPSessionView.h"
+#import "TouchPointerView.h"
+#import "AdvancedKeyboardView.h"
+
+@interface RDPSessionViewController
+    : UIViewController <RDPSessionDelegate, TouchPointerDelegate, AdvancedKeyboardDelegate,
+                        RDPKeyboardDelegate, UIScrollViewDelegate, UITextFieldDelegate>
+{
+	// scrollview that hosts the rdp session view
+	IBOutlet UIScrollView *_session_scrollview;
+
+	// rdp session view
+	IBOutlet RDPSessionView *_session_view;
+
+	// touch pointer view
+	IBOutlet TouchPointerView *_touchpointer_view;
+	BOOL _autoscroll_with_touchpointer;
+	BOOL _is_autoscrolling;
+
+	// rdp session toolbar
+	IBOutlet UIToolbar *_session_toolbar;
+	BOOL _session_toolbar_visible;
+
+	// dummy text field used to display the keyboard
+	IBOutlet UITextField *_dummy_textfield;
+
+	// connecting view and the controls within that view
+	IBOutlet UIView *_connecting_view;
+	IBOutlet UILabel *_lbl_connecting;
+	IBOutlet UIActivityIndicatorView *_connecting_indicator_view;
+	IBOutlet UIButton *_cancel_connect_button;
+
+	// extended keyboard toolbar
+	UIToolbar *_keyboard_toolbar;
+
+	// rdp session
+	RDPSession *_session;
+	BOOL _session_initilized;
+
+	// flag that indicates whether the keyboard is visible or not
+	BOOL _keyboard_visible;
+
+	// flag to switch between left/right mouse button mode
+	BOOL _toggle_mouse_button;
+
+	// keyboard extension view
+	AdvancedKeyboardView *_advanced_keyboard_view;
+	BOOL _advanced_keyboard_visible;
+	BOOL _requesting_advanced_keyboard;
+	CGFloat _keyboard_last_height;
+
+	// delayed mouse move event sending
+	NSTimer *_mouse_move_event_timer;
+	int _mouse_move_events_skipped;
+	CGPoint _prev_long_press_position;
+}
+
+- (id)initWithNibName:(NSString *)nibNameOrNil
+               bundle:(NSBundle *)nibBundleOrNil
+              session:(RDPSession *)session;
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Controllers/RDPSessionViewController.m

@@ -0,0 +1,1113 @@
+/*
+ RDP Session View Controller
+
+ Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import <QuartzCore/QuartzCore.h>
+#import "RDPSessionViewController.h"
+#import "RDPKeyboard.h"
+#import "Utils.h"
+#import "Toast+UIView.h"
+#import "ConnectionParams.h"
+#import "CredentialsInputController.h"
+#import "VerifyCertificateController.h"
+#import "BlockAlertView.h"
+
+#define TOOLBAR_HEIGHT 30
+
+#define AUTOSCROLLDISTANCE 20
+#define AUTOSCROLLTIMEOUT 0.05
+
+@interface RDPSessionViewController (Private)
+- (void)showSessionToolbar:(BOOL)show;
+- (UIToolbar *)keyboardToolbar;
+- (void)initGestureRecognizers;
+- (void)suspendSession;
+- (NSDictionary *)eventDescriptorForMouseEvent:(int)event position:(CGPoint)position;
+- (void)handleMouseMoveForPosition:(CGPoint)position;
+@end
+
+@implementation RDPSessionViewController
+
+#pragma mark class methods
+
+- (id)initWithNibName:(NSString *)nibNameOrNil
+               bundle:(NSBundle *)nibBundleOrNil
+              session:(RDPSession *)session
+{
+	self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+	if (self)
+	{
+		_session = [session retain];
+		[_session setDelegate:self];
+		_session_initilized = NO;
+
+		_mouse_move_events_skipped = 0;
+		_mouse_move_event_timer = nil;
+
+		_advanced_keyboard_view = nil;
+		_advanced_keyboard_visible = NO;
+		_requesting_advanced_keyboard = NO;
+		_keyboard_last_height = 0;
+
+		_session_toolbar_visible = NO;
+
+		_toggle_mouse_button = NO;
+
+		_autoscroll_with_touchpointer =
+		    [[NSUserDefaults standardUserDefaults] boolForKey:@"ui.auto_scroll_touchpointer"];
+		_is_autoscrolling = NO;
+
+		[UIView setAnimationDelegate:self];
+		[UIView setAnimationDidStopSelector:@selector(animationStopped:finished:context:)];
+	}
+
+	return self;
+}
+
+// Implement loadView to create a view hierarchy programmatically, without using a nib.
+- (void)loadView
+{
+	// load default view and set background color and resizing mask
+	[super loadView];
+
+	// init keyboard handling vars
+	_keyboard_visible = NO;
+
+	// init keyboard toolbar
+	_keyboard_toolbar = [[self keyboardToolbar] retain];
+	[_dummy_textfield setInputAccessoryView:_keyboard_toolbar];
+
+	// init gesture recognizers
+	[self initGestureRecognizers];
+
+	// hide session toolbar
+	[_session_toolbar
+	    setFrame:CGRectMake(0.0, -TOOLBAR_HEIGHT, [[self view] bounds].size.width, TOOLBAR_HEIGHT)];
+}
+
+// Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
+- (void)viewDidLoad
+{
+	[super viewDidLoad];
+}
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+	return YES;
+}
+
+- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation
+{
+	if (![_touchpointer_view isHidden])
+		[_touchpointer_view ensurePointerIsVisible];
+}
+
+- (void)didReceiveMemoryWarning
+{
+	// Releases the view if it doesn't have a superview.
+	[super didReceiveMemoryWarning];
+
+	// Release any cached data, images, etc. that aren't in use.
+}
+
+- (void)viewDidUnload
+{
+	[super viewDidUnload];
+	// Release any retained subviews of the main view.
+	// e.g. self.myOutlet = nil;
+}
+
+- (void)viewWillAppear:(BOOL)animated
+{
+	[super viewWillAppear:animated];
+
+	// hide navigation bar and (if enabled) the status bar
+	if ([[NSUserDefaults standardUserDefaults] boolForKey:@"ui.hide_status_bar"])
+	{
+		if (animated == YES)
+			[[UIApplication sharedApplication] setStatusBarHidden:YES
+			                                        withAnimation:UIStatusBarAnimationSlide];
+		else
+			[[UIApplication sharedApplication] setStatusBarHidden:YES
+			                                        withAnimation:UIStatusBarAnimationNone];
+	}
+	[[self navigationController] setNavigationBarHidden:YES animated:animated];
+
+	// if session is suspended - notify that we got a new bitmap context
+	if ([_session isSuspended])
+		[self sessionBitmapContextWillChange:_session];
+
+	// init keyboard
+	[[RDPKeyboard getSharedRDPKeyboard] initWithSession:_session delegate:self];
+}
+
+- (void)viewDidAppear:(BOOL)animated
+{
+	[super viewDidAppear:animated];
+
+	if (!_session_initilized)
+	{
+		if ([_session isSuspended])
+		{
+			[_session resume];
+			[self sessionBitmapContextDidChange:_session];
+			[_session_view setNeedsDisplay];
+		}
+		else
+			[_session connect];
+
+		_session_initilized = YES;
+	}
+}
+
+- (void)viewWillDisappear:(BOOL)animated
+{
+	[super viewWillDisappear:animated];
+
+	// show navigation and status bar again
+	if (animated == YES)
+		[[UIApplication sharedApplication] setStatusBarHidden:NO
+		                                        withAnimation:UIStatusBarAnimationSlide];
+	else
+		[[UIApplication sharedApplication] setStatusBarHidden:NO
+		                                        withAnimation:UIStatusBarAnimationNone];
+	[[self navigationController] setNavigationBarHidden:NO animated:animated];
+
+	// reset all modifier keys on rdp keyboard
+	[[RDPKeyboard getSharedRDPKeyboard] reset];
+
+	// hide toolbar and keyboard
+	[self showSessionToolbar:NO];
+	[_dummy_textfield resignFirstResponder];
+}
+
+- (void)dealloc
+{
+	// remove any observers
+	[[NSNotificationCenter defaultCenter] removeObserver:self];
+
+	// the session lives on longer so set the delegate to nil
+	[_session setDelegate:nil];
+
+	[_advanced_keyboard_view release];
+	[_keyboard_toolbar release];
+	[_session release];
+	[super dealloc];
+}
+
+#pragma mark -
+#pragma mark ScrollView delegate methods
+
+- (UIView *)viewForZoomingInScrollView:(UIScrollView *)scrollView
+{
+	return _session_view;
+}
+
+- (void)scrollViewDidEndZooming:(UIScrollView *)scrollView
+                       withView:(UIView *)view
+                        atScale:(float)scale
+{
+	NSLog(@"New zoom scale: %f", scale);
+	[_session_view setNeedsDisplay];
+}
+
+#pragma mark -
+#pragma mark TextField delegate methods
+- (BOOL)textFieldShouldBeginEditing:(UITextField *)textField
+{
+	_keyboard_visible = YES;
+	_advanced_keyboard_visible = NO;
+	return YES;
+}
+
+- (BOOL)textFieldShouldEndEditing:(UITextField *)textField
+{
+	_keyboard_visible = NO;
+	_advanced_keyboard_visible = NO;
+	return YES;
+}
+
+- (BOOL)textField:(UITextField *)textField
+    shouldChangeCharactersInRange:(NSRange)range
+                replacementString:(NSString *)string
+{
+	if ([string length] > 0)
+	{
+		for (int i = 0; i < [string length]; i++)
+		{
+			unichar curChar = [string characterAtIndex:i];
+
+			// special handling for return/enter key
+			if (curChar == '\n')
+				[[RDPKeyboard getSharedRDPKeyboard] sendEnterKeyStroke];
+			else
+				[[RDPKeyboard getSharedRDPKeyboard] sendUnicode:curChar];
+		}
+	}
+	else
+	{
+		[[RDPKeyboard getSharedRDPKeyboard] sendBackspaceKeyStroke];
+	}
+
+	return NO;
+}
+
+#pragma mark -
+#pragma mark AdvancedKeyboardDelegate functions
+- (void)advancedKeyPressedVKey:(int)key
+{
+	[[RDPKeyboard getSharedRDPKeyboard] sendVirtualKeyCode:key];
+}
+
+- (void)advancedKeyPressedUnicode:(int)key
+{
+	[[RDPKeyboard getSharedRDPKeyboard] sendUnicode:key];
+}
+
+#pragma mark - RDP keyboard handler
+
+- (void)modifiersChangedForKeyboard:(RDPKeyboard *)keyboard
+{
+	UIBarButtonItem *curItem;
+
+	// shift button (only on iPad)
+	int objectIdx = 0;
+	if (IsPad())
+	{
+		objectIdx = 2;
+		curItem = (UIBarButtonItem *)[[_keyboard_toolbar items] objectAtIndex:objectIdx];
+		[curItem setStyle:[keyboard shiftPressed] ? UIBarButtonItemStyleDone
+		                                          : UIBarButtonItemStyleBordered];
+	}
+
+	// ctrl button
+	objectIdx += 2;
+	curItem = (UIBarButtonItem *)[[_keyboard_toolbar items] objectAtIndex:objectIdx];
+	[curItem
+	    setStyle:[keyboard ctrlPressed] ? UIBarButtonItemStyleDone : UIBarButtonItemStyleBordered];
+
+	// win button
+	objectIdx += 2;
+	curItem = (UIBarButtonItem *)[[_keyboard_toolbar items] objectAtIndex:objectIdx];
+	[curItem
+	    setStyle:[keyboard winPressed] ? UIBarButtonItemStyleDone : UIBarButtonItemStyleBordered];
+
+	// alt button
+	objectIdx += 2;
+	curItem = (UIBarButtonItem *)[[_keyboard_toolbar items] objectAtIndex:objectIdx];
+	[curItem
+	    setStyle:[keyboard altPressed] ? UIBarButtonItemStyleDone : UIBarButtonItemStyleBordered];
+}
+
+#pragma mark -
+#pragma mark RDPSessionDelegate functions
+
+- (void)session:(RDPSession *)session didFailToConnect:(int)reason
+{
+	// remove and release connecting view
+	[_connecting_indicator_view stopAnimating];
+	[_connecting_view removeFromSuperview];
+	[_connecting_view autorelease];
+
+	// return to bookmark list
+	[[self navigationController] popViewControllerAnimated:YES];
+}
+
+- (void)sessionWillConnect:(RDPSession *)session
+{
+	// load connecting view
+	[[NSBundle mainBundle] loadNibNamed:@"RDPConnectingView" owner:self options:nil];
+
+	// set strings
+	[_lbl_connecting setText:NSLocalizedString(@"Connecting", @"Connecting progress view - label")];
+	[_cancel_connect_button setTitle:NSLocalizedString(@"Cancel", @"Cancel Button")
+	                        forState:UIControlStateNormal];
+
+	// center view and give it round corners
+	[_connecting_view setCenter:[[self view] center]];
+	[[_connecting_view layer] setCornerRadius:10];
+
+	// display connecting view and start indicator
+	[[self view] addSubview:_connecting_view];
+	[_connecting_indicator_view startAnimating];
+}
+
+- (void)sessionDidConnect:(RDPSession *)session
+{
+	// register keyboard notification handlers
+	[[NSNotificationCenter defaultCenter] addObserver:self
+	                                         selector:@selector(keyboardWillShow:)
+	                                             name:UIKeyboardWillShowNotification
+	                                           object:nil];
+	[[NSNotificationCenter defaultCenter] addObserver:self
+	                                         selector:@selector(keyboardDidShow:)
+	                                             name:UIKeyboardDidShowNotification
+	                                           object:nil];
+	[[NSNotificationCenter defaultCenter] addObserver:self
+	                                         selector:@selector(keyboardWillHide:)
+	                                             name:UIKeyboardWillHideNotification
+	                                           object:nil];
+	[[NSNotificationCenter defaultCenter] addObserver:self
+	                                         selector:@selector(keyboardDidHide:)
+	                                             name:UIKeyboardDidHideNotification
+	                                           object:nil];
+
+	// remove and release connecting view
+	[_connecting_indicator_view stopAnimating];
+	[_connecting_view removeFromSuperview];
+	[_connecting_view autorelease];
+
+	// check if session settings changed ...
+	// The 2nd width check is to ignore changes in resolution settings due to the RDVH display bug
+	// (refer to RDPSEssion.m for more details)
+	ConnectionParams *orig_params = [session params];
+	rdpSettings *sess_params = [session getSessionParams];
+	if (([orig_params intForKey:@"width"] != sess_params->DesktopWidth &&
+	     [orig_params intForKey:@"width"] != (sess_params->DesktopWidth + 1)) ||
+	    [orig_params intForKey:@"height"] != sess_params->DesktopHeight ||
+	    [orig_params intForKey:@"colors"] != sess_params->ColorDepth)
+	{
+		// display notification that the session params have been changed by the server
+		NSString *message =
+		    [NSString stringWithFormat:NSLocalizedString(
+		                                   @"The server changed the screen settings to %dx%dx%d",
+		                                   @"Screen settings not supported message with width, "
+		                                   @"height and colors parameter"),
+		                               sess_params->DesktopWidth, sess_params->DesktopHeight,
+		                               sess_params->ColorDepth];
+		[[self view] makeToast:message duration:ToastDurationNormal position:@"bottom"];
+	}
+}
+
+- (void)sessionWillDisconnect:(RDPSession *)session
+{
+}
+
+- (void)sessionDidDisconnect:(RDPSession *)session
+{
+	// return to bookmark list
+	[[self navigationController] popViewControllerAnimated:YES];
+}
+
+- (void)sessionBitmapContextWillChange:(RDPSession *)session
+{
+	// calc new view frame
+	rdpSettings *sess_params = [session getSessionParams];
+	CGRect view_rect = CGRectMake(0, 0, sess_params->DesktopWidth, sess_params->DesktopHeight);
+
+	// reset  zoom level and update content size
+	[_session_scrollview setZoomScale:1.0];
+	[_session_scrollview setContentSize:view_rect.size];
+
+	// set session view size
+	[_session_view setFrame:view_rect];
+
+	// show/hide toolbar
+	[_session
+	    setToolbarVisible:![[NSUserDefaults standardUserDefaults] boolForKey:@"ui.hide_tool_bar"]];
+	[self showSessionToolbar:[_session toolbarVisible]];
+}
+
+- (void)sessionBitmapContextDidChange:(RDPSession *)session
+{
+	// associate view with session
+	[_session_view setSession:session];
+
+	// issue an update (this might be needed in case we had a resize for instance)
+	[_session_view setNeedsDisplay];
+}
+
+- (void)session:(RDPSession *)session needsRedrawInRect:(CGRect)rect
+{
+	[_session_view setNeedsDisplayInRect:rect];
+}
+
+- (void)session:(RDPSession *)session requestsAuthenticationWithParams:(NSMutableDictionary *)params
+{
+	CredentialsInputController *view_controller =
+	    [[[CredentialsInputController alloc] initWithNibName:@"CredentialsInputView"
+	                                                  bundle:nil
+	                                                 session:_session
+	                                                  params:params] autorelease];
+	[self presentModalViewController:view_controller animated:YES];
+}
+
+- (void)session:(RDPSession *)session verifyCertificateWithParams:(NSMutableDictionary *)params
+{
+	VerifyCertificateController *view_controller =
+	    [[[VerifyCertificateController alloc] initWithNibName:@"VerifyCertificateView"
+	                                                   bundle:nil
+	                                                  session:_session
+	                                                   params:params] autorelease];
+	[self presentModalViewController:view_controller animated:YES];
+}
+
+- (CGSize)sizeForFitScreenForSession:(RDPSession *)session
+{
+	if (IsPad())
+		return [self view].bounds.size;
+	else
+	{
+		// on phones make a resolution that has a 16:10 ratio with the phone's height
+		CGSize size = [self view].bounds.size;
+		CGFloat maxSize = (size.width > size.height) ? size.width : size.height;
+		return CGSizeMake(maxSize * 1.6f, maxSize);
+	}
+}
+
+#pragma mark - Keyboard Toolbar Handlers
+
+- (void)showAdvancedKeyboardAnimated
+{
+	// calc initial and final rect of the advanced keyboard view
+	CGRect rect = [[_keyboard_toolbar superview] bounds];
+	rect.origin.y = [_keyboard_toolbar bounds].size.height;
+	rect.size.height -= rect.origin.y;
+
+	// create new view (hidden) and add to host-view of keyboard toolbar
+	_advanced_keyboard_view = [[AdvancedKeyboardView alloc]
+	    initWithFrame:CGRectMake(rect.origin.x, [[_keyboard_toolbar superview] bounds].size.height,
+	                             rect.size.width, rect.size.height)
+	         delegate:self];
+	[[_keyboard_toolbar superview] addSubview:_advanced_keyboard_view];
+	// we set autoresize to YES for the keyboard toolbar's superview so that our adv. keyboard view
+	// gets properly resized
+	[[_keyboard_toolbar superview] setAutoresizesSubviews:YES];
+
+	// show view with animation
+	[UIView beginAnimations:nil context:NULL];
+	[_advanced_keyboard_view setFrame:rect];
+	[UIView commitAnimations];
+}
+
+- (IBAction)toggleKeyboardWhenOtherVisible:(id)sender
+{
+	if (_advanced_keyboard_visible == NO)
+	{
+		[self showAdvancedKeyboardAnimated];
+	}
+	else
+	{
+		// hide existing view
+		[UIView beginAnimations:@"hide_advanced_keyboard_view" context:NULL];
+		CGRect rect = [_advanced_keyboard_view frame];
+		rect.origin.y = [[_keyboard_toolbar superview] bounds].size.height;
+		[_advanced_keyboard_view setFrame:rect];
+		[UIView commitAnimations];
+
+		// the view is released in the animationDidStop selector registered in init
+	}
+
+	// toggle flag
+	_advanced_keyboard_visible = !_advanced_keyboard_visible;
+}
+
+- (IBAction)toggleWinKey:(id)sender
+{
+	[[RDPKeyboard getSharedRDPKeyboard] toggleWinKey];
+}
+
+- (IBAction)toggleShiftKey:(id)sender
+{
+	[[RDPKeyboard getSharedRDPKeyboard] toggleShiftKey];
+}
+
+- (IBAction)toggleCtrlKey:(id)sender
+{
+	[[RDPKeyboard getSharedRDPKeyboard] toggleCtrlKey];
+}
+
+- (IBAction)toggleAltKey:(id)sender
+{
+	[[RDPKeyboard getSharedRDPKeyboard] toggleAltKey];
+}
+
+- (IBAction)pressEscKey:(id)sender
+{
+	[[RDPKeyboard getSharedRDPKeyboard] sendEscapeKeyStroke];
+}
+
+#pragma mark -
+#pragma mark event handlers
+
+- (void)animationStopped:(NSString *)animationID
+                finished:(NSNumber *)finished
+                 context:(void *)context
+{
+	if ([animationID isEqualToString:@"hide_advanced_keyboard_view"])
+	{
+		// cleanup advanced keyboard view
+		[_advanced_keyboard_view removeFromSuperview];
+		[_advanced_keyboard_view autorelease];
+		_advanced_keyboard_view = nil;
+	}
+}
+
+- (IBAction)switchSession:(id)sender
+{
+	[self suspendSession];
+}
+
+- (IBAction)toggleKeyboard:(id)sender
+{
+	if (!_keyboard_visible)
+		[_dummy_textfield becomeFirstResponder];
+	else
+		[_dummy_textfield resignFirstResponder];
+}
+
+- (IBAction)toggleExtKeyboard:(id)sender
+{
+	// if the sys kb is shown but not the advanced kb then toggle the advanced kb
+	if (_keyboard_visible && !_advanced_keyboard_visible)
+		[self toggleKeyboardWhenOtherVisible:nil];
+	else
+	{
+		// if not visible request the advanced keyboard view
+		if (_advanced_keyboard_visible == NO)
+			_requesting_advanced_keyboard = YES;
+		[self toggleKeyboard:nil];
+	}
+}
+
+- (IBAction)toggleTouchPointer:(id)sender
+{
+	BOOL toggle_visibilty = ![_touchpointer_view isHidden];
+	[_touchpointer_view setHidden:toggle_visibilty];
+	if (toggle_visibilty)
+		[_session_scrollview setContentInset:UIEdgeInsetsZero];
+	else
+		[_session_scrollview setContentInset:[_touchpointer_view getEdgeInsets]];
+}
+
+- (IBAction)disconnectSession:(id)sender
+{
+	[_session disconnect];
+}
+
+- (IBAction)cancelButtonPressed:(id)sender
+{
+	[_session disconnect];
+}
+
+#pragma mark -
+#pragma mark iOS Keyboard Notification Handlers
+
+// the keyboard is given in a portrait frame of reference
+- (BOOL)isLandscape
+{
+
+	UIInterfaceOrientation ori = [[UIApplication sharedApplication] statusBarOrientation];
+	return (ori == UIInterfaceOrientationLandscapeLeft ||
+	        ori == UIInterfaceOrientationLandscapeRight);
+}
+
+- (void)shiftKeyboard:(NSNotification *)notification
+{
+
+	CGRect keyboardEndFrame =
+	    [[[notification userInfo] objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue];
+
+	CGFloat previousHeight = _keyboard_last_height;
+
+	if ([self isLandscape])
+	{
+		// landscape has the keyboard based on x, so x can go negative
+		_keyboard_last_height = keyboardEndFrame.size.width + keyboardEndFrame.origin.x;
+	}
+	else
+	{
+		// portrait has the keyboard based on the difference of the height and the frames y.
+		CGFloat height = [[UIScreen mainScreen] bounds].size.height;
+		_keyboard_last_height = height - keyboardEndFrame.origin.y;
+	}
+
+	CGFloat shiftHeight = _keyboard_last_height - previousHeight;
+
+	[UIView beginAnimations:nil context:NULL];
+	[UIView setAnimationCurve:[[[notification userInfo]
+	                              objectForKey:UIKeyboardAnimationCurveUserInfoKey] intValue]];
+	[UIView
+	    setAnimationDuration:[[[notification userInfo]
+	                             objectForKey:UIKeyboardAnimationDurationUserInfoKey] doubleValue]];
+	CGRect frame = [_session_scrollview frame];
+	frame.size.height -= shiftHeight;
+	[_session_scrollview setFrame:frame];
+	[_touchpointer_view setFrame:frame];
+	[UIView commitAnimations];
+}
+
+- (void)keyboardWillShow:(NSNotification *)notification
+{
+	[self shiftKeyboard:notification];
+
+	[_touchpointer_view ensurePointerIsVisible];
+}
+
+- (void)keyboardDidShow:(NSNotification *)notification
+{
+	if (_requesting_advanced_keyboard)
+	{
+		[self showAdvancedKeyboardAnimated];
+		_advanced_keyboard_visible = YES;
+		_requesting_advanced_keyboard = NO;
+	}
+}
+
+- (void)keyboardWillHide:(NSNotification *)notification
+{
+
+	[self shiftKeyboard:notification];
+}
+
+- (void)keyboardDidHide:(NSNotification *)notification
+{
+	// release adanced keyboard view
+	if (_advanced_keyboard_visible == YES)
+	{
+		_advanced_keyboard_visible = NO;
+		[_advanced_keyboard_view removeFromSuperview];
+		[_advanced_keyboard_view autorelease];
+		_advanced_keyboard_view = nil;
+	}
+}
+
+#pragma mark -
+#pragma mark Gesture handlers
+
+- (void)handleSingleTap:(UITapGestureRecognizer *)gesture
+{
+	CGPoint pos = [gesture locationInView:_session_view];
+	if (_toggle_mouse_button)
+	{
+		[_session
+		    sendInputEvent:[self eventDescriptorForMouseEvent:GetRightMouseButtonClickEvent(YES)
+		                                             position:pos]];
+		[_session
+		    sendInputEvent:[self eventDescriptorForMouseEvent:GetRightMouseButtonClickEvent(NO)
+		                                             position:pos]];
+	}
+	else
+	{
+		[_session
+		    sendInputEvent:[self eventDescriptorForMouseEvent:GetLeftMouseButtonClickEvent(YES)
+		                                             position:pos]];
+		[_session sendInputEvent:[self eventDescriptorForMouseEvent:GetLeftMouseButtonClickEvent(NO)
+		                                                   position:pos]];
+	}
+
+	_toggle_mouse_button = NO;
+}
+
+- (void)handleDoubleTap:(UITapGestureRecognizer *)gesture
+{
+	CGPoint pos = [gesture locationInView:_session_view];
+	[_session sendInputEvent:[self eventDescriptorForMouseEvent:GetLeftMouseButtonClickEvent(YES)
+	                                                   position:pos]];
+	[_session sendInputEvent:[self eventDescriptorForMouseEvent:GetLeftMouseButtonClickEvent(NO)
+	                                                   position:pos]];
+	[_session sendInputEvent:[self eventDescriptorForMouseEvent:GetLeftMouseButtonClickEvent(YES)
+	                                                   position:pos]];
+	[_session sendInputEvent:[self eventDescriptorForMouseEvent:GetLeftMouseButtonClickEvent(NO)
+	                                                   position:pos]];
+	_toggle_mouse_button = NO;
+}
+
+- (void)handleLongPress:(UILongPressGestureRecognizer *)gesture
+{
+	CGPoint pos = [gesture locationInView:_session_view];
+
+	if ([gesture state] == UIGestureRecognizerStateBegan)
+		[_session
+		    sendInputEvent:[self eventDescriptorForMouseEvent:GetLeftMouseButtonClickEvent(YES)
+		                                             position:pos]];
+	else if ([gesture state] == UIGestureRecognizerStateChanged)
+		[self handleMouseMoveForPosition:pos];
+	else if ([gesture state] == UIGestureRecognizerStateEnded)
+		[_session sendInputEvent:[self eventDescriptorForMouseEvent:GetLeftMouseButtonClickEvent(NO)
+		                                                   position:pos]];
+}
+
+- (void)handleDoubleLongPress:(UILongPressGestureRecognizer *)gesture
+{
+	// this point is mapped against the scroll view because we want to have relative movement to the
+	// screen/scrollview
+	CGPoint pos = [gesture locationInView:_session_scrollview];
+
+	if ([gesture state] == UIGestureRecognizerStateBegan)
+		_prev_long_press_position = pos;
+	else if ([gesture state] == UIGestureRecognizerStateChanged)
+	{
+		int delta = _prev_long_press_position.y - pos.y;
+
+		if (delta > GetScrollGestureDelta())
+		{
+			[_session sendInputEvent:[self eventDescriptorForMouseEvent:GetMouseWheelEvent(YES)
+			                                                   position:pos]];
+			_prev_long_press_position = pos;
+		}
+		else if (delta < -GetScrollGestureDelta())
+		{
+			[_session sendInputEvent:[self eventDescriptorForMouseEvent:GetMouseWheelEvent(NO)
+			                                                   position:pos]];
+			_prev_long_press_position = pos;
+		}
+	}
+}
+
+- (void)handleSingle2FingersTap:(UITapGestureRecognizer *)gesture
+{
+	_toggle_mouse_button = !_toggle_mouse_button;
+}
+
+- (void)handleSingle3FingersTap:(UITapGestureRecognizer *)gesture
+{
+	[_session setToolbarVisible:![_session toolbarVisible]];
+	[self showSessionToolbar:[_session toolbarVisible]];
+}
+
+#pragma mark -
+#pragma mark Touch Pointer delegates
+// callback if touch pointer should be closed
+- (void)touchPointerClose
+{
+	[self toggleTouchPointer:nil];
+}
+
+// callback for a left click action
+- (void)touchPointerLeftClick:(CGPoint)pos down:(BOOL)down
+{
+	CGPoint session_view_pos = [_touchpointer_view convertPoint:pos toView:_session_view];
+	[_session sendInputEvent:[self eventDescriptorForMouseEvent:GetLeftMouseButtonClickEvent(down)
+	                                                   position:session_view_pos]];
+}
+
+// callback for a right click action
+- (void)touchPointerRightClick:(CGPoint)pos down:(BOOL)down
+{
+	CGPoint session_view_pos = [_touchpointer_view convertPoint:pos toView:_session_view];
+	[_session sendInputEvent:[self eventDescriptorForMouseEvent:GetRightMouseButtonClickEvent(down)
+	                                                   position:session_view_pos]];
+}
+
+- (void)doAutoScrolling
+{
+	int scrollX = 0;
+	int scrollY = 0;
+	CGPoint curPointerPos = [_touchpointer_view getPointerPosition];
+	CGRect viewBounds = [_touchpointer_view bounds];
+	CGRect scrollBounds = [_session_view bounds];
+
+	// add content insets to scroll bounds
+	scrollBounds.size.width += [_session_scrollview contentInset].right;
+	scrollBounds.size.height += [_session_scrollview contentInset].bottom;
+
+	// add zoom factor
+	scrollBounds.size.width *= [_session_scrollview zoomScale];
+	scrollBounds.size.height *= [_session_scrollview zoomScale];
+
+	if (curPointerPos.x > (viewBounds.size.width - [_touchpointer_view getPointerWidth]))
+		scrollX = AUTOSCROLLDISTANCE;
+	else if (curPointerPos.x < 0)
+		scrollX = -AUTOSCROLLDISTANCE;
+
+	if (curPointerPos.y > (viewBounds.size.height - [_touchpointer_view getPointerHeight]))
+		scrollY = AUTOSCROLLDISTANCE;
+	else if (curPointerPos.y < (_session_toolbar_visible ? TOOLBAR_HEIGHT : 0))
+		scrollY = -AUTOSCROLLDISTANCE;
+
+	CGPoint newOffset = [_session_scrollview contentOffset];
+	newOffset.x += scrollX;
+	newOffset.y += scrollY;
+
+	// if offset is going off screen - stop scrolling in that direction
+	if (newOffset.x < 0)
+	{
+		scrollX = 0;
+		newOffset.x = 0;
+	}
+	else if (newOffset.x > (scrollBounds.size.width - viewBounds.size.width))
+	{
+		scrollX = 0;
+		newOffset.x = MAX(scrollBounds.size.width - viewBounds.size.width, 0);
+	}
+	if (newOffset.y < 0)
+	{
+		scrollY = 0;
+		newOffset.y = 0;
+	}
+	else if (newOffset.y > (scrollBounds.size.height - viewBounds.size.height))
+	{
+		scrollY = 0;
+		newOffset.y = MAX(scrollBounds.size.height - viewBounds.size.height, 0);
+	}
+
+	// perform scrolling
+	[_session_scrollview setContentOffset:newOffset];
+
+	// continue scrolling?
+	if (scrollX != 0 || scrollY != 0)
+		[self performSelector:@selector(doAutoScrolling)
+		           withObject:nil
+		           afterDelay:AUTOSCROLLTIMEOUT];
+	else
+		_is_autoscrolling = NO;
+}
+
+// callback for a right click action
+- (void)touchPointerMove:(CGPoint)pos
+{
+	CGPoint session_view_pos = [_touchpointer_view convertPoint:pos toView:_session_view];
+	[self handleMouseMoveForPosition:session_view_pos];
+
+	if (_autoscroll_with_touchpointer && !_is_autoscrolling)
+	{
+		_is_autoscrolling = YES;
+		[self performSelector:@selector(doAutoScrolling)
+		           withObject:nil
+		           afterDelay:AUTOSCROLLTIMEOUT];
+	}
+}
+
+// callback if scrolling is performed
+- (void)touchPointerScrollDown:(BOOL)down
+{
+	[_session sendInputEvent:[self eventDescriptorForMouseEvent:GetMouseWheelEvent(down)
+	                                                   position:CGPointZero]];
+}
+
+// callback for toggling the standard keyboard
+- (void)touchPointerToggleKeyboard
+{
+	if (_advanced_keyboard_visible)
+		[self toggleKeyboardWhenOtherVisible:nil];
+	else
+		[self toggleKeyboard:nil];
+}
+
+// callback for toggling the extended keyboard
+- (void)touchPointerToggleExtendedKeyboard
+{
+	[self toggleExtKeyboard:nil];
+}
+
+// callback for reset view
+- (void)touchPointerResetSessionView
+{
+	[_session_scrollview setZoomScale:1.0 animated:YES];
+}
+
+@end
+
+@implementation RDPSessionViewController (Private)
+
+#pragma mark -
+#pragma mark Helper functions
+
+- (void)showSessionToolbar:(BOOL)show
+{
+	// already shown or hidden?
+	if (_session_toolbar_visible == show)
+		return;
+
+	if (show)
+	{
+		[UIView beginAnimations:@"showToolbar" context:nil];
+		[UIView setAnimationDuration:.4];
+		[UIView setAnimationCurve:UIViewAnimationCurveLinear];
+		[_session_toolbar
+		    setFrame:CGRectMake(0.0, 0.0, [[self view] bounds].size.width, TOOLBAR_HEIGHT)];
+		[UIView commitAnimations];
+		_session_toolbar_visible = YES;
+	}
+	else
+	{
+		[UIView beginAnimations:@"hideToolbar" context:nil];
+		[UIView setAnimationDuration:.4];
+		[UIView setAnimationCurve:UIViewAnimationCurveLinear];
+		[_session_toolbar setFrame:CGRectMake(0.0, -TOOLBAR_HEIGHT, [[self view] bounds].size.width,
+		                                      TOOLBAR_HEIGHT)];
+		[UIView commitAnimations];
+		_session_toolbar_visible = NO;
+	}
+}
+
+- (UIToolbar *)keyboardToolbar
+{
+	UIToolbar *keyboard_toolbar = [[[UIToolbar alloc] initWithFrame:CGRectNull] autorelease];
+	[keyboard_toolbar setBarStyle:UIBarStyleBlackOpaque];
+
+	UIBarButtonItem *esc_btn =
+	    [[[UIBarButtonItem alloc] initWithTitle:@"Esc"
+	                                      style:UIBarButtonItemStyleBordered
+	                                     target:self
+	                                     action:@selector(pressEscKey:)] autorelease];
+	UIImage *win_icon =
+	    [UIImage imageWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"toolbar_icon_win"
+	                                                                     ofType:@"png"]];
+	UIBarButtonItem *win_btn =
+	    [[[UIBarButtonItem alloc] initWithImage:win_icon
+	                                      style:UIBarButtonItemStyleBordered
+	                                     target:self
+	                                     action:@selector(toggleWinKey:)] autorelease];
+	UIBarButtonItem *ctrl_btn =
+	    [[[UIBarButtonItem alloc] initWithTitle:@"Ctrl"
+	                                      style:UIBarButtonItemStyleBordered
+	                                     target:self
+	                                     action:@selector(toggleCtrlKey:)] autorelease];
+	UIBarButtonItem *alt_btn =
+	    [[[UIBarButtonItem alloc] initWithTitle:@"Alt"
+	                                      style:UIBarButtonItemStyleBordered
+	                                     target:self
+	                                     action:@selector(toggleAltKey:)] autorelease];
+	UIBarButtonItem *ext_btn = [[[UIBarButtonItem alloc]
+	    initWithTitle:@"Ext"
+	            style:UIBarButtonItemStyleBordered
+	           target:self
+	           action:@selector(toggleKeyboardWhenOtherVisible:)] autorelease];
+	UIBarButtonItem *done_btn = [[[UIBarButtonItem alloc]
+	    initWithBarButtonSystemItem:UIBarButtonSystemItemDone
+	                         target:self
+	                         action:@selector(toggleKeyboard:)] autorelease];
+	UIBarButtonItem *flex_spacer =
+	    [[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace
+	                                                   target:nil
+	                                                   action:nil] autorelease];
+
+	// iPad gets a shift button, iphone doesn't (there's just not enough space ...)
+	NSArray *items;
+	if (IsPad())
+	{
+		UIBarButtonItem *shift_btn =
+		    [[[UIBarButtonItem alloc] initWithTitle:@"Shift"
+		                                      style:UIBarButtonItemStyleBordered
+		                                     target:self
+		                                     action:@selector(toggleShiftKey:)] autorelease];
+		items = [NSArray arrayWithObjects:esc_btn, flex_spacer, shift_btn, flex_spacer, ctrl_btn,
+		                                  flex_spacer, win_btn, flex_spacer, alt_btn, flex_spacer,
+		                                  ext_btn, flex_spacer, done_btn, nil];
+	}
+	else
+	{
+		items = [NSArray arrayWithObjects:esc_btn, flex_spacer, ctrl_btn, flex_spacer, win_btn,
+		                                  flex_spacer, alt_btn, flex_spacer, ext_btn, flex_spacer,
+		                                  done_btn, nil];
+	}
+
+	[keyboard_toolbar setItems:items];
+	[keyboard_toolbar sizeToFit];
+	return keyboard_toolbar;
+}
+
+- (void)initGestureRecognizers
+{
+	// single and double tap recognizer
+	UITapGestureRecognizer *doubleTapRecognizer =
+	    [[[UITapGestureRecognizer alloc] initWithTarget:self
+	                                             action:@selector(handleDoubleTap:)] autorelease];
+	[doubleTapRecognizer setNumberOfTouchesRequired:1];
+	[doubleTapRecognizer setNumberOfTapsRequired:2];
+
+	UITapGestureRecognizer *singleTapRecognizer =
+	    [[[UITapGestureRecognizer alloc] initWithTarget:self
+	                                             action:@selector(handleSingleTap:)] autorelease];
+	[singleTapRecognizer requireGestureRecognizerToFail:doubleTapRecognizer];
+	[singleTapRecognizer setNumberOfTouchesRequired:1];
+	[singleTapRecognizer setNumberOfTapsRequired:1];
+
+	// 2 fingers - tap recognizer
+	UITapGestureRecognizer *single2FingersTapRecognizer = [[[UITapGestureRecognizer alloc]
+	    initWithTarget:self
+	            action:@selector(handleSingle2FingersTap:)] autorelease];
+	[single2FingersTapRecognizer setNumberOfTouchesRequired:2];
+	[single2FingersTapRecognizer setNumberOfTapsRequired:1];
+
+	// long press gesture recognizer
+	UILongPressGestureRecognizer *longPressRecognizer = [[[UILongPressGestureRecognizer alloc]
+	    initWithTarget:self
+	            action:@selector(handleLongPress:)] autorelease];
+	[longPressRecognizer setMinimumPressDuration:0.5];
+
+	// double long press gesture recognizer
+	UILongPressGestureRecognizer *doubleLongPressRecognizer = [[[UILongPressGestureRecognizer alloc]
+	    initWithTarget:self
+	            action:@selector(handleDoubleLongPress:)] autorelease];
+	[doubleLongPressRecognizer setNumberOfTouchesRequired:2];
+	[doubleLongPressRecognizer setMinimumPressDuration:0.5];
+
+	// 3 finger, single tap gesture for showing/hiding the toolbar
+	UITapGestureRecognizer *single3FingersTapRecognizer = [[[UITapGestureRecognizer alloc]
+	    initWithTarget:self
+	            action:@selector(handleSingle3FingersTap:)] autorelease];
+	[single3FingersTapRecognizer setNumberOfTapsRequired:1];
+	[single3FingersTapRecognizer setNumberOfTouchesRequired:3];
+
+	// add gestures to scroll view
+	[_session_scrollview addGestureRecognizer:singleTapRecognizer];
+	[_session_scrollview addGestureRecognizer:doubleTapRecognizer];
+	[_session_scrollview addGestureRecognizer:single2FingersTapRecognizer];
+	[_session_scrollview addGestureRecognizer:longPressRecognizer];
+	[_session_scrollview addGestureRecognizer:doubleLongPressRecognizer];
+	[_session_scrollview addGestureRecognizer:single3FingersTapRecognizer];
+}
+
+- (void)suspendSession
+{
+	// suspend session and pop navigation controller
+	[_session suspend];
+
+	// pop current view controller
+	[[self navigationController] popViewControllerAnimated:YES];
+}
+
+- (NSDictionary *)eventDescriptorForMouseEvent:(int)event position:(CGPoint)position
+{
+	return [NSDictionary
+	    dictionaryWithObjectsAndKeys:@"mouse", @"type", [NSNumber numberWithUnsignedShort:event],
+	                                 @"flags",
+	                                 [NSNumber numberWithUnsignedShort:lrintf(position.x)],
+	                                 @"coord_x",
+	                                 [NSNumber numberWithUnsignedShort:lrintf(position.y)],
+	                                 @"coord_y", nil];
+}
+
+- (void)sendDelayedMouseEventWithTimer:(NSTimer *)timer
+{
+	_mouse_move_event_timer = nil;
+	NSDictionary *event = [timer userInfo];
+	[_session sendInputEvent:event];
+	[timer autorelease];
+}
+
+- (void)handleMouseMoveForPosition:(CGPoint)position
+{
+	NSDictionary *event = [self eventDescriptorForMouseEvent:PTR_FLAGS_MOVE position:position];
+
+	// cancel pending mouse move events
+	[_mouse_move_event_timer invalidate];
+	_mouse_move_events_skipped++;
+
+	if (_mouse_move_events_skipped >= 5)
+	{
+		[_session sendInputEvent:event];
+		_mouse_move_events_skipped = 0;
+	}
+	else
+	{
+		[_mouse_move_event_timer autorelease];
+		_mouse_move_event_timer =
+		    [[NSTimer scheduledTimerWithTimeInterval:0.05
+		                                      target:self
+		                                    selector:@selector(sendDelayedMouseEventWithTimer:)
+		                                    userInfo:event
+		                                     repeats:NO] retain];
+	}
+}
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Controllers/ScreenSelectionController.h

@@ -0,0 +1,34 @@
+/*
+ controller for screen settings selection
+
+ Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import "EditorBaseController.h"
+
+@class ConnectionParams;
+@class OrderedDictionary;
+
+@interface ScreenSelectionController : EditorBaseController
+{
+  @private
+	NSString *_keyPath;
+	ConnectionParams *_params;
+
+	// available options
+	OrderedDictionary *_color_options;
+	NSArray *_resolution_modes;
+
+	// current selections
+	int _selection_color;
+	int _selection_resolution;
+}
+
+- (id)initWithConnectionParams:(ConnectionParams *)params;
+- (id)initWithConnectionParams:(ConnectionParams *)params keyPath:(NSString *)keyPath;
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Controllers/ScreenSelectionController.m

@@ -0,0 +1,253 @@
+/*
+ controller for screen settings selection
+
+ Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import "ScreenSelectionController.h"
+#import "Utils.h"
+#import "OrderedDictionary.h"
+#import "ConnectionParams.h"
+
+@interface ScreenSelectionController (Private)
+- (NSString *)keyPathForKey:(NSString *)key;
+@end
+
+@implementation ScreenSelectionController
+
+- (id)initWithConnectionParams:(ConnectionParams *)params
+{
+	return [self initWithConnectionParams:params keyPath:nil];
+}
+
+- (id)initWithConnectionParams:(ConnectionParams *)params keyPath:(NSString *)keyPath
+{
+	self = [super initWithStyle:UITableViewStyleGrouped];
+	if (self)
+	{
+		_params = [params retain];
+		_keyPath = (keyPath != nil ? [keyPath retain] : nil);
+
+		_color_options = (OrderedDictionary *)[SelectionForColorSetting() retain];
+		_resolution_modes = [ResolutionModes() retain];
+
+		// init current selections
+		NSUInteger idx = [_color_options
+		    indexForValue:[NSNumber
+		                      numberWithInt:[_params
+		                                        intForKeyPath:[self keyPathForKey:@"colors"]]]];
+		_selection_color = (idx != NSNotFound) ? idx : 0;
+
+		idx = [_resolution_modes
+		    indexOfObject:ScreenResolutionDescription(
+		                      [_params
+		                          intForKeyPath:[self keyPathForKey:@"screen_resolution_type"]],
+		                      [_params intForKeyPath:[self keyPathForKey:@"width"]],
+		                      [_params intForKeyPath:[self keyPathForKey:@"height"]])];
+		_selection_resolution = (idx != NSNotFound) ? idx : 0;
+	}
+	return self;
+}
+
+- (void)dealloc
+{
+	[super dealloc];
+	[_params autorelease];
+	[_keyPath autorelease];
+	[_color_options autorelease];
+	[_resolution_modes autorelease];
+}
+
+- (NSString *)keyPathForKey:(NSString *)key
+{
+	if (_keyPath)
+		return [_keyPath stringByAppendingFormat:@".%@", key];
+	return key;
+}
+
+#pragma mark - View lifecycle
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+	// Return YES for supported orientations
+	return YES;
+}
+
+#pragma mark - Table view data source
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
+{
+	return 2;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+	// Return the number of rows in the section.
+	if (section == 0)
+		return [_color_options count];
+	return [_resolution_modes count] + 2; // +2 for custom width/height input fields
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView
+         cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+	UITableViewCell *cell = nil;
+	switch ([indexPath section])
+	{
+		case 0:
+			cell = [self tableViewCellFromIdentifier:TableCellIdentifierMultiChoice];
+			[[cell textLabel] setText:[_color_options keyAtIndex:[indexPath row]]];
+			break;
+
+		case 1:
+			if ([indexPath row] < [_resolution_modes count])
+			{
+				cell = [self tableViewCellFromIdentifier:TableCellIdentifierMultiChoice];
+				[[cell textLabel] setText:[_resolution_modes objectAtIndex:[indexPath row]]];
+			}
+			else
+				cell = [self tableViewCellFromIdentifier:TableCellIdentifierText];
+			break;
+
+		default:
+			break;
+	}
+
+	if ([indexPath section] == 1)
+	{
+		BOOL enabled = ([_params intForKeyPath:[self keyPathForKey:@"screen_resolution_type"]] ==
+		                TSXScreenOptionCustom);
+		if ([indexPath row] == [_resolution_modes count])
+		{
+			int value = [_params intForKeyPath:[self keyPathForKey:@"width"]];
+			EditTextTableViewCell *textCell = (EditTextTableViewCell *)cell;
+			[[textCell label] setText:NSLocalizedString(@"Width", @"Custom Screen Width")];
+			[[textCell textfield] setText:[NSString stringWithFormat:@"%d", value ? value : 800]];
+			[[textCell textfield] setKeyboardType:UIKeyboardTypeNumberPad];
+			[[textCell label] setEnabled:enabled];
+			[[textCell textfield] setEnabled:enabled];
+			[[textCell textfield] setTag:1];
+		}
+		else if ([indexPath row] == ([_resolution_modes count] + 1))
+		{
+			int value = [_params intForKeyPath:[self keyPathForKey:@"height"]];
+			EditTextTableViewCell *textCell = (EditTextTableViewCell *)cell;
+			[[textCell label] setText:NSLocalizedString(@"Height", @"Custom Screen Height")];
+			[[textCell textfield] setText:[NSString stringWithFormat:@"%d", value ? value : 600]];
+			[[textCell textfield] setKeyboardType:UIKeyboardTypeNumberPad];
+			[[textCell label] setEnabled:enabled];
+			[[textCell textfield] setEnabled:enabled];
+			[[textCell textfield] setTag:2];
+		}
+	}
+
+	// set default checkmark
+	if ([indexPath row] == ([indexPath section] == 0 ? _selection_color : _selection_resolution))
+		[cell setAccessoryType:UITableViewCellAccessoryCheckmark];
+	else
+		[cell setAccessoryType:UITableViewCellAccessoryNone];
+
+	return cell;
+}
+
+#pragma mark - Table view delegate
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+	// custom width/height cells are not selectable
+	if ([indexPath section] == 1 && [indexPath row] >= [_resolution_modes count])
+		return;
+
+	// has selection change?
+	int cur_selection = ([indexPath section] == 0 ? _selection_color : _selection_resolution);
+	if ([indexPath row] != cur_selection)
+	{
+		[tableView deselectRowAtIndexPath:indexPath animated:NO];
+
+		NSIndexPath *oldIndexPath = [NSIndexPath indexPathForRow:cur_selection
+		                                               inSection:[indexPath section]];
+
+		// clear old checkmark
+		UITableViewCell *old_sel_cell = [tableView cellForRowAtIndexPath:oldIndexPath];
+		old_sel_cell.accessoryType = UITableViewCellAccessoryNone;
+
+		// set new checkmark
+		UITableViewCell *new_sel_cell = [tableView cellForRowAtIndexPath:indexPath];
+		new_sel_cell.accessoryType = UITableViewCellAccessoryCheckmark;
+
+		if ([indexPath section] == 0)
+		{
+			// get value from color dictionary
+			int sel_value =
+			    [[_color_options valueForKey:[_color_options keyAtIndex:[indexPath row]]] intValue];
+
+			// update selection index and params value
+			[_params setInt:sel_value forKeyPath:[self keyPathForKey:@"colors"]];
+			_selection_color = [indexPath row];
+		}
+		else
+		{
+			// update selection index and params value
+			int width, height;
+			TSXScreenOptions mode;
+			ScanScreenResolution([_resolution_modes objectAtIndex:[indexPath row]], &width, &height,
+			                     &mode);
+			[_params setInt:mode forKeyPath:[self keyPathForKey:@"screen_resolution_type"]];
+			if (mode != TSXScreenOptionCustom)
+			{
+				[_params setInt:width forKeyPath:[self keyPathForKey:@"width"]];
+				[_params setInt:height forKeyPath:[self keyPathForKey:@"height"]];
+			}
+			_selection_resolution = [indexPath row];
+
+			// refresh width/height edit fields if custom selection changed
+			NSArray *indexPaths = [NSArray
+			    arrayWithObjects:[NSIndexPath indexPathForRow:[_resolution_modes count]
+			                                        inSection:1],
+			                     [NSIndexPath indexPathForRow:([_resolution_modes count] + 1)
+			                                        inSection:1],
+			                     nil];
+			[[self tableView] reloadRowsAtIndexPaths:indexPaths
+			                        withRowAnimation:UITableViewRowAnimationNone];
+		}
+	}
+}
+
+#pragma mark -
+#pragma mark Text Field delegate
+
+- (BOOL)textFieldShouldReturn:(UITextField *)textField
+{
+	[textField resignFirstResponder];
+	return NO;
+}
+
+- (BOOL)textFieldShouldEndEditing:(UITextField *)textField
+{
+
+	switch ([textField tag])
+	{
+			// update resolution settings (and check for invalid input)
+		case 1:
+			if ([[textField text] intValue] < 640)
+				[textField setText:@"640"];
+			[_params setInt:[[textField text] intValue] forKeyPath:[self keyPathForKey:@"width"]];
+			break;
+
+		case 2:
+			if ([[textField text] intValue] < 480)
+				[textField setText:@"480"];
+			[_params setInt:[[textField text] intValue] forKeyPath:[self keyPathForKey:@"height"]];
+			break;
+
+		default:
+			break;
+	}
+	return YES;
+}
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Controllers/VerifyCertificateController.h

@@ -0,0 +1,33 @@
+/*
+ Certificate verification controller
+
+ Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import <UIKit/UIKit.h>
+
+@class RDPSession;
+
+@interface VerifyCertificateController : UIViewController
+{
+  @private
+	IBOutlet UILabel *_label_issuer;
+	IBOutlet UIButton *_btn_accept;
+	IBOutlet UIButton *_btn_decline;
+	IBOutlet UILabel *_label_message;
+	IBOutlet UILabel *_label_for_issuer;
+
+	RDPSession *_session;
+	NSMutableDictionary *_params;
+}
+
+- (id)initWithNibName:(NSString *)nibNameOrNil
+               bundle:(NSBundle *)nibBundleOrNil
+              session:(RDPSession *)session
+               params:(NSMutableDictionary *)params;
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Controllers/VerifyCertificateController.m

@@ -0,0 +1,86 @@
+/*
+ Certificate verification controller
+
+ Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import "VerifyCertificateController.h"
+#import "RDPSession.h"
+
+@implementation VerifyCertificateController
+
+- (id)initWithNibName:(NSString *)nibNameOrNil
+               bundle:(NSBundle *)nibBundleOrNil
+              session:(RDPSession *)session
+               params:(NSMutableDictionary *)params
+{
+	self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+	if (self)
+	{
+		_session = session;
+		_params = params;
+		[self setModalPresentationStyle:UIModalPresentationFormSheet];
+	}
+	return self;
+}
+
+- (void)viewDidLoad
+{
+	[super viewDidLoad];
+
+	NSString *message = NSLocalizedString(
+	    @"The identity of the remote computer cannot be verified. Do you want to connect anyway?",
+	    @"Verify certificate view message");
+
+	// init strings
+	[_label_message setText:message];
+	[_label_for_issuer
+	    setText:NSLocalizedString(@"Issuer:", @"Verify certificate view issuer label")];
+	[_btn_accept setTitle:NSLocalizedString(@"Yes", @"Yes Button") forState:UIControlStateNormal];
+	[_btn_decline setTitle:NSLocalizedString(@"No", @"No Button") forState:UIControlStateNormal];
+
+	[_label_issuer setText:[_params valueForKey:@"issuer"]];
+}
+
+- (void)viewDidUnload
+{
+	[super viewDidUnload];
+	// Release any retained subviews of the main view.
+}
+
+- (void)viewDidDisappear:(BOOL)animated
+{
+	[super viewDidDisappear:animated];
+
+	// set signal
+	[[_session uiRequestCompleted] signal];
+}
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+	return YES;
+}
+
+#pragma mark - Action handlers
+
+- (IBAction)acceptPressed:(id)sender
+{
+	[_params setValue:[NSNumber numberWithBool:YES] forKey:@"result"];
+
+	// dismiss controller
+	[self dismissModalViewControllerAnimated:YES];
+}
+
+- (IBAction)declinePressed:(id)sender
+{
+	[_params setValue:[NSNumber numberWithBool:NO] forKey:@"result"];
+
+	// dismiss controller
+	[self dismissModalViewControllerAnimated:YES];
+}
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/FreeRDP/ios_cliprdr.m

@@ -0,0 +1,499 @@
+/**
+ * FreeRDP: A Remote Desktop Protocol Implementation
+ * Android Clipboard Redirection
+ *
+ * Copyright 2013 Felix Long
+ * Copyright 2015 Thincast Technologies GmbH
+ * Copyright 2015 DI (FH) Martin Haimberger <[email protected]>
+ * Copyright 2023 Iordan Iordanov
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <freerdp/config.h>
+
+#include <winpr/crt.h>
+#include <winpr/stream.h>
+#include <winpr/clipboard.h>
+
+#include <freerdp/client/channels.h>
+#include <freerdp/client/cliprdr.h>
+
+#include "ios_cliprdr.h"
+
+UINT ios_cliprdr_send_client_format_list(CliprdrClientContext *cliprdr)
+{
+	UINT rc = ERROR_INTERNAL_ERROR;
+	UINT32 formatId;
+	UINT32 numFormats;
+	UINT32 *pFormatIds;
+	const char *formatName;
+	CLIPRDR_FORMAT *formats;
+	CLIPRDR_FORMAT_LIST formatList = { 0 };
+
+	if (!cliprdr)
+		return ERROR_INVALID_PARAMETER;
+
+	mfContext *afc = (mfContext *)cliprdr->custom;
+
+	if (!afc || !afc->cliprdr)
+		return ERROR_INVALID_PARAMETER;
+
+	pFormatIds = NULL;
+	numFormats = ClipboardGetFormatIds(afc->clipboard, &pFormatIds);
+	formats = (CLIPRDR_FORMAT *)calloc(numFormats, sizeof(CLIPRDR_FORMAT));
+
+	if (!formats)
+		goto fail;
+
+	for (UINT32 index = 0; index < numFormats; index++)
+	{
+		formatId = pFormatIds[index];
+		formatName = ClipboardGetFormatName(afc->clipboard, formatId);
+		formats[index].formatId = formatId;
+		formats[index].formatName = NULL;
+
+		if ((formatId > CF_MAX) && formatName)
+		{
+			formats[index].formatName = _strdup(formatName);
+
+			if (!formats[index].formatName)
+				goto fail;
+		}
+	}
+
+	formatList.common.msgFlags = 0;
+	formatList.numFormats = numFormats;
+	formatList.formats = formats;
+	formatList.common.msgType = CB_FORMAT_LIST;
+
+	if (!afc->cliprdr->ClientFormatList)
+		goto fail;
+
+	rc = afc->cliprdr->ClientFormatList(afc->cliprdr, &formatList);
+fail:
+	free(pFormatIds);
+	free(formats);
+	return rc;
+}
+
+static UINT ios_cliprdr_send_client_format_data_request(CliprdrClientContext *cliprdr,
+                                                        UINT32 formatId)
+{
+	UINT rc = ERROR_INVALID_PARAMETER;
+	CLIPRDR_FORMAT_DATA_REQUEST formatDataRequest = { 0 };
+	mfContext *afc;
+
+	if (!cliprdr)
+		goto fail;
+
+	afc = (mfContext *)cliprdr->custom;
+
+	if (!afc || !afc->clipboardRequestEvent || !cliprdr->ClientFormatDataRequest)
+		goto fail;
+
+	formatDataRequest.common.msgType = CB_FORMAT_DATA_REQUEST;
+	formatDataRequest.common.msgFlags = 0;
+	formatDataRequest.requestedFormatId = formatId;
+	afc->requestedFormatId = formatId;
+	(void)ResetEvent(afc->clipboardRequestEvent);
+	rc = cliprdr->ClientFormatDataRequest(cliprdr, &formatDataRequest);
+fail:
+	return rc;
+}
+
+static UINT ios_cliprdr_send_client_capabilities(CliprdrClientContext *cliprdr)
+{
+	CLIPRDR_CAPABILITIES capabilities;
+	CLIPRDR_GENERAL_CAPABILITY_SET generalCapabilitySet;
+
+	if (!cliprdr || !cliprdr->ClientCapabilities)
+		return ERROR_INVALID_PARAMETER;
+
+	capabilities.cCapabilitiesSets = 1;
+	capabilities.capabilitySets = (CLIPRDR_CAPABILITY_SET *)&(generalCapabilitySet);
+	generalCapabilitySet.capabilitySetType = CB_CAPSTYPE_GENERAL;
+	generalCapabilitySet.capabilitySetLength = 12;
+	generalCapabilitySet.version = CB_CAPS_VERSION_2;
+	generalCapabilitySet.generalFlags = CB_USE_LONG_FORMAT_NAMES;
+	return cliprdr->ClientCapabilities(cliprdr, &capabilities);
+}
+
+/**
+ * Function description
+ *
+ * @return 0 on success, otherwise a Win32 error code
+ */
+static UINT ios_cliprdr_monitor_ready(CliprdrClientContext *cliprdr,
+                                      const CLIPRDR_MONITOR_READY *monitorReady)
+{
+	UINT rc;
+	mfContext *afc;
+
+	if (!cliprdr || !monitorReady)
+		return ERROR_INVALID_PARAMETER;
+
+	afc = (mfContext *)cliprdr->custom;
+
+	if (!afc)
+		return ERROR_INVALID_PARAMETER;
+
+	if ((rc = ios_cliprdr_send_client_capabilities(cliprdr)) != CHANNEL_RC_OK)
+		return rc;
+
+	if ((rc = ios_cliprdr_send_client_format_list(cliprdr)) != CHANNEL_RC_OK)
+		return rc;
+
+	afc->clipboardSync = TRUE;
+	return CHANNEL_RC_OK;
+}
+
+/**
+ * Function description
+ *
+ * @return 0 on success, otherwise a Win32 error code
+ */
+static UINT ios_cliprdr_server_capabilities(CliprdrClientContext *cliprdr,
+                                            const CLIPRDR_CAPABILITIES *capabilities)
+{
+	CLIPRDR_CAPABILITY_SET *capabilitySet;
+	mfContext *afc;
+
+	if (!cliprdr || !capabilities)
+		return ERROR_INVALID_PARAMETER;
+
+	afc = (mfContext *)cliprdr->custom;
+
+	if (!afc)
+		return ERROR_INVALID_PARAMETER;
+
+	for (UINT32 index = 0; index < capabilities->cCapabilitiesSets; index++)
+	{
+		capabilitySet = &(capabilities->capabilitySets[index]);
+
+		if ((capabilitySet->capabilitySetType == CB_CAPSTYPE_GENERAL) &&
+		    (capabilitySet->capabilitySetLength >= CB_CAPSTYPE_GENERAL_LEN))
+		{
+			CLIPRDR_GENERAL_CAPABILITY_SET *generalCapabilitySet =
+			    (CLIPRDR_GENERAL_CAPABILITY_SET *)capabilitySet;
+			afc->clipboardCapabilities = generalCapabilitySet->generalFlags;
+			break;
+		}
+	}
+
+	return CHANNEL_RC_OK;
+}
+
+/**
+ * Function description
+ *
+ * @return 0 on success, otherwise a Win32 error code
+ */
+static UINT ios_cliprdr_server_format_list(CliprdrClientContext *cliprdr,
+                                           const CLIPRDR_FORMAT_LIST *formatList)
+{
+	UINT rc;
+	CLIPRDR_FORMAT *format;
+	mfContext *afc;
+
+	if (!cliprdr || !formatList)
+		return ERROR_INVALID_PARAMETER;
+
+	afc = (mfContext *)cliprdr->custom;
+
+	if (!afc)
+		return ERROR_INVALID_PARAMETER;
+
+	if (afc->serverFormats)
+	{
+		for (UINT32 index = 0; index < afc->numServerFormats; index++)
+			free(afc->serverFormats[index].formatName);
+
+		free(afc->serverFormats);
+		afc->serverFormats = NULL;
+		afc->numServerFormats = 0;
+	}
+
+	if (formatList->numFormats < 1)
+		return CHANNEL_RC_OK;
+
+	afc->numServerFormats = formatList->numFormats;
+	afc->serverFormats = (CLIPRDR_FORMAT *)calloc(afc->numServerFormats, sizeof(CLIPRDR_FORMAT));
+
+	if (!afc->serverFormats)
+		return CHANNEL_RC_NO_MEMORY;
+
+	for (UINT32 index = 0; index < afc->numServerFormats; index++)
+	{
+		afc->serverFormats[index].formatId = formatList->formats[index].formatId;
+		afc->serverFormats[index].formatName = NULL;
+
+		if (formatList->formats[index].formatName)
+		{
+			afc->serverFormats[index].formatName = _strdup(formatList->formats[index].formatName);
+
+			if (!afc->serverFormats[index].formatName)
+				return CHANNEL_RC_NO_MEMORY;
+		}
+	}
+
+	BOOL unicode = FALSE;
+	BOOL text = FALSE;
+	for (UINT32 index = 0; index < afc->numServerFormats; index++)
+	{
+		format = &(afc->serverFormats[index]);
+
+		if (format->formatId == CF_UNICODETEXT)
+			unicode = TRUE;
+
+		else if (format->formatId == CF_TEXT)
+			text = TRUE;
+	}
+
+	if (unicode)
+		return ios_cliprdr_send_client_format_data_request(cliprdr, CF_UNICODETEXT);
+	if (text)
+		return ios_cliprdr_send_client_format_data_request(cliprdr, CF_TEXT);
+	return CHANNEL_RC_OK;
+}
+
+/**
+ * Function description
+ *
+ * @return 0 on success, otherwise a Win32 error code
+ */
+static UINT
+ios_cliprdr_server_format_list_response(CliprdrClientContext *cliprdr,
+                                        const CLIPRDR_FORMAT_LIST_RESPONSE *formatListResponse)
+{
+	if (!cliprdr || !formatListResponse)
+		return ERROR_INVALID_PARAMETER;
+
+	return CHANNEL_RC_OK;
+}
+
+/**
+ * Function description
+ *
+ * @return 0 on success, otherwise a Win32 error code
+ */
+static UINT
+ios_cliprdr_server_lock_clipboard_data(CliprdrClientContext *cliprdr,
+                                       const CLIPRDR_LOCK_CLIPBOARD_DATA *lockClipboardData)
+{
+	if (!cliprdr || !lockClipboardData)
+		return ERROR_INVALID_PARAMETER;
+
+	return CHANNEL_RC_OK;
+}
+
+/**
+ * Function description
+ *
+ * @return 0 on success, otherwise a Win32 error code
+ */
+static UINT
+ios_cliprdr_server_unlock_clipboard_data(CliprdrClientContext *cliprdr,
+                                         const CLIPRDR_UNLOCK_CLIPBOARD_DATA *unlockClipboardData)
+{
+	if (!cliprdr || !unlockClipboardData)
+		return ERROR_INVALID_PARAMETER;
+
+	return CHANNEL_RC_OK;
+}
+
+/**
+ * Function description
+ *
+ * @return 0 on success, otherwise a Win32 error code
+ */
+static UINT
+ios_cliprdr_server_format_data_request(CliprdrClientContext *cliprdr,
+                                       const CLIPRDR_FORMAT_DATA_REQUEST *formatDataRequest)
+{
+	UINT rc;
+	BYTE *data;
+	UINT32 size;
+	UINT32 formatId;
+	CLIPRDR_FORMAT_DATA_RESPONSE response = { 0 };
+	mfContext *afc;
+
+	if (!cliprdr || !formatDataRequest || !cliprdr->ClientFormatDataResponse)
+		return ERROR_INVALID_PARAMETER;
+
+	afc = (mfContext *)cliprdr->custom;
+
+	if (!afc)
+		return ERROR_INVALID_PARAMETER;
+
+	formatId = formatDataRequest->requestedFormatId;
+	data = (BYTE *)ClipboardGetData(afc->clipboard, formatId, &size);
+	response.common.msgFlags = CB_RESPONSE_OK;
+	response.common.dataLen = size;
+	response.requestedFormatData = data;
+
+	if (!data)
+	{
+		response.common.msgFlags = CB_RESPONSE_FAIL;
+		response.common.dataLen = 0;
+		response.requestedFormatData = NULL;
+	}
+
+	rc = cliprdr->ClientFormatDataResponse(cliprdr, &response);
+	free(data);
+	return rc;
+}
+
+/**
+ * Function description
+ *
+ * @return 0 on success, otherwise a Win32 error code
+ */
+static UINT
+ios_cliprdr_server_format_data_response(CliprdrClientContext *cliprdr,
+                                        const CLIPRDR_FORMAT_DATA_RESPONSE *formatDataResponse)
+{
+	BYTE *data;
+	UINT32 size;
+	UINT32 formatId;
+	CLIPRDR_FORMAT *format = NULL;
+	mfContext *afc;
+	freerdp *instance;
+
+	if (!cliprdr || !formatDataResponse)
+		return ERROR_INVALID_PARAMETER;
+
+	afc = (mfContext *)cliprdr->custom;
+
+	if (!afc)
+		return ERROR_INVALID_PARAMETER;
+
+	instance = ((rdpContext *)afc)->instance;
+
+	if (!instance)
+		return ERROR_INVALID_PARAMETER;
+
+	for (UINT32 index = 0; index < afc->numServerFormats; index++)
+	{
+		if (afc->requestedFormatId == afc->serverFormats[index].formatId)
+			format = &(afc->serverFormats[index]);
+	}
+
+	if (!format)
+	{
+		(void)SetEvent(afc->clipboardRequestEvent);
+		return ERROR_INTERNAL_ERROR;
+	}
+
+	if (format->formatName)
+		formatId = ClipboardRegisterFormat(afc->clipboard, format->formatName);
+	else
+		formatId = format->formatId;
+
+	size = formatDataResponse->common.dataLen;
+
+	ClipboardLock(afc->clipboard);
+	if (!ClipboardSetData(afc->clipboard, formatId, formatDataResponse->requestedFormatData, size))
+		return ERROR_INTERNAL_ERROR;
+
+	(void)SetEvent(afc->clipboardRequestEvent);
+
+	if ((formatId == CF_TEXT) || (formatId == CF_UNICODETEXT))
+	{
+		formatId = ClipboardRegisterFormat(afc->clipboard, "UTF8_STRING");
+		data = (BYTE *)ClipboardGetData(afc->clipboard, formatId, &size);
+		size = (UINT32)strnlen(data, size);
+		if (afc->ServerCutText != NULL)
+		{
+			afc->ServerCutText((rdpContext *)afc, (uint8_t *)data, size);
+		}
+	}
+	ClipboardUnlock(afc->clipboard);
+
+	return CHANNEL_RC_OK;
+}
+
+/**
+ * Function description
+ *
+ * @return 0 on success, otherwise a Win32 error code
+ */
+static UINT
+ios_cliprdr_server_file_contents_request(CliprdrClientContext *cliprdr,
+                                         const CLIPRDR_FILE_CONTENTS_REQUEST *fileContentsRequest)
+{
+	if (!cliprdr || !fileContentsRequest)
+		return ERROR_INVALID_PARAMETER;
+
+	return CHANNEL_RC_OK;
+}
+
+/**
+ * Function description
+ *
+ * @return 0 on success, otherwise a Win32 error code
+ */
+static UINT ios_cliprdr_server_file_contents_response(
+    CliprdrClientContext *cliprdr, const CLIPRDR_FILE_CONTENTS_RESPONSE *fileContentsResponse)
+{
+	if (!cliprdr || !fileContentsResponse)
+		return ERROR_INVALID_PARAMETER;
+
+	return CHANNEL_RC_OK;
+}
+
+BOOL ios_cliprdr_init(mfContext *afc, CliprdrClientContext *cliprdr)
+{
+	wClipboard *clipboard;
+	HANDLE hevent;
+
+	if (!afc || !cliprdr)
+		return FALSE;
+
+	if (!(hevent = CreateEvent(NULL, TRUE, FALSE, NULL)))
+		return FALSE;
+
+	if (!(clipboard = ClipboardCreate()))
+	{
+		(void)CloseHandle(hevent);
+		return FALSE;
+	}
+
+	afc->cliprdr = cliprdr;
+	afc->clipboard = clipboard;
+	afc->clipboardRequestEvent = hevent;
+	cliprdr->custom = (void *)afc;
+	cliprdr->MonitorReady = ios_cliprdr_monitor_ready;
+	cliprdr->ServerCapabilities = ios_cliprdr_server_capabilities;
+	cliprdr->ServerFormatList = ios_cliprdr_server_format_list;
+	cliprdr->ServerFormatListResponse = ios_cliprdr_server_format_list_response;
+	cliprdr->ServerLockClipboardData = ios_cliprdr_server_lock_clipboard_data;
+	cliprdr->ServerUnlockClipboardData = ios_cliprdr_server_unlock_clipboard_data;
+	cliprdr->ServerFormatDataRequest = ios_cliprdr_server_format_data_request;
+	cliprdr->ServerFormatDataResponse = ios_cliprdr_server_format_data_response;
+	cliprdr->ServerFileContentsRequest = ios_cliprdr_server_file_contents_request;
+	cliprdr->ServerFileContentsResponse = ios_cliprdr_server_file_contents_response;
+	return TRUE;
+}
+
+BOOL ios_cliprdr_uninit(mfContext *afc, CliprdrClientContext *cliprdr)
+{
+	if (!afc || !cliprdr)
+		return FALSE;
+
+	cliprdr->custom = NULL;
+	afc->cliprdr = NULL;
+	ClipboardDestroy(afc->clipboard);
+	(void)CloseHandle(afc->clipboardRequestEvent);
+	return TRUE;
+}

local-test-freerdp-full-01/afc-freerdp/client/iOS/FreeRDP/ios_freerdp.h

@@ -0,0 +1,87 @@
+/*
+ RDP run-loop
+
+ Copyright 2013 Thincast Technologies GmbH, Authors: Martin Fleisz, Dorian Johnson
+ Copyright 2023 Iordan Iordanov
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import <CoreGraphics/CoreGraphics.h>
+
+#import <freerdp/freerdp.h>
+#import <freerdp/channels/channels.h>
+#import "TSXTypes.h"
+#import <winpr/clipboard.h>
+#import <freerdp/client/cliprdr.h>
+
+@class RDPSession, RDPSessionView;
+
+typedef BOOL (*pServerCutText)(rdpContext *context, UINT8 *data, UINT32 size);
+
+// FreeRDP extended structs
+typedef struct mf_info mfInfo;
+
+typedef struct mf_context
+{
+	rdpContext _p;
+
+	mfInfo *mfi;
+	rdpSettings *settings;
+
+	BOOL clipboardSync;
+	wClipboard *clipboard;
+	UINT32 numServerFormats;
+	UINT32 requestedFormatId;
+	HANDLE clipboardRequestEvent;
+	CLIPRDR_FORMAT *serverFormats;
+	CliprdrClientContext *cliprdr;
+	UINT32 clipboardCapabilities;
+	pServerCutText ServerCutText;
+} mfContext;
+
+struct mf_info
+{
+	// RDP
+	freerdp *instance;
+	mfContext *context;
+	rdpContext *_context;
+
+	// UI
+	RDPSession *session;
+
+	// Graphics
+	CGContextRef bitmap_context;
+
+	// Events
+	int event_pipe_producer;
+	int event_pipe_consumer;
+	HANDLE handle;
+
+	// Tracking connection state
+	volatile TSXConnectionState connection_state;
+	volatile BOOL
+	    unwanted; // set when controlling Session no longer wants the connection to continue
+};
+
+#define MFI_FROM_INSTANCE(inst) (((mfContext *)((inst)->context))->mfi)
+
+enum MF_EXIT_CODE
+{
+	MF_EXIT_SUCCESS = 0,
+
+	MF_EXIT_CONN_FAILED = 128,
+	MF_EXIT_CONN_CANCELED = 129,
+	MF_EXIT_LOGON_TIMEOUT = 130,
+
+	MF_EXIT_UNKNOWN = 255
+};
+
+void ios_init_freerdp(void);
+void ios_uninit_freerdp(void);
+freerdp *ios_freerdp_new(void);
+int ios_run_freerdp(freerdp *instance);
+void ios_freerdp_free(freerdp *instance);
+void ios_send_clipboard_data(void *context, const void *data, UINT32 size);

local-test-freerdp-full-01/afc-freerdp/client/iOS/FreeRDP/ios_freerdp_ui.h

@@ -0,0 +1,29 @@
+/*
+ RDP ui callbacks
+
+ Copyright 2013 Thincast Technologies GmbH, Authors: Martin Fleisz, Dorian Johnson
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import "ios_freerdp.h"
+
+BOOL ios_ui_begin_paint(rdpContext* context);
+BOOL ios_ui_end_paint(rdpContext* context);
+BOOL ios_ui_resize_window(rdpContext* context);
+
+BOOL ios_ui_authenticate(freerdp* instance, char** username, char** password, char** domain);
+BOOL ios_ui_gw_authenticate(freerdp* instance, char** username, char** password, char** domain);
+DWORD ios_ui_verify_certificate_ex(freerdp* instance, const char* host, UINT16 port,
+                                   const char* common_name, const char* subject, const char* issuer,
+                                   const char* fingerprint, DWORD flags);
+
+DWORD ios_ui_verify_changed_certificate_ex(freerdp* instance, const char* host, UINT16 port,
+                                           const char* common_name, const char* subject,
+                                           const char* issuer, const char* fingerprint,
+                                           const char* old_subject, const char* old_issuer,
+                                           const char* old_fingerprint, DWORD flags);
+
+void ios_allocate_display_buffer(mfInfo* mfi);

local-test-freerdp-full-01/afc-freerdp/client/iOS/FreeRDP/ios_freerdp_ui.m

@@ -0,0 +1,211 @@
+/*
+ RDP ui callbacks
+
+ Copyright 2013 Thincast Technologies GmbH, Authors: Martin Fleisz, Dorian Johnson
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import <Foundation/Foundation.h>
+
+#import <freerdp/gdi/gdi.h>
+#import "ios_freerdp_ui.h"
+
+#import "RDPSession.h"
+
+#pragma mark -
+#pragma mark Certificate authentication
+
+static void ios_resize_display_buffer(mfInfo *mfi);
+static BOOL ios_ui_authenticate_raw(freerdp *instance, char **username, char **password,
+                                    char **domain, const char *title)
+{
+	mfInfo *mfi = MFI_FROM_INSTANCE(instance);
+	NSMutableDictionary *params = [NSMutableDictionary
+	    dictionaryWithObjectsAndKeys:(*username) ? [NSString stringWithUTF8String:*username] : @"",
+	                                 @"username",
+	                                 (*password) ? [NSString stringWithUTF8String:*password] : @"",
+	                                 @"password",
+	                                 (*domain) ? [NSString stringWithUTF8String:*domain] : @"",
+	                                 @"domain",
+	                                 [NSString stringWithUTF8String:freerdp_settings_get_string(
+	                                                                    instance->context->settings,
+	                                                                    FreeRDP_ServerHostname)],
+	                                 @"hostname", // used for the auth prompt message; not changed
+	                                 nil];
+	// request auth UI
+	[mfi->session performSelectorOnMainThread:@selector(sessionRequestsAuthenticationWithParams:)
+	                               withObject:params
+	                            waitUntilDone:YES];
+	// wait for UI request to be completed
+	[[mfi->session uiRequestCompleted] lock];
+	[[mfi->session uiRequestCompleted] wait];
+	[[mfi->session uiRequestCompleted] unlock];
+
+	if (![[params valueForKey:@"result"] boolValue])
+	{
+		mfi->unwanted = YES;
+		return FALSE;
+	}
+
+	// Free old values
+	free(*username);
+	free(*password);
+	free(*domain);
+	// set values back
+	*username = _strdup([[params objectForKey:@"username"] UTF8String]);
+	*password = _strdup([[params objectForKey:@"password"] UTF8String]);
+	*domain = _strdup([[params objectForKey:@"domain"] UTF8String]);
+
+	if (!(*username) || !(*password) || !(*domain))
+	{
+		free(*username);
+		free(*password);
+		free(*domain);
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+BOOL ios_ui_authenticate(freerdp *instance, char **username, char **password, char **domain)
+{
+	return ios_ui_authenticate_raw(instance, username, password, domain, "");
+}
+
+BOOL ios_ui_gw_authenticate(freerdp *instance, char **username, char **password, char **domain)
+{
+	return ios_ui_authenticate_raw(instance, username, password, domain, "gateway");
+}
+
+DWORD ios_ui_verify_certificate_ex(freerdp *instance, const char *host, UINT16 port,
+                                   const char *common_name, const char *subject, const char *issuer,
+                                   const char *fingerprint, DWORD flags)
+{
+	// check whether we accept all certificates
+	if ([[NSUserDefaults standardUserDefaults] boolForKey:@"security.accept_certificates"] == YES)
+		return 2;
+
+	mfInfo *mfi = MFI_FROM_INSTANCE(instance);
+	NSMutableDictionary *params = [NSMutableDictionary
+	    dictionaryWithObjectsAndKeys:(subject) ? [NSString stringWithUTF8String:subject] : @"",
+	                                 @"subject",
+	                                 (issuer) ? [NSString stringWithUTF8String:issuer] : @"",
+	                                 @"issuer",
+	                                 (fingerprint) ? [NSString stringWithUTF8String:subject] : @"",
+	                                 @"fingerprint", nil];
+	// request certificate verification UI
+	[mfi->session performSelectorOnMainThread:@selector(sessionVerifyCertificateWithParams:)
+	                               withObject:params
+	                            waitUntilDone:YES];
+	// wait for UI request to be completed
+	[[mfi->session uiRequestCompleted] lock];
+	[[mfi->session uiRequestCompleted] wait];
+	[[mfi->session uiRequestCompleted] unlock];
+
+	if (![[params valueForKey:@"result"] boolValue])
+	{
+		mfi->unwanted = YES;
+		return 0;
+	}
+
+	return 1;
+}
+
+DWORD ios_ui_verify_changed_certificate_ex(freerdp *instance, const char *host, UINT16 port,
+                                           const char *common_name, const char *subject,
+                                           const char *issuer, const char *fingerprint,
+                                           const char *old_subject, const char *old_issuer,
+                                           const char *old_fingerprint, DWORD flags)
+{
+	return ios_ui_verify_certificate_ex(instance, host, port, common_name, subject, issuer,
+	                                    fingerprint, flags);
+}
+
+#pragma mark -
+#pragma mark Graphics updates
+
+BOOL ios_ui_begin_paint(rdpContext *context)
+{
+	rdpGdi *gdi = context->gdi;
+	gdi->primary->hdc->hwnd->invalid->null = TRUE;
+	return TRUE;
+}
+
+BOOL ios_ui_end_paint(rdpContext *context)
+{
+	mfInfo *mfi = MFI_FROM_INSTANCE(context->instance);
+	rdpGdi *gdi = context->gdi;
+	CGRect dirty_rect =
+	    CGRectMake(gdi->primary->hdc->hwnd->invalid->x, gdi->primary->hdc->hwnd->invalid->y,
+	               gdi->primary->hdc->hwnd->invalid->w, gdi->primary->hdc->hwnd->invalid->h);
+
+	if (!gdi->primary->hdc->hwnd->invalid->null)
+		[mfi->session performSelectorOnMainThread:@selector(setNeedsDisplayInRectAsValue:)
+		                               withObject:[NSValue valueWithCGRect:dirty_rect]
+		                            waitUntilDone:NO];
+
+	return TRUE;
+}
+
+BOOL ios_ui_resize_window(rdpContext *context)
+{
+	rdpSettings *settings;
+	rdpGdi *gdi;
+
+	if (!context || !context->settings)
+		return FALSE;
+
+	settings = context->settings;
+	gdi = context->gdi;
+
+	if (!gdi_resize(gdi, freerdp_settings_get_uint32(settings, FreeRDP_DesktopWidth),
+	                freerdp_settings_get_uint32(settings, FreeRDP_DesktopHeight)))
+		return FALSE;
+
+	ios_resize_display_buffer(MFI_FROM_INSTANCE(context->instance));
+	return TRUE;
+}
+
+#pragma mark -
+#pragma mark Exported
+
+static void ios_create_bitmap_context(mfInfo *mfi)
+{
+	[mfi->session performSelectorOnMainThread:@selector(sessionBitmapContextWillChange)
+	                               withObject:nil
+	                            waitUntilDone:YES];
+	rdpGdi *gdi = mfi->instance->context->gdi;
+	CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
+
+	if (FreeRDPGetBytesPerPixel(gdi->dstFormat) == 2)
+		mfi->bitmap_context = CGBitmapContextCreate(
+		    gdi->primary_buffer, gdi->width, gdi->height, 5, gdi->stride, colorSpace,
+		    kCGBitmapByteOrder16Little | kCGImageAlphaNoneSkipFirst);
+	else
+		mfi->bitmap_context = CGBitmapContextCreate(
+		    gdi->primary_buffer, gdi->width, gdi->height, 8, gdi->stride, colorSpace,
+		    kCGBitmapByteOrder32Little | kCGImageAlphaNoneSkipFirst);
+
+	CGColorSpaceRelease(colorSpace);
+	[mfi->session performSelectorOnMainThread:@selector(sessionBitmapContextDidChange)
+	                               withObject:nil
+	                            waitUntilDone:YES];
+}
+
+void ios_allocate_display_buffer(mfInfo *mfi)
+{
+	ios_create_bitmap_context(mfi);
+}
+
+void ios_resize_display_buffer(mfInfo *mfi)
+{
+	// Release the old context in a thread-safe manner
+	CGContextRef old_context = mfi->bitmap_context;
+	mfi->bitmap_context = NULL;
+	CGContextRelease(old_context);
+	// Create the new context
+	ios_create_bitmap_context(mfi);
+}

local-test-freerdp-full-01/afc-freerdp/client/iOS/Misc/Reachability.m

@@ -0,0 +1,277 @@
+/*
+
+ File: Reachability.m
+ Abstract: Basic demonstration of how to use the SystemConfiguration Reachablity APIs.
+
+ Version: 2.2
+
+ Disclaimer: IMPORTANT:  This Apple software is supplied to you by Apple Inc.
+ ("Apple") in consideration of your agreement to the following terms, and your
+ use, installation, modification or redistribution of this Apple software
+ constitutes acceptance of these terms.  If you do not agree with these terms,
+ please do not use, install, modify or redistribute this Apple software.
+
+ In consideration of your agreement to abide by the following terms, and subject
+ to these terms, Apple grants you a personal, non-exclusive license, under
+ Apple's copyrights in this original Apple software (the "Apple Software"), to
+ use, reproduce, modify and redistribute the Apple Software, with or without
+ modifications, in source and/or binary forms; provided that if you redistribute
+ the Apple Software in its entirety and without modifications, you must retain
+ this notice and the following text and disclaimers in all such redistributions
+ of the Apple Software.
+ Neither the name, trademarks, service marks or logos of Apple Inc. may be used
+ to endorse or promote products derived from the Apple Software without specific
+ prior written permission from Apple.  Except as expressly stated in this notice,
+ no other rights or licenses, express or implied, are granted by Apple herein,
+ including but not limited to any patent rights that may be infringed by your
+ derivative works or by other works in which the Apple Software may be
+ incorporated.
+
+ The Apple Software is provided by Apple on an "AS IS" basis.  APPLE MAKES NO
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED
+ WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN
+ COMBINATION WITH YOUR PRODUCTS.
+
+ IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR
+ DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF
+ CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF
+ APPLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ Copyright (C) 2010 Apple Inc. All Rights Reserved.
+
+*/
+
+#import <sys/socket.h>
+#import <netinet/in.h>
+#import <netinet6/in6.h>
+#import <arpa/inet.h>
+#import <ifaddrs.h>
+#import <netdb.h>
+
+#import <CoreFoundation/CoreFoundation.h>
+
+#import "Reachability.h"
+
+#define kShouldPrintReachabilityFlags 1
+
+static void PrintReachabilityFlags(SCNetworkReachabilityFlags flags, const char *comment)
+{
+#if kShouldPrintReachabilityFlags
+
+	NSLog(@"Reachability Flag Status: %c%c %c%c%c%c%c%c%c %s\n",
+	      (flags & kSCNetworkReachabilityFlagsIsWWAN) ? 'W' : '-',
+	      (flags & kSCNetworkReachabilityFlagsReachable) ? 'R' : '-',
+
+	      (flags & kSCNetworkReachabilityFlagsTransientConnection) ? 't' : '-',
+	      (flags & kSCNetworkReachabilityFlagsConnectionRequired) ? 'c' : '-',
+	      (flags & kSCNetworkReachabilityFlagsConnectionOnTraffic) ? 'C' : '-',
+	      (flags & kSCNetworkReachabilityFlagsInterventionRequired) ? 'i' : '-',
+	      (flags & kSCNetworkReachabilityFlagsConnectionOnDemand) ? 'D' : '-',
+	      (flags & kSCNetworkReachabilityFlagsIsLocalAddress) ? 'l' : '-',
+	      (flags & kSCNetworkReachabilityFlagsIsDirect) ? 'd' : '-', comment);
+#endif
+}
+
+@implementation Reachability
+static void ReachabilityCallback(SCNetworkReachabilityRef target, SCNetworkReachabilityFlags flags,
+                                 void *info)
+{
+#pragma unused(target, flags)
+	NSCAssert(info != NULL, @"info was NULL in ReachabilityCallback");
+	NSCAssert([(NSObject *)info isKindOfClass:[Reachability class]],
+	          @"info was wrong class in ReachabilityCallback");
+
+	// We're on the main RunLoop, so an NSAutoreleasePool is not necessary, but is added defensively
+	// in case someone uses the Reachablity object in a different thread.
+	NSAutoreleasePool *myPool = [[NSAutoreleasePool alloc] init];
+
+	Reachability *noteObject = (Reachability *)info;
+	// Post a notification to notify the client that the network reachability changed.
+	[[NSNotificationCenter defaultCenter] postNotificationName:kReachabilityChangedNotification
+	                                                    object:noteObject];
+
+	[myPool release];
+}
+
+- (BOOL)startNotifier
+{
+	BOOL retVal = NO;
+	SCNetworkReachabilityContext context = { 0, self, NULL, NULL, NULL };
+	if (SCNetworkReachabilitySetCallback(reachabilityRef, ReachabilityCallback, &context))
+	{
+		if (SCNetworkReachabilityScheduleWithRunLoop(reachabilityRef, CFRunLoopGetCurrent(),
+		                                             kCFRunLoopDefaultMode))
+		{
+			retVal = YES;
+		}
+	}
+	return retVal;
+}
+
+- (void)stopNotifier
+{
+	if (reachabilityRef != NULL)
+	{
+		SCNetworkReachabilityUnscheduleFromRunLoop(reachabilityRef, CFRunLoopGetCurrent(),
+		                                           kCFRunLoopDefaultMode);
+	}
+}
+
+- (void)dealloc
+{
+	[self stopNotifier];
+	if (reachabilityRef != NULL)
+	{
+		CFRelease(reachabilityRef);
+	}
+	[super dealloc];
+}
+
++ (Reachability *)reachabilityWithHostName:(NSString *)hostName;
+{
+	Reachability *retVal = NULL;
+	SCNetworkReachabilityRef reachability =
+	    SCNetworkReachabilityCreateWithName(NULL, [hostName UTF8String]);
+	if (reachability != NULL)
+	{
+		retVal = [[[self alloc] init] autorelease];
+		if (retVal != NULL)
+		{
+			retVal->reachabilityRef = reachability;
+			retVal->localWiFiRef = NO;
+		}
+	}
+	return retVal;
+}
+
++ (Reachability *)reachabilityWithAddress:(const struct sockaddr_in *)hostAddress;
+{
+	SCNetworkReachabilityRef reachability = SCNetworkReachabilityCreateWithAddress(
+	    kCFAllocatorDefault, (const struct sockaddr *)hostAddress);
+	Reachability *retVal = NULL;
+	if (reachability != NULL)
+	{
+		retVal = [[[self alloc] init] autorelease];
+		if (retVal != NULL)
+		{
+			retVal->reachabilityRef = reachability;
+			retVal->localWiFiRef = NO;
+		}
+	}
+	return retVal;
+}
+
++ (Reachability *)reachabilityForInternetConnection;
+{
+	struct sockaddr_in zeroAddress;
+	bzero(&zeroAddress, sizeof(zeroAddress));
+	zeroAddress.sin_len = sizeof(zeroAddress);
+	zeroAddress.sin_family = AF_INET;
+	return [self reachabilityWithAddress:&zeroAddress];
+}
+
++ (Reachability *)reachabilityForLocalWiFi;
+{
+	struct sockaddr_in localWifiAddress;
+	bzero(&localWifiAddress, sizeof(localWifiAddress));
+	localWifiAddress.sin_len = sizeof(localWifiAddress);
+	localWifiAddress.sin_family = AF_INET;
+	// IN_LINKLOCALNETNUM is defined in <netinet/in.h> as 169.254.0.0
+	localWifiAddress.sin_addr.s_addr = htonl(IN_LINKLOCALNETNUM);
+	Reachability *retVal = [self reachabilityWithAddress:&localWifiAddress];
+	if (retVal != NULL)
+	{
+		retVal->localWiFiRef = YES;
+	}
+	return retVal;
+}
+
+#pragma mark Network Flag Handling
+
+- (NetworkStatus)localWiFiStatusForFlags:(SCNetworkReachabilityFlags)flags
+{
+	PrintReachabilityFlags(flags, "localWiFiStatusForFlags");
+
+	BOOL retVal = NotReachable;
+	if ((flags & kSCNetworkReachabilityFlagsReachable) &&
+	    (flags & kSCNetworkReachabilityFlagsIsDirect))
+	{
+		retVal = ReachableViaWiFi;
+	}
+	return retVal;
+}
+
+- (NetworkStatus)networkStatusForFlags:(SCNetworkReachabilityFlags)flags
+{
+	PrintReachabilityFlags(flags, "networkStatusForFlags");
+	if ((flags & kSCNetworkReachabilityFlagsReachable) == 0)
+	{
+		// if target host is not reachable
+		return NotReachable;
+	}
+
+	BOOL retVal = NotReachable;
+
+	if ((flags & kSCNetworkReachabilityFlagsConnectionRequired) == 0)
+	{
+		// if target host is reachable and no connection is required
+		//  then we'll assume (for now) that your on Wi-Fi
+		retVal = ReachableViaWiFi;
+	}
+
+	if ((((flags & kSCNetworkReachabilityFlagsConnectionOnDemand) != 0) ||
+	     (flags & kSCNetworkReachabilityFlagsConnectionOnTraffic) != 0))
+	{
+		// ... and the connection is on-demand (or on-traffic) if the
+		//     calling application is using the CFSocketStream or higher APIs
+
+		if ((flags & kSCNetworkReachabilityFlagsInterventionRequired) == 0)
+		{
+			// ... and no [user] intervention is needed
+			retVal = ReachableViaWiFi;
+		}
+	}
+
+	if ((flags & kSCNetworkReachabilityFlagsIsWWAN) == kSCNetworkReachabilityFlagsIsWWAN)
+	{
+		// ... but WWAN connections are OK if the calling application
+		//     is using the CFNetwork (CFSocketStream?) APIs.
+		retVal = ReachableViaWWAN;
+	}
+	return retVal;
+}
+
+- (BOOL)connectionRequired;
+{
+	NSAssert(reachabilityRef != NULL, @"connectionRequired called with NULL reachabilityRef");
+	SCNetworkReachabilityFlags flags;
+	if (SCNetworkReachabilityGetFlags(reachabilityRef, &flags))
+	{
+		return (flags & kSCNetworkReachabilityFlagsConnectionRequired);
+	}
+	return NO;
+}
+
+- (NetworkStatus)currentReachabilityStatus
+{
+	NSAssert(reachabilityRef != NULL, @"currentNetworkStatus called with NULL reachabilityRef");
+	NetworkStatus retVal = NotReachable;
+	SCNetworkReachabilityFlags flags;
+	if (SCNetworkReachabilityGetFlags(reachabilityRef, &flags))
+	{
+		if (localWiFiRef)
+		{
+			retVal = [self localWiFiStatusForFlags:flags];
+		}
+		else
+		{
+			retVal = [self networkStatusForFlags:flags];
+		}
+	}
+	return retVal;
+}
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Models/Encryptor.h

@@ -0,0 +1,43 @@
+/*
+ Password Encryptor
+
+ Copyright 2013 Thincast Technologies GmbH, Author: Dorian Johnson
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+/* Encrypts data using AES 128 with a 256 bit key derived using PBKDF2-HMAC-SHA1  */
+
+#import <Foundation/Foundation.h>
+
+// Encryption block cipher config
+#define TSXEncryptorBlockCipherAlgo kCCAlgorithmAES128
+#define TSXEncryptorBlockCipherKeySize kCCKeySizeAES256
+#define TSXEncryptorBlockCipherOptions kCCOptionPKCS7Padding
+#define TSXEncryptorBlockCipherBlockSize 16
+
+// Key generation: If any of these are changed, existing password stores will no longer work
+#define TSXEncryptorPBKDF2Rounds 100
+#define TSXEncryptorPBKDF2Salt "9D¶3L}S¿lA[e€3C«"
+#define TSXEncryptorPBKDF2SaltLen TSXEncryptorBlockCipherOptions
+#define TSXEncryptorPBKDF2KeySize TSXEncryptorBlockCipherKeySize
+
+@interface Encryptor : NSObject
+{
+  @private
+	NSData *_encryption_key;
+	NSString *_plaintext_password;
+}
+
+@property(readonly) NSString *plaintextPassword;
+
+- (id)initWithPassword:(NSString *)plaintext_password;
+
+- (NSData *)encryptData:(NSData *)plaintext_data;
+- (NSData *)decryptData:(NSData *)encrypted_data;
+- (NSData *)encryptString:(NSString *)plaintext_string;
+- (NSString *)decryptString:(NSData *)encrypted_string;
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Models/RDPKeyboard.h

@@ -0,0 +1,76 @@
+/*
+ RDP Keyboard helper
+
+ Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import <Foundation/Foundation.h>
+#import "RDPSession.h"
+
+@class RDPKeyboard;
+
+@protocol RDPKeyboardDelegate <NSObject>
+@optional
+- (void)modifiersChangedForKeyboard:(RDPKeyboard *)keyboard;
+@end
+
+@interface RDPKeyboard : NSObject
+{
+
+	RDPSession *_session;
+
+	int _virtual_key_map[256];
+	int _unicode_map[256];
+	NSDictionary *_special_keys;
+
+	NSObject<RDPKeyboardDelegate> *_delegate;
+
+	BOOL _ctrl_pressed;
+	BOOL _alt_pressed;
+	BOOL _shift_pressed;
+	BOOL _win_pressed;
+}
+
+@property(assign) id<RDPKeyboardDelegate> delegate;
+@property(readonly) BOOL ctrlPressed;
+@property(readonly) BOOL altPressed;
+@property(readonly) BOOL shiftPressed;
+@property(readonly) BOOL winPressed;
+
+// returns a keyboard instance
++ (RDPKeyboard *)getSharedRDPKeyboard;
+
+// init the keyboard and assign the given rdp session and delegate
+- (void)initWithSession:(RDPSession *)session delegate:(NSObject<RDPKeyboardDelegate> *)delegate;
+
+// called to reset any pending key states (i.e. pressed modifier keys)
+- (void)reset;
+
+// sends the given unicode character to the server
+- (void)sendUnicode:(int)character;
+
+// send a key stroke event using the given virtual key code
+- (void)sendVirtualKeyCode:(int)keyCode;
+
+// toggle ctrl key, returns true if pressed, otherwise false
+- (void)toggleCtrlKey;
+
+// toggle alt key, returns true if pressed, otherwise false
+- (void)toggleAltKey;
+
+// toggle shift key, returns true if pressed, otherwise false
+- (void)toggleShiftKey;
+
+// toggle windows key, returns true if pressed, otherwise false
+- (void)toggleWinKey;
+
+// send key strokes
+- (void)sendEnterKeyStroke;
+- (void)sendEscapeKeyStroke;
+- (void)sendBackspaceKeyStroke;
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Models/RDPKeyboard.m

@@ -0,0 +1,310 @@
+/*
+ RDP Keyboard helper
+
+ Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import "RDPKeyboard.h"
+#include <freerdp/locale/keyboard.h>
+
+@interface RDPKeyboard (Private)
+- (void)sendVirtualKey:(int)vKey up:(BOOL)up;
+- (void)handleSpecialKey:(int)character;
+- (void)handleAlphaNumChar:(int)character;
+- (void)notifyDelegateModifiersChanged;
+@end
+
+@implementation RDPKeyboard
+
+@synthesize delegate = _delegate, ctrlPressed = _ctrl_pressed, altPressed = _alt_pressed,
+            shiftPressed = _shift_pressed, winPressed = _win_pressed;
+
+- (id)init
+{
+	if ((self = [super init]) != nil)
+	{
+		[self initWithSession:nil delegate:nil];
+
+		memset(_virtual_key_map, 0, sizeof(_virtual_key_map));
+		memset(_unicode_map, 0, sizeof(_unicode_map));
+
+		// init vkey map - used for alpha-num characters
+		_virtual_key_map['0'] = VK_KEY_0;
+		_virtual_key_map['1'] = VK_KEY_1;
+		_virtual_key_map['2'] = VK_KEY_2;
+		_virtual_key_map['3'] = VK_KEY_3;
+		_virtual_key_map['4'] = VK_KEY_4;
+		_virtual_key_map['5'] = VK_KEY_5;
+		_virtual_key_map['6'] = VK_KEY_6;
+		_virtual_key_map['7'] = VK_KEY_7;
+		_virtual_key_map['8'] = VK_KEY_8;
+		_virtual_key_map['9'] = VK_KEY_9;
+
+		_virtual_key_map['a'] = VK_KEY_A;
+		_virtual_key_map['b'] = VK_KEY_B;
+		_virtual_key_map['c'] = VK_KEY_C;
+		_virtual_key_map['d'] = VK_KEY_D;
+		_virtual_key_map['e'] = VK_KEY_E;
+		_virtual_key_map['f'] = VK_KEY_F;
+		_virtual_key_map['g'] = VK_KEY_G;
+		_virtual_key_map['h'] = VK_KEY_H;
+		_virtual_key_map['i'] = VK_KEY_I;
+		_virtual_key_map['j'] = VK_KEY_J;
+		_virtual_key_map['k'] = VK_KEY_K;
+		_virtual_key_map['l'] = VK_KEY_L;
+		_virtual_key_map['m'] = VK_KEY_M;
+		_virtual_key_map['n'] = VK_KEY_N;
+		_virtual_key_map['o'] = VK_KEY_O;
+		_virtual_key_map['p'] = VK_KEY_P;
+		_virtual_key_map['q'] = VK_KEY_Q;
+		_virtual_key_map['r'] = VK_KEY_R;
+		_virtual_key_map['s'] = VK_KEY_S;
+		_virtual_key_map['t'] = VK_KEY_T;
+		_virtual_key_map['u'] = VK_KEY_U;
+		_virtual_key_map['v'] = VK_KEY_V;
+		_virtual_key_map['w'] = VK_KEY_W;
+		_virtual_key_map['x'] = VK_KEY_X;
+		_virtual_key_map['y'] = VK_KEY_Y;
+		_virtual_key_map['z'] = VK_KEY_Z;
+
+		// init scancode map - used for special characters
+		_unicode_map['-'] = 45;
+		_unicode_map['/'] = 47;
+		_unicode_map[':'] = 58;
+		_unicode_map[';'] = 59;
+		_unicode_map['('] = 40;
+		_unicode_map[')'] = 41;
+		_unicode_map['&'] = 38;
+		_unicode_map['@'] = 64;
+		_unicode_map['.'] = 46;
+		_unicode_map[','] = 44;
+		_unicode_map['?'] = 63;
+		_unicode_map['!'] = 33;
+		_unicode_map['\''] = 39;
+		_unicode_map['\"'] = 34;
+
+		_unicode_map['['] = 91;
+		_unicode_map[']'] = 93;
+		_unicode_map['{'] = 123;
+		_unicode_map['}'] = 125;
+		_unicode_map['#'] = 35;
+		_unicode_map['%'] = 37;
+		_unicode_map['^'] = 94;
+		_unicode_map['*'] = 42;
+		_unicode_map['+'] = 43;
+		_unicode_map['='] = 61;
+
+		_unicode_map['_'] = 95;
+		_unicode_map['\\'] = 92;
+		_unicode_map['|'] = 124;
+		_unicode_map['~'] = 126;
+		_unicode_map['<'] = 60;
+		_unicode_map['>'] = 62;
+		_unicode_map['$'] = 36;
+	}
+	return self;
+}
+
+- (void)dealloc
+{
+	[super dealloc];
+}
+
+#pragma mark -
+#pragma mark class methods
+
+// return a keyboard instance
++ (RDPKeyboard *)getSharedRDPKeyboard
+{
+	static RDPKeyboard *_shared_keyboard = nil;
+
+	if (_shared_keyboard == nil)
+	{
+		@synchronized(self)
+		{
+			if (_shared_keyboard == nil)
+				_shared_keyboard = [[RDPKeyboard alloc] init];
+		}
+	}
+
+	return _shared_keyboard;
+}
+
+// reset the keyboard instance and assign the given rdp instance
+- (void)initWithSession:(RDPSession *)session delegate:(NSObject<RDPKeyboardDelegate> *)delegate
+{
+	_alt_pressed = NO;
+	_ctrl_pressed = NO;
+	_shift_pressed = NO;
+	_win_pressed = NO;
+
+	_session = session;
+	_delegate = delegate;
+}
+
+- (void)reset
+{
+	// reset pressed ctrl, alt, shift or win key
+	if (_shift_pressed)
+		[self toggleShiftKey];
+	if (_alt_pressed)
+		[self toggleAltKey];
+	if (_ctrl_pressed)
+		[self toggleCtrlKey];
+	if (_win_pressed)
+		[self toggleWinKey];
+}
+
+// handles button pressed input event from the iOS keyboard
+// performs all conversions etc.
+- (void)sendUnicode:(int)character
+{
+	if (isalnum(character))
+		[self handleAlphaNumChar:character];
+	else
+		[self handleSpecialKey:character];
+
+	[self reset];
+}
+
+// send a backspace key press
+- (void)sendVirtualKeyCode:(int)keyCode
+{
+	[self sendVirtualKey:keyCode up:NO];
+	[self sendVirtualKey:keyCode up:YES];
+}
+
+#pragma mark modifier key handling
+// toggle ctrl key, returns true if pressed, otherwise false
+- (void)toggleCtrlKey
+{
+	[self sendVirtualKey:VK_LCONTROL up:_ctrl_pressed];
+	_ctrl_pressed = !_ctrl_pressed;
+	[self notifyDelegateModifiersChanged];
+}
+
+// toggle alt key, returns true if pressed, otherwise false
+- (void)toggleAltKey
+{
+	[self sendVirtualKey:VK_LMENU up:_alt_pressed];
+	_alt_pressed = !_alt_pressed;
+	[self notifyDelegateModifiersChanged];
+}
+
+// toggle shift key, returns true if pressed, otherwise false
+- (void)toggleShiftKey
+{
+	[self sendVirtualKey:VK_LSHIFT up:_shift_pressed];
+	_shift_pressed = !_shift_pressed;
+	[self notifyDelegateModifiersChanged];
+}
+
+// toggle windows key, returns true if pressed, otherwise false
+- (void)toggleWinKey
+{
+	[self sendVirtualKey:(VK_LWIN | KBDEXT) up:_win_pressed];
+	_win_pressed = !_win_pressed;
+	[self notifyDelegateModifiersChanged];
+}
+
+#pragma mark Sending special key strokes
+
+- (void)sendEnterKeyStroke
+{
+	[self sendVirtualKeyCode:(VK_RETURN | KBDEXT)];
+}
+
+- (void)sendEscapeKeyStroke
+{
+	[self sendVirtualKeyCode:VK_ESCAPE];
+}
+
+- (void)sendBackspaceKeyStroke
+{
+	[self sendVirtualKeyCode:VK_BACK];
+}
+
+@end
+
+#pragma mark -
+@implementation RDPKeyboard (Private)
+
+- (void)handleAlphaNumChar:(int)character
+{
+	// if we receive an uppercase letter - make it lower and send an shift down event to server
+	BOOL shift_was_sent = NO;
+	if (isupper(character) && _shift_pressed == NO)
+	{
+		character = tolower(character);
+		[self sendVirtualKey:VK_LSHIFT up:NO];
+		shift_was_sent = YES;
+	}
+
+	// convert the character to a VK
+	int vk = _virtual_key_map[character];
+	if (vk != 0)
+	{
+		// send key pressed
+		[self sendVirtualKey:vk up:NO];
+		[self sendVirtualKey:vk up:YES];
+	}
+
+	// send the missing shift up if we had a shift down
+	if (shift_was_sent)
+		[self sendVirtualKey:VK_LSHIFT up:YES];
+}
+
+- (void)handleSpecialKey:(int)character
+{
+	NSDictionary *eventDescriptor = nil;
+	if (character < 256)
+	{
+		// convert the character to a unicode character
+		int code = _unicode_map[character];
+		if (code != 0)
+			eventDescriptor = [NSDictionary
+			    dictionaryWithObjectsAndKeys:@"keyboard", @"type", @"unicode", @"subtype",
+			                                 [NSNumber numberWithUnsignedShort:0], @"flags",
+			                                 [NSNumber numberWithUnsignedShort:code],
+			                                 @"unicode_char", nil];
+	}
+
+	if (eventDescriptor == nil)
+		eventDescriptor = [NSDictionary
+		    dictionaryWithObjectsAndKeys:@"keyboard", @"type", @"unicode", @"subtype",
+		                                 [NSNumber numberWithUnsignedShort:0], @"flags",
+		                                 [NSNumber numberWithUnsignedShort:character],
+		                                 @"unicode_char", nil];
+
+	[_session sendInputEvent:eventDescriptor];
+}
+
+// sends the vk code to the session
+- (void)sendVirtualKey:(int)vKey up:(BOOL)up
+{
+	DWORD scancode = GetVirtualScanCodeFromVirtualKeyCode(vKey, 4);
+	int flags = (up ? KBD_FLAGS_RELEASE : KBD_FLAGS_DOWN);
+	flags |= ((scancode & KBDEXT) ? KBD_FLAGS_EXTENDED : 0);
+	[_session
+	    sendInputEvent:[NSDictionary
+	                       dictionaryWithObjectsAndKeys:@"keyboard", @"type", @"scancode",
+	                                                    @"subtype",
+	                                                    [NSNumber numberWithUnsignedShort:flags],
+	                                                    @"flags",
+	                                                    [NSNumber
+	                                                        numberWithUnsignedShort:(scancode &
+	                                                                                 0xFF)],
+	                                                    @"scancode", nil]];
+}
+
+- (void)notifyDelegateModifiersChanged
+{
+	if ([[self delegate] respondsToSelector:@selector(modifiersChangedForKeyboard:)])
+		[[self delegate] modifiersChangedForKeyboard:self];
+}
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Views/AdvancedKeyboardView.h

@@ -0,0 +1,48 @@
+/*
+ Advanced keyboard view interface
+
+ Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one at
+ http://mozilla.org/MPL/2.0/.
+ */
+
+#import <UIKit/UIKit.h>
+
+// forward declaration
+@protocol AdvancedKeyboardDelegate <NSObject>
+@optional
+// called when a function key was pressed and a virtual keycode is provided
+//  @key: virtual key code
+- (void)advancedKeyPressedVKey:(int)key;
+// called when a function key was pressed and the keys unicode is provided
+//  @key: unicode character
+- (void)advancedKeyPressedUnicode:(int)key;
+@end
+
+@interface AdvancedKeyboardView : UIView
+{
+  @private
+	// view containing function keys (F-keys) and function block (ins, del, home, end, ...)
+	UIView *_function_keys_view;
+
+	// view containing numpad keys (0-9, +-/*)
+	UIView *_numpad_keys_view;
+
+	// view containing cursor keys (up, down, left, right)
+	UIView *_cursor_keys_view;
+
+	// currently visible view
+	UIView *_cur_view;
+
+	// delegate
+	NSObject<AdvancedKeyboardDelegate> *_delegate;
+}
+
+@property(assign) NSObject<AdvancedKeyboardDelegate> *delegate;
+
+// init keyboard view with frame and delegate
+- (id)initWithFrame:(CGRect)frame delegate:(NSObject<AdvancedKeyboardDelegate> *)delegate;
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Views/BlockAlertView.h

@@ -0,0 +1,42 @@
+//
+//  BlockAlertView.h
+//
+//
+
+#import <UIKit/UIKit.h>
+
+@interface BlockAlertView : NSObject
+{
+  @protected
+	UIView *_view;
+	NSMutableArray *_blocks;
+	CGFloat _height;
+	NSString *_title;
+	NSString *_message;
+	BOOL _shown;
+	BOOL _cancelBounce;
+}
+
++ (BlockAlertView *)alertWithTitle:(NSString *)title message:(NSString *)message;
+
++ (void)showInfoAlertWithTitle:(NSString *)title message:(NSString *)message;
++ (void)showErrorAlert:(NSError *)error;
+
+- (id)initWithTitle:(NSString *)title message:(NSString *)message;
+
+- (void)setDestructiveButtonWithTitle:(NSString *)title block:(void (^)())block;
+- (void)setCancelButtonWithTitle:(NSString *)title block:(void (^)())block;
+- (void)addButtonWithTitle:(NSString *)title block:(void (^)())block;
+
+- (void)addComponents:(CGRect)frame;
+
+- (void)show;
+- (void)dismissWithClickedButtonIndex:(NSInteger)buttonIndex animated:(BOOL)animated;
+
+- (void)setupDisplay;
+
+@property(nonatomic, retain) UIImage *backgroundImage;
+@property(nonatomic, readonly) UIView *view;
+@property(nonatomic, readwrite) BOOL vignetteBackground;
+
+@end

local-test-freerdp-full-01/afc-freerdp/client/iOS/Views/BlockAlertView.m

@@ -0,0 +1,475 @@
+//
+//  BlockAlertView.m
+//
+//
+
+#import "BlockAlertView.h"
+#import "BlockBackground.h"
+#import "BlockUI.h"
+
+@implementation BlockAlertView
+
+@synthesize view = _view;
+@synthesize backgroundImage = _backgroundImage;
+@synthesize vignetteBackground = _vignetteBackground;
+
+static UIImage *background = nil;
+static UIImage *backgroundlandscape = nil;
+static UIFont *titleFont = nil;
+static UIFont *messageFont = nil;
+static UIFont *buttonFont = nil;
+
+#pragma mark - init
+
++ (void)initialize
+{
+	if (self == [BlockAlertView class])
+	{
+		background = [UIImage imageNamed:kAlertViewBackground];
+		background =
+		    [[background stretchableImageWithLeftCapWidth:0
+		                                     topCapHeight:kAlertViewBackgroundCapHeight] retain];
+
+		backgroundlandscape = [UIImage imageNamed:kAlertViewBackgroundLandscape];
+		backgroundlandscape = [[backgroundlandscape
+		    stretchableImageWithLeftCapWidth:0
+		                        topCapHeight:kAlertViewBackgroundCapHeight] retain];
+
+		titleFont = [kAlertViewTitleFont retain];
+		messageFont = [kAlertViewMessageFont retain];
+		buttonFont = [kAlertViewButtonFont retain];
+	}
+}
+
++ (BlockAlertView *)alertWithTitle:(NSString *)title message:(NSString *)message
+{
+	return [[[BlockAlertView alloc] initWithTitle:title message:message] autorelease];
+}
+
++ (void)showInfoAlertWithTitle:(NSString *)title message:(NSString *)message
+{
+	BlockAlertView *alert = [[BlockAlertView alloc] initWithTitle:title message:message];
+	[alert setCancelButtonWithTitle:NSLocalizedString(@"Dismiss", nil) block:nil];
+	[alert show];
+	[alert release];
+}
+
++ (void)showErrorAlert:(NSError *)error
+{
+	BlockAlertView *alert = [[BlockAlertView alloc]
+	    initWithTitle:NSLocalizedString(@"Operation Failed", nil)
+	          message:[NSString
+	                      stringWithFormat:NSLocalizedString(
+	                                           @"The operation did not complete successfully: %@",
+	                                           nil),
+	                                       error]];
+	[alert setCancelButtonWithTitle:@"Dismiss" block:nil];
+	[alert show];
+	[alert release];
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark - NSObject
+
+- (void)addComponents:(CGRect)frame
+{
+	if (_title)
+	{
+		CGSize size = [_title sizeWithFont:titleFont
+		                 constrainedToSize:CGSizeMake(frame.size.width - kAlertViewBorder * 2, 1000)
+		                     lineBreakMode:NSLineBreakByWordWrapping];
+
+		UILabel *labelView = [[UILabel alloc]
+		    initWithFrame:CGRectMake(kAlertViewBorder, _height,
+		                             frame.size.width - kAlertViewBorder * 2, size.height)];
+		labelView.font = titleFont;
+		labelView.numberOfLines = 0;
+		labelView.lineBreakMode = NSLineBreakByWordWrapping;
+		labelView.textColor = kAlertViewTitleTextColor;
+		labelView.backgroundColor = [UIColor clearColor];
+		labelView.textAlignment = NSTextAlignmentCenter;
+		labelView.shadowColor = kAlertViewTitleShadowColor;
+		labelView.shadowOffset = kAlertViewTitleShadowOffset;
+		labelView.text = _title;
+		[_view addSubview:labelView];
+		[labelView release];
+
+		_height += size.height + kAlertViewBorder;
+	}
+
+	if (_message)
+	{
+		CGSize size =
+		    [_message sizeWithFont:messageFont
+		         constrainedToSize:CGSizeMake(frame.size.width - kAlertViewBorder * 2, 1000)
+		             lineBreakMode:NSLineBreakByWordWrapping];
+
+		UILabel *labelView = [[UILabel alloc]
+		    initWithFrame:CGRectMake(kAlertViewBorder, _height,
+		                             frame.size.width - kAlertViewBorder * 2, size.height)];
+		labelView.font = messageFont;
+		labelView.numberOfLines = 0;
+		labelView.lineBreakMode = NSLineBreakByWordWrapping;
+		labelView.textColor = kAlertViewMessageTextColor;
+		labelView.backgroundColor = [UIColor clearColor];
+		labelView.textAlignment = NSTextAlignmentCenter;
+		labelView.shadowColor = kAlertViewMessageShadowColor;
+		labelView.shadowOffset = kAlertViewMessageShadowOffset;
+		labelView.text = _message;
+		[_view addSubview:labelView];
+		[labelView release];
+
+		_height += size.height + kAlertViewBorder;
+	}
+}
+
+- (void)setupDisplay
+{
+	[[_view subviews] enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
+		[obj removeFromSuperview];
+	}];
+
+	UIWindow *parentView = [BlockBackground sharedInstance];
+	CGRect frame = parentView.bounds;
+	frame.origin.x = floorf((frame.size.width - background.size.width) * 0.5);
+	frame.size.width = background.size.width;
+
+	UIInterfaceOrientation orientation = [[UIApplication sharedApplication] statusBarOrientation];
+	if (UIInterfaceOrientationIsLandscape(orientation))
+	{
+		frame.size.width += 150;
+		frame.origin.x -= 75;
+	}
+
+	_view.frame = frame;
+
+	_height = kAlertViewBorder + 15;
+
+	if (NeedsLandscapePhoneTweaks)
+	{
+		_height -= 15; // landscape phones need to trimmed a bit
+	}
+
+	[self addComponents:frame];
+
+	if (_shown)
+		[self show];
+}
+
+- (id)initWithTitle:(NSString *)title message:(NSString *)message
+{
+	self = [super init];
+
+	if (self)
+	{
+		_title = [title copy];
+		_message = [message copy];
+
+		_view = [[UIView alloc] init];
+
+		_view.autoresizingMask =
+		    UIViewAutoresizingFlexibleBottomMargin | UIViewAutoresizingFlexibleTopMargin |
+		    UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin;
+
+		_blocks = [[NSMutableArray alloc] init];
+
+		[[NSNotificationCenter defaultCenter]
+		    addObserver:self
+		       selector:@selector(setupDisplay)
+		           name:UIApplicationDidChangeStatusBarOrientationNotification
+		         object:nil];
+
+		if ([self class] == [BlockAlertView class])
+			[self setupDisplay];
+
+		_vignetteBackground = NO;
+	}
+
+	return self;
+}
+
+- (void)dealloc
+{
+	[_title release];
+	[_message release];
+	[_backgroundImage release];
+	[_view release];
+	[_blocks release];
+	[super dealloc];
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark - Public
+
+- (void)addButtonWithTitle:(NSString *)title color:(NSString *)color block:(void (^)())block
+{
+	[_blocks addObject:[NSArray arrayWithObjects:block ? [[block copy] autorelease] : [NSNull null],
+	                                             title, color, nil]];
+}
+
+- (void)addButtonWithTitle:(NSString *)title block:(void (^)())block
+{
+	[self addButtonWithTitle:title color:@"gray" block:block];
+}
+
+- (void)setCancelButtonWithTitle:(NSString *)title block:(void (^)())block
+{
+	[self addButtonWithTitle:title color:@"black" block:block];
+}
+
+- (void)setDestructiveButtonWithTitle:(NSString *)title block:(void (^)())block
+{
+	[self addButtonWithTitle:title color:@"red" block:block];
+}
+
+- (void)show
+{
+	_shown = YES;
+
+	BOOL isSecondButton = NO;
+	NSUInteger index = 0;
+	for (NSUInteger i = 0; i < _blocks.count; i++)
+	{
+		NSArray *block = [_blocks objectAtIndex:i];
+		NSString *title = [block objectAtIndex:1];
+		NSString *color = [block objectAtIndex:2];
+
+		UIImage *image =
+		    [UIImage imageNamed:[NSString stringWithFormat:@"alert-%@-button.png", color]];
+		image = [image stretchableImageWithLeftCapWidth:(int)(image.size.width + 1) >> 1
+		                                   topCapHeight:0];
+
+		CGFloat maxHalfWidth = floorf((_view.bounds.size.width - kAlertViewBorder * 3) * 0.5);
+		CGFloat width = _view.bounds.size.width - kAlertViewBorder * 2;
+		CGFloat xOffset = kAlertViewBorder;
+		if (isSecondButton)
+		{
+			width = maxHalfWidth;
+			xOffset = width + kAlertViewBorder * 2;
+			isSecondButton = NO;
+		}
+		else if (i + 1 < _blocks.count)
+		{
+			// In this case there's another button.
+			// Let's check if they fit on the same line.
+			CGSize size = [title sizeWithFont:buttonFont
+			                      minFontSize:10
+			                   actualFontSize:nil
+			                         forWidth:_view.bounds.size.width - kAlertViewBorder * 2
+			                    lineBreakMode:NSLineBreakByClipping];
+
+			if (size.width < maxHalfWidth - kAlertViewBorder)
+			{
+				// It might fit. Check the next Button
+				NSArray *block2 = [_blocks objectAtIndex:i + 1];
+				NSString *title2 = [block2 objectAtIndex:1];
+				size = [title2 sizeWithFont:buttonFont
+				                minFontSize:10
+				             actualFontSize:nil
+				                   forWidth:_view.bounds.size.width - kAlertViewBorder * 2
+				              lineBreakMode:NSLineBreakByClipping];
+
+				if (size.width < maxHalfWidth - kAlertViewBorder)
+				{
+					// They'll fit!
+					isSecondButton = YES; // For the next iteration
+					width = maxHalfWidth;
+				}
+			}
+		}
+		else if (_blocks.count == 1)
+		{
+			// In this case this is the only button. We'll size according to the text
+			CGSize size = [title sizeWithFont:buttonFont
+			                      minFontSize:10
+			                   actualFontSize:nil
+			                         forWidth:_view.bounds.size.width - kAlertViewBorder * 2
+			                    lineBreakMode:UILineBreakModeClip];
+
+			size.width = MAX(size.width, 80);
+			if (size.width + 2 * kAlertViewBorder < width)
+			{
+				width = size.width + 2 * kAlertViewBorder;
+				xOffset = floorf((_view.bounds.size.width - width) * 0.5);
+			}
+		}
+
+		UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom];
+		button.frame = CGRectMake(xOffset, _height, width, kAlertButtonHeight);
+		button.titleLabel.font = buttonFont;
+		if (IOS_LESS_THAN_6)
+		{
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+			button.titleLabel.minimumFontSize = 10;
+#pragma clang diagnostic pop
+		}
+		else
+		{
+			button.titleLabel.adjustsFontSizeToFitWidth = YES;
+			button.titleLabel.adjustsLetterSpacingToFitWidth = YES;
+			button.titleLabel.minimumScaleFactor = 0.1;
+		}
+		button.titleLabel.textAlignment = NSTextAlignmentCenter;
+		button.titleLabel.shadowOffset = kAlertViewButtonShadowOffset;
+		button.backgroundColor = [UIColor clearColor];
+		button.tag = i + 1;
+
+		[button setBackgroundImage:image forState:UIControlStateNormal];
+		[button setTitleColor:kAlertViewButtonTextColor forState:UIControlStateNormal];
+		[button setTitleShadowColor:kAlertViewButtonShadowColor forState:UIControlStateNormal];
+		[button setTitle:title forState:UIControlStateNormal];
+		button.accessibilityLabel = title;
+
+		[button addTarget:self
+		              action:@selector(buttonClicked:)
+		    forControlEvents:UIControlEventTouchUpInside];
+
+		[_view addSubview:button];
+
+		if (!isSecondButton)
+			_height += kAlertButtonHeight + kAlertViewBorder;
+
+		index++;
+	}
+
+	_height += 10; // Margin for the shadow
+
+	if (_height < background.size.height)
+	{
+		CGFloat offset = background.size.height - _height;
+		_height = background.size.height;
+		CGRect frame;
+		for (NSUInteger i = 0; i < _blocks.count; i++)
+		{
+			UIButton *btn = (UIButton *)[_view viewWithTag:i + 1];
+			frame = btn.frame;
+			frame.origin.y += offset;
+			btn.frame = frame;
+		}
+	}
+
+	CGRect frame = _view.frame;
+	frame.origin.y = -_height;
+	frame.size.height = _height;
+	_view.frame = frame;
+
+	UIImageView *modalBackground = [[UIImageView alloc] initWithFrame:_view.bounds];
+
+	if (UIInterfaceOrientationIsLandscape([[UIApplication sharedApplication] statusBarOrientation]))
+		modalBackground.image = backgroundlandscape;
+	else
+		modalBackground.image = background;
+
+	modalBackground.contentMode = UIViewContentModeScaleToFill;
+	modalBackground.autoresizingMask =
+	    UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+	[_view insertSubview:modalBackground atIndex:0];
+	[modalBackground release];
+
+	if (_backgroundImage)
+	{
+		[BlockBackground sharedInstance].backgroundImage = _backgroundImage;
+		[_backgroundImage release];
+		_backgroundImage = nil;
+	}
+
+	[BlockBackground sharedInstance].vignetteBackground = _vignetteBackground;
+	[[BlockBackground sharedInstance] addToMainWindow:_view];
+
+	__block CGPoint center = _view.center;
+	center.y = floorf([BlockBackground sharedInstance].bounds.size.height * 0.5) + kAlertViewBounce;
+
+	_cancelBounce = NO;
+
+	[UIView animateWithDuration:0.4
+	    delay:0.0
+	    options:UIViewAnimationCurveEaseOut
+	    animations:^{
+		    [BlockBackground sharedInstance].alpha = 1.0f;
+		    _view.center = center;
+	    }
+	    completion:^(BOOL finished) {
+		    if (_cancelBounce)
+			    return;
+
+		    [UIView animateWithDuration:0.1
+		        delay:0.0
+		        options:0
+		        animations:^{
+			        center.y -= kAlertViewBounce;
+			        _view.center = center;
+		        }
+		        completion:^(BOOL finished) {
+			        [[NSNotificationCenter defaultCenter]
+			            postNotificationName:@"AlertViewFinishedAnimations"
+			                          object:nil];
+		        }];
+	    }];
+
+	[self retain];
+}
+
+- (void)dismissWithClickedButtonIndex:(NSInteger)buttonIndex animated:(BOOL)animated
+{
+	_shown = NO;
+
+	[[NSNotificationCenter defaultCenter] removeObserver:self];
+
+	if (buttonIndex >= 0 && buttonIndex < [_blocks count])
+	{
+		id obj = [[_blocks objectAtIndex:buttonIndex] objectAtIndex:0];
+		if (![obj isEqual:[NSNull null]])
+		{
+			((void (^)())obj)();
+		}
+	}
+
+	if (animated)
+	{
+		[UIView animateWithDuration:0.1
+		    delay:0.0
+		    options:0
+		    animations:^{
+			    CGPoint center = _view.center;
+			    center.y += 20;
+			    _view.center = center;
+		    }
+		    completion:^(BOOL finished) {
+			    [UIView animateWithDuration:0.4
+			        delay:0.0
+			        options:UIViewAnimationCurveEaseIn
+			        animations:^{
+				        CGRect frame = _view.frame;
+				        frame.origin.y = -frame.size.height;
+				        _view.frame = frame;
+				        [[BlockBackground sharedInstance] reduceAlphaIfEmpty];
+			        }
+			        completion:^(BOOL finished) {
+				        [[BlockBackground sharedInstance] removeView:_view];
+				        [_view release];
+				        _view = nil;
+				        [self autorelease];
+			        }];
+		    }];
+	}
+	else
+	{
+		[[BlockBackground sharedInstance] removeView:_view];
+		[_view release];
+		_view = nil;
+		[self autorelease];
+	}
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark - Action
+
+- (void)buttonClicked:(id)sender
+{
+	/* Run the button's block */
+	int buttonIndex = [sender tag] - 1;
+	[self dismissWithClickedButtonIndex:buttonIndex animated:YES];
+}
+
+@end